Skip to content

Commit

Permalink
Replace the cite-note attribute of style objects with category
Browse files Browse the repository at this point in the history
  • Loading branch information
andras-simonyi committed Mar 2, 2024
1 parent c61c98b commit 2d3b198
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion citeproc-context.el
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ documentation of `citeproc-render-varlist-in-rt', while MODE is
the rendering mode, `bib' or `cite', and CITE-POS is a cite
position. Returns an appropriate attribute to be added or nil if
no internal links should be produced."
(let ((note-style (citeproc-style-cite-note style)))
(let ((note-style (string= (citeproc-style-category style) "note")))
(unless (or (and internal-links (not (memq internal-links '(auto bib-links))))
(and note-style (eq mode 'bib) (or (null internal-links)
(eq internal-links 'auto))))
Expand Down
14 changes: 7 additions & 7 deletions citeproc-style.el
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ BIB-SORT-ORDERS and CITE-SORT-ORDERS are the lists of sort orders
the n-th key should be in ascending or desending order,
CITE-LAYOUT-ATTRS contains the attributes of the citation layout
as an alist,
CITE-NOTE is non-nil iff the style's citation-format is \"note\",
CATEGORY is the style's category as a string,
DATE-TEXT and DATE-NUMERIC are the style's date formats,
LOCALE contains the locale to be used or nil if not set,
MACROS is an alist with macro names as keys and corresponding
Expand All @@ -58,7 +58,7 @@ TERMS is the style's parsed term-list,
USES-YS-VAR is non-nil iff the style uses the YEAR-SUFFIX
CSL-variable."
info opts bib-opts bib-sort bib-sort-orders
bib-layout cite-opts cite-note cite-sort cite-sort-orders
bib-layout cite-opts category cite-sort cite-sort-orders
cite-layout cite-layout-attrs locale-opts macros terms
uses-ys-var date-text date-numeric locale)

Expand Down Expand Up @@ -98,12 +98,12 @@ in-style locale information will be loaded (if available)."
(--each (cddr parsed-style)
(pcase (car it)
('info
(let ((info-lst (cddr it)))
(let* ((info-lst (cddr it))
(category-info (cl-find-if (lambda (x) (eq 'category (car x)))
info-lst))
(category (cdaadr category-info)))
(setf (citeproc-style-info style) info-lst
(citeproc-style-cite-note style)
(not (not (member '(category
((citation-format . "note")))
info-lst))))))
(citeproc-style-category style) category)))
('locale
(let ((lang (alist-get 'lang (cadr it))))
(when (and (citeproc-locale--compatible-p lang locale)
Expand Down

0 comments on commit 2d3b198

Please sign in to comment.