summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-16 22:55:05 +0000
committerKarl Berry <karl@freefriends.org>2016-12-16 22:55:05 +0000
commit2e527eaebe9ef04d4d6d1b0c5ac8ff0f331aacad (patch)
tree721613fdae2cd8c2ea107a2a6ad51768261009b6 /Build
parent8ea673e9cfeb30456e238a5f138bea79990c46dd (diff)
glossaries (16dec16)
git-svn-id: svn://tug.org/texlive/trunk@42726 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/glossaries/makeglossaries28
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua22
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl4
3 files changed, 44 insertions, 10 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries
index 3ec5dd02ed6..b322759f0fb 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 : 2.19
+# Version : 2.20
# 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.
-my $version="2.19 (2016-05-27)";
+my $version="2.20 (2016-12-16)";
# History:
+# v2.20 (2016/12/16)
+# * Added check for \glsxtr@makeglossaries
# v2.19 (2016/05/27)
# * Improved check in &parse_for_xindy_nosort
# v2.18 (2016/01/24)
@@ -298,6 +300,8 @@ unless (-e "$name.aux")
my $istfile = "";
+my $glslist = "";
+
# should letter ordering be used? (v1.5 added)
my $letterordering = defined($opt_l);
@@ -440,8 +444,7 @@ if ($ext)
my $thislang = "";
my $thiscodepage = "";
- # v2.15 added:
- my @types = keys %exttype;
+ my @types = ($glslist ? split /,/, $glslist : keys %exttype);
foreach my $type (@types)
{
@@ -528,7 +531,9 @@ else
{
# no file extension specified so process all glossary types
- foreach my $type (keys %exttype)
+ my @types = ($glslist ? split /,/, $glslist : keys %exttype);
+
+ foreach my $type (@types)
{
my %thistype = %{$exttype{$type}};
@@ -647,8 +652,19 @@ sub scan_aux{
{
while (<AUXFILE>)
{
+ #v2.20 added
+ if (m/\\glsxtr\@makeglossaries\{(.*)\}/)
+ {
+ $glslist = $1;
+
+ unless ($opt_q)
+ {
+ print "only processing subset '$glslist'\n";
+ }
+ }
+
#v2.14 added
- if (m/\\\@gls\@reference/)
+ if (m/\\\@gls\@reference/ and not $glslist)
{
die "Your document has used \\makenoidxglossaries\n",
"You don't need makeindex or xindy.\n";
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 0aa91654241..ae8bfe2dc1f 100755
--- a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua
+++ b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua
@@ -26,14 +26,16 @@
This work has the LPPL maintenance status `maintained'.
History:
- * 1.2
+ * 1.3
+ - added check for \glsxtr@makeglossaries
+ * 1.2 (2016-05-27)
- added check for \@gls@extramakeindexopts
- added check for nil codepage
* 1.1
- changed first line from lua to texlua
--]]
-thisversion = "1.2 2016-05-27"
+thisversion = "1.3 2016-12-16"
quiet = false
dryrun = false
@@ -399,6 +401,22 @@ for name, glg, gls, glo in
end
+onlytypes = string.match(aux, "\\glsxtr@makeglossaries{([^}]+)}")
+
+if onlytypes ~= nil
+then
+ if not quiet then
+ print(string.format("Only process subset: '%s'", onlytypes))
+ end
+
+ onlyglossaries = {}
+
+ for name in string.gmatch(onlytypes, '([^,]+)') do
+ onlyglossaries[name] = glossaries[name]
+ end
+
+ glossaries = onlyglossaries
+end
if ext == nil
then
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 623749755b0..1f5d205e253 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -6783,8 +6783,8 @@ actually present, and lists those missing.
=item B<depends>
-Lists those packages which occur as dependencies in an installed collections,
-but are themselves not installed, and those packages that are not
+Lists those packages which occur as dependencies in an installed collection,
+but are themselves not installed, and those packages which are not
contained in any collection.
If you call C<tlmgr check collections> this test will be carried out