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

Merge branch 'bugfix'

This commit is contained in:
Nicolas Goaziou 2021-11-03 16:54:04 +01:00
parent e0bbfe63a4 d0201d5801
commit 74b1eefa5e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/oc-csl.el
View File

@ -492,16 +492,20 @@ INFO is the export state, as a property list."
(let ((global-prefix (org-element-property :prefix citation))) (let ((global-prefix (org-element-property :prefix citation)))
(when global-prefix (when global-prefix
(let* ((first (car cites)) (let* ((first (car cites))
(prefix (org-element-property :prefix first))) (prefix-item (assq 'prefix first)))
(org-element-put-property (setcdr prefix-item
first :prefix (org-cite-concat global-prefix prefix))))) (concat (org-element-interpret-data global-prefix)
" "
(cdr prefix-item))))))
;; Global suffix is appended to the suffix of the last reference. ;; Global suffix is appended to the suffix of the last reference.
(let ((global-suffix (org-element-property :suffix citation))) (let ((global-suffix (org-element-property :suffix citation)))
(when global-suffix (when global-suffix
(let* ((last (org-last cites)) (let* ((last (org-last cites))
(suffix (org-element-property :suffix last))) (suffix-item (assq 'suffix last)))
(org-element-put-property (setcdr suffix-item
last :suffix (org-cite-concat suffix global-suffix))))) (concat (cdr suffix-item)
" "
(org-element-interpret-data global-suffix))))))
;; Check if CITATION needs wrapping, i.e., it should be wrapped in ;; Check if CITATION needs wrapping, i.e., it should be wrapped in
;; a footnote, but isn't yet. ;; a footnote, but isn't yet.
(when (and (not footnote) (org-cite-csl--note-style-p info)) (when (and (not footnote) (org-cite-csl--note-style-p info))