summaryrefslogtreecommitdiff
path: root/biblio
diff options
context:
space:
mode:
Diffstat (limited to 'biblio')
-rw-r--r--biblio/citation-style-language/CHANGELOG.md10
-rw-r--r--biblio/citation-style-language/citation-style-language-compatible.sty2
-rw-r--r--biblio/citation-style-language/citation-style-language-doc.pdfbin229863 -> 229873 bytes
-rw-r--r--biblio/citation-style-language/citation-style-language-doc.tex2
-rw-r--r--biblio/citation-style-language/citation-style-language.sty2
-rw-r--r--biblio/citation-style-language/citeproc-bibtex-data.lua8
-rw-r--r--biblio/citation-style-language/citeproc-ir-node.lua17
-rw-r--r--biblio/citation-style-language/citeproc-journal-data.lua3
-rw-r--r--biblio/citation-style-language/citeproc-lua.12
-rw-r--r--biblio/citation-style-language/citeproc-node-choose.lua4
-rw-r--r--biblio/citation-style-language/citeproc-node-citation.lua6
-rw-r--r--biblio/citation-style-language/citeproc.lua2
-rw-r--r--biblio/ctan-bibdata/ctan.bib22
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3708431 -> 3709587 bytes
14 files changed, 47 insertions, 33 deletions
diff --git a/biblio/citation-style-language/CHANGELOG.md b/biblio/citation-style-language/CHANGELOG.md
index b4f84afd44..85ffb9f43d 100644
--- a/biblio/citation-style-language/CHANGELOG.md
+++ b/biblio/citation-style-language/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+## [0.4.4] - 2023-09-16
+
+### Fixed
+
+- Fix a disambiguation bug with names from conditional branches.
+- Fix a typo related to `beamer` compatibility ([#41](https://github.com/zepinglee/citeproc-lua/issues/41#issuecomment-1715538773)).
+
## [0.4.3] - 2023-09-07
### Added
@@ -139,7 +146,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial CTAN release.
-[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.3...HEAD
+[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.4...HEAD
+[0.4.4]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.3...v0.4.4
[0.4.3]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.2...v0.4.3
[0.4.2]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.1...v0.4.2
[0.4.1]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.0...v0.4.1
diff --git a/biblio/citation-style-language/citation-style-language-compatible.sty b/biblio/citation-style-language/citation-style-language-compatible.sty
index eedc5dc4a1..424df6775a 100644
--- a/biblio/citation-style-language/citation-style-language-compatible.sty
+++ b/biblio/citation-style-language/citation-style-language-compatible.sty
@@ -54,7 +54,7 @@
\ignorespaces
}
-\cs_new:Npn \__csl_beamer_lbibitem:n #1
+\cs_new:Npn \__csl_beamer_bibitem:n #1
{
\exp_after:wN \item \beamer@bibstore
\cs_if_exist:cF { beamerbib@ #1 @ \int_use:N \c@framenumber }
diff --git a/biblio/citation-style-language/citation-style-language-doc.pdf b/biblio/citation-style-language/citation-style-language-doc.pdf
index 2765720657..b18b95c0eb 100644
--- a/biblio/citation-style-language/citation-style-language-doc.pdf
+++ b/biblio/citation-style-language/citation-style-language-doc.pdf
Binary files differ
diff --git a/biblio/citation-style-language/citation-style-language-doc.tex b/biblio/citation-style-language/citation-style-language-doc.tex
index 991b68dcfb..4c2f500ca7 100644
--- a/biblio/citation-style-language/citation-style-language-doc.tex
+++ b/biblio/citation-style-language/citation-style-language-doc.tex
@@ -49,7 +49,7 @@
}%
}
-\date{2023-09-07 v0.4.3}
+\date{2023-09-16 v0.4.4}
\maketitle
diff --git a/biblio/citation-style-language/citation-style-language.sty b/biblio/citation-style-language/citation-style-language.sty
index c7c54fb4d9..b7f8f9a36f 100644
--- a/biblio/citation-style-language/citation-style-language.sty
+++ b/biblio/citation-style-language/citation-style-language.sty
@@ -9,7 +9,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {citation-style-language} {2023-09-07} {0.4.3}
+\ProvidesExplPackage {citation-style-language} {2023-09-16} {0.4.4}
{Citation Style Language for LaTeX}
\RequirePackage { l3keys2e }
diff --git a/biblio/citation-style-language/citeproc-bibtex-data.lua b/biblio/citation-style-language/citeproc-bibtex-data.lua
index b875f3eb91..666d813c9b 100644
--- a/biblio/citation-style-language/citeproc-bibtex-data.lua
+++ b/biblio/citation-style-language/citeproc-bibtex-data.lua
@@ -2553,6 +2553,10 @@ return {
csl = nil,
source = "IEEEtran.bst",
},
+ monthtie = {
+ csl = nil,
+ source = "tugboat.bst",
+ },
mrnumber = {
csl = nil,
source = "amsplain.bst",
@@ -4185,10 +4189,6 @@ return {
csl = nil,
source = "adrbirthday.bst",
},
- monthtie = {
- csl = nil,
- source = "tugboat.bst",
- },
},
macros = {
acmcs = {
diff --git a/biblio/citation-style-language/citeproc-ir-node.lua b/biblio/citation-style-language/citeproc-ir-node.lua
index 7a940ef061..92093309bc 100644
--- a/biblio/citation-style-language/citeproc-ir-node.lua
+++ b/biblio/citation-style-language/citeproc-ir-node.lua
@@ -37,6 +37,7 @@ local GroupVar = {
---@field delimiter string?
---@field should_inherit_delim boolean?
---@field group_var GroupVar
+---@field sort_key string | boolean?
---@field person_name_irs IrNode[]
---@field name_count integer?
---@field is_year boolean?
@@ -102,17 +103,18 @@ end
function IrNode:_debug(level)
level = level or 0
local ir_info_str = ""
+ local ir_info = {}
if self.delimiter then
- ir_info_str = ir_info_str .. string.format('delimiter: "%s"', self.delimiter)
+ table.insert(ir_info, string.format('delimiter: "%s"', self.delimiter))
end
if self.should_inherit_delim then
- if ir_info_str ~= "" then
- ir_info_str = ir_info_str .. " "
- end
- ir_info_str = ir_info_str .. "should_inherit_delim: true"
+ table.insert(ir_info, "should_inherit_delim: true")
+ end
+ if self.person_name_irs then
+ table.insert(ir_info, "person_name_irs: " .. tostring(#self.person_name_irs))
end
- if ir_info_str ~= "" then
- ir_info_str = string.format("{%s}", ir_info_str)
+ if #ir_info > 0 then
+ ir_info_str = string.format("{%s}", table.concat(ir_info, ' '))
end
local element_info = self._element.element_name
for _, attr in ipairs({"name", "variable"}) do
@@ -244,6 +246,7 @@ end
---@class SeqIr: IrNode
---@field children IrNode[]
+---@field disambiguate_branch_ir IrNode?
local SeqIr = IrNode:derive("SeqIr")
-- function SeqIr:new(children)
diff --git a/biblio/citation-style-language/citeproc-journal-data.lua b/biblio/citation-style-language/citeproc-journal-data.lua
index c78a3f9d4a..fc05997a3f 100644
--- a/biblio/citation-style-language/citeproc-journal-data.lua
+++ b/biblio/citation-style-language/citeproc-journal-data.lua
@@ -10446,7 +10446,6 @@ abbrevs = {
["ANTIOQUIA MÉDICA"] = "Antioquia Med",
["ANTIOXIDANT MEASUREMENT AND APPLICATIONS"] = "Acs. Sym. Ser.",
["ANTIOXIDANT NUTRIENTS AND IMMUNE FUNCTIONS"] = "Adv. Exp. Med. Biol.",
- ["ANTIOXIDANTS"] = "Antioxidants",
["ANTIOXIDANTS & REDOX SIGNALING"] = "Antioxid Redox Signal",
["ANTIOXIDANTS (BASEL, SWITZERLAND)"] = "Antioxidants (Basel)",
["ANTIOXIDANTS AND REDOX SIGNALLING"] = "Antioxid. Redox. Signal.",
@@ -131207,8 +131206,6 @@ unabbrevs = {
["ANTIOQUIA MED"] = "Antioquia médica",
["ANTIOXID REDOX SIGN"] = "Antioxidants & Redox Signaling",
["ANTIOXID REDOX SIGNAL"] = "Antioxidants & redox signaling",
- ["ANTIOXID REDOX SIGNALING"] = "Antioxidants & Redox Signaling",
- ["ANTIOXIDANTS"] = "Antioxidants",
["ANTIOXIDANTS (BASEL)"] = "Antioxidants (Basel, Switzerland)",
["ANTIPODE"] = "Antipode",
["ANTIPOLIS"] = "Antipolis. A Journal of Mediterranean Archaeology",
diff --git a/biblio/citation-style-language/citeproc-lua.1 b/biblio/citation-style-language/citeproc-lua.1
index 65581dfb00..5b62299f57 100644
--- a/biblio/citation-style-language/citeproc-lua.1
+++ b/biblio/citation-style-language/citeproc-lua.1
@@ -1,4 +1,4 @@
-.TH citeproc-lua 1 "0.4.3"
+.TH citeproc-lua 1 "0.4.4"
.SH NAME
citeproc-lua \- make CSL citations and bibliography for LaTeX
.SH SYNOPSIS
diff --git a/biblio/citation-style-language/citeproc-node-choose.lua b/biblio/citation-style-language/citeproc-node-choose.lua
index 3bc48a8f05..65262e0a07 100644
--- a/biblio/citation-style-language/citeproc-node-choose.lua
+++ b/biblio/citation-style-language/citeproc-node-choose.lua
@@ -47,6 +47,7 @@ function Choose:build_ir(engine, state, context)
local branch_ir
local ir = SeqIr:new({}, self)
+ ---@case ir SeqIr
ir.should_inherit_delim = true
ir.group_var = GroupVar.UnresolvedPlain
@@ -56,7 +57,8 @@ function Choose:build_ir(engine, state, context)
---@cast child If
branch_ir = child:build_ir(engine, state, context)
if branch_ir and branch_ir.group_var ~= GroupVar.Missing then
- table.insert(ir.children, branch_ir)
+ ir = SeqIr:new({branch_ir}, self)
+ ir.should_inherit_delim = true
ir.group_var = branch_ir.group_var
ir.name_count = branch_ir.name_count
ir.sort_key = branch_ir.sort_key
diff --git a/biblio/citation-style-language/citeproc-node-citation.lua b/biblio/citation-style-language/citeproc-node-citation.lua
index cea12afc8a..25573c93f1 100644
--- a/biblio/citation-style-language/citeproc-node-citation.lua
+++ b/biblio/citation-style-language/citeproc-node-citation.lua
@@ -48,7 +48,7 @@ local SortStringFormat = output.SortStringFormat
local Position = util.Position
-local DEBUG_DISAMBIGUATE = false
+-- local DEBUG_DISAMBIGUATE = true
---@class Citation: Element
@@ -716,9 +716,11 @@ function Citation:apply_disambiguate_add_givenname_primary_name(cite_ir, engine)
end
function Citation:apply_disambiguate_add_givenname_by_cite(cite_ir, engine)
+ -- util.debug(cite_ir.is_ambiguous)
if not cite_ir.is_ambiguous then
return cite_ir
end
+ -- util.debug(cite_ir)
if not cite_ir.person_name_irs or #cite_ir.person_name_irs == 0 then
return cite_ir
end
@@ -992,8 +994,10 @@ function Citation:apply_disambiguate_conditionals(cite_ir, engine)
if #ir_.irs_with_disambiguate_branch > 0 then
-- Disambiguation is incremental
-- disambiguate_IncrementalExtraText.txt
+ ---@type SeqIr
local condition_ir = ir_.irs_with_disambiguate_branch[1]
condition_ir.children[1] = condition_ir.disambiguate_branch_ir
+ -- condition_ir.person_name_irs are no longer used and we ignore them
condition_ir.group_var = condition_ir.disambiguate_branch_ir.group_var
table.remove(ir_.irs_with_disambiguate_branch, 1)
-- disambiguate_DisambiguateTrueReflectedInBibliography.txt
diff --git a/biblio/citation-style-language/citeproc.lua b/biblio/citation-style-language/citeproc.lua
index 51b9bfe9c7..a69367b606 100644
--- a/biblio/citation-style-language/citeproc.lua
+++ b/biblio/citation-style-language/citeproc.lua
@@ -16,7 +16,7 @@ else
util = require("citeproc.util")
end
-citeproc.__VERSION__ = "0.4.3"
+citeproc.__VERSION__ = "0.4.4"
citeproc.new = engine.CiteProc.new
citeproc.util = util
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 6c3eab5a75..453deaaaf0 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
%% bib file of all CTAN packages
%% (C) Herbert Voß
%%
-%% created at 16-09-2023, 02:03:11
+%% created at 17-09-2023, 02:00:46
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -12618,8 +12618,8 @@
title = {The \texttt{citation-style-language} package},
subtitle = {Bibliography formatting with Citation Style Language},
author = {Zeping Lee},
- date = {2023-09-07},
- version = {0.4.3},
+ date = {2023-09-16},
+ version = {0.4.4},
license = {mit,cc-by-sa-3},
mirror = {https://mirror.ctan.org/biblio/citation-style-language},
url = {https://ctan.org/pkg/citation-style-language},
@@ -22557,8 +22557,8 @@
title = {The \texttt{epstopdf} package},
subtitle = {Convert EPS to PDF using Ghostscript},
author = {Gerben Wierda and Sebastian Rahtz and Thomas Esser and Heiko Oberdiek and Karl Berry},
- date = {2023-07-09},
- version = {2.32},
+ date = {2023-09-16},
+ version = {2.33},
license = {other-free},
mirror = {https://mirror.ctan.org/support/epstopdf},
url = {https://ctan.org/pkg/epstopdf},
@@ -51288,8 +51288,8 @@
title = {The \texttt{parsimatn} package},
subtitle = {Contemporary Persian font for scientific and formal writings},
author = {Sajad Kazemi},
- date = {2023-09-14},
- version = {1.1},
+ date = {2023-09-16},
+ version = {2.0},
license = {ofl},
mirror = {https://mirror.ctan.org/fonts/parsimatn},
url = {https://ctan.org/pkg/parsimatn},
@@ -71914,8 +71914,8 @@
title = {The \texttt{truthtable} package},
subtitle = {Automatically generate truth tables for given variables and statements},
author = {Dominic Flück},
- date = {2021-10-09},
- version = {0.0.2},
+ date = {2023-09-16},
+ version = {0.1.0},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/luatex/latex/truthtable},
url = {https://ctan.org/pkg/truthtable},
@@ -74028,7 +74028,7 @@
title = {The \texttt{uptex-base} package},
subtitle = {Plain \TeX{} formats and documents for upTeX},
author = {Kazuki Maeda and Takuji Tanaka and {Japanese \TeX{} Development Community}},
- date = {2023-02-12},
+ date = {2023-09-16},
version = {},
license = {bsd3},
mirror = {https://mirror.ctan.org/macros/jptex/generic/uptex-base},
@@ -74041,7 +74041,7 @@
title = {The \texttt{uptex-fonts} package},
subtitle = {Fonts for use with upTeX},
author = {Kazuki Maeda and {Japanese \TeX{} Development Community} and Takuji Tanaka},
- date = {2023-01-28},
+ date = {2023-09-16},
version = {},
license = {bsd3},
mirror = {https://mirror.ctan.org/fonts/uptex-fonts},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index c683e78579..77872c2879 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