summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-07 21:48:40 +0000
committerKarl Berry <karl@freefriends.org>2018-03-07 21:48:40 +0000
commitf715555c29bf630fa58c0129486f793e29db4c17 (patch)
treeee6561c99bcc51bf54c423994b553d068bac11c5 /Master/texmf-dist/scripts/glossaries
parent4fa439e0226fee506c74cf2b08d8e666a1d497db (diff)
glossaries (7mar18)
git-svn-id: svn://tug.org/texlive/trunk@46872 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/glossaries')
-rwxr-xr-xMaster/texmf-dist/scripts/glossaries/makeglossaries6
-rwxr-xr-xMaster/texmf-dist/scripts/glossaries/makeglossaries-lite.lua16
2 files changed, 18 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries
index e40eed5696f..cbc24a40210 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.35
+# Version : 4.36
# 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.35 (2017-11-14)";
+my $version="4.36 (2018-03-07)";
# History:
+# v4.36:
+# * No change.
# v4.35:
# * No change.
# v4.34:
diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua b/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua
index 89561d7e182..c7e3d07ef50 100755
--- a/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua
+++ b/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua
@@ -26,6 +26,9 @@
This work has the LPPL maintenance status `maintained'.
History:
+ * 4.36:
+ - fixed check for double-quotes (from \jobname when the file name
+ contains spaces).
* 4.35:
- no change.
* 4.34:
@@ -41,7 +44,7 @@
- changed first line from lua to texlua
--]]
-thisversion = "4.35 2017-11-14"
+thisversion = "4.36 2018-03-07"
quiet = false
dryrun = false
@@ -134,6 +137,11 @@ end
function doxindy(name, glg, gls, glo, language, codepage)
+ if codepage == nil
+ then
+ codepage = "utf8"
+ end
+
cmd = string.format('"%s" -I xindy -L %s -C %s -M "%s" -t "%s" -o "%s"',
xindyexec, language, codepage, styfile, glg, gls)
@@ -342,7 +350,11 @@ end
if styfile == nil
then
- styfile = string.match(aux, "\\@istfilename{\"?([^}]*%.?%a*)\"?}")
+
+-- v4.36: corrected check for double-quotes
+
+ styfile = string.match(aux, "\\@istfilename{([^}]*)}")
+ styfile = string.gsub(styfile, "\"", "");
if styfile == nil
then