((= n 27) (throw :complete (cons 0 (cons 0 result))))
(t nil))))))))
-(defun org-cite-basic--get-year (entry-or-key info)
+(defun org-cite-basic--get-year (entry-or-key info &optional no-suffix)
"Return year associated to ENTRY-OR-KEY.
ENTRY-OR-KEY is either an association list, as returned by
-`org-cite-basic--get-entry', or a string representing a citation key. INFO is
-the export state, as a property list.
+`org-cite-basic--get-entry', or a string representing a citation
+key. INFO is the export state, as a property list.
-Unlike `org-cite-basic--get-field', this function disambiguates author-year
-patterns."
+Year is obtained from the \"year\" field, if available, or from
+the \"date\" field if it starts with a year pattern.
+
+Unlike `org-cite-basic--get-field', this function disambiguates
+author-year patterns by adding a letter suffix to the year when
+necessary, unless optional argument NO-SUFFIX is non-nil."
;; The cache is an association list with the following structure:
;;
;; (AUTHOR-YEAR . KEY-SUFFIX-ALIST).
;; the cite key, as a string, and SUFFIX is the generated suffix
;; string, or the empty string.
(let* ((author (org-cite-basic--get-field 'author entry-or-key info 'raw))
- (year (org-cite-basic--get-field 'year entry-or-key info 'raw))
+ (year
+ (or (org-cite-basic--get-field 'year entry-or-key info 'raw)
+ (let ((date
+ (org-cite-basic--get-field 'date entry-or-key info t)))
+ (and (stringp date)
+ (string-match (rx string-start
+ (group (= 4 digit))
+ (or string-end (not digit)))
+ date)
+ (match-string 1 date)))))
(cache-key (cons author year))
(key
(pcase entry-or-key
(plist-put info :cite-basic/author-date-cache (cons value cache))
year))
(`(,_ . ,alist)
- (concat year
- (or (cdr (assoc key alist))
- (let ((new (org-cite-basic--number-to-suffix (1- (length alist)))))
- (push (cons key new) alist)
- new)))))))
+ (let ((suffix
+ (or (cdr (assoc key alist))
+ (let ((new (org-cite-basic--number-to-suffix
+ (1- (length alist)))))
+ (push (cons key new) alist)
+ new))))
+ (if no-suffix year (concat year suffix)))))))
(defun org-cite-basic--print-entry (entry style &optional info)
"Format ENTRY according to STYLE string.
Optional argument INFO is the export state, as a property list."
(let ((author (org-cite-basic--get-field 'author entry info))
(title (org-cite-basic--get-field 'title entry info))
- (year (org-cite-basic--get-field 'year entry info))
(from
(or (org-cite-basic--get-field 'publisher entry info)
(org-cite-basic--get-field 'journal entry info)
(org-cite-basic--get-field 'school entry info))))
(pcase style
("plain"
- (org-cite-concat
- author ". " title (and from (list ", " from)) ", " year "."))
+ (let ((year (org-cite-basic--get-year entry info 'no-suffix)))
+ (org-cite-concat
+ author ". " title (and from (list ", " from)) ", " year ".")))
("numeric"
- (let ((n (org-cite-basic--key-number (cdr (assq 'id entry)) info)))
+ (let ((n (org-cite-basic--key-number (cdr (assq 'id entry)) info))
+ (year (org-cite-basic--get-year entry info 'no-suffix)))
(org-cite-concat
(format "[%d] " n) author ", "
(org-cite-emphasize 'italic title)
;; When using this style on citations with multiple references,
;; use global affixes and ignore local ones.
(`(,(or "numeric" "nb") . ,_)
- (let* ((references (org-cite-get-references citation))
- (prefix
- (or (org-element-property :prefix citation)
- (and (= 1 (length references))
- (org-element-property :prefix (car references)))))
- (suffix
- (or (org-element-property :suffix citation)
- (and (= 1 (length references))
- (org-element-property :suffix (car references))))))
+ (pcase-let ((`(,prefix . ,suffix) (org-cite-main-affixes citation)))
(org-export-data
(org-cite-concat
"(" prefix (org-cite-basic--citation-numbers citation info) suffix ")")
org-cite-basic-author-column-end nil ?\s)
(make-string org-cite-basic-author-column-end ?\s)))
org-cite-basic-column-separator
- (let ((date (org-cite-basic--get-field 'year key nil t)))
+ (let ((date (org-cite-basic--get-year key nil 'no-suffix)))
(format "%4s" (or date "")))
org-cite-basic-column-separator
(org-cite-basic--get-field 'title key nil t))))
(let ((global-prefix (org-element-property :prefix citation)))
(when global-prefix
(let* ((first (car cites))
- (prefix (org-element-property :prefix first)))
- (org-element-put-property
- first :prefix (org-cite-concat global-prefix prefix)))))
+ (prefix-item (assq 'prefix first)))
+ (setcdr prefix-item
+ (concat (org-element-interpret-data global-prefix)
+ " "
+ (cdr prefix-item))))))
;; Global suffix is appended to the suffix of the last reference.
(let ((global-suffix (org-element-property :suffix citation)))
(when global-suffix
(let* ((last (org-last cites))
- (suffix (org-element-property :suffix last)))
- (org-element-put-property
- last :suffix (org-cite-concat suffix global-suffix)))))
+ (suffix-item (assq 'suffix last)))
+ (setcdr suffix-item
+ (concat (cdr suffix-item)
+ " "
+ (org-element-interpret-data global-suffix))))))
;; Check if CITATION needs wrapping, i.e., it should be wrapped in
;; a footnote, but isn't yet.
(when (and (not footnote) (org-cite-csl--note-style-p info))
(org-cite-adjust-note citation info)
- (org-cite-wrap-citation citation info))
+ (setq footnote (org-cite-wrap-citation citation info)))
;; Return structure.
(apply #'citeproc-citation-create
`(:note-index
(re-search-forward org-element-citation-key-re end t)
(cons (match-beginning 0) (match-end 0)))))
+(defun org-cite-main-affixes (citation)
+ "Return main affixes for CITATION object.
+
+Some export back-ends only support a single pair of affixes per
+citation, even if it contains multiple keys. This function
+decides what affixes are the most appropriate.
+
+Return a pair (PREFIX . SUFFIX) where PREFIX and SUFFIX are
+parsed data."
+ (let ((source
+ ;; When there are multiple references, use global affixes.
+ ;; Otherwise, local affixes have priority.
+ (pcase (org-cite-get-references citation)
+ (`(,reference) reference)
+ (_ citation))))
+ (cons (org-element-property :prefix source)
+ (org-element-property :suffix source))))
+
(defun org-cite-supported-styles (&optional processors)
"List of supported citation styles and variants.
INFO is the export state, as a property list.
White space before the citation, if any, are removed. The parse tree is
-modified by side-effect."
+modified by side-effect.
+
+Return newly created footnote object."
(let ((footnote
(list 'footnote-reference
(list :label nil
projects / emacs.git / commitdiff