From 7116eb3c7dd50b9b6a0470aceaa9f6e993d07490 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Nov 2017 22:53:09 +0000 Subject: glossaries (15nov17) git-svn-id: svn://tug.org/texlive/trunk@45821 c570f23f-e606-0410-a88d-b1316a301751 --- .../linked_scripts/glossaries/makeglossaries | 6 +- .../glossaries/makeglossaries-lite.lua | 6 +- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 97 +++++++++++++-------- Master/texmf-dist/doc/latex/glossaries/CHANGES | 6 ++ Master/texmf-dist/doc/latex/glossaries/README | 4 +- .../doc/latex/glossaries/glossaries-code.pdf | Bin 1180481 -> 1180590 bytes .../doc/latex/glossaries/glossaries-user.html | 10 +-- .../doc/latex/glossaries/glossaries-user.pdf | Bin 881431 -> 881442 bytes .../doc/latex/glossaries/glossaries-user.tex | 10 +-- .../doc/latex/glossaries/glossariesbegin.html | 4 +- .../doc/latex/glossaries/glossariesbegin.pdf | Bin 186422 -> 186422 bytes .../doc/latex/glossaries/glossariesbegin.tex | 4 +- .../doc/latex/glossaries/glossary2glossaries.html | 2 +- .../doc/latex/glossaries/glossary2glossaries.pdf | Bin 142449 -> 142449 bytes .../doc/latex/glossaries/glossary2glossaries.tex | 2 +- .../samples/glossary-lipsum-examples.pdf | Bin 248641 -> 248641 bytes .../doc/latex/glossaries/samples/minimalgls.pdf | Bin 49958 -> 49958 bytes .../doc/latex/glossaries/samples/mwe-acr-desc.pdf | Bin 37957 -> 37957 bytes .../doc/latex/glossaries/samples/mwe-acr.pdf | Bin 33649 -> 33649 bytes .../doc/latex/glossaries/samples/mwe-gls.pdf | Bin 29939 -> 29939 bytes .../doc/latex/glossaries/samples/sample-FnDesc.pdf | Bin 58817 -> 58817 bytes .../glossaries/samples/sample-chap-hyperfirst.pdf | Bin 54822 -> 54822 bytes .../latex/glossaries/samples/sample-crossref.pdf | Bin 53456 -> 53456 bytes .../glossaries/samples/sample-custom-acronym.pdf | Bin 82185 -> 82185 bytes .../latex/glossaries/samples/sample-dot-abbr.pdf | Bin 52796 -> 52796 bytes .../doc/latex/glossaries/samples/sample-dual.pdf | Bin 36455 -> 36455 bytes .../latex/glossaries/samples/sample-entrycount.pdf | Bin 36839 -> 36839 bytes .../latex/glossaries/samples/sample-entryfmt.pdf | Bin 34904 -> 34904 bytes .../latex/glossaries/samples/sample-font-abbr.pdf | Bin 50703 -> 50703 bytes .../latex/glossaries/samples/sample-ignored.pdf | Bin 31810 -> 31810 bytes .../doc/latex/glossaries/samples/sample-index.pdf | Bin 43379 -> 43379 bytes .../doc/latex/glossaries/samples/sample-inline.pdf | Bin 147244 -> 147208 bytes .../latex/glossaries/samples/sample-langdict.pdf | Bin 38855 -> 38855 bytes .../latex/glossaries/samples/sample-newkeys.pdf | Bin 39198 -> 39198 bytes .../glossaries/samples/sample-noidxapp-utf8.pdf | Bin 96000 -> 96000 bytes .../latex/glossaries/samples/sample-noidxapp.pdf | Bin 67077 -> 67077 bytes .../glossaries/samples/sample-nomathhyper.pdf | Bin 41745 -> 41745 bytes .../latex/glossaries/samples/sample-numberlist.pdf | Bin 41979 -> 41979 bytes .../doc/latex/glossaries/samples/sample-prefix.pdf | Bin 43259 -> 43259 bytes .../doc/latex/glossaries/samples/sample-si.pdf | Bin 21710 -> 21710 bytes .../samples/sample-storage-abbr-desc.pdf | Bin 39892 -> 39892 bytes .../glossaries/samples/sample-storage-abbr.pdf | Bin 37659 -> 37659 bytes .../doc/latex/glossaries/samples/sample.pdf | Bin 102914 -> 102874 bytes .../doc/latex/glossaries/samples/sample4col.pdf | Bin 43320 -> 43320 bytes .../doc/latex/glossaries/samples/sampleAcr.pdf | Bin 65506 -> 65506 bytes .../doc/latex/glossaries/samples/sampleAcrDesc.pdf | Bin 65613 -> 65613 bytes .../latex/glossaries/samples/sampleCustomAcr.pdf | Bin 93612 -> 93612 bytes .../doc/latex/glossaries/samples/sampleDB.pdf | Bin 47043 -> 47043 bytes .../doc/latex/glossaries/samples/sampleDesc.pdf | Bin 48396 -> 48396 bytes .../doc/latex/glossaries/samples/sampleEq.pdf | Bin 155616 -> 155612 bytes .../doc/latex/glossaries/samples/sampleEqPg.pdf | Bin 169071 -> 169067 bytes .../latex/glossaries/samples/sampleFnAcrDesc.pdf | Bin 91343 -> 91343 bytes .../doc/latex/glossaries/samples/sampleNtn.pdf | Bin 98878 -> 98834 bytes .../doc/latex/glossaries/samples/samplePeople.pdf | Bin 47459 -> 47459 bytes .../doc/latex/glossaries/samples/sampleSec.pdf | Bin 65669 -> 65669 bytes .../doc/latex/glossaries/samples/sampleSort.pdf | Bin 95258 -> 95220 bytes .../doc/latex/glossaries/samples/sampleaccsupp.pdf | Bin 41155 -> 41155 bytes .../latex/glossaries/samples/sampleacronyms.pdf | Bin 37201 -> 37201 bytes .../doc/latex/glossaries/samples/sampletree.pdf | Bin 66912 -> 66912 bytes .../doc/latex/glossaries/samples/sampleutf8.pdf | Bin 44939 -> 44939 bytes .../doc/latex/glossaries/samples/samplexdy.pdf | Bin 133770 -> 133691 bytes .../doc/latex/glossaries/samples/samplexdy2.pdf | Bin 68399 -> 68399 bytes .../doc/latex/glossaries/samples/samplexdy3.pdf | Bin 178811 -> 178723 bytes .../texmf-dist/doc/man/man1/makeglossaries-lite.1 | 2 +- .../doc/man/man1/makeglossaries-lite.man1.pdf | Bin 23735 -> 23593 bytes Master/texmf-dist/doc/man/man1/makeglossaries.1 | 2 +- .../doc/man/man1/makeglossaries.man1.pdf | Bin 24558 -> 24416 bytes .../texmf-dist/scripts/glossaries/makeglossaries | 6 +- .../scripts/glossaries/makeglossaries-lite.lua | 6 +- .../source/latex/glossaries/glossaries.dtx | 70 ++++++++------- .../source/latex/glossaries/glossaries.ins | 2 +- .../tex/latex/glossaries/base/glossaries-babel.sty | 2 +- .../glossaries/base/glossaries-compatible-207.sty | 2 +- .../glossaries/base/glossaries-compatible-307.sty | 2 +- .../glossaries/base/glossaries-polyglossia.sty | 2 +- .../latex/glossaries/base/glossaries-prefix.sty | 2 +- .../tex/latex/glossaries/base/glossaries.sty | 3 +- .../latex/glossaries/expl/glossaries-accsupp.sty | 2 +- .../latex/glossaries/styles/glossary-hypernav.sty | 2 +- .../latex/glossaries/styles/glossary-inline.sty | 2 +- .../tex/latex/glossaries/styles/glossary-list.sty | 2 +- .../tex/latex/glossaries/styles/glossary-long.sty | 2 +- .../glossaries/styles/glossary-longbooktabs.sty | 2 +- .../glossaries/styles/glossary-longragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-mcols.sty | 2 +- .../tex/latex/glossaries/styles/glossary-super.sty | 2 +- .../glossaries/styles/glossary-superragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-tree.sty | 2 +- 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