forked from mirrors/org-mode
Merge branch 'bugfix'
This commit is contained in:
commit
c0c576b445
|
@ -165,15 +165,11 @@ INFO is the export state, as a property list."
|
||||||
(org-cite-biblatex--atomic-arguments (list r) info))
|
(org-cite-biblatex--atomic-arguments (list r) info))
|
||||||
(org-cite-get-references citation)
|
(org-cite-get-references citation)
|
||||||
"")
|
"")
|
||||||
;; According to biblatex manual, left braces or brackets
|
;; According to BibLaTeX manual, left braces or brackets
|
||||||
;; following a multicite command could be parsed as other
|
;; following a multicite command could be parsed as other
|
||||||
;; arguments. So we look ahead and insert a \relax if
|
;; arguments. So we stop any further parsing by inserting
|
||||||
;; needed.
|
;; a \relax unconditionally.
|
||||||
(and (let ((next (org-export-get-next-element citation info)))
|
"\\relax")))
|
||||||
(and next
|
|
||||||
(string-match (rx string-start (or "{" "["))
|
|
||||||
(org-export-data next info))))
|
|
||||||
"\\relax"))))
|
|
||||||
|
|
||||||
(defun org-cite-biblatex--command (citation info base &optional multi no-opt)
|
(defun org-cite-biblatex--command (citation info base &optional multi no-opt)
|
||||||
"Return biblatex command using BASE name for CITATION object.
|
"Return biblatex command using BASE name for CITATION object.
|
||||||
|
|
16
lisp/oc.el
16
lisp/oc.el
|
@ -89,7 +89,6 @@
|
||||||
(declare-function org-element-type "org-element" (element))
|
(declare-function org-element-type "org-element" (element))
|
||||||
|
|
||||||
(declare-function org-export-derived-backend-p "org-export" (backend &rest backends))
|
(declare-function org-export-derived-backend-p "org-export" (backend &rest backends))
|
||||||
(declare-function org-export-get-footnote-definition "org-export" (footnote-reference info))
|
|
||||||
(declare-function org-export-get-next-element "org-export" (blob info &optional n))
|
(declare-function org-export-get-next-element "org-export" (blob info &optional n))
|
||||||
(declare-function org-export-get-previous-element "org-export" (blob info &optional n))
|
(declare-function org-export-get-previous-element "org-export" (blob info &optional n))
|
||||||
(declare-function org-export-raw-string "org-export" (s))
|
(declare-function org-export-raw-string "org-export" (s))
|
||||||
|
@ -799,9 +798,20 @@ INFO is the export communication channel, as a property list."
|
||||||
;; Do not force entering inline definitions, since
|
;; Do not force entering inline definitions, since
|
||||||
;; `org-element-map' is going to enter it anyway.
|
;; `org-element-map' is going to enter it anyway.
|
||||||
((guard (eq 'inline (org-element-property :type datum))))
|
((guard (eq 'inline (org-element-property :type datum))))
|
||||||
|
;; Find definition for current standard
|
||||||
|
;; footnote reference. Unlike to
|
||||||
|
;; `org-export-get-footnote-definition', do
|
||||||
|
;; not cache results as they would contain
|
||||||
|
;; un-processed citation objects.
|
||||||
(_
|
(_
|
||||||
(funcall search-cites
|
(let ((label (org-element-property :label datum)))
|
||||||
(org-export-get-footnote-definition datum info)))))
|
(funcall
|
||||||
|
search-cites
|
||||||
|
(org-element-map data 'footnote-definition
|
||||||
|
(lambda (d)
|
||||||
|
(and
|
||||||
|
(equal label (org-element-property :label d))
|
||||||
|
(or (org-element-contents d) "")))))))))
|
||||||
info nil 'footnote-definition t))))
|
info nil 'footnote-definition t))))
|
||||||
(funcall search-cites (plist-get info :parse-tree))
|
(funcall search-cites (plist-get info :parse-tree))
|
||||||
(let ((result (nreverse cites)))
|
(let ((result (nreverse cites)))
|
||||||
|
|
Loading…
Reference in a new issue