glossaries (6jan19)

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

6 files changed, 99 insertions, 17 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 74bbbc00802..c0cf4afd1eb 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-babel.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2018 Nicola Talbot
+%%  Copyright 2019 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2018/07/23 v4.41 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2019/01/06 v4.42 (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 21d7b051769..da25c1f14ae 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
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-compatible-207.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2018 Nicola Talbot
+%%  Copyright 2019 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2018/07/23 v4.41 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2019/01/06 v4.42 (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 befacf01a0b..157ee4218a4 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
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-compatible-307.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2018 Nicola Talbot
+%%  Copyright 2019 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2018/07/23 v4.41 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2019/01/06 v4.42 (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 9d45c682139..2db1a8b6588 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-polyglossia.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2018 Nicola Talbot
+%%  Copyright 2019 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2018/07/23 v4.41 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2019/01/06 v4.42 (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 f3fdd7736f3..f882e673e37 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-prefix.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2018 Nicola Talbot
+%%  Copyright 2019 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2018/07/23 v4.41 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2019/01/06 v4.42 (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 e2063c1290b..56d27e5703f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2018 Nicola Talbot
+%%  Copyright 2019 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2018/07/23 v4.41 (NLCT)]
+\ProvidesPackage{glossaries}[2019/01/06 v4.42 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -814,7 +814,15 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \glsxindytrue
   \gls@xindy@glsnumbersfalse
 }
-\define@boolkey{glossaries.sty}[gls]{automake}[true]{%
+\newif\ifglsautomake
+\newcommand{\gls@automake@nr}{1}
+\define@choicekey{glossaries.sty}{automake}%
+  [\gls@automake@val\gls@automake@nr]{true,false,immediate}[true]{%
+  \ifnum\gls@automake@nr=1\relax
+   \glsautomakefalse
+  \else
+   \glsautomaketrue
+  \fi
   \ifglsautomake
     \renewcommand*{\@gls@doautomake}{%
       \PackageError{glossaries}{You must use
@@ -925,7 +933,12 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   }%
 }%
 \@gls@declareoption{index}{%
-  \let\@gls@do@indexdef\@gls@indexdef
+  \ifx\@gls@do@indexdef\@empty
+    \let\@gls@do@indexdef\@gls@indexdef
+  \fi
+}
+\@gls@declareoption{noglossaryindex}{%
+  \let\@gls@do@indexdef\relax
 }
 \newcommand*{\@gls@do@indexdef}{}
 \newcommand*{\@gls@indexdef}{%
@@ -934,6 +947,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \newcommand*{\newterm}[2][]{%
     \newglossaryentry{##2}%
     {type={index},name={##2},description={\nopostdesc},##1}}
+  \let\@gls@do@indexdef\relax
 }%
 \@for\CurrentOption :=\@declaredoptions\do{%
   \ifx\CurrentOption\@empty
@@ -950,7 +964,8 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 \RequirePackage{glossaries-compatible-307}
 \disable@keys{glossaries.sty}{compatible-2.07,%
  xindy,xindygloss,xindynoglsnumbers,makeindex,%
- acronym,translate,notranslate,nolong,nosuper,notree,nostyles,nomain}
+ acronym,translate,notranslate,nolong,nosuper,notree,nostyles,%
+ nomain,noglossaryindex}
 \newcommand*{\setupglossaries}[1]{%
   \renewcommand*{\@gls@setacrstyle}{}%
   \ifglsacrshortcuts
@@ -2326,7 +2341,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
    \edef\@glo@label{\glsdetoklabel{#1}}%
    \ifcsdef{glo@\@glo@label @#2}%
    {%
-      \expandafter\xdef\csname glo@\@glo@label @#2\endcsname{#3}%
+      \protected@csxdef{glo@\@glo@label @#2}{#3}%
    }%
    {%
       \PackageError{glossaries}{Key `#2' doesn't exist}{}%
@@ -2339,7 +2354,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
    \edef\@glo@label{\glsdetoklabel{#1}}%
    \ifcsdef{glo@\@glo@label @#2}%
    {%
-      \expandafter\edef\csname glo@\@glo@label @#2\endcsname{#3}%
+      \protected@csedef{glo@\@glo@label @#2}{#3}%
    }%
    {%
       \PackageError{glossaries}{Key `#2' doesn't exist}{}%
@@ -5238,9 +5253,76 @@ false,nolabel,autolabel,nameref}[nolabel]{%
    }%
  }
 \fi
+\ifglsxindy
+ \newcommand*{\@gls@automake@immediate}[1]{%
+   \ifglossaryexists{#1}
+   {%
+     \IfFileExists{\jobname.\csuse{@glotype@#1@out}}%
+     {%
+       \ifdefstring{\glsorder}{letter}%
+        {\def\@gls@order{-M ord/letorder }}%
+        {\let\@gls@order\@empty}%
+       \ifcsundef{@xdy@#1@language}%
+        {\let\@gls@langmod\@xdy@main@language}%
+        {\letcs\@gls@langmod{@xdy@#1@language}}%
+       \edef\@gls@dothiswrite{\noexpand\immediate\noexpand\write18{xindy
+         -I xindy
+         \@gls@order
+         -L \@gls@langmod\space
+         -M \gls@istfilebase\space
+         -C \gls@codepage\space
+         -t \jobname.\csuse{@glotype@#1@log}
+         -o \jobname.\csuse{@glotype@#1@in}
+         \jobname.\csuse{@glotype@#1@out}}%
+       }%
+       \@gls@dothiswrite
+     }%
+     {\GlossariesWarning{can't automake `#1': \jobname.\csuse{@glotype@#1@out}
+      doesn't exist. Rerun may be required}}%
+   }%
+   {%
+     \GlossariesWarning{Can't make glossary `#1', it doesn't exist}%
+   }%
+ }
+\else
+ \newcommand*{\@gls@automake@immediate}[1]{%
+   \ifglossaryexists{#1}
+   {%
+     \IfFileExists{\jobname.\csuse{@glotype@#1@out}}%
+     {%
+       \ifdefstring{\glsorder}{letter}%
+        {\def\@gls@order{-l }}%
+        {\let\@gls@order\@empty}%
+       \edef\@gls@dothiswrite{\noexpand\immediate\noexpand\write18{makeindex \@gls@order
+         -s \istfilename\space
+         -t \jobname.\csuse{@glotype@#1@log}
+         -o \jobname.\csuse{@glotype@#1@in}
+         \jobname.\csuse{@glotype@#1@out}}%
+       }%
+       \@gls@dothiswrite
+     }%
+     {\GlossariesWarning{can't automake `#1': \jobname.\csuse{@glotype@#1@out}
+      doesn't exist. Rerun may be required}}%
+   }%
+   {%
+     \GlossariesWarning{Can't make glossary `#1', it doesn't exist}%
+   }%
+ }
+\fi
 \newcommand*{\@warn@nomakeglossaries}{}
 \newcommand*{\warn@nomakeglossaries}{\@warn@nomakeglossaries}
+\newcommand{\@gls@@automake@immediate}{%
+ \ifnum\gls@automake@nr=2\relax
+   \@for\@gls@type:=\@glo@types\do{%
+      \ifdefempty{\@gls@type}{}%
+      {\@gls@automake@immediate{\@gls@type}}%
+   }%
+   \glsautomakefalse
+   \renewcommand*{\@gls@doautomake}{}%
+ \fi
+}
 \newcommand*{\makeglossaries}{%
+   \@gls@@automake@immediate
   \ifundef{\glswrite}{\newwrite\glswrite}{}%
   \protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}}
   \protected@write\@auxout{}{\string\providecommand\string\@istfilename[1]{}}