From c75601a3ebfd5ef7b5c31447719e117d4a5dd3f3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Mar 2024 20:08:10 +0000 Subject: citation-style-language (12mar24) git-svn-id: svn://tug.org/texlive/trunk@70622 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/citation-style-language/CHANGELOG.md | 9 +++++- .../doc/latex/citation-style-language/README.md | 5 ++++ .../citation-style-language-doc.pdf | Bin 229002 -> 229002 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 14874 -> 14960 bytes .../citeproc-bibtex-data.lua | 32 ++++++++++----------- .../citation-style-language/citeproc-context.lua | 5 +++- .../citeproc-journal-data.lua | 4 +++ .../scripts/citation-style-language/citeproc.lua | 2 +- .../citation-style-language.sty | 2 +- 11 files changed, 41 insertions(+), 22 deletions(-) (limited to 'Master') 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 c79e3805f07..ab403cb5308 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,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.8] - 2024-03-12 + +### Fixed + +- Fix unexpected "nil" with empty page ([#58](https://github.com/zepinglee/citeproc-lua/issues/58)). + ## [0.4.7] - 2024-03-10 ### Added @@ -172,7 +178,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.7...HEAD +[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.8...HEAD +[0.4.8]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.7...v0.4.8 [0.4.7]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.6...v0.4.7 [0.4.6]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.5...v0.4.6 [0.4.5]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.4...v0.4.5 diff --git a/Master/texmf-dist/doc/latex/citation-style-language/README.md b/Master/texmf-dist/doc/latex/citation-style-language/README.md index efcd8973614..bbfd8c8bb20 100644 --- a/Master/texmf-dist/doc/latex/citation-style-language/README.md +++ b/Master/texmf-dist/doc/latex/citation-style-language/README.md @@ -1,5 +1,10 @@ # citation-style-language +- Homepage: https://github.com/zepinglee/citeproc-lua +- Author: Zeping Lee +- Email: zepinglee AT gmail DOT com +- License: MIT + The [Citation Style Language](https://citationstyles.org/) (CSL) is an XML-based language that defines the formats of citations and bibliography. There are currently thousands of styles in CSL including the most widely used 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 560691af59e..e506738e491 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 e68d49e56e3..4d2019780d5 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{2024-03-10 v0.4.7} +\date{2024-03-12 v0.4.8} \maketitle diff --git a/Master/texmf-dist/doc/man/man1/citeproc-lua.1 b/Master/texmf-dist/doc/man/man1/citeproc-lua.1 index da8e441f748..8a4265f8e8d 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.7" +.TH citeproc-lua 1 "0.4.8" .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 c4b047bfabb..e6921b09900 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 8d0b56c1715..29f5a0c5908 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 @@ -1217,6 +1217,10 @@ return { source = "windycity.dbx", type = "literal", }, + by = { + csl = nil, + source = "iran-unsrt.bst", + }, ["call-number"] = { csl = "call-number", source = "csl", @@ -2067,6 +2071,10 @@ return { source = "publist.dbx", type = "literal", }, + impression = { + csl = nil, + source = "iran-unsrt.bst", + }, inafterword = { csl = nil, source = "archaeologie.dbx", @@ -2896,6 +2904,10 @@ return { source = "bibtex", type = "range", }, + pagesnodashify = { + csl = nil, + source = "tugboat.bst", + }, pagetotal = { csl = "number-of-pages", source = "biblatex", @@ -3807,6 +3819,10 @@ return { csl = nil, source = "iopart-num.bst", }, + translateyear = { + csl = nil, + source = "iran-unsrt.bst", + }, translation = { csl = nil, source = "apsrev4-2.bst", @@ -4189,22 +4205,6 @@ return { csl = nil, source = "adrbirthday.bst", }, - pagesnodashify = { - csl = nil, - source = "tugboat.bst", - }, - by = { - csl = nil, - source = "iran-unsrt.bst", - }, - impression = { - csl = nil, - source = "iran-unsrt.bst", - }, - translateyear = { - csl = nil, - source = "iran-unsrt.bst", - }, }, macros = { acmcs = { diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua index ba7bf9fe14f..13618b407aa 100644 --- a/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua +++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua @@ -319,8 +319,11 @@ function Context:get_localized_quotes() end ---@param page string|number ----@return string +---@return string? function Context.page_first(page) + if not page then + return nil + end page = tostring(page) local page_first = util.split(page, "%s*[&,-]%s*")[1] return util.split(page_first, util.unicode["en dash"])[1] 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 eec47eb7d6c..f798dafd0de 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 @@ -25286,6 +25286,7 @@ abbrevs = { ["COMBINATORICS /"] = "Colloq. Math. Soc. J. B.", ["COMBINATORICS ADVANCES"] = "Math. Appl.", ["COMBINATORICS AND GRAPHS"] = "Contemp. Math.", + ["COMBINATORICS AND NUMBER THEORY"] = "Comb. Number Theory", ["COMBINATORICS AND REASONING: REPRESENTING, JUSTIFYING AND BUILDING ISOMORPHISMS"] = "Math. Educ. Lib.", ["COMBINATORICS PROBABILITY & COMPUTING"] = "Comb. Probab. Comput.", ["COMBINATORICS, ALGORITHMS, PROBABILISTIC AND EXPERIMENTAL METHODOLOGIES"] = "Lect. Notes. Comput. Sc.", @@ -72637,6 +72638,7 @@ abbrevs = { ["MATHEMATICS TEXTBOOKS FOR SCIENCE AND ENGINEERING"] = "Math. Textb. Sci. Eng.", ["MATHEMATICS TODAY"] = "Math. Today (Southend-on-Sea)", ["MATHEMATICS TODAY (AHMEDABAD)"] = "Math. Today (Ahmedabad)", + ["MATHEMATICS, COMPUTATION AND GEOMETRY OF DATA"] = "Math. Comput. Geom. Data", ["MATHEMATICS, CULTURE, AND THE ARTS"] = "Math. Cult. Arts", ["MATHEMATICS, DEVELOPMENTAL BIOLOGY AND TUMOUR GROWTH"] = "Contemp. Math.", ["MATHEMATICS, EDUCATION, AND SOCIETY"] = "Sci. Tech. Ed.", @@ -140859,6 +140861,7 @@ unabbrevs = { ["COMB CHEM HIGH T SCR"] = "Combinatorial Chemistry & High Throughput Screening", ["COMB CHEM HIGH THROUGHPUT SCREEN"] = "Combinatorial chemistry & high throughput screening", ["COMB CHEM HIGH THROUGHPUT SCREENING"] = "Combinatorial Chemistry and High Throughput Screening", + ["COMB NUMBER THEORY"] = "Combinatorics and Number Theory", ["COMB OPTIM"] = "Combinatorial Optimization", ["COMB PROBAB COMPUT"] = "Combinatorics, Probability and Computing", ["COMB THEORY"] = "Combinatorial Theory", @@ -169281,6 +169284,7 @@ unabbrevs = { ["MATH COMPUT"] = "Mathematics of Computation", ["MATH COMPUT APPL"] = "Mathematical & Computational Applications", ["MATH COMPUT BIOL NUMER ANAL"] = "Mathematical and Computational Biology and Numerical Analysis", + ["MATH COMPUT GEOM DATA"] = "Mathematics, Computation and Geometry of Data", ["MATH COMPUT MODEL"] = "Mathematical and computer modelling", ["MATH COMPUT MODEL DYN SYST"] = "Mathematical and Computer Modelling of Dynamical Systems", ["MATH COMPUT MODELLING"] = "Mathematical and Computer Modelling", diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc.lua index 0c673c67e33..3c591a3079d 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.7" +citeproc.__VERSION__ = "0.4.8" citeproc.new = engine.CiteProc.new citeproc.util = util 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 4dd3456b78a..ae1e4e7ff49 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} {2024-03-10} {0.4.7} +\ProvidesExplPackage {citation-style-language} {2024-03-12} {0.4.8} {Citation Style Language for LaTeX} \RequirePackage { l3keys2e } -- cgit v1.2.3