glossaries (23may18)

git-svn-id: svn://tug.org/texlive/trunk@47817 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 24 insertions, 8 deletions

diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries
index 97a45862641..218dfc921a5 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.38
+# Version : 4.39
 # Description: simple Perl script that calls makeindex or xindy.
 # Intended for use with "glossaries.sty" (saves having to remember
 # all the various switches)
@@ -31,9 +31,11 @@
 # glossaries-babel.sty, glossaries-polyglossia.sty, glossaries.perl.
 # Also makeglossaries and makeglossaries-lite.lua.
 
-my $version="4.38 (2018-05-10)";
+my $version="4.39 (2018-05-23)";
 
 # History:
+# v4.39:
+#   * No change.
 # v4.38:
 #   * No change.
 # v4.37:
@@ -1521,8 +1523,16 @@ sub HELP_MESSAGE{
 }
 
 sub VERSION_MESSAGE{
+
+   my $verYear = '';
+
+   if ($version=~/(\d{4})-\d{2}-\d{2}/)
+   {
+      $verYear = "-$1";
+   }
+
    print "Makeglossaries Version $version\n";
-   print "Copyright (C) 2007 Nicola L C Talbot\n";
+   print "Copyright (C) 2007$verYear Nicola L C Talbot\n";
    print "This material is subject to the LaTeX Project Public License.\n";
 }
 
diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua b/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua
index 88f15ab08f1..77da25667b3 100755
--- a/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua
+++ b/Master/texmf-dist/scripts/glossaries/makeglossaries-lite.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env texlua
 --[[
-   File   : makeglossaries.lua
+   File   : makeglossaries-lite.lua
    Author : Nicola Talbot
    
    Lua alternative to the makeglossaries Perl script.
@@ -36,6 +36,8 @@
    Also makeglossaries and makeglossaries-lite.lua.
   
    History:
+   * 4.39:
+     - corrected script name in version and help messages
    * 4.38:
      - no change.
    * 4.37:
@@ -58,7 +60,7 @@
      - changed first line from lua to texlua
 --]]
 
-thisversion = "4.37 2018-04-07"
+thisversion = "4.39 (2018-05-23)"
 
 quiet = false
 dryrun = false
@@ -84,15 +86,18 @@ makeindex_extra = nil
 makeindex_m = "makeindex"
 
 function version()
-  print(string.format("makeglossaries.lua version %s", thisversion))
-  print("Copyright (C) 2015 Nicola L C Talbot")
+
+  verYear = string.match(thisversion, "%d%d%d%d");
+
+  print(string.format("makeglossaries-lite version %s", thisversion))
+  print(string.format("Copyright (C) 2015-%s Nicola L C Talbot", verYear))
   print("This material is subject to the LaTeX Project Public License.")
 end
 
 function help()
   version()
   print([[
-Syntax : makeglossaries.lua [options] <filename>
+Syntax : makeglossaries-lite [options] <filename>
 
 For use with the glossaries package to pass relevant
 files to makeindex or xindy.
@@ -136,6 +141,7 @@ Makeindex Options:
 This is a light-weight Lua alternative to the makeglossaries Perl script.
 If you want to use xindy, it's better to use the Perl makeglossaries version
 instead.
+
 ]])
 end