From 15c78b7d3931a379e08791206453a2a8e819aacf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Nov 2022 21:02:55 +0000 Subject: bib2gls (25nov22) git-svn-id: svn://tug.org/texlive/trunk@65104 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/bib2gls.1 | 9 ++++++++- Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf | Bin 38869 -> 39132 bytes .../doc/man/man1/convertgls2bib.man1.pdf | Bin 27489 -> 27489 bytes Master/texmf-dist/doc/support/bib2gls/CHANGES | 8 ++++++++ .../doc/support/bib2gls/bib2gls-begin.pdf | Bin 718818 -> 718677 bytes Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf | Bin 5135194 -> 5136230 bytes .../support/bib2gls/examples/sample-authors.pdf | Bin 51554 -> 51554 bytes .../support/bib2gls/examples/sample-bacteria.pdf | Bin 54221 -> 54221 bytes .../support/bib2gls/examples/sample-chemical.pdf | Bin 54006 -> 54006 bytes .../support/bib2gls/examples/sample-citations.pdf | Bin 49745 -> 49745 bytes .../support/bib2gls/examples/sample-constants.pdf | Bin 97789 -> 97789 bytes .../bib2gls/examples/sample-hierarchical.pdf | Bin 52505 -> 52505 bytes .../bib2gls/examples/sample-markuplanguages.pdf | Bin 61070 -> 61070 bytes .../doc/support/bib2gls/examples/sample-maths.pdf | Bin 121219 -> 121219 bytes .../doc/support/bib2gls/examples/sample-media.pdf | Bin 166484 -> 166484 bytes .../support/bib2gls/examples/sample-msymbols.pdf | Bin 109211 -> 109211 bytes .../doc/support/bib2gls/examples/sample-multi1.pdf | Bin 255310 -> 255310 bytes .../doc/support/bib2gls/examples/sample-multi2.pdf | Bin 330706 -> 330706 bytes .../doc/support/bib2gls/examples/sample-nested.pdf | Bin 52518 -> 52518 bytes .../doc/support/bib2gls/examples/sample-people.pdf | Bin 50320 -> 50320 bytes .../bib2gls/examples/sample-textsymbols.pdf | Bin 73042 -> 73042 bytes .../bib2gls/examples/sample-textsymbols2.pdf | Bin 70256 -> 70256 bytes .../doc/support/bib2gls/examples/sample-units1.pdf | Bin 57344 -> 57344 bytes .../doc/support/bib2gls/examples/sample-units2.pdf | Bin 59076 -> 59076 bytes .../doc/support/bib2gls/examples/sample-units3.pdf | Bin 44644 -> 44644 bytes .../support/bib2gls/examples/sample-usergroups.pdf | Bin 23827 -> 23827 bytes Master/texmf-dist/scripts/bib2gls/bib2gls.jar | Bin 353466 -> 353593 bytes .../texmf-dist/scripts/bib2gls/convertgls2bib.jar | Bin 40754 -> 40752 bytes .../scripts/bib2gls/resources/bib2gls-en.xml | 1 + Master/texmf-dist/scripts/bib2gls/texparserlib.jar | Bin 1624931 -> 1629366 bytes .../source/support/bib2gls/src/bib2gls-src.zip | Bin 266494 -> 266583 bytes .../source/support/bib2gls/src/bib2gls.bib | 14 ++++++++++++++ .../source/support/bib2gls/src/bib2gls.pod | 9 +++++++++ .../source/support/bib2gls/src/bib2gls.tex | 12 ++++++++++++ .../source/support/bib2gls/src/gls2bib-src.zip | Bin 33176 -> 33176 bytes .../source/support/bib2gls/src/texparser-src.zip | Bin 1391320 -> 1395657 bytes 36 files changed, 52 insertions(+), 1 deletion(-) diff --git a/Master/texmf-dist/doc/man/man1/bib2gls.1 b/Master/texmf-dist/doc/man/man1/bib2gls.1 index 448bd6550ff..b9c0737f628 100644 --- a/Master/texmf-dist/doc/man/man1/bib2gls.1 +++ b/Master/texmf-dist/doc/man/man1/bib2gls.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIB2GLS 1" -.TH BIB2GLS 1 "2022-10-09" "perl v5.34.1" "bib2gls" +.TH BIB2GLS 1 "2022-11-24" "perl v5.34.1" "bib2gls" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -210,6 +210,13 @@ Interpret \f(CW\*(C`~\*(C'\fR (tilde) character and \f(CW\*(C`\enobreakspace\*(C .IP "\fB\-\-no\-break\-space\fR" 4 .IX Item "--no-break-space" Interpret \f(CW\*(C`~\*(C'\fR (tilde) and \f(CW\*(C`\enobreakspace\*(C'\fR as a non-breaking space (default). +.IP "\fB\-\-obey\-aux\-catcode\fR" 4 +.IX Item "--obey-aux-catcode" +Obey known category code changing commands encountered in the aux +file. +.IP "\fB\-\-no\-obey\-aux\-catcode\fR" 4 +.IX Item "--no-obey-aux-catcode" +Ignore category code changing commands encountered in the aux file. .IP "\fB\-\-cite\-as\-record\fR" 4 .IX Item "--cite-as-record" Treat \f(CW\*(C`\ecitation\*(C'\fR as an ignored record. diff --git a/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf b/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf index dcb958b1513..c5313ebb0e7 100644 Binary files a/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf and b/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf b/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf index d545b91e9c8..58b5b62985a 100644 Binary files a/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf and b/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/CHANGES b/Master/texmf-dist/doc/support/bib2gls/CHANGES index a3e2fbcaac5..f4c605a222e 100644 --- a/Master/texmf-dist/doc/support/bib2gls/CHANGES +++ b/Master/texmf-dist/doc/support/bib2gls/CHANGES @@ -1,3 +1,11 @@ +v3.2 (2022-11-24): + + * Added --[no-]obey-aux-catcode + + The default is --no-obey-aux-catcode, which ignores catcode + changing commands found in the aux file. + (Issue #22 https://github.com/nlct/bib2gls/issues/22) + v3.1 (2022-11-05): * If new versions of glossaries.sty, mfirstuc.sty and glossaries-extra.sty diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf index c825f2b8c04..49c4081c8d2 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf and b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf index e23282b73c3..ac6fe779c8d 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf and b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf index 5094e02ec7b..9d03fab6d67 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf index f8bc312fefa..56c4305f5cb 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf index 0d303e47830..cd908a360df 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf index 46c9b2e8a9e..c43a35719a7 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf index 07c5a9b596e..0b696332039 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf index 9f83fe64da4..466ea4f9d48 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf index 959a97cfbf9..def5425c19d 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf index 327dea9a3e7..de2eb3515bb 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf index 085fba316a9..6abb0ecfc02 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf index 1a9fef29710..3db76c0e6df 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf index 03769633838..8cea7bcde50 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf index c356c6c2f90..92a16ca5285 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf index 9b59f762b16..952939e39f9 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf index 8824610553d..9e4a223ba1b 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf index 64aab9e3acc..0663ccc47bb 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf index f50f6f721d0..07ffce53dbd 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf index f5c7275af8b..9bc41618eef 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf index 7445d761e6d..2ebc649abaa 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf index 2d1e53be631..be092481fc6 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf index 27bcbecd597..d38ce54eb28 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf differ diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar index a57e51af588..34c7f2ec83e 100755 Binary files a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar and b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar differ diff --git a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar index 47741b64562..9f7f53a2527 100755 Binary files a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar and b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar differ diff --git a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml index 1deb254d84a..50abc80670f 100644 --- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml +++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml @@ -43,6 +43,7 @@ file is in or in a location that can be found by kpsewhich. {0} <name> Set the character encoding for the output files. {0} Enable interpreter. {0} Interpret tilde character as normal space. +{0} Obey known category code changing commands encountered in the aux file. {1}, {0} <list> Instruct interpreter to assume the listed packages have been used in the document. (The packages must be known by the interpreter.) {1}, {0} <list> Don''t check the log file for the listed packages. {0} <list> Instruct the interpreter to parse the listed packages. diff --git a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar index e3f8666d83d..5536760978e 100755 Binary files a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar and b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar differ diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip b/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip index 02674421879..b0c16848af6 100644 Binary files a/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip and b/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip differ diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib index 9f2d002928b..dde9f5d1fdd 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib @@ -10041,6 +10041,20 @@ primary formats, if enabled.}, parent={commandlineoptions} } +@switch{switch.obey-aux-catcode, + name={\longargfmt{obey\dhyphen aux\dhyphen catcode}}, + user1={}, + category={switch}, + parent={commandlineoptions} +} + +@switch{switch.no-obey-aux-catcode, + name={\longargfmt{no\dhyphen obey\dhyphen aux\dhyphen catcode}}, + user1={}, + category={switch}, + parent={commandlineoptions} +} + @switch{switch.cite-as-record, name={\longargfmt{cite\dhyphen as\dhyphen record}}, user1={}, diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod index e9f821d9074..e75573aa2c0 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod @@ -89,6 +89,15 @@ Interpret C<~> (tilde) character and C<\nobreakspace> as a normal space. Interpret C<~> (tilde) and C<\nobreakspace> as a non-breaking space (default). +=item B<--obey-aux-catcode> + +Obey known category code changing commands encountered in the aux +file. + +=item B<--no-obey-aux-catcode> + +Ignore category code changing commands encountered in the aux file. + =item B<--cite-as-record> Treat C<\citation> as an ignored record. diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex index dd56fedc310..679fab16edb 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex @@ -3498,6 +3498,18 @@ this setting. For example, if \csfmt{superiortwo} is defined as then it will be interpreted as \hex{00B2} (superscript two) even if this setting is on. +\argsection{obey-aux-catcode} + +By default, the \ext{aux} parser ignores category code changing +commands. This option will instruct the parser to implement the +category code, but note that it can only do this for known commands +that the parser is able to implement. + +\argsection{no-obey-aux-catcode} + +Instructs the \ext{aux} parser to ignore category code changing +commands. (Default.) + \section{Record Options} \argsection{cite-as-record} diff --git a/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip b/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip index bf21db49439..20f82e93ab0 100644 Binary files a/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip and b/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip differ diff --git a/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip b/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip index e0496feef00..20ba5b0c91c 100644 Binary files a/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip and b/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip differ -- cgit v1.2.3