Merge branch 'maint'
This commit is contained in:
commit
25b02e7cc8
|
@ -1765,8 +1765,6 @@ CONTENTS is nil. INFO is a plist holding contextual information."
|
||||||
((not
|
((not
|
||||||
(org-export-footnote-first-reference-p footnote-reference info nil t))
|
(org-export-footnote-first-reference-p footnote-reference info nil t))
|
||||||
(funcall --format-footnote-reference n))
|
(funcall --format-footnote-reference n))
|
||||||
;; Inline definitions are secondary strings.
|
|
||||||
;; Non-inline footnotes definitions are full Org data.
|
|
||||||
(t
|
(t
|
||||||
(let* ((raw (org-export-get-footnote-definition
|
(let* ((raw (org-export-get-footnote-definition
|
||||||
footnote-reference info))
|
footnote-reference info))
|
||||||
|
@ -1784,7 +1782,11 @@ CONTENTS is nil. INFO is a plist holding contextual information."
|
||||||
"OrgFootnoteCenter"
|
"OrgFootnoteCenter"
|
||||||
"OrgFootnoteQuotations")))))
|
"OrgFootnoteQuotations")))))
|
||||||
info))))
|
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>"
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
||||||
"Footnote" def)))))
|
"Footnote" def)))))
|
||||||
(funcall --format-footnote-definition n def))))))))
|
(funcall --format-footnote-definition n def))))))))
|
||||||
|
|
Loading…
Reference in New Issue