From b6aa013d422a2a481b8f7efe24a3f07bd7269681 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Sep 2023 20:12:41 +0000 Subject: citation-style-language (16sep23) git-svn-id: svn://tug.org/texlive/trunk@68295 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 17 ++++++++++------- .../doc/latex/citation-style-language/CHANGELOG.md | 10 +++++++++- .../citation-style-language-doc.pdf | Bin 229863 -> 229873 bytes .../citation-style-language-doc.tex | 2 +- Master/texmf-dist/doc/man/man1/citeproc-lua.1 | 2 +- .../texmf-dist/doc/man/man1/citeproc-lua.man1.pdf | Bin 14878 -> 14738 bytes .../citeproc-bibtex-data.lua | 8 ++++---- .../citation-style-language/citeproc-ir-node.lua | 17 ++++++++++------- .../citeproc-journal-data.lua | 3 --- .../citeproc-node-choose.lua | 4 +++- .../citeproc-node-citation.lua | 6 +++++- .../scripts/citation-style-language/citeproc.lua | 2 +- .../citation-style-language-compatible.sty | 2 +- .../citation-style-language.sty | 2 +- 14 files changed, 46 insertions(+), 29 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 1197e71afe3..b80e538e8b9 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -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 @@ sub action_update { 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 @@ This script and its documentation were written for the TeX Live distribution (L) 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 @@ $Id: tlmgr.pl 66798 2023-04-08 00:15:21Z preining $ ### tab-width: 2 ### indent-tabs-mode: nil ### End: -# vim:set tabstop=2 expandtab: # +# vim:set tabstop=2 shiftwidth=2 expandtab: # diff --git a/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md b/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md index b4f84afd445..85ffb9f43d8 100644 --- a/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf index 27657206572..b18b95c0eb9 100644 Binary files a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf and b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex index 991b68dcfbd..4c2f500ca75 100644 --- a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/man/man1/citeproc-lua.1 b/Master/texmf-dist/doc/man/man1/citeproc-lua.1 index 65581dfb002..5b62299f579 100644 --- a/Master/texmf-dist/doc/man/man1/citeproc-lua.1 +++ b/Master/texmf-dist/doc/man/man1/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/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf b/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf index 29e6e04ff91..4d8da8c3f1f 100644 Binary files a/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf and b/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf differ diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua index b875f3eb91d..666d813c9b1 100644 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-data.lua +++ b/Master/texmf-dist/scripts/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/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua index 7a940ef0614..92093309bc5 100644 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc-ir-node.lua +++ b/Master/texmf-dist/scripts/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/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua index c78a3f9d4a4..fc05997a3fa 100644 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc-journal-data.lua +++ b/Master/texmf-dist/scripts/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/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua index 3bc48a8f057..65262e0a076 100644 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua +++ b/Master/texmf-dist/scripts/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/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua index cea12afc8ad..25573c93f18 100644 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua +++ b/Master/texmf-dist/scripts/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/Master/texmf-dist/scripts/citation-style-language/citeproc.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc.lua index 51b9bfe9c7d..a69367b606d 100755 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc.lua +++ b/Master/texmf-dist/scripts/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/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty index eedc5dc4a1e..424df6775a6 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty +++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty index c7c54fb4d9b..b7f8f9a36fc 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty +++ b/Master/texmf-dist/tex/latex/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 } -- cgit v1.2.3