texlive[68295] trunk: citation-style-language (16sep23)
commits+karl at tug.org
commits+karl at tug.org
Sat Sep 16 22:12:41 CEST 2023
Revision: 68295
http://tug.org/svn/texlive?view=revision&revision=68295
Author: karl
Date: 2023-09-16 22:12:41 +0200 (Sat, 16 Sep 2023)
Log Message:
-----------
citation-style-language (16sep23)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
trunk/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
trunk/Master/texmf-dist/doc/man/man1/citeproc-lua.1
trunk/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf
trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua
trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua
trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua
trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua
trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua
trunk/Master/texmf-dist/scripts/citation-style-language/citeproc.lua
trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2023-09-16 20:12:41 UTC (rev 68295)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 66798 2023-04-08 00:15:21Z preining $
+# $Id: tlmgr.pl 68283 2023-09-15 13:11:11Z preining $
# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 66798 $';
-my $datrev = '$Date: 2023-04-08 02:15:21 +0200 (Sat, 08 Apr 2023) $';
+my $svnrev = '$Revision: 68283 $';
+my $datrev = '$Date: 2023-09-15 15:11:11 +0200 (Fri, 15 Sep 2023) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -3371,8 +3371,11 @@
if ($pkg =~ m/$CriticalPackagesRegexp/) {
debug("Not removing critical package $pkg\n");
} else {
- $localtlpdb->remove_package($pkg,
- "remove-warn-files" => \%do_warn_on_move);
+ if (! $localtlpdb->remove_package($pkg,
+ "remove-warn-files" => \%do_warn_on_move)) {
+ info("aborted\n") unless $::machinereadable;
+ next;
+ }
}
if ($remotetlpdb->install_package($pkg, $localtlpdb)) {
# installation succeeded because we got a reference
@@ -10243,7 +10246,7 @@
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 66798 2023-04-08 00:15:21Z preining $
+$Id: tlmgr.pl 68283 2023-09-15 13:11:11Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
@@ -10253,4 +10256,4 @@
### tab-width: 2
### indent-tabs-mode: nil
### End:
-# vim:set tabstop=2 expandtab: #
+# vim:set tabstop=2 shiftwidth=2 expandtab: #
Modified: trunk/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md 2023-09-16 20:12:41 UTC (rev 68295)
@@ -7,6 +7,13 @@
## [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 @@
- 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
Modified: trunk/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex 2023-09-16 20:12:41 UTC (rev 68295)
@@ -49,7 +49,7 @@
}%
}
-\date{2023-09-07 v0.4.3}
+\date{2023-09-16 v0.4.4}
\maketitle
Modified: trunk/Master/texmf-dist/doc/man/man1/citeproc-lua.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/citeproc-lua.1 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/doc/man/man1/citeproc-lua.1 2023-09-16 20:12:41 UTC (rev 68295)
@@ -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
Modified: trunk/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua 2023-09-16 20:12:41 UTC (rev 68295)
@@ -2553,6 +2553,10 @@
csl = nil,
source = "IEEEtran.bst",
},
+ monthtie = {
+ csl = nil,
+ source = "tugboat.bst",
+ },
mrnumber = {
csl = nil,
source = "amsplain.bst",
@@ -4185,10 +4189,6 @@
csl = nil,
source = "adrbirthday.bst",
},
- monthtie = {
- csl = nil,
- source = "tugboat.bst",
- },
},
macros = {
acmcs = {
Modified: trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua 2023-09-16 20:12:41 UTC (rev 68295)
@@ -37,6 +37,7 @@
--- at field delimiter string?
--- at field should_inherit_delim boolean?
--- at field group_var GroupVar
+--- at field sort_key string | boolean?
--- at field person_name_irs IrNode[]
--- at field name_count integer?
--- at field is_year boolean?
@@ -102,18 +103,19 @@
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 ir_info_str ~= "" then
- ir_info_str = string.format("{%s}", ir_info_str)
+ if self.person_name_irs then
+ table.insert(ir_info, "person_name_irs: " .. tostring(#self.person_name_irs))
end
+ 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
if self._element[attr] then
@@ -244,6 +246,7 @@
--- at class SeqIr: IrNode
--- at field children IrNode[]
+--- at field disambiguate_branch_ir IrNode?
local SeqIr = IrNode:derive("SeqIr")
-- function SeqIr:new(children)
Modified: trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua 2023-09-16 20:12:41 UTC (rev 68295)
@@ -10446,7 +10446,6 @@
["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 @@
["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",
Modified: trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua 2023-09-16 20:12:41 UTC (rev 68295)
@@ -47,6 +47,7 @@
local branch_ir
local ir = SeqIr:new({}, self)
+ --- at case ir SeqIr
ir.should_inherit_delim = true
ir.group_var = GroupVar.UnresolvedPlain
@@ -56,7 +57,8 @@
--- at 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
Modified: trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua 2023-09-16 20:12:41 UTC (rev 68295)
@@ -48,7 +48,7 @@
local Position = util.Position
-local DEBUG_DISAMBIGUATE = false
+-- local DEBUG_DISAMBIGUATE = true
--- at class Citation: Element
@@ -716,9 +716,11 @@
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 @@
if #ir_.irs_with_disambiguate_branch > 0 then
-- Disambiguation is incremental
-- disambiguate_IncrementalExtraText.txt
+ --- at 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
Modified: trunk/Master/texmf-dist/scripts/citation-style-language/citeproc.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/citation-style-language/citeproc.lua 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/scripts/citation-style-language/citeproc.lua 2023-09-16 20:12:41 UTC (rev 68295)
@@ -16,7 +16,7 @@
util = require("citeproc.util")
end
-citeproc.__VERSION__ = "0.4.3"
+citeproc.__VERSION__ = "0.4.4"
citeproc.new = engine.CiteProc.new
citeproc.util = util
Modified: trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty 2023-09-16 20:12:41 UTC (rev 68295)
@@ -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 at bibstore
\cs_if_exist:cF { beamerbib@ #1 @ \int_use:N \c at framenumber }
Modified: trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty 2023-09-16 00:12:43 UTC (rev 68294)
+++ trunk/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty 2023-09-16 20:12:41 UTC (rev 68295)
@@ -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 }
More information about the tex-live-commits
mailing list.