diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-30 21:07:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-30 21:07:31 +0000 |
commit | 4cd5a13cada0c802764cd845fe52db78b87634b5 (patch) | |
tree | bd6986bf7488eff234df34d007d5e7d89a1738ca /Master | |
parent | 41a331fa8fa1fd9dcd8bf9aa032c5472ef597b15 (diff) |
bib2gls (29jan24)
git-svn-id: svn://tug.org/texlive/trunk@69635 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
37 files changed, 68 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/man/man1/bib2gls.1 b/Master/texmf-dist/doc/man/man1/bib2gls.1 index fb8ea43d204..3debddeefad 100644 --- a/Master/texmf-dist/doc/man/man1/bib2gls.1 +++ b/Master/texmf-dist/doc/man/man1/bib2gls.1 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "BIB2GLS 1" -.TH BIB2GLS 1 2023-08-24 "perl v5.36.1" bib2gls +.TH BIB2GLS 1 2024-01-30 "perl v5.36.3" bib2gls .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -94,6 +94,10 @@ location into a normal record (default). Instruct the TeX parser library to attempt to parse the packages listed in \fIlist\fR. This is intended for simple custom packages that don't contain complex code. +.IP "\fB\-\-date\-in\-header\fR (or \fB\-D\fR)" 4 +.IX Item "--date-in-header (or -D)" +The header comment at the start of the \fI.glstex\fR file will include +the file modification date. .IP "\fB\-\-debug\fR [\fIn\fR]" 4 .IX Item "--debug [n]" Switch on the debug mode at the given setting \fIn\fR, which @@ -258,6 +262,10 @@ Don't check for instances of \f(CW\*(C`\ecitation\*(C'\fR in the \fI.aux\fR file .IX Item "--no-collapse-same-location-range" Don't collapse an explicit range that has a duplicate start and end location into a normal record. +.IP \fB\-\-no\-date\-in\-header\fR 4 +.IX Item "--no-date-in-header" +The header comment at the start of the \fI.glstex\fR file will not include +the file modification date (default). .IP "\fB\-\-no\-debug\fR (or \fB\-\-nodebug\fR)" 4 .IX Item "--no-debug (or --nodebug)" Switch off debug mode. (Equivalent to \fB\-\-debug\fR \fB0\fR) diff --git a/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf b/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf Binary files differindex 4ccbba1d167..0a3a2320580 100644 --- a/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/bib2gls.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf b/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf Binary files differindex 53a0e7b9df5..5fbf07bbc84 100644 --- a/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/convertgls2bib.man1.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/CHANGES b/Master/texmf-dist/doc/support/bib2gls/CHANGES index 3e284ad3f11..88157ab29d6 100644 --- a/Master/texmf-dist/doc/support/bib2gls/CHANGES +++ b/Master/texmf-dist/doc/support/bib2gls/CHANGES @@ -1,3 +1,14 @@ +v3.9 (2024-01-30) + + * bib2gls + + - new command line switch: --[no-]date-in-header + + - allow \u<hex> in assign-fields + + - bug fix: NullPointerException if entry referenced before + bibData initialised + v3.8 (2023-10-13) * bib2gls diff --git a/Master/texmf-dist/doc/support/bib2gls/README.md b/Master/texmf-dist/doc/support/bib2gls/README.md index 61f24844952..2627a963a16 100644 --- a/Master/texmf-dist/doc/support/bib2gls/README.md +++ b/Master/texmf-dist/doc/support/bib2gls/README.md @@ -9,7 +9,7 @@ Application Home Page: https://www.dickimaw-books.com/software/bib2gls # Licence -Copyright (C) 2017-2023 Nicola L. C. Talbot (dickimaw-books.com) +Copyright (C) 2017-2024 Nicola L. C. Talbot (dickimaw-books.com) License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf Binary files differindex cc428484f0b..3f1c63c4f0a 100644 --- a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf Binary files differindex 882aa19c646..454b11c159f 100644 --- a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf Binary files differindex 8416fd871b4..da70242ba98 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf Binary files differindex b8b59907e45..96501a8a27e 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf Binary files differindex 12889a2ec89..18ab24c96f2 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf Binary files differindex 7326dafa98f..088c11e28ec 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf Binary files differindex 56e4526fac6..648240c6b0c 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf Binary files differindex 36782de0a15..0548bc8ba8d 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf Binary files differindex 766e98bef0d..f2a404af38d 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf Binary files differindex eba1e42fec1..d394c64cfb3 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf Binary files differindex 8d9533b9ad2..c708d921655 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf Binary files differindex 0adfaea9730..f2c35880378 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf Binary files differindex 7784474059e..6c63366549d 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf Binary files differindex 1e9aa193320..4bb1cc66356 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf Binary files differindex 7e6ea2ca9c5..4ee84daa5e8 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf Binary files differindex 78f7cdcca4b..ad10280f4a6 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf Binary files differindex 7b75bda11b5..2b4973e3a90 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf Binary files differindex 4b0ad42a675..32d4e2bbc11 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf Binary files differindex 43afba61865..47316136fa8 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf Binary files differindex 1c4d6f3cef6..e93385441e9 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf Binary files differindex 29915619c37..c7e98f02963 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf Binary files differindex c9e50621888..a411f9a669f 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar Binary files differindex e14df563b71..2af7facd1d9 100755 --- a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar +++ b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar diff --git a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar Binary files differindex 4fd2eb4232c..801adc2d10b 100755 --- a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar +++ b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar diff --git a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml index 1d337157905..7cb62e290a9 100644 --- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml +++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml @@ -84,6 +84,7 @@ file is in or in a location that can be found by kpsewhich.</entry> <entry key="syntax.trim.except.fields">{0} <list> Trim leading and trailing spaces from all fields except those listed. (Cumulative.)</entry> <entry key="syntax.expand.fields">{0} Allow field expansion to occur when LaTeX inputs the glstex file.</entry> <entry key="syntax.provide.glossaries">{0} Define any unknown glossaries with \provideignoredglossary*.</entry> +<entry key="syntax.date_in_header">{0} Include date in header comment.</entry> <!-- These are messages used by the TeX Parser Library --> <entry key="message.reading">Reading {0}</entry> @@ -273,6 +274,7 @@ Defaulting to: {0}. <entry key="message.etc"> ETC... </entry> <entry key="comment.header">% This file was created by {0} v{1} on {2}.</entry> +<entry key="comment.header.no_date">% This file was created by {0} v{1}.</entry> <entry key="comment.no_edit">% DO NOT edit this file. Any changes made will be lost next time {0} is run.</entry> <entry key="comment.source_list">% This file was generated from data obtained from the following files:</entry> <entry key="comment.list.and">{0,choice,2# and |2>, and }</entry> @@ -390,6 +392,7 @@ Aliased entries must be in the same resource set as their target entries with op <entry key="warning.blockers.unknown.token">Unknown token in blocker list: {0}</entry> <entry key="warning.mappings.cant.parse">Can''t parse mapping list: {0}</entry> <entry key="warning.mismatched.sty">Mismatching versions of packages {0} ({1}) and {2} ({3}). Please upgrade {2}</entry> +<entry key="warning.get.entry.no.data">Entry ''{0}'' referenced before data initialised.</entry> <entry key="error.title">Error: {0}</entry> <entry key="error.no_log">File {0} not found. Remember to run LaTeX before {1}. diff --git a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar Binary files differindex 1bc9a255962..1474e3c3610 100755 --- a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar +++ b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip b/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip Binary files differindex 104efeb0fb5..2e8e1796971 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls-src.zip diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib index 944345e4fed..8f33ed27756 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.bib @@ -10586,6 +10586,21 @@ primary formats, if enabled.}, parent={commandlineoptions} } +@switch{switch.no-date-in-header, + name={\longargfmt{no\dhyphen date\dhyphen in\dhyphen header}}, + user1={}, + category={switch}, + parent={commandlineoptions} +} + +@switch{switch.date-in-header, + name={\longargfmt{date\dhyphen in\dhyphen header}}, + symbol={\shortargfmt{D}}, + user1={}, + category={switch}, + parent={commandlineoptions} +} + @switch{switch.no-expand-fields, name={\longargfmt{no\dhyphen expand\dhyphen fields}}, user1={}, @@ -15268,7 +15283,7 @@ defined}, @glscommand{glshex, name={\csfmt{glshex}}, user1={}, - description={expands to \cs{cs.string}\cs{u}}, + description={expands to \cs{cs.string}\cs{uhex}}, topics={charcommands,collationsubrules}, note={\styfmt{glossaries-extra} v1.21+ (moved to \styfmt{glossaries-extra-bib2gls} in v1.27)}, @@ -15349,7 +15364,7 @@ warning rather than an error if the command isn't already defined}, @glscommand{GlsXtrResourceInitEscSequences, name={\csfmt{Gls\-Xtr\-Resource\-Init\-Esc\-Sequences}}, user1={}, - description={locally redefines \idx{quark} commands, such as \cs{u} and + description={locally redefines \idx{quark} commands, such as \cs{uhex} and \gls{NULL}, that shouldn't expand in resource options as they have special meanings for some options. May be added to the definition of \gls{glsxtrresourceinit} if diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod index e9645adb65a..a6c36b9d8d6 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.pod @@ -40,6 +40,11 @@ Instruct the TeX parser library to attempt to parse the packages listed in I<list>. This is intended for simple custom packages that don't contain complex code. +=item B<--date-in-header> (or B<-D>) + +The header comment at the start of the F<.glstex> file will include +the file modification date. + =item B<--debug> [I<n>] Switch on the debug mode at the given setting I<n>, which @@ -242,6 +247,11 @@ Don't check for instances of C<\citation> in the F<.aux> file (default). Don't collapse an explicit range that has a duplicate start and end location into a normal record. +=item B<--no-date-in-header> + +The header comment at the start of the F<.glstex> file will not include +the file modification date (default). + =item B<--no-debug> (or B<--nodebug>) Switch off debug mode. (Equivalent to B<--debug> B<0>) diff --git a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex index 8c4a11b717b..a0f931b3b8d 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex +++ b/Master/texmf-dist/source/support/bib2gls/src/bib2gls.tex @@ -3708,6 +3708,20 @@ all Java applications installed on your device, or you can use \longarg{default-encoding} just to set the default for \bibgls. See \sectionref{sec:defencoding}. +\argsection{date-in-header} + +The comment header block at the start of the \iext{glstex} files +will include the file modification date in the first line (after the +version information). This setting can interfere with +the document build process or version control if you are testing for +file differences rather than file modification dates when only the +timestamp changes. + +\argsection{no-date-in-header} + +The comment header block at the start of the \iext{glstex} files +won't include the file modification date (default). + \section{Interpreter Options} \argsection{break-space} @@ -11429,6 +11443,8 @@ only be overwritten if \csopt[true]{assign-override} or if of the field for the entry under consideration and doesn't use the more complex \meta{field-ref} syntax used in \meta{element-list}, which is described in \sectionref{sec:optstringconcat}. +You can, however, use the \cs{uhex} quark on either side of the +\keyval\ element to indicate a Unicode character. The \oargm{override} following the equal sign is optional and may be used to counteract the \csopt{assign-override} setting for the given @@ -11704,7 +11720,7 @@ The resource options are now: \oarg{ entrytype \idx{follow} original \idx{equalscmp} \qtdelim{person} }, \field{text} = \fieldfmt{forename} \idx{concat-plus} \qtdelim{ } \idx{concat-plus} \fieldfmt{surname} \oarg{ entrytype \idx{follow} original \idx{equalscmp} \qtdelim{person} }, - \field{first} = \gls{FIRSTUC} \marg{ parent \qt{follow} \field{text} } \idx{concat-plus} \qtdelim{ } \idx{concat-plus} \fieldfmt{name} + \field{first} = \gls{FIRSTUC} \marg{ parent \idx{follow} \field{text} } \idx{concat-plus} \qtdelim{ } \idx{concat-plus} \fieldfmt{name} \oarg{ entrytype \idx{follow} original \idx{equalscmp} \qtdelim{monarch} }, \field{text} = \fieldfmt{name} \oarg{ entrytype \idx{follow} original \idx{equalscmp} \qtdelim{monarch} } diff --git a/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip b/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip Binary files differindex 7064b4c3723..d8f948d3a69 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip +++ b/Master/texmf-dist/source/support/bib2gls/src/gls2bib-src.zip diff --git a/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip b/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip Binary files differindex bd273a22036..69406856be6 100644 --- a/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip +++ b/Master/texmf-dist/source/support/bib2gls/src/texparser-src.zip |