diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-19 21:56:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-19 21:56:15 +0000 |
commit | 6813a65f77dac6a12c0545b6ccd2bc53d8c33cbb (patch) | |
tree | 5e609c86af929a5eb07e45d8ce2708f476d46a2b /Master/texmf-dist/tex/latex/glossaries/base | |
parent | 95de47a0fd11f5271d239b79de308a91a1fc5693 (diff) |
glossaries (19mar20)
git-svn-id: svn://tug.org/texlive/trunk@54402 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base')
6 files changed, 35 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 03bc229b1fe..740f2cb2b6a 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}[2020/02/13 v4.45 (NLCT)] +\ProvidesPackage{glossaries-babel}[2020/03/19 v4.46 (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 614165f88e3..5f88a2ff37d 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}[2020/02/13 v4.45 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2020/03/19 v4.46 (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 e3d5d786eaa..6d91e1ed16b 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}[2020/02/13 v4.45 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2020/03/19 v4.46 (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 a04ea1775da..d9c152e0ca0 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}[2020/02/13 v4.45 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2020/03/19 v4.46 (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 dbac71c219e..4665ad75aaf 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}[2020/02/13 v4.45 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2020/03/19 v4.46 (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 a4ac2be7ca5..f1ced1aab7a 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}[2020/02/13 v4.45 (NLCT)] +\ProvidesPackage{glossaries}[2020/03/19 v4.46 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -1275,13 +1275,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% \csuse{@glossarypreamble@\currentglossary}% } \newcommand{\setglossarypreamble}[2][\glsdefaulttype]{% - \ifglossaryexists{#1}{% - \csgdef{@glossarypreamble@#1}{#2}% - }{% - \GlossariesWarning{% - Glossary `#1' is not defined% - }% - }% + \ifglossaryexists*{#1}% + {\csgdef{@glossarypreamble@#1}{#2}}% + {\GlossariesWarning{Glossary `#1' is not defined}}% } \newcommand*{\glossarypostamble}{} \newcommand*{\glossarysection}[2][\@gls@title]{% @@ -1712,9 +1708,15 @@ false,nolabel,autolabel,nameref}[nolabel]{% \forglsentries[\@@this@glo@]{#2}{#3}% }% } -\newcommand{\ifglossaryexists}[3]{% +\newcommand{\ifglossaryexists}{% + \@ifstar\s@ifglossaryexists\@ifglossaryexists +} +\newcommand{\@ifglossaryexists}[3]{% \ifcsundef{@glotype@#1@out}{#3}{#2}% } +\newcommand{\s@ifglossaryexists}[3]{% + \ifcsundef{glolist@#1}{#3}{#2}% +} \newcommand*{\glsdetoklabel}[1]{#1} \newcommand{\ifglsentryexists}[3]{% \ifcsundef{glo@\glsdetoklabel{#1}@name}{#3}{#2}% @@ -1748,7 +1750,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% }% } \newcommand{\doifglossarynoexistsordo}[3]{% - \ifglossaryexists{#1}% + \ifglossaryexists*{#1}% {% \PackageError{glossaries}{Glossary type `#1' already exists}{}% #3% @@ -5935,13 +5937,30 @@ you \@gls@warnonglossdefined \undef\printglossary } +\newcommand*{\@printgloss@checkexists@noignored}[2]{% + \@ifglossaryexists{#1}% + {#2}% + {% + \ifignoredglossary{#1}% + {\GlossariesWarning{Glossary `#1' is an ignored glossary}}% + {\GlossariesWarning{Glossary `#1' doesn't exist}}% + }% +} +\newcommand*{\@printgloss@checkexists@allowignored}[2]{% + \s@ifglossaryexists{#1}% + {#2}% + {\GlossariesWarning{Glossary `#1' doesn't exist}}% +} +\let\@printgloss@checkexists\@printgloss@checkexists@noignored \newcommand*{\printglossary}[1][type=\glsdefaulttype]{% + \let\@printgloss@checkexists\@printgloss@checkexists@noignored \@printglossary{#1}{\@print@glossary}% } \newcommand*{\printglossaries}{% \forallglossaries{\@@glo@type}{\printglossary[type=\@@glo@type]}% } \newcommand*{\printnoidxglossary}[1][type=\glsdefaulttype]{% + \let\@printgloss@checkexists\@printgloss@checkexists@noignored \@printglossary{#1}{\@print@noidx@glossary}% } \newcommand*{\printnoidxglossaries}{% @@ -5969,7 +5988,7 @@ you \bgroup \@printgloss@setsort \setkeys{printgloss}{#1}% - \ifglossaryexists{\@glo@type}% + \@printgloss@checkexists{\@glo@type}% {% \ifx\glossarytitle\org@glossarytitle \else @@ -5996,7 +6015,6 @@ you \@gls@preglossaryhook #2% }% - {\GlossariesWarning{Glossary `\@glo@type' doesn't exist}}% \egroup \global\let\glossaryentrynumbers\@org@glossaryentrynumbers \global\let\warn@noprintglossary\relax |