mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-15 23:50:27 +02:00
parent 69b0db33a1 8d00cd8966
commit 25b02e7cc8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ox-odt.el
View File

@ -1765,8 +1765,6 @@ CONTENTS is nil. INFO is a plist holding contextual information."
((not
(org-export-footnote-first-reference-p footnote-reference info nil t))
(funcall --format-footnote-reference n))
;; Inline definitions are secondary strings.
;; Non-inline footnotes definitions are full Org data.
(t
(let* ((raw (org-export-get-footnote-definition
footnote-reference info))
@ -1784,7 +1782,11 @@ CONTENTS is nil. INFO is a plist holding contextual information."
"OrgFootnoteCenter"
"OrgFootnoteQuotations")))))
info))))
(if (eq (org-element-type raw) 'org-data) def
;; Inline definitions are secondary strings. We
;; need to wrap them within a paragraph.
(if (org-element-map raw org-element-all-elements
#'identity info t)
def
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
"Footnote" def)))))
(funcall --format-footnote-definition n def))))))))