diff options
88 files changed, 161 insertions, 113 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries index 196662c18ce..e40eed5696f 100755 --- a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries +++ b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries @@ -2,7 +2,7 @@ # File : makeglossaries # Author : Nicola Talbot -# Version : 4.34 +# Version : 4.35 # Description: simple Perl script that calls makeindex or xindy. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -27,9 +27,11 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries-lite.lua. -my $version="4.34 (2017-11-03)"; +my $version="4.35 (2017-11-14)"; # History: +# v4.35: +# * No change. # v4.34: # * Added check for \glsxtr@resource # v4.33: diff --git a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua index 761383190f2..89561d7e182 100755 --- a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua +++ b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua @@ -26,10 +26,12 @@ This work has the LPPL maintenance status `maintained'. History: + * 4.35: + - no change. * 4.34: - added check for \glsxtr@resource * 4.33: - - Version number synchronized with glossaries.sty + - version number synchronized with glossaries.sty * 1.3 - added check for \glsxtr@makeglossaries * 1.2 (2016-05-27) @@ -39,7 +41,7 @@ - changed first line from lua to texlua --]] -thisversion = "4.34 2017-11-03" +thisversion = "4.35 2017-11-14" quiet = false dryrun = false diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 1d94540f5c5..e20b80d9a94 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 45788 2017-11-14 00:49:39Z karl $ +# $Id: tlmgr.pl 45806 2017-11-14 21:16:47Z karl $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 45788 $'; -my $datrev = '$Date: 2017-11-14 01:49:39 +0100 (Tue, 14 Nov 2017) $'; +my $svnrev = '$Revision: 45806 $'; +my $datrev = '$Date: 2017-11-14 22:16:47 +0100 (Tue, 14 Nov 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -110,6 +110,8 @@ use TeXLive::TLPaper; # # set up $prg for warning messages $prg = TeXLive::TLUtils::basename($0); +# for usage in various Perl modules +$::prg = $prg; binmode(STDOUT, ":utf8"); binmode(STDERR, ":utf8"); @@ -1242,6 +1244,10 @@ sub action_paper { } else { # tlmgr paper {a4|letter} => do it. return ($F_ERROR) if !check_on_writable(); + if ($opts{'json'}) { + tlwarn("$prg: option --json not supported with other arguments\n"); + return ($F_ERROR); + } my $ret = $F_OK; for my $prog (sort keys %TeXLive::TLPaper::paper) { my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'}; @@ -1254,6 +1260,10 @@ sub action_paper { } } else { # program-specific paper + if ($opts{'json'}) { + tlwarn("$prg: option --json not supported with other arguments\n"); + return ($F_ERROR); + } my $prog = $action; # first argument is the program to change my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'}; if (!$pkg) { @@ -4392,7 +4402,13 @@ sub action_option { $what = "show" unless defined($what); init_local_db(); my $ret = $F_OK; + my %json; if ($what =~ m/^show$/i) { + if ($opts{'json'}) { + my $json = $localtlpdb->options_as_json(); + print("$json\n"); + return($ret); + } for my $o (sort keys %{$localtlpdb->options}) { # ignore some things which are w32 specific next if ($o eq "desktop_integration" && !win32()); @@ -4414,6 +4430,11 @@ sub action_option { } } } elsif ($what =~ m/^showall$/i) { + if ($opts{'json'}) { + my $json = $localtlpdb->options_as_json(); + print("$json\n"); + return($ret); + } my %loc = %{$localtlpdb->options}; for my $o (sort keys %TLPDBOptions) { if ($::machinereadable) { @@ -4431,7 +4452,7 @@ sub action_option { } my $found = 0; for my $opt (keys %TLPDBOptions) { - if ($what eq $TLPDBOptions{$opt}->[2]) { + if (($what eq $TLPDBOptions{$opt}->[2]) || ($what eq $opt)) { $found = 1; # the option argument matches the name my $val = shift @ARGV; @@ -7833,23 +7854,29 @@ from the local keyring. =over 4 -=item B<option [show]> +=item B<option [--json] [show]> -=item B<option showall> +=item B<option [--json] showall> =item B<option I<key> [I<value>]> =back -The first form shows the global TeX Live settings currently saved in the -TLPDB with a short description and the C<key> used for changing it in -parentheses. +The first form, C<show>, shows the global TeX Live settings currently +saved in the TLPDB with a short description and the C<key> used for +changing it in parentheses. + +The second form, C<showall>, is similar, but also shows options which +can be defined but are not currently set to any value. -The second form is similar, but also shows options which can be defined -but are not currently set to any value. +Both C<show...> forms take an option C<--json>, which dumps the option +information in JSON format. In this case, both forms dump the same +data. For the format of the JSON output see +C<tlpkg/doc/JSON-formats.txt>, format definition C<TLOPTION>. -In the third form, if I<value> is not given, the setting for I<key> is -displayed. If I<value> is present, I<key> is set to I<value>. +In the third form, with I<key>, if I<value> is not given, the setting +for I<key> is displayed. If I<value> is present, I<key> is set to +I<value>. Possible values for I<key> are (run C<tlmgr option showall> for the definitive list): @@ -7876,21 +7903,22 @@ DVD. To do this, you can run The C<install-tl> documentation has more information about the possible values for C<repository>. (For backward compatibility, C<location> can -be used as alternative name for C<repository>.) +be used as a synonym for C<repository>.) If C<formats> is set (this is the default), then formats are regenerated when either the engine or the format files have changed. Disable this -only when you know what you are doing. +only when you know how and want to regenerate formats yourself. The C<postcode> option controls execution of per-package postinstallation action code. It is set by default, and again disabling -is not likely to be of interest except perhaps to developers. +is not likely to be of interest except to developers doing debugging. The C<docfiles> and C<srcfiles> options control the installation of -their respective files of a package. By default both are enabled (1). -Either or both can be disabled (set to 0) if disk space is limited or -for minimal testing installations, etc. When disabled, the respective -files are not downloaded at all. +their respective file groups (documentation, sources; grouping is +approximate) per package. By default both are enabled (1). Either or +both can be disabled (set to 0) if disk space is limited or for minimal +testing installations, etc. When disabled, the respective files are not +downloaded at all. The options C<autobackup> and C<backupdir> determine the defaults for the actions C<update>, C<backup> and C<restore>. These three actions @@ -7910,22 +7938,21 @@ To setup C<autobackup> to C<-1> on the command line, use: tlmgr option -- autobackup -1 -The C<--> avoids having the C<-1> treated as an option. (C<--> stops -parsing for options at the point where it appears; this is a general -feature across most Unix programs.) +The C<--> avoids having the C<-1> treated as an option. (The C<--> +stops parsing for options at the point where it appears; this is a +general feature across most Unix programs.) -The C<sys_bin>, C<sys_man>, and C<sys_info> options are used on -Unix-like systems to control the generation of links for executables, -info files and man pages. See the C<path> action for details. +The C<sys_bin>, C<sys_man>, and C<sys_info> options are used on Unix +systems to control the generation of links for executables, Info files +and man pages. See the C<path> action for details. -The last three options also affect behavior on Windows installations. -If C<desktop_integration> is set, then some packages will install items -in a sub-folder of the Start menu for C<tlmgr gui>, documentation, etc. -If C<fileassocs> is set, Windows file associations are made (see also -the C<postaction> action). Finally, if C<multiuser> is set, then -adaptions to the registry and the menus are done for all users on the -system instead of only the current user. All three options are on by -default. +The last three options affect behavior on Windows installations. If +C<desktop_integration> is set, then some packages will install items in +a sub-folder of the Start menu for C<tlmgr gui>, documentation, etc. If +C<fileassocs> is set, Windows file associations are made (see also the +C<postaction> action). Finally, if C<multiuser> is set, then adaptions +to the registry and the menus are done for all users on the system +instead of only the current user. All three options are on by default. =head2 paper @@ -9232,7 +9259,7 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 45788 2017-11-14 00:49:39Z karl $ +$Id: tlmgr.pl 45806 2017-11-14 21:16:47Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index a6851a09c1b..d76ca2f1cc4 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,11 @@ glossaries change log: +v4.35 (2017-11-14): + + * glossaries.sty: + + - bug fix (\glsadd breaks with sort=use) + v4.34 (2017-11-03): * glossaries.sty: diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index a7fedd31985..f29cd6dbf5b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v4.34 +LaTeX Package : glossaries v4.35 -Last Modified : 2017-11-03 +Last Modified : 2017-11-14 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf Binary files differindex 2de6e32c07f..734fcaf6609 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html index 07b3f5125c7..7cba3840d89 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html @@ -309,7 +309,7 @@ span#textcolor62{color:#00FF00} > <!--l. 455--><p class="noindent" > </p><!--l. 455--><p class="noindent" ><span -class="cmr-17">User Manual for glossaries.sty v4.34</span> +class="cmr-17">User Manual for glossaries.sty v4.35</span> </p> <div class="tabular"> <table id="TBL-1" class="tabular" cellspacing="0" cellpadding="0" @@ -325,7 +325,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span class="cmtt-12">http://www.dickimaw-books.com/</span></a> </td></tr></table> </div> <!--l. 455--><p class="noindent" ><span -class="cmr-12">2017-11-03</span></p></div> +class="cmr-12">2017-11-14</span></p></div> <div class="abstract" > @@ -467,7 +467,7 @@ class="cmtt-10">glossaries-code.pdf</span></a> </dt><dd class="description">Advanced users wishing to know more about the inner workings of all the packages provided in the <span class="cmss-10">glossaries </span>bundle should read “Documented - Code for glossaries v4.34”. + Code for glossaries v4.35”. </dd><dt class="description"> @@ -546,7 +546,7 @@ have a problem with hyperlinks in maths mode, I recommend you use <a href="#glo:glossaries-extra"><span class="cmss-10">glossaries-extra</span></a> with the <span -class="cmtt-10">hyperouter </span>and <span +class="cmtt-10">hyperoutside </span>and <span class="cmtt-10">textformat </span>attributes set to appropriate values for problematic entries. </div> </p><!--l. 588--><p class="noindent" > @@ -5904,7 +5904,7 @@ class="cmss-10">glossaries </span>package, make sure you also upgrade your versi <a href="#glo:makeglossaries"><span class="cmtt-10">makeglossaries</span><a - id="dx1-17037"></a></a>. The current version is 4.34. </div> + id="dx1-17037"></a></a>. The current version is 4.35. </div> </p><!--l. 2783--><p class="noindent" > </p><!--l. 2785--><p class="noindent" > </p> diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf Binary files differindex f305ca744b8..ef3bd69e68a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex index d2018e1cf28..ca53bf11c96 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex @@ -447,11 +447,11 @@ and~\hyperlink{option#2}{#2}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{User Manual for glossaries.sty v4.34} + \title{User Manual for glossaries.sty v4.35} \author{Nicola L.C. Talbot\\% \url{http://www.dickimaw-books.com/}} - \date{2017-11-03} + \date{2017-11-14} \maketitle \begin{abstract} @@ -536,7 +536,7 @@ package. \item[\url{glossaries-code.pdf}] Advanced users wishing to know more about the inner workings of all the packages provided in the \styfmt{glossaries} bundle should read -\qt{Documented Code for glossaries v4.34}. +\qt{Documented Code for glossaries v4.35}. \item[INSTALL] Installation instructions. @@ -582,7 +582,7 @@ encounter problems where you have long hyperlinks or hyperlinks in subscripts or superscripts. This is an issue with the DVI format not with \styfmt{glossaries}. If you really need to use the DVI format and have a problem with hyperlinks in maths mode, I recommend you use -\gls{glossaries-extra} with the \texttt{hyperouter} and +\gls{glossaries-extra} with the \texttt{hyperoutside} and \texttt{textformat} attributes set to appropriate values for problematic entries. \end{important} @@ -2779,7 +2779,7 @@ resulting file onto the man path. Alternatively do \begin{important} When upgrading the \styfmt{glossaries} package, make sure you also upgrade your version of \gls{makeglossaries}. The current version is -4.34. +4.35. \end{important} \subsection{Using the makeglossaries-lite Lua Script} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html index 8edf6464219..6a8b407df75 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html @@ -255,7 +255,7 @@ span#textcolor40{color:#00FF00} > <!--l. 55--><p class="noindent" > </p><!--l. 55--><p class="noindent" ><span -class="cmr-17">The glossaries package v4.34: a guide for</span> +class="cmr-17">The glossaries package v4.35: a guide for</span> <span class="cmr-17">beginners</span> </p> @@ -268,7 +268,7 @@ class="td11"> <span class="cmr-12">Nicola L.C. Talbot </span></td></tr></table> </div> <!--l. 55--><p class="noindent" ><span -class="cmr-12">2017-11-03</span></p></div> +class="cmr-12">2017-11-14</span></p></div> <div class="abstract" > diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf Binary files differindex d46b8cc6f6a..6e33c8fddb2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex index 075fccae4aa..e1a6e9b3c60 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex @@ -31,10 +31,10 @@ \texorpdfstring{{\frenchspacing\obeyspaces\ttfamily#1}}{#1}} \newcommand*{\file}[1]{\texorpdfstring{\texttt{#1}}{#1}} -\title{The glossaries package v4.34: +\title{The glossaries package v4.35: a guide for beginners} \author{Nicola L.C. Talbot} -\date{2017-11-03} +\date{2017-11-14} \ifpdf \externaldocument{glossaries-user} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html index 0e8feb912da..43f45a60169 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html @@ -200,7 +200,7 @@ class="td11"><span class="cmr-12">Nicola L.C. Talbot</span></td></tr></table> </div> <!--l. 51--><p class="noindent" ><span -class="cmr-12">2017-11-03</span></p></div> +class="cmr-12">2017-11-14</span></p></div> <div class="abstract" > diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf Binary files differindex 16c1eeb57f8..9461cbceff1 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex index 36607159198..289e0a9bc62 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex @@ -33,7 +33,7 @@ \title{Upgrading from the glossary package to the glossaries package} \author{Nicola L.C. Talbot} -\date{2017-11-03} +\date{2017-11-14} \newenvironment{oldway}{% \begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf Binary files differindex 26806906c24..dc57adb3156 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf Binary files differindex 1f15cf631f8..b651839e418 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf Binary files differindex e41380d7413..8a1835d3d10 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf Binary files differindex f3673d18c1f..b34188b76cc 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf Binary files differindex 010e283e9ef..4648adbc141 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf Binary files differindex baea42e8283..ced0e844813 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf Binary files differindex 97efd91f435..32abd684004 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf Binary files differindex 40c39a70bcf..8cf8ecd2495 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf Binary files differindex 762c6374a91..b2a3e806196 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf Binary files differindex 27b640384d4..c10e02813f9 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf Binary files differindex 229261bb734..1bff88be2a3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf Binary files differindex ed69757686f..9b53402764f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf Binary files differindex b1e254a9a63..51ee27be4bd 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf Binary files differindex e3404a68f0d..153e9d48a00 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf Binary files differindex 4fead71520f..47102a816b4 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf Binary files differindex 9134a5b2d4d..0af19291934 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf Binary files differindex f61c7350cfc..ad527c16d3b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf Binary files differindex 93e30ad5ace..83cc35c9680 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf Binary files differindex a15ed45b2a6..50cd424ae50 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf Binary files differindex 6c5f60357ea..5967dc8e93f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf Binary files differindex 58ee51c1d89..62734634804 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf Binary files differindex c9ba7d7515a..d2cfa1ae5ce 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf Binary files differindex a18f8205d7a..11cbb0b2e44 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf Binary files differindex da553f781b2..309eefaa000 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf Binary files differindex f8d28004b5a..7c83cf2ae28 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf Binary files differindex 32639048af6..901fa1909c9 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf Binary files differindex 004c04ed385..eca29ff68e3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf Binary files differindex e7bd3189f6e..bb8b85e7938 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf Binary files differindex ec4bf5182f4..3177e2d8f26 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf Binary files differindex 647553ecc3b..3f9b2acc4c3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf Binary files differindex eda3c4028ff..424d671399f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf Binary files differindex 944d427954b..bb0532945ba 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf Binary files differindex 3d0ae842ef5..5e5b93479af 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf Binary files differindex 6f47dd29cbf..20a16875ec6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf Binary files differindex 32dd179a345..8c2e3f54b92 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf Binary files differindex adf28509419..134aabc2e28 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf Binary files differindex 6a904585593..9e56a2486aa 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf Binary files differindex 435be885c07..b84cac4722f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf Binary files differindex 07af29f0463..093f557c9fd 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf Binary files differindex 7d724e4fb1c..1ba94b5b394 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf Binary files differindex d29a6cd5378..af69a3d8110 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf Binary files differindex 129f3688a5b..4c4dd84fb1f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf Binary files differindex 502bbb95c7d..5a617771994 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf Binary files differindex 2bae77890d9..11912f12886 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf Binary files differindex 94ba3e89ec1..8ded1621961 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf Binary files differindex 113fe2452c9..a9d99d6e5d9 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf Binary files differindex 5fe5753ce90..9c40f993f12 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf Binary files differindex abc3fedb85b..9bef03a9076 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf diff --git a/Master/texmf-dist/doc/man/man1/makeglossaries-lite.1 b/Master/texmf-dist/doc/man/man1/makeglossaries-lite.1 index 2d2701d2019..ca08446049d 100644 --- a/Master/texmf-dist/doc/man/man1/makeglossaries-lite.1 +++ b/Master/texmf-dist/doc/man/man1/makeglossaries-lite.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "MAKEGLOSSARIES-LITE 1" -.TH MAKEGLOSSARIES-LITE 1 "2017-11-03" "perl v5.18.4" "makeglossaries-lite Lua Script" +.TH MAKEGLOSSARIES-LITE 1 "2017-11-14" "perl v5.18.4" "makeglossaries-lite Lua Script" .\" 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/man/man1/makeglossaries-lite.man1.pdf b/Master/texmf-dist/doc/man/man1/makeglossaries-lite.man1.pdf Binary files differindex a0e809f445b..8258876e90a 100644 --- a/Master/texmf-dist/doc/man/man1/makeglossaries-lite.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/makeglossaries-lite.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/makeglossaries.1 b/Master/texmf-dist/doc/man/man1/makeglossaries.1 index e0daff5ca4a..35888da24fe 100644 --- a/Master/texmf-dist/doc/man/man1/makeglossaries.1 +++ b/Master/texmf-dist/doc/man/man1/makeglossaries.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "MAKEGLOSSARIES 1" -.TH MAKEGLOSSARIES 1 "2017-11-03" "perl v5.18.4" "makeglossaries Perl Script" +.TH MAKEGLOSSARIES 1 "2017-11-14" "perl v5.18.4" "makeglossaries Perl Script" .\" 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/man/man1/makeglossaries.man1.pdf b/Master/texmf-dist/doc/man/man1/makeglossaries.man1.pdf Binary files differindex e186123e4c1..eeed5e873e1 100644 --- a/Master/texmf-dist/doc/man/man1/makeglossaries.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/makeglossaries.man1.pdf diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries index 196662c18ce..e40eed5696f 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries @@ -2,7 +2,7 @@ # File : makeglossaries # Author : Nicola Talbot -# Version : 4.34 +# Version : 4.35 # Description: simple Perl script that calls makeindex or xindy. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -27,9 +27,11 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries-lite.lua. -my $version="4.34 (2017-11-03)"; +my $version="4.35 (2017-11-14)"; # History: +# v4.35: +# * No change. # v4.34: # * Added check for \glsxtr@resource # v4.33: diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua b/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua index 761383190f2..89561d7e182 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua @@ -26,10 +26,12 @@ This work has the LPPL maintenance status `maintained'. History: + * 4.35: + - no change. * 4.34: - added check for \glsxtr@resource * 4.33: - - Version number synchronized with glossaries.sty + - version number synchronized with glossaries.sty * 1.3 - added check for \glsxtr@makeglossaries * 1.2 (2016-05-27) @@ -39,7 +41,7 @@ - changed first line from lua to texlua --]] -thisversion = "4.34 2017-11-03" +thisversion = "4.35 2017-11-14" quiet = false dryrun = false diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 86d183f7103..348cbe6819f 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -1,10 +1,14 @@ %\iffalse % glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -section "chapter" +% -setambles ".*\.perl=>\nopreamble\nopostamble" +% -setambles ".*\.tex=>\nopreamble\nopostamble" +% -setambles ".*\.xdy=>\nopreamble\nopostamble" +% -macrocode ".*\.perl" +% -macrocode ".*\.tex" +% -macrocode ".*\.xdy" % -author "Nicola Talbot" -% -comment ".*\.perl" -% -comment ".*\.tex" -% -comment ".*\.xdy" % -src "glossaries\.sty\Z=>glossaries.sty" % -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" @@ -21,17 +25,13 @@ % -src "(samplexdy-mc.*\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" % -src "(.*\.perl)\Z=>\1" -% -macrocode ".*\.perl" -% -macrocode ".*\.tex" -% -macrocode ".*\.xdy" % -codetitle "Main Package Code" -% -section "chapter" +% -comment ".*\.perl" +% -comment ".*\.tex" +% -comment ".*\.xdy" % -doc "glossaries-manual.tex" -% -setambles ".*\.perl=>\nopreamble\nopostamble" -% -setambles ".*\.tex=>\nopreamble\nopostamble" -% -setambles ".*\.xdy=>\nopreamble\nopostamble" % glossaries -% Created on 2017/11/3 20:12 +% Created on 2017/11/14 19:44 %\fi %\iffalse %<*package> @@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{19480} +\CheckSum{19481} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\fi %\MakeShortVerb{"} % -% \title{Documented Code For glossaries v4.34} +% \title{Documented Code For glossaries v4.35} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2017-11-03} +% \date{2017-11-14} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -193,7 +193,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %glossaries package}. % %\item[\url{glossaries-user.pdf}] -%For the main user guide, read \qt{glossaries.sty v4.34: +%For the main user guide, read \qt{glossaries.sty v4.35: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle} % Required packages: @@ -11794,6 +11794,12 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \begin{macrocode} \@gls@saveentrycounter % \end{macrocode} +% Define sort key if necessary: +%\changes{4.35}{2017-11-14}{added \cs{@gls@setsort} (in case of +%\pkgopt[use]{sort})} +% \begin{macrocode} + \@gls@setsort{#2}% +% \end{macrocode} % This should use \cs{@@do@wrglossary} rather than % \cs{@do@wrglossary} since the whole point of \cs{glsadd} is to add % a line to the glossary. @@ -18850,7 +18856,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \cs{gls}\marg{label}} on subsequent use. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Pass all options to \sty{glossaries}: % \begin{macrocode} @@ -19265,7 +19271,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\label{sec:code:hypernav} % Package Definition: % \begin{macrocode} -\ProvidesPackage{glossary-hypernav}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % % The commands defined in this package are provided to @@ -19458,7 +19464,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % This defines an in-line style where the entries are % comma-separated with just the name and description displayed. % \begin{macrocode} -\ProvidesPackage{glossary-inline}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-inline}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -19649,7 +19655,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-list}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} %\begin{macro}{\indexspace} %\changes{4.13}{2015-02-03}{new} @@ -19931,7 +19937,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The glossary styles defined in the \isty{glossary-long} package % used the \env{longtable} environment in the glossary. % \begin{macrocode} -\ProvidesPackage{glossary-long}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-long}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -20428,7 +20434,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \url{http://tex.stackexchange.com/a/56890} % % \begin{macrocode} -\ProvidesPackage{glossary-longbooktabs}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Requires \sty{booktabs} package: % \begin{macrocode} @@ -20769,7 +20775,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % used the \env{longtable} environment in the glossary and use % ragged right formatting for the multiline columns. % \begin{macrocode} -\ProvidesPackage{glossary-longragged}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-longragged}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -21202,7 +21208,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %use the \sty{multicol} package. These use the tree-like glossary %styles in a multicol environment. % \begin{macrocode} -\ProvidesPackage{glossary-mcols}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-mcols}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -21639,7 +21645,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The glossary styles defined in the \isty{glossary-super} package % use the \env{supertabular} environment. % \begin{macrocode} -\ProvidesPackage{glossary-super}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-super}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -22171,7 +22177,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % are like those provided by the \isty{glossary-super} package, % except that the multiline columns have ragged right justification. % \begin{macrocode} -\ProvidesPackage{glossary-superragged}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-superragged}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -22611,7 +22617,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-tree}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % %\begin{macro}{\indexspace} @@ -23332,7 +23338,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % hyperlinks may not work properly. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} %\begin{macro}{\GlsAddXdyAttribute} % Adds an attribute in old format. @@ -23693,7 +23699,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\section{glossaries-compatible-307} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % % Compatibility macros for predefined glossary styles: @@ -24501,7 +24507,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} % Package version number now in line with main glossaries package number. % \begin{macrocode} -\ProvidesPackage{glossaries-accsupp}[2017/11/03 v4.34 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2017/11/14 v4.35 (NLCT) Experimental glossaries accessibility] % \end{macrocode} % Pass all options to \sty{glossaries}: @@ -26940,7 +26946,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-babel}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} @@ -26984,7 +26990,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2017/11/14 v4.35 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 93c4e6b34f1..c1c914d88ff 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins @@ -1,4 +1,4 @@ -% glossaries.ins generated using makedtx version 1.2 2017/11/3 20:12 +% glossaries.ins generated using makedtx version 1.2 2017/11/14 19:44 \input docstrip \preamble diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty index b351ace3cbc..8e35727e4ca 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-babel}[2017/11/14 v4.35 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index 4516fade98d..81c6b610a9c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2017/11/14 v4.35 (NLCT)] \ifglsxindy \renewcommand*\GlsAddXdyAttribute[1]{% \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty index 183df07e3e2..66cd8be945e 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2017/11/14 v4.35 (NLCT)] \newcommand{\compatglossarystyle}[2]{% \ifcsundef{@glscompstyle@#1}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty index a297a602c9e..4c0da358ff0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2017/11/14 v4.35 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty index bd3ed165b6a..8ee24bf8ce1 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2017/11/14 v4.35 (NLCT)] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions \RequirePackage{glossaries} diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 1794b8f9089..79fa6e751f3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossaries}[2017/11/14 v4.35 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -4636,6 +4636,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \edef\@gls@counter{\csname glo@\glsdetoklabel{#2}@counter\endcsname}% \setkeys{glossadd}{#1}% \@gls@saveentrycounter + \@gls@setsort{#2}% \@@do@wrglossary{#2}% }% } diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty index abc520df49f..f4a6f3e9496 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-accsupp}[2017/11/03 v4.34 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2017/11/14 v4.35 (NLCT) Experimental glossaries accessibility] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index ad068343b9f..e24a50c2cf3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-hypernav}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2017/11/14 v4.35 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index 2edb042d76b..e2f1a08684b 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-inline}[2017/11/14 v4.35 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index af03c0290e9..7b69d79fe46 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-list}[2017/11/14 v4.35 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index 56722e34790..47b7c454145 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-long}[2017/11/14 v4.35 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty index c3cde647bf1..689ed8955c0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longbooktabs}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2017/11/14 v4.35 (NLCT)] \RequirePackage{booktabs} \RequirePackage{glossary-long} \RequirePackage{glossary-longragged} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty index 6f9e07e85b2..8d8f15f17d3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longragged}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-longragged}[2017/11/14 v4.35 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index fa4e4f56f42..8c3f46980b1 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-mcols}[2017/11/14 v4.35 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \providecommand{\indexspace}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index b44a3019212..ff8b42ff597 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-super}[2017/11/14 v4.35 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty index 407e3c6b173..9004e2d7d66 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-superragged}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-superragged}[2017/11/14 v4.35 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty index 16049b6db3b..e848353df22 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2017/11/03 v4.34 (NLCT)] +\ProvidesPackage{glossary-tree}[2017/11/14 v4.35 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } |