summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-20 01:12:02 +0000
committerKarl Berry <karl@freefriends.org>2012-11-20 01:12:02 +0000
commit7c8d0edea78bbaa87a816da41a6351a7cb7edd0f (patch)
treedbcb453b8c7e4b69ee2b9c4c5d27bf1d80052cbe /Master/texmf-dist/tex/latex/glossaries
parent6c960e7402ad996080bddee70b48625460f46d8e (diff)
glossaries (19nov12)
git-svn-id: svn://tug.org/texlive/trunk@28305 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty559
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty5
2 files changed, 383 insertions, 181 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index fc83c81924c..bb0826b2f7f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -39,13 +39,52 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossaries}[2012/11/18 v3.04 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
\RequirePackage{xfor}
+\RequirePackage{datatool-base}
\RequirePackage{amsgen}
\RequirePackage{etoolbox}
+\newif\if@gls@docloaded
+\@ifpackageloaded{doc}%
+{%
+ \@gls@docloadedtrue
+}%
+{%
+ \@ifclassloaded{nlctdoc}{\@gls@docloadedtrue}{\@gls@docloadedfalse}%
+}
+\if@gls@docloaded
+ \newcommand{\glsorg@glossary}{%
+ \@bsphack
+ \begingroup
+ \@sanitize \glsorg@wrglossary
+ }
+ \newcommand{\glsorg@wrglossary}[1]{%
+ \protected@write\@glossaryfile{}{%
+ \string \glossaryentry{#1}{\thepage}}%
+ \endgroup
+ \@esphack
+ }
+ \let\glsorg@changes\changes
+ \renewcommand{\changes}[3]{%
+ \begingroup
+ \let\glossary\glsorg@glossary
+ \glsorg@changes{#1}{#2}{#3}%
+ \endgroup
+ }
+ \let\glsorg@theglossary\theglossary
+ \let\glsorg@endtheglossary\endtheglossary
+ \let\glsorg@PrintChanges\PrintChanges
+ \renewcommand{\PrintChanges}{%
+ \begingroup
+ \let\theglossary\glsorg@theglossary
+ \let\endtheglossary\glsorg@endtheglossary
+ \glsorg@PrintChanges
+ \endgroup
+ }
+\fi
\define@boolkey{glossaries.sty}[gls]{toc}[true]{}
\define@boolkey{glossaries.sty}[gls]{numberline}[true]{}
\ifcsundef{chapter}%
@@ -186,7 +225,11 @@ false,nolabel,autolabel}[nolabel]{%
}%
}
\newcommand*{\glsdefmain}{%
- \newglossary{main}{gls}{glo}{\glossaryname}%
+ \if@gls@docloaded
+ \newglossary[glg2]{main}{gls2}{glo2}{\glossaryname}%
+ \else
+ \newglossary{main}{gls}{glo}{\glossaryname}%
+ \fi
}
\newcommand*{\glsdefaulttype}{main}
\newcommand*{\acronymtype}{\glsdefaulttype}
@@ -1444,6 +1487,7 @@ name=true]{%
\define@key{glslink}{format}{%
\def\@glsnumberformat{#1}}
\define@boolkey{glslink}{hyper}[true]{}
+\define@boolkey{glslink}{local}[true]{}
\newrobustcmd*{\glslink}{%
\@ifstar\@sgls@link\@gls@@link}
\newcommand*{\@sgls@link}[1][]{\@gls@@link[hyper=false,#1]}
@@ -1560,6 +1604,16 @@ name=true]{%
\def\@gls@checkedmkidx{}%
\expandafter\@gls@xdycheckquote\gls@xdystring\@nil""\null
\expandafter\@gls@updatechecked\@gls@checkedmkidx{\gls@xdystring}%
+ \@for\@gls@tmp:=\gls@protected@pagefmts\do
+ {%
+ \edef\@gls@sanitized@tmp{\expandafter\@gobble\string\\\expandonce\@gls@tmp}%
+ \@onelevel@sanitize\@gls@sanitized@tmp
+ \edef\gls@dosubst{%
+ \noexpand\DTLsubstituteall\noexpand\gls@xdystring
+ {\@gls@sanitized@tmp}{\expandonce\@gls@tmp}%
+ }%
+ \gls@dosubst
+ }%
\let#1=\gls@xdystring
}
\newcommand{\@gls@checkmkidxchars}[1]{%
@@ -1859,200 +1913,301 @@ name=true]{%
\newrobustcmd*{\gls}{\@ifstar\@sgls\@gls}
\newcommand*{\@sgls}[1][]{\@gls[hyper=false,#1]}
\newcommand*{\@gls}[2][]{%
-\new@ifnextchar[{\@gls@{#1}{#2}}{\@gls@{#1}{#2}[]}}
+ \new@ifnextchar[{\@gls@{#1}{#2}}{\@gls@{#1}{#2}[]}%
+}
\def\@gls@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\def\@gls@link@opts{#1}%
-\def\@gls@link@label{#2}%
-\ifglsused{#2}%
-{%
- \def\@glo@text{%
- \csname gls@\@glo@type @display\endcsname
- {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
-}%
-{%
- \def\@glo@text{%
- \csname gls@\@glo@type @displayfirst\endcsname
- {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
-}%
-\ifglsused{#2}{%
- \@gls@link[#1]{#2}{\@glo@text}%
-}{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
- }{%
- \@gls@link[#1]{#2}{\@glo@text}%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+ }%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \gls@checkisacronymlist\@glo@type
+ \ifthenelse
+ {\(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
+ \OR \NOT\boolean{glshyperfirst}
+ }%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
-}%
-\glsunset{#2}}%
}
\newrobustcmd*{\Gls}{\@ifstar\@sGls\@Gls}
\newcommand*{\@sGls}[1][]{\@Gls[hyper=false,#1]}
\newcommand*{\@Gls}[2][]{%
-\new@ifnextchar[{\@Gls@{#1}{#2}}{\@Gls@{#1}{#2}[]}}
+ \new@ifnextchar[{\@Gls@{#1}{#2}}{\@Gls@{#1}{#2}[]}%
+}
\def\@Gls@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\def\@gls@link@opts{#1}%
-\def\@gls@link@label{#2}%
-\def\glslabel{#2}%
-\ifglsused{#2}%
-{%
- \protected@edef\@glo@text{%
- \csname gls@\@glo@type @display\endcsname
- {\glsentrytext{#2}}{\glsentrydesc{#2}}%
- {\glsentrysymbol{#2}}{#3}}%
-}%
-{%
- \protected@edef\@glo@text{%
- \csname gls@\@glo@type @displayfirst\endcsname
- {\glsentryfirst{#2}}{\glsentrydesc{#2}}%
- {\glsentrysymbol{#2}}{#3}}%
-}%
-\ifglsused{#2}{%
- \@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
-}{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
- }{%
- \@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \def\glslabel{#2}%
+ \ifglsused{#2}%
+ {%
+ \protected@edef\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {\glsentrytext{#2}}{\glsentrydesc{#2}}%
+ {\glsentrysymbol{#2}}{#3}}%
+ }%
+ {%
+ \protected@edef\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirst{#2}}{\glsentrydesc{#2}}%
+ {\glsentrysymbol{#2}}{#3}}%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{%
+ \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ }%
+ {%
+ \gls@checkisacronymlist\@glo@type
+ \ifthenelse
+ {%
+ \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
+ \OR \NOT\boolean{glshyperfirst}%
+ }%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{%
+ \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{%
+ \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ }%
+ }%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
-}%
-\glsunset{#2}}%
}
\newrobustcmd*{\GLS}{\@ifstar\@sGLS\@GLS}
\newcommand*{\@sGLS}[1][]{\@GLS[hyper=false,#1]}
\newcommand*{\@GLS}[2][]{%
-\new@ifnextchar[{\@GLS@{#1}{#2}}{\@GLS@{#1}{#2}[]}}
+ \new@ifnextchar[{\@GLS@{#1}{#2}}{\@GLS@{#1}{#2}[]}%
+}
\def\@GLS@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\def\@gls@link@opts{#1}%
-\def\@gls@link@label{#2}%
-\ifglsused{#2}{\def\@glo@text{%
-\csname gls@\@glo@type @display\endcsname
-{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{%
-\def\@glo@text{%
-\csname gls@\@glo@type @displayfirst\endcsname
-{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}%
-\ifglsused{#2}{%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
-}{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
- }{%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}%
+ }%
+ }%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}%
+ }%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \gls@checkisacronymlist\@glo@type
+ \ifthenelse
+ {%
+ \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
+ \OR \NOT\boolean{glshyperfirst}}{%
+ \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ }%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
-}%
-\glsunset{#2}}%
}
\newrobustcmd*{\glspl}{\@ifstar\@sglspl\@glspl}
\newcommand*{\@sglspl}[1][]{\@glspl[hyper=false,#1]}
\newcommand*{\@glspl}[2][]{%
-\new@ifnextchar[{\@glspl@{#1}{#2}}{\@glspl@{#1}{#2}[]}}
+ \new@ifnextchar[{\@glspl@{#1}{#2}}{\@glspl@{#1}{#2}[]}%
+}
\def\@glspl@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\def\@gls@link@opts{#1}%
-\def\@gls@link@label{#2}%
-\ifglsused{#2}%
-{%
- \def\@glo@text{%
- \csname gls@\@glo@type @display\endcsname
- {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
- {\glsentrysymbolplural{#2}}{#3}}%
-}%
-{%
- \def\@glo@text{%
- \csname gls@\@glo@type @displayfirst\endcsname
- {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
- {\glsentrysymbolplural{#2}}{#3}}%
-}%
-\ifglsused{#2}{%
- \@gls@link[#1]{#2}{\@glo@text}%
-}{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
- }{%
- \@gls@link[#1]{#2}{\@glo@text}%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \gls@checkisacronymlist\@glo@type
+ \ifthenelse
+ {%
+ \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
+ \OR \NOT\boolean{glshyperfirst}%
+ }%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
-}%
-\glsunset{#2}}%
}
\newrobustcmd*{\Glspl}{\@ifstar\@sGlspl\@Glspl}
\newcommand*{\@sGlspl}[1][]{\@Glspl[hyper=false,#1]}
\newcommand*{\@Glspl}[2][]{%
-\new@ifnextchar[{\@Glspl@{#1}{#2}}{\@Glspl@{#1}{#2}[]}}
+ \new@ifnextchar[{\@Glspl@{#1}{#2}}{\@Glspl@{#1}{#2}[]}%
+}
\def\@Glspl@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\def\@gls@link@opts{#1}%
-\def\@gls@link@label{#2}%
-\def\glslabel{#2}%
-\ifglsused{#2}%
-{%
- \protected@edef\@glo@text{%
- \csname gls@\@glo@type @display\endcsname
- {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
- {\glsentrysymbolplural{#2}}{#3}}%
-}%
-{%
- \protected@edef\@glo@text{%
- \csname gls@\@glo@type @displayfirst\endcsname
- {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
- {\glsentrysymbolplural{#2}}{#3}}%
-}%
-\ifglsused{#2}{%
- \@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
-}{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
- }{%
- \@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \def\glslabel{#2}%
+ \ifglsused{#2}%
+ {%
+ \protected@edef\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ {%
+ \protected@edef\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{%
+ \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ }%
+ {%
+ \gls@checkisacronymlist\@glo@type
+ \ifthenelse
+ {%
+ \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
+ \OR \NOT\boolean{glshyperfirst}%
+ }%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{%
+ \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{%
+ \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ }%
+ }%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
-}%
-\glsunset{#2}}%
}
\newrobustcmd*{\GLSpl}{\@ifstar\@sGLSpl\@GLSpl}
\newcommand*{\@sGLSpl}[1][]{\@GLSpl[hyper=false,#1]}
\newcommand*{\@GLSpl}[2][]{%
-\new@ifnextchar[{\@GLSpl@{#1}{#2}}{\@GLSpl@{#1}{#2}[]}}
+ \new@ifnextchar[{\@GLSpl@{#1}{#2}}{\@GLSpl@{#1}{#2}[]}%
+}
\def\@GLSpl@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\def\@gls@link@opts{#1}%
-\def\@gls@link@label{#2}%
-\ifglsused{#2}{\def\@glo@text{%
-\csname gls@\@glo@type @display\endcsname
-{\glsentryplural{#2}}{\glsentrydescplural{#2}}{%
-\glsentrysymbolplural{#2}}{#3}}}{%
-\def\@glo@text{%
-\csname gls@\@glo@type @displayfirst\endcsname
-{\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}{%
-\glsentrysymbolplural{#2}}{#3}}}%
-\ifglsused{#2}{%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
-}{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
- }{%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}%
+ }%
+ }%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}%
+ }%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \gls@checkisacronymlist\@glo@type
+ \ifthenelse
+ {%
+ \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
+ \OR \NOT\boolean{glshyperfirst}%
+ }%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ }%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
-}%
-\glsunset{#2}}%
}
\newrobustcmd*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
\newcommand*{\@sglsdisp}[1][]{\@glsdisp[hyper=false,#1]}
@@ -2087,7 +2242,11 @@ name=true]{%
\@gls@link[#1]{#2}{\@glo@text}%
}%
}%
- \glsunset{#2}%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
}%
}
\newrobustcmd*{\glstext}{\@ifstar\@sglstext\@glstext}
@@ -3269,7 +3428,8 @@ you
\else
\ifcsdef{glo@#1@file}%
{%
- \expandafter\protected@write\csname glo@#1@file\endcsname{}{#2}%
+ \expandafter\protected@write\csname glo@#1@file\endcsname{%
+ \gls@disablepagerefexpansion}{#2}%
}%
{%
\GlossariesWarning{No file defined for glossary `#1'}%
@@ -3284,8 +3444,38 @@ you
\@@do@wrglossary{#1}%
\fi
}
+\newcommand{\gls@protected@pagefmts}{%
+ \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage
+}
+\newcommand*{\gls@disablepagerefexpansion}{%
+ \@for\@gls@this:=\gls@protected@pagefmts\do
+ {%
+ \expandafter\let\@gls@this\relax
+ }%
+}
+\newcommand*{\gls@alphpage}{\@alph\c@page}
+\newcommand*{\gls@Alphpage}{\@Alph\c@page}
+\newcommand*{\gls@numberpage}{\number\c@page}
+\newcommand*{\gls@romanpage}{\romannumeral\c@page}
\newcommand*{\@@do@wrglossary}[1]{%
- \protected@edef\@glslocref{\theglsentrycounter}%
+ \begingroup
+ \let\orgnumber\number
+ \let\orgromannumeral\romannumeral
+ \let\orgalph\@alph
+ \let\orgAlph\@Alph
+ \def\the##1{%
+ \ifx##1\c@page \gls@numberpage\else\orgnumber##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}%
+ \def\@alph##1{%
+ \ifx##1\c@page \gls@alphpage\else\orgnumber##1\fi}%
+ \def\@Alph##1{%
+ \ifx##1\c@page \gls@Alphpage\else\orgnumber##1\fi}%
+ \gls@disablepagerefexpansion
+ \protected@xdef\@glslocref{\theglsentrycounter}%
+ \endgroup
\@gls@checkmkidxchars\@glslocref
\expandafter\ifx\theHglsentrycounter\theglsentrycounter
\def\@glo@counterprefix{}%
@@ -3309,7 +3499,7 @@ you
\fi
\glossary[\csname glo@#1@type\endcsname]{%
(indexentry :tkey (\csname glo@#1@index\endcsname)
- :locref \string"{\@glo@counterprefix}{\theglsentrycounter}\string" %
+ :locref \string"{\@glo@counterprefix}{\@glslocref}\string" %
:attr \string"\@gls@counter\@glo@suffix\string"
\@glo@range
)
@@ -3319,7 +3509,7 @@ you
{\@glo@counterprefix}%
\glossary[\csname glo@#1@type\endcsname]{%
\string\glossaryentry{\csname glo@#1@index\endcsname
- \@gls@encapchar\@glo@numfmt}{\theglsentrycounter}}%
+ \@gls@encapchar\@glo@numfmt}{\@glslocref}}%
\fi
}
\newcommand*\@gls@getcounterprefix[2]{%
@@ -3447,16 +3637,30 @@ you
\ifglsxindy
\ifcsundef{@xdy@\@glo@type @language}%
{%
- \protected@write\@auxout{}{%
- \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}%
+ \edef\@do@auxoutstuff{%
+ \noexpand\AtEndDocument{%
+ \noexpand\immediate\noexpand\write\@auxout{%
+ \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}%
+ }%
+ }%
}%
{%
- \protected@write\@auxout{}{%
- \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type
- @language\endcsname}}%
+ \edef\@do@auxoutstuff{%
+ \noexpand\AtEndDocument{%
+ \noexpand\immediate\noexpand\write\@auxout{%
+ \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type
+ @language\endcsname}}%
+ }%
+ }%
+ }%
+ \@do@auxoutstuff
+ \edef\@do@auxoutstuff{%
+ \noexpand\AtEndDocument{%
+ \noexpand\immediate\noexpand\write\@auxout{%
+ \string\@gls@codepage{\@glo@type}{\gls@codepage}}%
+ }%
}%
- \protected@write\@auxout{}{%
- \string\@gls@codepage{\@glo@type}{\gls@codepage}}%
+ \@do@auxoutstuff
\fi
\egroup
\global\let\glossaryentrynumbers\@org@glossaryentrynumbers
@@ -4134,10 +4338,8 @@ false,nolabel,autolabel}[nolabel]{%
name={\noexpand\acronymfont{\the\glsshorttok}},%
sort={\the\glsshorttok},%
text={\noexpand\@glo@symbol},%
- %plural={\noexpand\@glo@symbolplural},%
plural={\noexpand\@glo@shortpl},%
first={\the\glslongtok},%
- %firstplural={\the\glslongtok\noexpand\acrpluralsuffix},%
firstplural={\noexpand\@glo@longpl},%
short={\the\glsshorttok},%
shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
@@ -4146,7 +4348,6 @@ false,nolabel,autolabel}[nolabel]{%
description={\noexpand\@glo@first},%
descriptionplural={\noexpand\@glo@firstplural},%
symbol={\the\glsshorttok},%
- %symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
symbolplural={\noexpand\@glo@shortpl},%
\the\glskeylisttok
}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
index 2e9e660cba2..44483b2be21 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-list}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-list}[2012/11/11 v3.04 (NLCT)]
\newglossarystyle{list}{%
\renewenvironment{theglossary}%
{\begin{description}}{\end{description}}%
@@ -64,7 +64,8 @@
\newglossarystyle{altlist}{%
\glossarystyle{list}%
\renewcommand*{\glossaryentryfield}[5]{%
- \item[\glsentryitem{##1}\glstarget{##1}{##2}]\mbox{}\newline
+ \item[\glsentryitem{##1}\glstarget{##1}{##2}]%
+ \mbox{}\par\nobreak\@afterheading
##3\glspostdescription\space ##5}%
\renewcommand{\glossarysubentryfield}[6]{%
\par