diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-23 22:10:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-23 22:10:54 +0000 |
commit | 537251570d7cfb23531f98becb2521dc89e93e63 (patch) | |
tree | f387291860f3a0b63c13fd6a78277c310dda01c0 /Master/texmf-dist/tex/latex/glossaries/base | |
parent | 1d2a6fd2512cbd4325e55f9607aa3ba191515ff7 (diff) |
glossaries (23apr13)
git-svn-id: svn://tug.org/texlive/trunk@30076 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base')
5 files changed, 40 insertions, 15 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 ad101bfb9cc..707e3480053 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 2012 Nicola Talbot +%% Copyright 2013 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 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 86ab2da9249..8b55a688b2e 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 2012 Nicola Talbot +%% Copyright 2013 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 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 4d8c5fde1c3..6668d69bdd8 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 2012 Nicola Talbot +%% Copyright 2013 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index bb0826b2f7f..18a1eb1c6b5 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 2012 Nicola Talbot +%% Copyright 2013 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}[2012/11/18 v3.04 (NLCT)] +\ProvidesPackage{glossaries}[2013/04/21 v3.05 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -281,6 +281,19 @@ false,nolabel,autolabel}[nolabel]{% \define@key{glossaries.sty}{counter}{% \renewcommand*{\glscounter}{#1}% } +\newcommand*{\@gls@nohyperlist}{} +\newcommand*{\GlsDeclareNoHyperList}[1]{% + \ifdefempty\@gls@nohyperlist + {% + \renewcommand*{\@gls@nohyperlist}{#1}% + }% + {% + \appto\@gls@nohyperlist{,#1}% + }% +} +\define@key{glossaries.sty}{nohypertypes}{% + \GlsDeclareNoHyperList{#1}% +} \newcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc} \newcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name} \newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol} @@ -516,7 +529,7 @@ name=true]{% \RequirePackage{glossaries-babel}}{}% }} \fi -\newcommand*{\nopostdesc}{} +\DeclareRobustCommand*{\nopostdesc}{} \newcommand*{\@nopostdesc}{% \let\org@glspostdescription\glspostdescription \def\glspostdescription{% @@ -1507,7 +1520,14 @@ name=true]{% \def\glslabel{#2}% \def\@glsnumberformat{glsnumberformat}% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% - \KV@glslink@hypertrue + \expandafter\xifinlist\expandafter + {\csname glo@#2@type\endcsname}{\@gls@nohyperlist}% + {% + \KV@glslink@hyperfalse + }% + {% + \KV@glslink@hypertrue + }% \setkeys{glslink}{#1}% \@gls@saveentrycounter \@gls@setsort{#2}% @@ -3445,7 +3465,7 @@ you \fi } \newcommand{\gls@protected@pagefmts}{% - \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage + \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage,\gls@Romanpage% } \newcommand*{\gls@disablepagerefexpansion}{% \@for\@gls@this:=\gls@protected@pagefmts\do @@ -3457,22 +3477,27 @@ you \newcommand*{\gls@Alphpage}{\@Alph\c@page} \newcommand*{\gls@numberpage}{\number\c@page} \newcommand*{\gls@romanpage}{\romannumeral\c@page} +\newcommand*{\gls@Romanpage}{\@Roman\c@page} \newcommand*{\@@do@wrglossary}[1]{% \begingroup + \let\orgthe\the \let\orgnumber\number \let\orgromannumeral\romannumeral \let\orgalph\@alph \let\orgAlph\@Alph + \let\orgRoman\@Roman \def\the##1{% - \ifx##1\c@page \gls@numberpage\else\orgnumber##1\fi}% + \ifx##1\c@page \gls@numberpage\else\orgthe##1\fi}% \def\number##1{% \ifx##1\c@page \gls@numberpage\else\orgnumber##1\fi}% \def\romannumeral##1{% - \ifx##1\c@page \gls@romanpage\else\orgnumber##1\fi}% + \ifx##1\c@page \gls@romanpage\else\orgromannumeral##1\fi}% + \def\@Roman##1{% + \ifx##1\c@page \gls@Romanpage\else\orgRoman##1\fi}% \def\@alph##1{% - \ifx##1\c@page \gls@alphpage\else\orgnumber##1\fi}% + \ifx##1\c@page \gls@alphpage\else\orgalph##1\fi}% \def\@Alph##1{% - \ifx##1\c@page \gls@Alphpage\else\orgnumber##1\fi}% + \ifx##1\c@page \gls@Alphpage\else\orgAlph##1\fi}% \gls@disablepagerefexpansion \protected@xdef\@glslocref{\theglsentrycounter}% \endgroup @@ -3818,8 +3843,8 @@ false,nolabel,autolabel}[nolabel]{% \ifcsundef{#1groupname}{#1}{\csname #1groupname\endcsname}% } \newcommand*{\glsgetgrouplabel}[1]{% -\ifthenelse{\equals{#1}{\glssymbolsgroupname}}{glssymbols}{% -\ifthenelse{\equals{#1}{\glsnumbersgroupname}}{glsnumbers}{#1}}} +\ifthenelse{\equal{#1}{\glssymbolsgroupname}}{glssymbols}{% +\ifthenelse{\equal{#1}{\glsnumbersgroupname}}{glsnumbers}{#1}}} \newcommand*{\setentrycounter}[2][]{% \def\@glo@counterprefix{#1}% \ifx\@glo@counterprefix\@empty diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty index be90bf07d55..d3434bb6568 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `mfirstuc.sty,package') %% %% glossaries.dtx -%% Copyright 2012 Nicola Talbot +%% Copyright 2013 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 |