glossaries (23jul18)

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

6 files changed, 80 insertions, 26 deletions

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 3260ffda8aa..74bbbc00802 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}[2018/06/01 v4.40 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2018/07/23 v4.41 (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 e44b2fb558c..21d7b051769 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}[2018/06/01 v4.40 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2018/07/23 v4.41 (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 c6cd1d0f6ac..befacf01a0b 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}[2018/06/01 v4.40 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2018/07/23 v4.41 (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 042c9c783d7..9d45c682139 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}[2018/06/01 v4.40 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2018/07/23 v4.41 (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 e3e9ef20912..f3fdd7736f3 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}[2018/06/01 v4.40 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2018/07/23 v4.41 (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 e7aecc10164..e2063c1290b 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}[2018/06/01 v4.40 (NLCT)]
+\ProvidesPackage{glossaries}[2018/07/23 v4.41 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -70,8 +70,9 @@
   }
 \fi
 \newif\if@gls@debug
-\define@choicekey{glossaries.sty}{debug}[\val\nr]{true,false,showtargets}[true]{%
-  \ifcase\nr\relax
+\define@choicekey{glossaries.sty}{debug}[\gls@debug@val\gls@debug@nr]%
+ {true,false,showtargets}[true]{%
+  \ifcase\gls@debug@nr\relax
     \@gls@debugtrue
     \renewcommand*{\GlossariesWarning}[1]{%
       \PackageWarning{glossaries}{##1}%
@@ -125,8 +126,9 @@
    \string\makeglossaries\space
    or \string\makenoidxglossaries}%
 }
-\define@choicekey{glossaries.sty}{seenoindex}[\val\nr]{error,warn,ignore}{%
-  \ifcase\nr
+\define@choicekey{glossaries.sty}{seenoindex}%
+ [\gls@seenoindex@val\gls@seenoindex@nr]{error,warn,ignore}{%
+  \ifcase\gls@seenoindex@nr
     \renewcommand*{\@gls@see@noindex}{%
       \PackageError{glossaries}%
       {`\gls@xr@key' key may only be used after \string\makeglossaries\space
@@ -154,9 +156,10 @@ subsection,subsubsection,paragraph,subparagraph}[section]{%
 \newcommand*{\@@glossarysecstar}{*}
 \newcommand*{\@@glossaryseclabel}{}
 \newcommand*{\glsautoprefix}{}
-\define@choicekey{glossaries.sty}{numberedsection}[\val\nr]{%
+\define@choicekey{glossaries.sty}{numberedsection}%
+ [\gls@numberedsection@val\gls@numberedsection@nr]{%
 false,nolabel,autolabel,nameref}[nolabel]{%
-  \ifcase\nr\relax
+  \ifcase\gls@numberedsection@nr\relax
     \renewcommand*{\@@glossarysecstar}{*}%
     \renewcommand*{\@@glossaryseclabel}{}%
   \or
@@ -702,10 +705,11 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \let\@gls@usetranslator\relax
   \let\glsifusetranslator\@secondoftwo
 }
-\define@choicekey{glossaries.sty}{translate}[\val\nr]%
+\define@choicekey{glossaries.sty}{translate}%
+  [\gls@translate@val\gls@translate@nr]%
   {true,false,babel}[true]%
   {%
-    \ifcase\nr\relax
+    \ifcase\gls@translate@nr\relax
       \glstranslatetrue
       \renewcommand*\@gls@usetranslator{%
         \@ifpackageloaded{polyglossia}%
@@ -846,6 +850,58 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   {}%
 }
 \boolfalse{glscompatible-2.07}
+\let\gls@original@makeglossary\makeglossary
+\let\gls@original@glossary\glossary
+\def\makeglossary{%
+ \GlossariesWarning{Use of \string\makeglossary\space with
+ glossaries.sty is \MessageBreak deprecated. Use \string\makeglossaries\space
+ instead. If you \MessageBreak need the original definition of
+ \string\makeglossary\space use \MessageBreak the package options
+ kernelglossredefs=false (to \MessageBreak restore the former definition of
+ \string\makeglossary) and \MessageBreak nomain (if the file extensions cause a
+ conflict)}%
+ \makeglossaries
+}
+\newcommand*{\@gls@override@glossary}[1][main]{%
+ \GlossariesWarning{Use of \string\glossary\space with
+ glossaries.sty is deprecated. \MessageBreak Indexing should be performed
+ with the user level \MessageBreak commands, such as \string\gls\space or
+ \string\glsadd. If you need the \MessageBreak original definition of
+ \string\glossary\space use the package \MessageBreak options
+  kernelglossredefs=false (to restore the \MessageBreak former definition of
+ \string\glossary) and nomain (if the \MessageBreak file extensions cause a
+ conflict)}%
+ \gls@glossary{#1}%
+}
+\if@gls@docloaded
+\else
+  \def\glossary{\@gls@override@glossary}
+\fi
+\define@choicekey{glossaries.sty}{kernelglossredefs}%
+ [\gls@debug@val\gls@debug@nr]{true,false,nowarn}[true]%
+{%
+  \ifcase\gls@debug@nr\relax
+   \def\glossary{\@gls@override@glossary}%
+   \def\makeglossary{%
+    \GlossariesWarning{Use of \string\makeglossary\space with
+    glossaries.sty is deprecated. Use \string\makeglossaries\space
+    instead. If you need the original definition of
+    \string\makeglossary\space use the package options
+    kernelglossredefs=false (to prevent redefinition of
+    \string\makeglossary) and nomain (if the file extensions cause a
+    conflict)}%
+    \makeglossaries
+   }%
+  \or
+    \let\glossary\gls@original@glossary
+    \let\makeglossary\gls@original@makeglossary
+  \or
+    \def\makeglossary{\makeglossaries}%
+    \renewcommand*{\@gls@override@glossary}[1][main]{%
+       \gls@glossary{##1}%
+    }%
+  \fi
+}
 \@gls@declareoption{symbols}{%
   \let\@gls@do@symbolsdef\@gls@symbolsdef
 }
@@ -1878,8 +1934,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 }
 \define@key{glossentry}{parent}{%
 \def\@glo@parent{#1}}
-\define@choicekey{glossentry}{nonumberlist}[\val\nr]{true,false}[true]{%
-  \ifcase\nr\relax
+\define@choicekey{glossentry}{nonumberlist}%
+ [\gls@nonumberlist@val\gls@nonumberlist@nr]{true,false}[true]%
+{%
+  \ifcase\gls@nonumberlist@nr\relax
     \def\@glo@prefix{\glsnonextpages}%
     \@gls@savenonumberlist{true}%
   \else
@@ -5121,7 +5179,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   {%
     \PackageError{glossaries}%
     {Glossary type `#1' not defined}%
-    {New glossaries must be defined before using \string\makeglossary}%
+    {New glossaries must be defined before using \string\makeglossaries}%
   }%
 }
 \newcommand*{\@glsopenfile}[2]{%
@@ -5206,7 +5264,6 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   to move \string\makeglossaries\space after all your
   \string\newglossary\space commands}}%
   \let\@makeglossary\relax
-  \let\makeglossary\relax
   \let\makeglossaries\relax
   \@disable@onlypremakeg
   \let\gls@checkseeallowed\relax
@@ -5244,7 +5301,6 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \@glo@check@sortallowed\makeglossaries
 }
 \@onlypreamble{\makeglossaries}
-\let\makeglossary\makeglossaries
 \AtEndDocument{%
   \warn@nomakeglossaries
   \warn@noprintglossary
@@ -5424,10 +5480,6 @@ you
      \fi
   }%
 }
-\if@gls@docloaded
-\else
-  \renewcommand*{\glossary}[1][main]{\gls@glossary{#1}}
-\fi
 \newcommand*{\gls@glossary}[1]{%
   \@gls@glossary{#1}%
 }
@@ -6148,9 +6200,11 @@ you
       \csname @glsstyle@#1\endcsname}%
   }%
 }
-\define@choicekey{printgloss}{numberedsection}[\val\nr]{%
-false,nolabel,autolabel,nameref}[nolabel]{%
-  \ifcase\nr\relax
+\define@choicekey{printgloss}{numberedsection}%
+ [\gls@numberedsection@val\gls@numberedsection@nr]%
+ {false,nolabel,autolabel,nameref}[nolabel]%
+{%
+  \ifcase\gls@numberedsection@nr\relax
     \renewcommand*{\@@glossarysecstar}{*}%
     \renewcommand*{\@@glossaryseclabel}{}%
   \or