update packages

lisp/org-ref/org-ref-export.el

@@ -1,6 +1,6 @@
 ;;; org-ref-export.el --- org-ref-export library -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2021  John Kitchin
+;; Copyright (C) 2024  John Kitchin
 
 ;; Author: John Kitchin <jkitchin@andrew.cmu.edu>
 ;; Keywords: convenience
@@ -52,6 +52,8 @@
 
 (require 'citeproc)
 
+(defvar org-cite-csl-styles-dir)
+
 (defcustom org-ref-backend-csl-formats
   '((html . html)
     (latex . latex)
@@ -66,11 +68,14 @@
 
 
 (defcustom org-ref-cite-internal-links 'auto
-  "Should be one of
-- 'bib-links :: link cites to bibliography entries
-- 'no-links :: do not link cites to bibliography entries
-- nil or 'auto :: add links based on the style."
-  :type '(choice bib-links no-links auto nil)
+  "Should be one of these symbols (quoted)
+- bib-links :: link cites to bibliography entries
+- no-links :: do not link cites to bibliography entries
+- nil or auto :: add links based on the style."
+  :type '(choice symbol (sexp :tag bib-links)
+		 symbol (sexp :tag no-links)
+		 symbol (sexp :tag auto-links)
+		 symbol (sexp :tag nil))
   :group 'org-ref)
 
 
@@ -212,17 +217,16 @@ REF is a plist data structure returned from `org-ref-parse-cite-path'."
       (suffix . ,suffix)
       (locator . ,locator)
       (label . ,(when label (org-ref-dealias-label (string-trim label))))
-      ;; TODO: proof of concept and not complete. I did not go through all the
-      ;; types to see what else should be in here.
-      (suppress-author . ,(not (null (member type
-					     '("citenum"
-					       "citeyear"
-					       "citeyear*"
-					       "citedate"
-					       "citedate*"
-					       "citetitle"
-					       "citetitle*"
-					       "citeurl"))))))))
+      ;; [2024-01-29 Mon] see
+      ;; https://github.com/jkitchin/org-ref/issues/1103#issuecomment-1915028374
+      ;; and related comments at
+      ;; https://github.com/andras-simonyi/citeproc-el/issues/151. It seems I
+      ;; should not be adding this. TODO: proof of concept and not complete. I
+      ;; did not go through all the types to see what else should be in here.
+      ;; (suppress-author . ,(not (null (member type '("citenum" "citeyear"
+      ;; "citeyear*" "citedate" "citedate*" "citetitle" "citetitle*"
+      ;; "citeurl")))))
+      )))
 
 (declare-function org-ref-find-bibliography "org-ref-core")
 
@@ -513,9 +517,9 @@ VISIBLE-ONLY BODY-ONLY and INFO."
   "Export the buffer to PDF via LaTeX and open.
 See `org-export-as' for the meaning of ASYNC SUBTREEP
 VISIBLE-ONLY BODY-ONLY and INFO."
-  (let ((org-export-before-parsing-hook (append
-					 org-export-before-parsing-hook
-					 '(org-ref-csl-preprocess-buffer))))
+  (let ((org-export-before-parsing-functions (append
+					      org-export-before-parsing-functions
+					      '(org-ref-csl-preprocess-buffer))))
     (org-open-file (org-latex-export-to-pdf async subtreep visible-only
 					    body-only info))))
 
@@ -595,8 +599,8 @@ VISIBLE-ONLY BODY-ONLY and INFO."
 	(?e "to email" org-ref-export-to-message)
 	(?w "to docx" org-ref-export-to-docx))))
 
-;; An alternative to this exporter is to use an  `org-export-before-parsing-hook'
-;; (add-hook 'org-export-before-parsing-hook 'org-ref-csl-preprocess-buffer)
+;; An alternative to this exporter is to use an  `org-export-before-parsing-functions'
+;; (add-hook 'org-export-before-parsing-functions 'org-ref-csl-preprocess-buffer)
 
 (defun org-ref-csl-preprocess-buffer (backend)
   "Preprocess the buffer in BACKEND export.
@@ -627,27 +631,27 @@ I am not positive on this though."
   (when (and org-ref/citeproc org-ref/bblproc)
     (error "You cannot use CSL and BBL at the same time."))
   
-  (let ((org-export-before-parsing-hook org-export-before-parsing-hook))
+  (let ((org-export-before-parsing-functions org-export-before-parsing-functions))
     (when org-ref/citeproc
-      (cl-pushnew 'org-ref-csl-preprocess-buffer org-export-before-parsing-hook))
+      (cl-pushnew 'org-ref-csl-preprocess-buffer org-export-before-parsing-functions))
 
     (when org-ref/refproc
-      (cl-pushnew 'org-ref-refproc org-export-before-parsing-hook))
+      (cl-pushnew 'org-ref-refproc org-export-before-parsing-functions))
 
     (when org-ref/acrossproc
-      (cl-pushnew 'org-ref-acrossproc org-export-before-parsing-hook))
+      (cl-pushnew 'org-ref-acrossproc org-export-before-parsing-functions))
 
     (when org-ref/idxproc
-      (cl-pushnew 'org-ref-idxproc org-export-before-parsing-hook))
+      (cl-pushnew 'org-ref-idxproc org-export-before-parsing-functions))
 
     (when org-ref/bblproc
       (unless (featurep 'org-ref-natbib-bbl-citeproc)
 	(require 'org-ref-natbib-bbl-citeproc))
-      (cl-pushnew 'org-ref-bbl-preprocess org-export-before-parsing-hook))
+      (cl-pushnew 'org-ref-bbl-preprocess org-export-before-parsing-functions))
     
     ;; this goes last since it moves cites before they might get replaced.
     (when org-ref/natmove
-      (cl-pushnew 'org-ref-cite-natmove org-export-before-parsing-hook))
+      (cl-pushnew 'org-ref-cite-natmove org-export-before-parsing-functions))
 
     (org-export-dispatch arg)))