diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index e6041bfae35..c9f7c96a53d 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}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries}[2017/08/10 v4.31 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -142,7 +142,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% {\newcommand*{\@glossary@default@style}{index}} {\newcommand*{\@glossary@default@style}{list}} \define@key{glossaries.sty}{style}{% - \renewcommand*{\@glossary@default@style}{#1}% + \def\@glossary@default@style{#1}% } \newcommand*{\@gls@declareoption}[2]{% \DeclareOptionX{#1}{#2}% @@ -167,7 +167,13 @@ false,nolabel,autolabel,nameref}[nolabel]{% \newcommand*{\@gls@loadsuper}{}} \@gls@declareoption{nosuper}{\renewcommand*{\@gls@loadsuper}{}} \newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}} -\@gls@declareoption{nolist}{\renewcommand*{\@gls@loadlist}{}} +\@gls@declareoption{nolist}{% + \renewcommand*{\@gls@loadlist}{% + \ifdefstring{\@glossary@default@style}{list}% + {\let\@glossary@default@style\relax}% + {}% + }% +} \newcommand*{\@gls@loadtree}{\RequirePackage{glossary-tree}} \@gls@declareoption{notree}{\renewcommand*{\@gls@loadtree}{}} \@gls@declareoption{nostyles}{% |