summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty42
1 files changed, 30 insertions, 12 deletions
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