diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-08 22:31:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-08 22:31:19 +0000 |
commit | fec3a5740e195359a7666cf8d39eace242c8f939 (patch) | |
tree | 0b62b75993b536c3af036d7bcb83fc171bd4bc67 /Master/texmf-dist/tex/latex/glossaries/base | |
parent | 8ef99cf53c6d05b5d88a4e8fe8a00222d358659e (diff) |
glossaries (8may16)
git-svn-id: svn://tug.org/texlive/trunk@40959 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base')
6 files changed, 24 insertions, 9 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 5ff987e185e..11a2d3f06e0 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}[2016/04/19 v4.22 (NLCT)] +\ProvidesPackage{glossaries-babel}[2016/04/30 v4.23 (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 3ef619ffc19..75b335c14a1 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}[2016/04/19 v4.22 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2016/04/30 v4.23 (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 84ef1cd01ce..5801c472032 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}[2016/04/19 v4.22 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2016/04/30 v4.23 (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 013326deeb0..bbc6b2c9943 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}[2016/04/19 v4.22 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2016/04/30 v4.23 (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 cb047a2e309..7123a42cb10 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}[2016/04/19 v4.22 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2016/04/30 v4.23 (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 d50b0c384bc..0c1219f6478 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}[2016/04/19 v4.22 (NLCT)] +\ProvidesPackage{glossaries}[2016/04/30 v4.23 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -1496,7 +1496,14 @@ false,nolabel,autolabel,nameref}[nolabel]{% #4% }% {% - \ifdefequal\@glo@thisvalue\@gls@default@value{#4}{#3}% + \ifdefequal\@glo@thisvalue\@gls@default@value + {% + #4% + }% + {% + \let\glscurrentfieldvalue\@glo@thisvalue + #3% + }% }% }% {% @@ -1509,7 +1516,14 @@ false,nolabel,autolabel,nameref}[nolabel]{% #4% }% {% - \ifdefequal\@glo@thisvalue\@gls@default@value{#4}{#3}% + \ifdefequal\@glo@thisvalue\@gls@default@value + {% + #4% + }% + {% + \let\glscurrentfieldvalue\@glo@thisvalue + #3% + }% }% }% {% @@ -1519,6 +1533,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% }% }% } +\newcommand*{\glscurrentfieldvalue}{} \newcommand*{\@glo@types}{,} \newcommand*\@gls@provide@newglossary{% \protected@write\@auxout{}{\string\providecommand\string\@newglossary[4]{}}% @@ -2219,7 +2234,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \ifundef\glsdefaulttype {% \PackageError{glossaries}% - {No default glossary type (have you used `nomain'?)}% + {No default glossary type (have you used `nomain' by mistake?)}% {If you use package option `nomain' you must define a new glossary before you can define entries}% }% |