org-exp: normalize footnotes after removing commented subtrees

* lisp/org-exp.el (org-export-preprocess-string): if the last subtree
  is commented, footnotes inserted during normalizing at the end of
  the buffer may get deleted. This patch ensures deletion comes first,
  normalization second.
This commit is contained in:
Nicolas Goaziou 2011-06-28 17:07:37 +02:00
parent 39d4bfa0e8
commit 56b558d15a
1 changed files with 5 additions and 5 deletions

View File

@ -1119,10 +1119,6 @@ on this string to produce the exported version."
(org-export-handle-include-files-recurse) (org-export-handle-include-files-recurse)
(run-hooks 'org-export-preprocess-after-include-files-hook) (run-hooks 'org-export-preprocess-after-include-files-hook)
;; Normalize footnotes
(when (plist-get parameters :footnotes)
(org-footnote-normalize nil 'pre-process-p))
;; Change lists ending. Other parts of export may insert blank ;; Change lists ending. Other parts of export may insert blank
;; lines and lists' structure could be altered. ;; lines and lists' structure could be altered.
(org-export-mark-list-end) (org-export-mark-list-end)
@ -1130,7 +1126,7 @@ on this string to produce the exported version."
;; Process the macros ;; Process the macros
(org-export-preprocess-apply-macros) (org-export-preprocess-apply-macros)
(run-hooks 'org-export-preprocess-after-macros-hook) (run-hooks 'org-export-preprocess-after-macros-hook)
;; Get rid of archived trees ;; Get rid of archived trees
(org-export-remove-archived-trees archived-trees) (org-export-remove-archived-trees archived-trees)
@ -1142,6 +1138,10 @@ on this string to produce the exported version."
(plist-get parameters :exclude-tags)) (plist-get parameters :exclude-tags))
(run-hooks 'org-export-preprocess-after-tree-selection-hook) (run-hooks 'org-export-preprocess-after-tree-selection-hook)
;; Normalize footnotes
(when (plist-get parameters :footnotes)
(org-footnote-normalize nil 'pre-process-p))
;; Get rid of tasks, depending on configuration ;; Get rid of tasks, depending on configuration
(org-export-remove-tasks (plist-get parameters :tasks)) (org-export-remove-tasks (plist-get parameters :tasks))