update of packages

lisp/citeproc/citeproc-cite.el

@@ -141,7 +141,7 @@ links else). For legacy reasons, any other value is treated as
       ;; Add cite prefix and suffix
       (when (s-present-p plain-suff)
 	(push (citeproc-rt-from-str suff) result)
-	(unless (= (aref plain-suff 0) ?\s)
+	(unless (memql (aref plain-suff 0) '(?, ?\s))
 	  (push " " result)))
       (push rendered-varlist result)
       (when (s-present-p plain-pref)
@@ -237,11 +237,11 @@ For the optional INTERNAL-LINKS argument see
 				 (cadr first-elt)
 			       first-elt))
 		 (author-cite
-		  (append '((suppress-author . nil) (stop-rendering-at . names))
-			  first-cite))
+		  (append '((suppress-author . nil) (stop-rendering-at . names)
+			    (prefix) (suffix) (locator))
+		   first-cite))
 		 (rendered-author (citeproc-cite--render author-cite style 'no-links)))
-	    (when (and (listp rendered-author)
-		       (alist-get 'stopped-rendering (car rendered-author)))
+	    (when (listp rendered-author)
 	      (setq result `(nil ,rendered-author " " ,result)))))
 	;; Capitalize first
 	(when (citeproc-citation-capitalize-first c)
@@ -548,6 +548,7 @@ Possible values are `last', `first' and `subsequent'.")
   (unless (citeproc-proc-finalized proc)
     (citeproc-proc-process-uncited proc)
     (citeproc-sb-add-subbib-info proc)
+    (citeproc-sb-prune-unrendered proc)
     (citeproc-proc-update-sortkeys proc)
     (citeproc-proc-sort-itds proc)
     (citeproc-proc-update-positions proc)

lisp/citeproc/citeproc-formatters.el

@@ -164,8 +164,10 @@ Performs finalization by removing unnecessary zero-width spaces."
       (setq result (citeproc-s-replace-all-seq
 		    result '((" ​" . " ") ("​ " . " ") ("​," . ",") ("​;" . ";")
 			     ("​:" . ":") ("​." . "."))))
-      ;; Starting and ending z-w spaces are also removed.
-      (when (= (aref result 0) 8203)
+      ;; Starting and ending z-w spaces are also removed, but not before an
+      ;; asterisk to avoid creating an Org heading.
+      (when (and (= (aref result 0) 8203)
+		 (not (= (aref result 1) ?*)))
 	(setq result (substring result 1)))
       (when (= (aref result (- (length result) 1)) 8203)
 	(setq result (substring result 0 -1))))
@@ -371,7 +373,9 @@ CSL tests."
 		   :rt (citeproc-formatter-fun-create citeproc-fmt--org-latex-alist)
 		   :bib #'citeproc-fmt--org-latex-bib-formatter))
     (latex . ,(citeproc-formatter-create
-	       :rt (citeproc-formatter-fun-create citeproc-fmt--latex-alist)))
+	       :rt (citeproc-formatter-fun-create citeproc-fmt--latex-alist)
+	       :bib (lambda (x _) (concat (mapconcat #'identity x "\n\n")
+					  "\\bigskip"))))
     (plain . ,(citeproc-formatter-create :rt #'citeproc-rt-to-plain
 					 :no-external-links t)))
   "Alist mapping supported output formats to formatter structs.")

lisp/citeproc/citeproc-itemdata.el

@@ -45,9 +45,10 @@ OCCURRED-BEFORE is used during bibliography generation to
 DISAMB-POS contains the position on which cite disambiguation is
   based. Possible values are 'first, 'ibid and 'subsequent,
 SUBBIB-NOS is a list of numeric indexes of sub-bibliographies
-  in which the item occurs."
+  in which the item occurs,
+UNCITED is t iff the item has no associated citation."
   varvals rawcite rawbibitem rc-uptodate sort-key occurred-before
-  disamb-pos subbib-nos)
+  disamb-pos subbib-nos uncited)
 
 (defun citeproc-itd-getvar (itd var)
   "Return itemdata ITD's value for VAR ."

lisp/citeproc/citeproc-pkg.el

@@ -1,4 +1,4 @@
-(define-package "citeproc" "20221216.1238" "A CSL 1.0.2 Citation Processor"
+(define-package "citeproc" "20230228.1414" "A CSL 1.0.2 Citation Processor"
   '((emacs "26")
     (dash "2.13.0")
     (s "1.12.0")
@@ -7,7 +7,9 @@
     (string-inflection "1.0")
     (org "9")
     (parsebib "2.4"))
-  :commit "3cb83db147bdda208520246e82dbf9878fa3cbd0" :authors
+  :commit "290320fc579f886255f00d7268600df7fa5cc7e8" :authors
+  '(("András Simonyi" . "andras.simonyi@gmail.com"))
+  :maintainers
   '(("András Simonyi" . "andras.simonyi@gmail.com"))
   :maintainer
   '("András Simonyi" . "andras.simonyi@gmail.com")

lisp/citeproc/citeproc-proc.el

@@ -99,11 +99,11 @@ sorted."
       (push (cons 'editor-translator editor) result))
     result))
 
-(defun citeproc-proc--put-item (proc item itemid)
+(defun citeproc-proc--put-item (proc item itemid &optional uncited)
   "Put parsed csl-json ITEM with ITEMID into PROC.
 Return the added itemdata structure."
   (let* ((int-vars (citeproc-proc--internalize-item proc item))
-	 (itemdata (citeproc-itemdata-create :varvals int-vars :rc-uptodate nil)))
+	 (itemdata (citeproc-itemdata-create :varvals int-vars :uncited uncited)))
     (citeproc-proc-put-itd-put itemid itemdata proc)
     (citeproc-itd-setvar itemdata 'citation-number
 			 (number-to-string (hash-table-count
@@ -150,7 +150,7 @@ Return the itemdata struct that was added."
 	 (citeproc-proc--put-item
 	  proc
 	  (or item `((unprocessed-with-id . ,id)))
-	  id))))))
+	  id t))))))
 
 (defun citeproc-proc-delete-occurrence-info (proc)
   "Remove all itemdata occurrence info from PROC."
@@ -225,6 +225,11 @@ Return the PROC-internal representation of REP."
     (when bib-sort (setf (citeproc-style-bib-sort style) (byte-compile bib-sort)))
     (when cite-sort (setf (citeproc-style-cite-sort style) (byte-compile cite-sort)))))
 
