From b16e919628629aef9c73fbb8d87fe15aff7635bb Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 24 Dec 2025 13:18:34 +0100 Subject: [PATCH] update citeproc --- .../citeproc-autoloads.el | 0 .../citeproc-biblatex.el | 0 .../citeproc-bibtex.el | 8 +++++--- .../citeproc-choose.el | 0 .../citeproc-cite.el | 0 .../citeproc-context.el | 0 .../citeproc-date.el | 0 .../citeproc-disamb.el | 0 .../citeproc-formatters.el | 2 +- .../citeproc-generic-elements.el | 0 .../citeproc-itemdata.el | 0 .../citeproc-itemgetters.el | 0 .../citeproc-lib.el | 0 .../citeproc-locale.el | 17 +++++++++++------ .../citeproc-macro.el | 0 .../citeproc-name.el | 0 .../citeproc-number.el | 0 .../citeproc-pkg.el | 6 +++--- .../citeproc-prange.el | 0 .../citeproc-proc.el | 0 .../citeproc-rt.el | 4 +++- .../citeproc-s.el | 2 +- .../citeproc-sort.el | 0 .../citeproc-style.el | 0 .../citeproc-subbibs.el | 0 .../citeproc-term.el | 0 .../citeproc-test-human.el | 0 .../citeproc.el | 4 ++-- 28 files changed, 26 insertions(+), 17 deletions(-) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-autoloads.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-biblatex.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-bibtex.el (98%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-choose.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-cite.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-context.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-date.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-disamb.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-formatters.el (99%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-generic-elements.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-itemdata.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-itemgetters.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-lib.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-locale.el (89%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-macro.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-name.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-number.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-pkg.el (82%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-prange.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-proc.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-rt.el (99%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-s.el (99%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-sort.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-style.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-subbibs.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-term.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc-test-human.el (100%) rename elpa/{citeproc-20240722.1110 => citeproc-20251103.716}/citeproc.el (99%) diff --git a/elpa/citeproc-20240722.1110/citeproc-autoloads.el b/elpa/citeproc-20251103.716/citeproc-autoloads.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-autoloads.el rename to elpa/citeproc-20251103.716/citeproc-autoloads.el diff --git a/elpa/citeproc-20240722.1110/citeproc-biblatex.el b/elpa/citeproc-20251103.716/citeproc-biblatex.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-biblatex.el rename to elpa/citeproc-20251103.716/citeproc-biblatex.el diff --git a/elpa/citeproc-20240722.1110/citeproc-bibtex.el b/elpa/citeproc-20251103.716/citeproc-bibtex.el similarity index 98% rename from elpa/citeproc-20240722.1110/citeproc-bibtex.el rename to elpa/citeproc-20251103.716/citeproc-bibtex.el index aeb17d9a..c9112124 100644 --- a/elpa/citeproc-20240722.1110/citeproc-bibtex.el +++ b/elpa/citeproc-20251103.716/citeproc-bibtex.el @@ -232,7 +232,9 @@ character was found." (rx "\\" (1+ (any "a-z" "A-Z")) word-end)) ; \TEX-COMMAND + word-end (defconst citeproc-bt--braces-rx - (rx "{" (group (*? anything)) "}")) ; {TEXT} + (rx (group (or string-start (not "\\"))) "{" ; unescaped { + (group (optional (seq (*? anything) (not "\\")))) ; TEXT + "}")) ; unescaped } (defun citeproc-bt--process-brackets (s &optional lhb rhb) "Process LaTeX curly brackets in string S. @@ -250,11 +252,11 @@ The default is to remove them." match t)) ((string-match citeproc-bt--braces-rx result) (setq result (replace-match - (concat lhb "\\1" rhb) + (concat "\\1" lhb "\\2" rhb) t nil result) match t)) (t (setq match nil)))) - result)) + (s-replace-all '(("\\{" . "{") ("\\}" . "}")) result))) (defun citeproc-bt--preprocess-for-decode (s) "Preprocess field S before decoding. diff --git a/elpa/citeproc-20240722.1110/citeproc-choose.el b/elpa/citeproc-20251103.716/citeproc-choose.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-choose.el rename to elpa/citeproc-20251103.716/citeproc-choose.el diff --git a/elpa/citeproc-20240722.1110/citeproc-cite.el b/elpa/citeproc-20251103.716/citeproc-cite.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-cite.el rename to elpa/citeproc-20251103.716/citeproc-cite.el diff --git a/elpa/citeproc-20240722.1110/citeproc-context.el b/elpa/citeproc-20251103.716/citeproc-context.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-context.el rename to elpa/citeproc-20251103.716/citeproc-context.el diff --git a/elpa/citeproc-20240722.1110/citeproc-date.el b/elpa/citeproc-20251103.716/citeproc-date.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-date.el rename to elpa/citeproc-20251103.716/citeproc-date.el diff --git a/elpa/citeproc-20240722.1110/citeproc-disamb.el b/elpa/citeproc-20251103.716/citeproc-disamb.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-disamb.el rename to elpa/citeproc-20251103.716/citeproc-disamb.el diff --git a/elpa/citeproc-20240722.1110/citeproc-formatters.el b/elpa/citeproc-20251103.716/citeproc-formatters.el similarity index 99% rename from elpa/citeproc-20240722.1110/citeproc-formatters.el rename to elpa/citeproc-20251103.716/citeproc-formatters.el index 6168a753..d722ee18 100644 --- a/elpa/citeproc-20240722.1110/citeproc-formatters.el +++ b/elpa/citeproc-20251103.716/citeproc-formatters.el @@ -258,7 +258,7 @@ CSL tests." ;; LaTeX (defconst citeproc-fmt--latex-esc-regex - (regexp-opt '("_" "&" "#" "%" "$")) + (regexp-opt '("_" "&" "#" "%" "$" "{" "}" )) "Regular expression matching characters to be escaped in LaTeX output.") (defun citeproc-fmt--latex-escape (s) diff --git a/elpa/citeproc-20240722.1110/citeproc-generic-elements.el b/elpa/citeproc-20251103.716/citeproc-generic-elements.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-generic-elements.el rename to elpa/citeproc-20251103.716/citeproc-generic-elements.el diff --git a/elpa/citeproc-20240722.1110/citeproc-itemdata.el b/elpa/citeproc-20251103.716/citeproc-itemdata.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-itemdata.el rename to elpa/citeproc-20251103.716/citeproc-itemdata.el diff --git a/elpa/citeproc-20240722.1110/citeproc-itemgetters.el b/elpa/citeproc-20251103.716/citeproc-itemgetters.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-itemgetters.el rename to elpa/citeproc-20251103.716/citeproc-itemgetters.el diff --git a/elpa/citeproc-20240722.1110/citeproc-lib.el b/elpa/citeproc-20251103.716/citeproc-lib.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-lib.el rename to elpa/citeproc-20251103.716/citeproc-lib.el diff --git a/elpa/citeproc-20240722.1110/citeproc-locale.el b/elpa/citeproc-20251103.716/citeproc-locale.el similarity index 89% rename from elpa/citeproc-20240722.1110/citeproc-locale.el rename to elpa/citeproc-20251103.716/citeproc-locale.el index aee16912..68cc91e8 100644 --- a/elpa/citeproc-20240722.1110/citeproc-locale.el +++ b/elpa/citeproc-20251103.716/citeproc-locale.el @@ -63,7 +63,7 @@ simply the result of upcasing.") (defun citeproc-locale-getter-from-dir (dir) "Return a locale getter getting parsed locales from a local DIR. If the requested locale couldn't be read then return the parsed -en-US locale, which must exist." +en-US locale, which must exist, and warn the user." (let ((default-loc-file (f-join dir "locales-en-US.xml"))) (lambda (loc) (let* ((ext-loc (if (or (member loc citeproc-locale--simple-locales) @@ -75,11 +75,16 @@ en-US locale, which must exist." (citeproc-lib-remove-xml-comments (citeproc-lib-parse-xml-file (if loc-available loc-file - (if (not (f-readable-p default-loc-file)) - (error - "The default CSL locale file %s doesn't exist or is unreadable" - default-loc-file) - default-loc-file)))))))) + (if (not (f-readable-p default-loc-file)) + (error + "The default CSL locale file %s doesn't exist or is unreadable" + default-loc-file) + (display-warning + 'citeproc + (format + "Could not read CSL locale file %s, using the fallback en-US locale" + loc-file)) + default-loc-file)))))))) (defun citeproc-locale-termlist-from-xml-frag (frag) "Transform xml FRAG representing citeproc--terms into a citeproc-term list." diff --git a/elpa/citeproc-20240722.1110/citeproc-macro.el b/elpa/citeproc-20251103.716/citeproc-macro.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-macro.el rename to elpa/citeproc-20251103.716/citeproc-macro.el diff --git a/elpa/citeproc-20240722.1110/citeproc-name.el b/elpa/citeproc-20251103.716/citeproc-name.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-name.el rename to elpa/citeproc-20251103.716/citeproc-name.el diff --git a/elpa/citeproc-20240722.1110/citeproc-number.el b/elpa/citeproc-20251103.716/citeproc-number.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-number.el rename to elpa/citeproc-20251103.716/citeproc-number.el diff --git a/elpa/citeproc-20240722.1110/citeproc-pkg.el b/elpa/citeproc-20251103.716/citeproc-pkg.el similarity index 82% rename from elpa/citeproc-20240722.1110/citeproc-pkg.el rename to elpa/citeproc-20251103.716/citeproc-pkg.el index f64f89c5..ceea34ae 100644 --- a/elpa/citeproc-20240722.1110/citeproc-pkg.el +++ b/elpa/citeproc-20251103.716/citeproc-pkg.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "citeproc" "20240722.1110" +(define-package "citeproc" "20251103.716" "A CSL 1.0.2 Citation Processor." '((emacs "26") (dash "2.13.0") @@ -11,8 +11,8 @@ (parsebib "2.4") (compat "28.1")) :url "https://github.com/andras-simonyi/citeproc-el" - :commit "54184baaff555b5c7993d566d75dd04ed485b5c0" - :revdesc "54184baaff55" + :commit "a3d62ab8e40a75fcfc6e4c0c107e3137b4db6db8" + :revdesc "a3d62ab8e40a" :keywords '("bib") :authors '(("András Simonyi" . "andras.simonyi@gmail.com")) :maintainers '(("András Simonyi" . "andras.simonyi@gmail.com"))) diff --git a/elpa/citeproc-20240722.1110/citeproc-prange.el b/elpa/citeproc-20251103.716/citeproc-prange.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-prange.el rename to elpa/citeproc-20251103.716/citeproc-prange.el diff --git a/elpa/citeproc-20240722.1110/citeproc-proc.el b/elpa/citeproc-20251103.716/citeproc-proc.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-proc.el rename to elpa/citeproc-20251103.716/citeproc-proc.el diff --git a/elpa/citeproc-20240722.1110/citeproc-rt.el b/elpa/citeproc-20251103.716/citeproc-rt.el similarity index 99% rename from elpa/citeproc-20240722.1110/citeproc-rt.el rename to elpa/citeproc-20251103.716/citeproc-rt.el index 26d06222..fb3091f5 100644 --- a/elpa/citeproc-20240722.1110/citeproc-rt.el +++ b/elpa/citeproc-20251103.716/citeproc-rt.el @@ -264,7 +264,9 @@ on any dominated branch for which PRED holds." (if (and s (s-matches-p "" s)) (let* ((parsed (citeproc-lib-parse-html-frag s)) (body (cddr (cl-caddr parsed))) - (stripped (if (eq (caar body) 'p) (cl-cddar body) body))) + (stripped (if (and (consp (car body)) (eq (caar body) 'p)) + (cl-cddar body) + body))) (if (= 1 (length stripped)) (citeproc-rt-from-html (car stripped)) (cons nil (mapcar 'citeproc-rt-from-html stripped)))) diff --git a/elpa/citeproc-20240722.1110/citeproc-s.el b/elpa/citeproc-20251103.716/citeproc-s.el similarity index 99% rename from elpa/citeproc-20240722.1110/citeproc-s.el rename to elpa/citeproc-20251103.716/citeproc-s.el index 88d58663..e14f6b83 100644 --- a/elpa/citeproc-20240722.1110/citeproc-s.el +++ b/elpa/citeproc-20251103.716/citeproc-s.el @@ -247,7 +247,7 @@ REPLACEMENTS is an alist with (FROM . TO) elements." "Replace dumb apostophes in string S with smart ones. The replacement character used is the unicode character `modifier letter apostrophe'." - (subst-char-in-string ?' ?ʼ (subst-char-in-string ?’ ?ʼ s t) t)) + (string-replace "'" "ʼ" (string-replace "’" "ʼ" s))) (defconst citeproc-s--cull-spaces-alist '((" " . " ") (";;" . ";") ("..." . ".") (",," . ",") (".." . ".")) diff --git a/elpa/citeproc-20240722.1110/citeproc-sort.el b/elpa/citeproc-20251103.716/citeproc-sort.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-sort.el rename to elpa/citeproc-20251103.716/citeproc-sort.el diff --git a/elpa/citeproc-20240722.1110/citeproc-style.el b/elpa/citeproc-20251103.716/citeproc-style.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-style.el rename to elpa/citeproc-20251103.716/citeproc-style.el diff --git a/elpa/citeproc-20240722.1110/citeproc-subbibs.el b/elpa/citeproc-20251103.716/citeproc-subbibs.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-subbibs.el rename to elpa/citeproc-20251103.716/citeproc-subbibs.el diff --git a/elpa/citeproc-20240722.1110/citeproc-term.el b/elpa/citeproc-20251103.716/citeproc-term.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-term.el rename to elpa/citeproc-20251103.716/citeproc-term.el diff --git a/elpa/citeproc-20240722.1110/citeproc-test-human.el b/elpa/citeproc-20251103.716/citeproc-test-human.el similarity index 100% rename from elpa/citeproc-20240722.1110/citeproc-test-human.el rename to elpa/citeproc-20251103.716/citeproc-test-human.el diff --git a/elpa/citeproc-20240722.1110/citeproc.el b/elpa/citeproc-20251103.716/citeproc.el similarity index 99% rename from elpa/citeproc-20240722.1110/citeproc.el rename to elpa/citeproc-20251103.716/citeproc.el index c8648b4f..5b954fa5 100644 --- a/elpa/citeproc-20240722.1110/citeproc.el +++ b/elpa/citeproc-20251103.716/citeproc.el @@ -7,8 +7,8 @@ ;; URL: https://github.com/andras-simonyi/citeproc-el ;; Keywords: bib ;; Package-Requires: ((emacs "26") (dash "2.13.0") (s "1.12.0") (f "0.18.0") (queue "0.2") (string-inflection "1.0") (org "9") (parsebib "2.4")(compat "28.1")) -;; Package-Version: 20240722.1110 -;; Package-Revision: 54184baaff55 +;; Package-Version: 20251103.716 +;; Package-Revision: a3d62ab8e40a ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -- 2.47.3