From 6c9767fa3ed5fdd16f7045079d4c7144ed22a89f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Mar 2020 20:54:02 +0000 Subject: bib2gls (24mar20) git-svn-id: svn://tug.org/texlive/trunk@54525 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 23 +- Master/texmf-dist/doc/support/bib2gls/CHANGES | 24 + .../doc/support/bib2gls/bib2gls-begin.pdf | Bin 726603 -> 726572 bytes Master/texmf-dist/doc/support/bib2gls/bib2gls.1 | 56 +- Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf | Bin 4532038 -> 4692176 bytes .../doc/support/bib2gls/convertgls2bib.1 | 2 +- .../support/bib2gls/examples/sample-authors.pdf | Bin 49007 -> 49007 bytes .../support/bib2gls/examples/sample-bacteria.pdf | Bin 50457 -> 50457 bytes .../support/bib2gls/examples/sample-chemical.pdf | Bin 50346 -> 50249 bytes .../support/bib2gls/examples/sample-citations.pdf | Bin 47241 -> 47241 bytes .../support/bib2gls/examples/sample-constants.pdf | Bin 89877 -> 89380 bytes .../bib2gls/examples/sample-hierarchical.pdf | Bin 0 -> 49656 bytes .../bib2gls/examples/sample-hierarchical.tex | 31 + .../bib2gls/examples/sample-markuplanguages.pdf | Bin 56324 -> 56324 bytes .../doc/support/bib2gls/examples/sample-maths.pdf | Bin 111702 -> 110925 bytes .../doc/support/bib2gls/examples/sample-media.pdf | Bin 160836 -> 160836 bytes .../support/bib2gls/examples/sample-msymbols.pdf | Bin 104361 -> 103819 bytes .../doc/support/bib2gls/examples/sample-multi1.pdf | Bin 243245 -> 243149 bytes .../doc/support/bib2gls/examples/sample-multi2.pdf | Bin 318519 -> 318033 bytes .../doc/support/bib2gls/examples/sample-nested.pdf | Bin 0 -> 49664 bytes .../doc/support/bib2gls/examples/sample-nested.tex | 49 ++ .../doc/support/bib2gls/examples/sample-people.pdf | Bin 47742 -> 47742 bytes .../bib2gls/examples/sample-textsymbols.pdf | Bin 69911 -> 69791 bytes .../bib2gls/examples/sample-textsymbols2.pdf | Bin 67001 -> 67001 bytes .../doc/support/bib2gls/examples/sample-units1.pdf | Bin 53003 -> 53003 bytes .../doc/support/bib2gls/examples/sample-units2.pdf | Bin 54745 -> 54745 bytes .../doc/support/bib2gls/examples/sample-units3.pdf | Bin 41199 -> 41132 bytes .../support/bib2gls/examples/sample-usergroups.pdf | Bin 23839 -> 23838 bytes Master/texmf-dist/scripts/bib2gls/bib2gls.jar | Bin 272031 -> 275528 bytes .../texmf-dist/scripts/bib2gls/convertgls2bib.jar | Bin 39240 -> 39256 bytes .../scripts/bib2gls/resources/bib2gls-en.xml | 9 + Master/texmf-dist/scripts/bib2gls/texparserlib.jar | Bin 993525 -> 993572 bytes .../source/support/bib2gls/src/bib2gls-src.zip | Bin 195429 -> 198175 bytes .../source/support/bib2gls/src/bib2gls.bib | 134 +++- .../source/support/bib2gls/src/bib2gls.pod | 59 +- .../source/support/bib2gls/src/bib2gls.tex | 732 +++++++++++++++++++-- .../source/support/bib2gls/src/gls2bib-src.zip | Bin 32315 -> 32329 bytes .../source/support/bib2gls/src/texparser-src.zip | Bin 833795 -> 833840 bytes 38 files changed, 1023 insertions(+), 96 deletions(-) create mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf create mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex create mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf create mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index a07e5ce5bbf..db05eef149c 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 54386 2020-03-18 03:27:17Z preining $ +# $Id: tlmgr.pl 54446 2020-03-21 16:45:22Z karl $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 54386 $'; -my $datrev = '$Date: 2020-03-18 04:27:17 +0100 (Wed, 18 Mar 2020) $'; +my $svnrev = '$Revision: 54446 $'; +my $datrev = '$Date: 2020-03-21 17:45:22 +0100 (Sat, 21 Mar 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -649,6 +649,8 @@ for the full story.\n"; debug("Cannot open package log file for appending: $packagelogfile\n"); debug("Will not log package installation/removal/update for this run\n"); $packagelogfile = ""; + } else { + debug("appending to package log file: $packagelogfile\n"); } $loadmediasrcerror = "Cannot load TeX Live database from "; @@ -827,15 +829,22 @@ sub do_cmd_and_check { } else { ($out, $ret) = TeXLive::TLUtils::run_cmd("$cmd 2>&1"); } + # Although it is quite verbose to report all the output from every + # fmtutil (especially) run, it's the only way to know what's normal + # when something fails. Prefix each line to make them easy to see + # (and filter out/in). + (my $prefixed_out = $out) =~ s/^/(cmd)/gm; + $prefixed_out =~ s/\n+$//; # trailing newlines don't seem interesting + my $outmsg = "output:\n$prefixed_out\n--end of output of $cmd.\n"; if ($ret == $F_OK) { info("done running $cmd.\n"); - logpackage("success, output: $out"); - ddebug("--output of $cmd:\n$out\n--end of output of $cmd."); + logpackage("success, $outmsg"); + ddebug("$cmd $outmsg"); return ($F_OK); } else { info("\n"); tlwarn("$prg: $cmd failed (status $ret), output:\n$out\n"); - logpackage("error, status: $ret, output: $out"); + logpackage("error, status: $ret, $outmsg"); return ($F_ERROR); } } @@ -10014,7 +10023,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 54386 2020-03-18 03:27:17Z preining $ +$Id: tlmgr.pl 54446 2020-03-21 16:45:22Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/support/bib2gls/CHANGES b/Master/texmf-dist/doc/support/bib2gls/CHANGES index b68f56882e8..7f1d128d1ac 100644 --- a/Master/texmf-dist/doc/support/bib2gls/CHANGES +++ b/Master/texmf-dist/doc/support/bib2gls/CHANGES @@ -1,3 +1,27 @@ +v2.3 (2020-03-23): + + * New sort methods: recordcount and recordcount-reverse + (both require --record-count). + + * Resource option 'selection' now also allows the values + 'deps but not recorded' and 'ancestors but not recorded' + + * New resource options: + + custom-sort-fallbacks + field-concat-sep + + * The sort fallback resource options custom-sort-fallbacks, + entry-sort-fallback, symbol-sort-fallback, + abbreviation-sort-fallback and bibtexentry-sort-fallback + now allow 'id' or 'original id' as values or values that are + field concatenations. + + * New command line switches: + + --provide-glossaries + --no-provide-glossaries + v2.2 (2020-03-16): * Bug fix (texparserlib.jar): diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf index fb5b191d509..0511e6a2cd7 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.1 b/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 index 42ece34b41e..55d4579a25b 100644 --- a/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 +++ b/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIB2GLS 1" -.TH BIB2GLS 1 "2020-02-09" "perl v5.30.1" "bib2gls" +.TH BIB2GLS 1 "2020-03-18" "perl v5.30.2" "bib2gls" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -201,30 +201,30 @@ Use the TeX parser library to interpret known (La)TeX commands Don't try interpreting (La)TeX commands. .IP "\fB\-\-break\-space\fR" 4 .IX Item "--break-space" -Interpret tilde character and \enobreakspace as a normal space. +Interpret \f(CW\*(C`~\*(C'\fR (tilde) character and \f(CW\*(C`\enobreakspace\*(C'\fR as a normal space. .IP "\fB\-\-no\-break\-space\fR" 4 .IX Item "--no-break-space" -Interpret tilde and \enobreakspace as a non-breaking space (default). +Interpret \f(CW\*(C`~\*(C'\fR (tilde) and \f(CW\*(C`\enobreakspace\*(C'\fR as a non-breaking space (default). .IP "\fB\-\-cite\-as\-record\fR" 4 .IX Item "--cite-as-record" -Treat \fB\ecitation\fR as an ignored record. +Treat \f(CW\*(C`\ecitation\*(C'\fR as an ignored record. .IP "\fB\-\-no\-cite\-as\-record\fR" 4 .IX Item "--no-cite-as-record" -Don't check for instances of \fB\ecitation\fR in the \fB.aux\fR file (default). +Don't check for instances of \f(CW\*(C`\ecitation\*(C'\fR in the \fI.aux\fR file (default). .IP "\fB\-\-warn\-non\-bib\-fields\fR" 4 .IX Item "--warn-non-bib-fields" -Warn if internal non-bib fields are found in the .bib file. +Warn if internal non-bib fields are found in the \fI.bib\fR file. .IP "\fB\-\-no\-warn\-non\-bib\-fields\fR" 4 .IX Item "--no-warn-non-bib-fields" -Don't warn if internal non-bib fields are found in the .bib file. +Don't warn if internal non-bib fields are found in the \fI.bib\fR file. The use of these internal fields can cause unexpected results, so only use this option if you have taken appropriate precautions. .IP "\fB\-\-warn\-unknown\-entry\-types\fR" 4 .IX Item "--warn-unknown-entry-types" -Warn if any unknown entry types are found in the .bib file. +Warn if any unknown entry types are found in the \fI.bib\fR file. .IP "\fB\-\-no\-warn\-unknown\-entry\-types\fR" 4 .IX Item "--no-warn-unknown-entry-types" -Don't warn if any unknown entry types are found in the .bib file. +Don't warn if any unknown entry types are found in the \fI.bib\fR file. .IP "\fB\-\-merge\-wrglossary\-records\fR" 4 .IX Item "--merge-wrglossary-records" Merge an entry's \fBwrglossary\fR records for the same page locations. @@ -234,8 +234,8 @@ Merge an entry's \fBwrglossary\fR records for the same page locations. Don't merge an entry's \fBwrglossary\fR records. .IP "\fB\-\-merge\-nameref\-on\fR \fIrule\fR" 4 .IX Item "--merge-nameref-on rule" -Rule for merging locations created with the record=nameref package option -(requires glossaries\-extra.sty version 1.37+). The \fIrule\fR may be +Rule for merging locations created with the \fBrecord=nameref\fR package option +(requires \fIglossaries\-extra.sty\fR version 1.37+). The \fIrule\fR may be one of: \fBhcounter\fR, \fBhref\fR, \fBtitle\fR or \fBlocation\fR. .IP "\fB\-\-force\-cross\-resource\-refs\fR or \fB\-x\fR" 4 .IX Item "--force-cross-resource-refs or -x" @@ -245,15 +245,15 @@ Force cross-resource referencing mode on. Don't force cross-resource referencing mode on (default). .IP "\fB\-\-support\-unicode\-script\fR" 4 .IX Item "--support-unicode-script" -Text superscript (\etextsuperscript) or subscripts (\etextsubscript) +Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR) will use Unicode superscript/subscript characters if available. -For example, \etextsuperscript{2} will be converted to U+00B2 +For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to U+00B2 (superscript two). .IP "\fB\-\-no\-support\-unicode\-script\fR" 4 .IX Item "--no-support-unicode-script" -Text superscript (\etextsuperscript) or subscripts (\etextsubscript) +Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR) won't be converted to Unicode superscript/subscript characters. -For example, \etextsuperscript{2} will be converted to 2 +For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to \f(CW\*(C`2\*(C'\fR and the markup will be stripped leaving just the character 2. .IP "\fB\-\-packages\fR \fIlist\fR (or \fB\-p\fR \fIlist\fR)" 4 .IX Item "--packages list (or -p list)" @@ -286,7 +286,7 @@ packages may be used in \fB\-\-packages\fR or \fB\-\-ignore\-packages\fR. .IP "\fB\-\-mfirstuc\-protection\fR \fIfields\fR|\fBall\fR (or \fB\-u\fR \fIfields\fR|\fBall\fR)" 4 .IX Item "--mfirstuc-protection fields|all (or -u fields|all)" Insert an empty group if fields start with certain problematic -commands to protect against case-changing commands like \eGls. +commands to protect against case-changing commands like \f(CW\*(C`\eGls\*(C'\fR. .Sp The default is to do this for all fields. To do this for only a subset of fields, set \fIfields\fR to a comma-separated list of fields @@ -296,11 +296,11 @@ subset of fields, set \fIfields\fR to a comma-separated list of fields Switch off the auto-insertion of an empty group for all fields. .IP "\fB\-\-mfirstuc\-math\-protection\fR" 4 .IX Item "--mfirstuc-math-protection" -Switch on the auto-insertion of an empty group for math-shift ($). +Switch on the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR). This option will be overridden by \fB\-\-no\-mfirstuc\-protection\fR. .IP "\fB\-\-no\-mfirstuc\-math\-protection\fR" 4 .IX Item "--no-mfirstuc-math-protection" -Switch off the auto-insertion of an empty group for math-shift ($). +Switch off the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR). .IP "\fB\-\-nested\-link\-check\fR \fIlist\fR|\fBnone\fR" 4 .IX Item "--nested-link-check list|none" Check each field listed in \fIlist\fR for potentially problematic @@ -323,10 +323,10 @@ Permitted values of \fIoption\fR: \fBacronyms\fR (or \fBacro\fR), \fBac\fR, Set location format mappings. .IP "\fB\-\-group\fR or \fB\-g\fR" 4 .IX Item "--group or -g" -Add 'group' field to entries. +Add \fBgroup\fR field to entries. .IP "\fB\-\-no\-group\fR" 4 .IX Item "--no-group" -Don't add 'group' field to entries (default). +Don't add \fBgroup\fR field to entries (default). .IP "\fB\-\-record\-count\fR or \fB\-c\fR" 4 .IX Item "--record-count or -c" Add record count fields to entries. @@ -363,10 +363,20 @@ Don't trim leading and trailing spaces from fields (default). This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-trim\-fields\fR. .IP "\fB\-\-expand\-fields\fR" 4 .IX Item "--expand-fields" -Don't write \fB\eglsnoexpandfields\fR to the \fB.glstex\fR file. +Don't write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file. .IP "\fB\-\-no\-expand\-fields\fR" 4 .IX Item "--no-expand-fields" -Write \fB\eglsnoexpandfields\fR to the \fB.glstex\fR file (default). +Write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file (default). +.IP "\fB\-\-provide\-glossaries\fR" 4 +.IX Item "--provide-glossaries" +Write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to provide +unknown glossaries. +.IP "\fB\-\-no\-provide\-glossaries\fR" 4 +.IX Item "--no-provide-glossaries" +Don't write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to +provide unknown glossaries except in documented situations +(\fBmaster\fR, \fBsecondary\fR and \fBtrigger-type\fR resource options). +This setting is the default. .SH "REQUIRES" .IX Header "REQUIRES" Java 7 or later and a TeX distribution. @@ -398,4 +408,4 @@ The glossaries manual: .SH "AUTHOR" .IX Header "AUTHOR" Nicola L. C. Talbot, - + diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf index dfd6523fb8b..1ec0b544baf 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/convertgls2bib.1 b/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 index c5f2aceaa08..4c44b2b86a0 100644 --- a/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 +++ b/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "CONVERTGLS2BIB 1" -.TH CONVERTGLS2BIB 1 "2020-02-11" "perl v5.30.1" "convertgls2bib" +.TH CONVERTGLS2BIB 1 "2020-02-11" "perl v5.30.2" "convertgls2bib" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l 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 8b5267884aa..9313283211c 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 7a234832ef1..4bea556abdf 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 6eea6850c5f..a40807a98fe 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 4e7484577bc..af0ca7379de 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 afd62a657f4..f940272f170 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 new file mode 100644 index 00000000000..e33b240606b Binary files /dev/null and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex new file mode 100644 index 00000000000..7d00843f90d --- /dev/null +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex @@ -0,0 +1,31 @@ +% This file is public domain. See the "Examples" chapter +% in the bib2gls user manual for a more detailed description +% of this file. + +\documentclass[12pt,a4paper]{article} + +\usepackage[T1]{fontenc} +\usepackage[colorlinks]{hyperref} + +\usepackage[record,% use bib2gls + nostyles,% don't load default styles + postdot,% add a full stop after the description +% load glossary-tree.sty and patch styles: + stylemods={tree}, + style=treegroup]{glossaries-extra} + +\GlsXtrLoadResources[ + src={terms,animals,minerals,vegetables},% data these .bib files + field-aliases={identifier=parent} +] + +\begin{document} +Some sample terms: \gls{duck}, \gls{sealion}, \gls{armadillo}, +\gls{seal}, \gls{aardvark}, \gls{amethyst}, \gls{aquamarine}, +\gls{diamond}, \gls{dolomite}, \gls{chalcedony}, \gls{citrine}, +\gls{quetzalcoatlite}, \gls{cabbage}, \gls{cauliflower}, +\gls{artichoke}, \gls{courgette}. + +\GlsXtrSetDefaultNumberFormat{glsignore}% ignore records in the glossary +\printunsrtglossary +\end{document} 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 c381c0b8d9f..6688825d480 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 3bc8fe6a11c..43cd7710df4 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 5daa1bcf79b..1369546ba45 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 94b0cd9aa74..2b066570ab5 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 7cb94e2e827..49cc35baaf4 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 b2ad9f79f33..90cdb481e90 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 new file mode 100644 index 00000000000..8286cb06433 Binary files /dev/null and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex new file mode 100644 index 00000000000..fc6b540706c --- /dev/null +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex @@ -0,0 +1,49 @@ +% This file is public domain. See the "Examples" chapter +% in the bib2gls user manual for a more detailed description +% of this file. + +\documentclass[12pt,a4paper]{article} + +\usepackage[T1]{fontenc} +\usepackage[colorlinks]{hyperref} + +\usepackage[record,% use bib2gls + nostyles,% don't load default styles + postdot,% add a full stop after the description +% load glossary-tree.sty and patch styles: + stylemods={tree}, + style=treegroup]{glossaries-extra} + +\GlsXtrLoadResources[src={terms},sort={en-reverse}] + +\GlsXtrLoadResources[ + src={animals,minerals,vegetables}, + field-aliases={identifier=type}, + dependency-fields=type, + sort={en} +] + +\newcommand{\nestedhandler}[1]{% + \glsxtrunsrtdo{#1}% +% Is there a glossary whose label (type) matches this entry's label? + \ifglossaryexists*{#1}% + {% + \printunsrtinnerglossary[type={#1},leveloffset=++1,groups=false]{}{}% + }% + {}% +} + +\begin{document} +Some sample terms: \gls{duck}, \gls{sealion}, \gls{armadillo}, +\gls{seal}, \gls{aardvark}, \gls{amethyst}, \gls{aquamarine}, +\gls{diamond}, \gls{dolomite}, \gls{chalcedony}, \gls{citrine}, +\gls{quetzalcoatlite}, \gls{cabbage}, \gls{cauliflower}, +\gls{artichoke}, \gls{courgette}. + +\GlsXtrSetDefaultNumberFormat{glsignore}% ignore records in the glossary + +\printunsrtglossary*{% + \let\printunsrtglossaryhandler\nestedhandler +} + +\end{document} 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 34c8dc47507..e56463c5cbd 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 1a142e08f0e..1b7fbffb086 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 6a3eb23a495..a9a33d07507 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 b1f890b33d0..82a539f6db0 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 57fa32679d3..2bdd998fac6 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 77ec87df670..c8a61336578 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 41b5ee9544c..2b0a48ce126 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 ed0517bc0b8..26ce08f4776 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 0568b5cb64d..0373b04c384 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 524ba7ca257..92a7472c71f 100644 --- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml +++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml @@ -164,6 +164,13 @@ See the manual for further details. the listed packages. {0} List the packages known to the interpreter. +{0} + Define any unknown glossaries with + \provideignoredglossary*. +{0} + Don''t define unknown glossaries with + \provideignoredglossary* except in certain situations + (default). Reading {0} Writing {0} @@ -293,6 +300,7 @@ Defaulting to: {0}. Clearing entry type aliases. Setting entry type aliases. Stripping missing parent ''{0}'' from entry {1} +Removing ''{0}'' because it has records (''{1}={2}'' in effect). Entry ''{0}'' missing sort field ''{1}''. Falling back on field ''{2}''. Automatic support for: Support available for: @@ -493,6 +501,7 @@ Use {1} {0} instead. Attempt to create missing parent ''{0}'' for entry ''{1}'' caused a problem: {2} Interpreter needed for setting {0} +Sort method ''{0}'' requires {1} switch.