org-latex: fix footnotes wrt lists and links

* lisp/org-latex.el: pay attention to end of footnote. Before closing
  the command, ensure that list is properly closed or that last link
  is separated from the curly brace.
This commit is contained in:
Nicolas Goaziou 2011-03-30 23:52:33 +02:00
parent a1458ba5ec
commit 5efc6f5fc4
1 changed files with 9 additions and 6 deletions

View File

@ -2412,12 +2412,15 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(replace-match (org-export-latex-protect-string (replace-match (org-export-latex-protect-string
(concat "$^{" (match-string 1) "}$"))) (concat "$^{" (match-string 1) "}$")))
(replace-match "") (replace-match "")
(let ((end (save-excursion (let* ((end (save-excursion
(if (re-search-forward "^$\\|^#.*$\\|\\[[0-9]+\\]" nil t) (if (re-search-forward "^$\\|^#.*$\\|\\[[0-9]+\\]" nil t)
(match-beginning 0) (point-max))))) (match-beginning 0) (point-max))))
(setq footnote (concat (org-trim (buffer-substring (point) end)) (body (org-trim (buffer-substring (point) end))))
; last } won't be part of a link or list. ;; Fix for footnotes ending on a link or a list.
"\n")) (setq footnote
(concat body
(if (string-match "ORG-LIST-END-MARKER\\'" body)
"\n" " ")))
(delete-region (point) end)) (delete-region (point) end))
(goto-char foot-beg) (goto-char foot-beg)
(delete-region foot-beg foot-end) (delete-region foot-beg foot-end)