+(defun citeproc-proc-filtered-bib-p (proc)
+  "Return whether PROC has nontrivial filters"
+  (let ((filters (citeproc-proc-bib-filters proc)))
+    (and filters (not (equal filters '(nil))))))
+
 (provide 'citeproc-proc)
 
 ;;; citeproc-proc.el ends here

lisp/citeproc/citeproc-sort.el

@@ -169,17 +169,17 @@ MODE is either `cite' or `bib'."
 
 (defun citeproc-proc-sort-itds (proc)
   "Sort the itemdata in PROC."
-  (let ((sorted-bib-p (citeproc-style-bib-sort (citeproc-proc-style proc)))
-	(filters (citeproc-proc-bib-filters proc)))
-    (when (or sorted-bib-p filters)
+  (let ((is-sorted-bib (citeproc-style-bib-sort (citeproc-proc-style proc)))
+	(is-filtered (citeproc-proc-filtered-bib-p proc)))
+    (when (or is-sorted-bib is-filtered)
       (let* ((itds (hash-table-values (citeproc-proc-itemdata proc)))
-	     (sorted (if sorted-bib-p
+	     (sorted (if is-sorted-bib
 			 (let ((sort-orders (citeproc-style-bib-sort-orders
 					     (citeproc-proc-style proc))))
 			   (citeproc-sort-itds itds sort-orders))
 		       (citeproc-sort-itds-on-citnum itds))))
 	;; Additionally sort according to subbibliographies if there are filters.
-	(when filters
+	(when is-filtered
 	  (setq sorted (sort sorted #'citeproc-sort-itds-on-subbib)))
 	;; Set the CSL citation-number field according to the sort order.
 	(--each-indexed sorted

lisp/citeproc/citeproc-subbibs.el

@@ -54,17 +54,32 @@ see the documentation of `citeproc-add-subbib-filters'."
 
 (defun citeproc-sb-add-subbib-info (proc)
   "Add subbibliography information to the items in PROC."
-  (let ((filters (citeproc-proc-bib-filters proc)))
-    (maphash
-     (lambda (_ itemdata)
-       (let* ((varvals (citeproc-itemdata-varvals itemdata))
-	      (subbib-nos
-	       (-non-nil
-		(--map-indexed
-		 (when (citeproc-sb--match-p varvals it) it-index)
-		 filters))))
-	 (setf (citeproc-itemdata-subbib-nos itemdata) subbib-nos)))
-     (citeproc-proc-itemdata proc))))
+  (when (citeproc-proc-filtered-bib-p proc)
+    (let ((filters (citeproc-proc-bib-filters proc)))
+      (maphash
+       (lambda (_ itemdata)
+	 (let* ((varvals (citeproc-itemdata-varvals itemdata))
+		(subbib-nos
+		 (-non-nil
+		  (--map-indexed
+		   (when (citeproc-sb--match-p varvals it) it-index)
+		   filters))))
+	   (setf (citeproc-itemdata-subbib-nos itemdata) subbib-nos)))
+       (citeproc-proc-itemdata proc)))))
+
+(defun citeproc-sb-prune-unrendered (proc)
+  "Remove all itemdata about unrendered items from PROC.
+An item is unrendered if
+- there are subbibfilters but none of them matches it, and
+- it is not cited."
+  (when (citeproc-proc-filtered-bib-p proc)
+    (let ((itemdata (citeproc-proc-itemdata proc)))
+      (maphash
+       (lambda (id data)
+	 (when (and (citeproc-itemdata-uncited data)
+		    (null (citeproc-itemdata-subbib-nos data)))
+	   (remhash id itemdata)))
+       itemdata))))
 
 (provide 'citeproc-subbibs)
 

lisp/citeproc/citeproc.el

@@ -1,13 +1,13 @@
 ;;; citeproc.el --- A CSL 1.0.2 Citation Processor -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2022 András Simonyi
+;; Copyright (C) 2017-2023 András Simonyi
 
 ;; Author: András Simonyi <andras.simonyi@gmail.com>
 ;; Maintainer: András Simonyi <andras.simonyi@gmail.com>
 ;; 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"))
-;; Version: 0.9
+;; Version: 0.9.3
 
 ;; 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
@@ -196,8 +196,8 @@ formatting parameters keyed to the parameter names as symbols:
 			punct-in-quote)))
 	       itemdata)
       (let* ((raw-bib
-	      (if (cdr filters)
-		  ;; There are several filters, we need to select and sort the subbibs.
+	      (if (citeproc-proc-filtered-bib-p proc)
+		  ;; There are filters, we need to select and sort the subbibs.
 		  (let* ((nr-of-filters (length filters))
 		 	 (result (make-list nr-of-filters nil))
 			 ;; We store boolean to-be-sorted flags for each sub-bib
@@ -228,7 +228,7 @@ formatting parameters keyed to the parameter names as symbols:
 			   result))
 		    ;; Generate the raw bibs.
 		    (--map (mapcar #'citeproc-itemdata-rawbibitem it) result))
-		;; No filters, so raw-bib is a list containg a single raw bibliograhy.
+		;; No filters, so raw-bib is a list containing a single raw bibliograhy.
 		(list (mapcar #'citeproc-itemdata-rawbibitem
 			      (citeproc-sort-itds-on-citnum (hash-table-values itemdata))))))
 	     ;; Perform author-substitution.