summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-20 23:17:11 +0000
committerKarl Berry <karl@freefriends.org>2014-01-20 23:17:11 +0000
commitb172732c296db880f27bfba6ea750c2f4bffb860 (patch)
tree84ee0192c4316225790fd459f4b42a7a732b0cc1 /Master/texmf-dist/tex/latex/glossaries
parentb6299c522a7525e9707f6567ebd46e32f6cd47ca (diff)
glossaries (20jan14)
git-svn-id: svn://tug.org/texlive/trunk@32735 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-babel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty874
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty819
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty2
28 files changed, 1116 insertions, 629 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 e7736fce866..b66cb8d3d1f 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 2013 Nicola Talbot
+%% Copyright 2014 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 b42fa4a33ec..b8d76376f58 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 2013 Nicola Talbot
+%% Copyright 2014 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-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
index 7a520508b48..be55f61824a 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
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-compatible-307.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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 e1e6d41a174..8ca3f214f7e 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 2013 Nicola Talbot
+%% Copyright 2014 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 629cc72c41e..4761b75eb3c 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 2013 Nicola Talbot
+%% Copyright 2014 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}[2013/12/05 v4.02 (NLCT)]
+\ProvidesPackage{glossaries}[2014/01/20 v4.03 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -398,8 +398,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\fi
}
\define@boolkey[gls]{sanitize}{name}[true]{%
- \GlossariesWarning{sanitize={name} package option
-deprecated}%
+ \GlossariesWarning{sanitize={name} package option deprecated}%
\ifgls@sanitize@name
\glssetnoexpandfield{name}%
\else
@@ -407,8 +406,7 @@ deprecated}%
\fi
}
\define@boolkey[gls]{sanitize}{symbol}[true]{%
- \GlossariesWarning{sanitize={symbol} package option
-deprecated}%
+ \GlossariesWarning{sanitize={symbol} package option deprecated}%
\ifgls@sanitize@symbol
\glssetnoexpandfield{symbol}%
\glssetnoexpandfield{symbolplural}%
@@ -536,11 +534,11 @@ name=true]{%
\ifglssavewrites
\renewcommand*{\glswritefiles}{\@glswritefiles}%
\else
- \let\glswritefiles\relax
+ \let\glswritefiles\@empty
\fi
}
\glssavewritesfalse
-\let\glswritefiles\relax
+\let\glswritefiles\@empty
\define@boolkey{glossaries.sty}[gls]{compatible-3.07}[true]{}
\boolfalse{glscompatible-3.07}
\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{%
@@ -665,7 +663,7 @@ name=true]{%
\providecommand*{\glossaryname}{Glossary}
\providecommand*{\acronymname}{Acronyms}
\newcommand*{\glssettoctitle}[1]{%
-\def\glossarytoctitle{\csname @glotype@#1@title\endcsname}}
+ \def\glossarytoctitle{\csname @glotype@#1@title\endcsname}}
\providecommand*{\entryname}{Notation}
\providecommand*{\descriptionname}{Description}
\providecommand*{\symbolname}{Symbol}
@@ -1232,30 +1230,41 @@ name=true]{%
\newcommand{\ifglossaryexists}[3]{%
\ifcsundef{@glotype@#1@out}{#3}{#2}%
}
+\newcommand*{\glsdetoklabel}[1]{#1}
\newcommand{\ifglsentryexists}[3]{%
- \ifcsundef{glo@#1@name}{#3}{#2}%
+ \ifcsundef{glo@\glsdetoklabel{#1}@name}{#3}{#2}%
+}
+\newcommand*{\ifglsused}[3]{%
+ \ifbool{glo@\glsdetoklabel{#1}@flag}{#2}{#3}%
}
-\newcommand*{\ifglsused}[3]{\ifbool{glo@#1@flag}{#2}{#3}}
\newcommand{\glsdoifexists}[2]{%
\ifglsentryexists{#1}{#2}{%
- \PackageError{glossaries}{Glossary entry `#1' has not been
- defined}{You need to define a glossary entry before you
+ \PackageError{glossaries}{Glossary entry `\glsdetoklabel{#1}'
+ has not been defined}{You need to define a glossary entry before you
can use it.}}%
}
\newcommand{\glsdoifnoexists}[2]{%
\ifglsentryexists{#1}{%
- \PackageError{glossaries}{Glossary entry `#1' has already
+ \PackageError{glossaries}{Glossary entry `\glsdetoklabel{#1}' has already
been defined}{}}{#2}%
}
+\newcommand{\glsdoifexistsorwarn}[2]{%
+ \ifglsentryexists{#1}{#2}{%
+ \GlossariesWarning{Glossary entry `\glsdetoklabel{#1}'
+ has not been defined}%
+ }%
+}
\newcommand{\ifglshaschildren}[3]{%
\glsdoifexists{#1}%
{%
\def\do@glshaschildren{#3}%
- \expandafter\forglsentries\expandafter[\csname glo@#1@type\endcsname]
+ \edef\@gls@thislabel{\glsdetoklabel{#1}}%
+ \expandafter\forglsentries\expandafter
+ [\csname glo@\@gls@thislabel @type\endcsname]
{\glo@label}%
{%
\letcs\glo@parent{glo@\glo@label @parent}%
- \ifthenelse{\equal{#1}{\glo@parent}}%
+ \ifdefequal\@gls@thislabel\glo@parent
{%
\def\do@glshaschildren{#2}%
\@endfortrue
@@ -1268,50 +1277,81 @@ name=true]{%
\newcommand{\ifglshasparent}[3]{%
\glsdoifexists{#1}%
{%
- \ifcsempty{glo@#1@parent}{#3}{#2}%
+ \ifcsempty{glo@\glsdetoklabel{#1}@parent}{#3}{#2}%
}%
}
\newcommand*{\ifglshasdesc}[3]{%
- \ifcsempty{glo@#1@desc}%
+ \ifcsempty{glo@\glsdetoklabel{#1}@desc}%
{#3}%
{#2}%
}
\newcommand*{\ifglsdescsuppressed}[3]{%
- \ifcsequal{glos@#1@desc}{@no@post@desc}%
+ \ifcsequal{glo@\glsdetoklabel{#1}@desc}{@no@post@desc}%
{#2}%
{#3}%
}
\newcommand*{\ifglshassymbol}[3]{%
- \ifcsempty{glo@#1@symbol}%
+ \letcs{\@glo@symbol}{glo@\glsdetoklabel{#1}@symbol}%
+ \ifdefempty\@glo@symbol
{#3}%
{%
- \expandafter\ifx\csname glo@#1@symbol\endcsname\@gls@default@value
- #3%
- \else
- #2%
- \fi
+ \ifdefequal\@glo@symbol\@gls@default@value
+ {#3}%
+ {#2}%
}%
}
\newcommand*{\ifglshaslong}[3]{%
- \ifcsempty{glo@#1@long}%
+ \letcs{\@glo@long}{glo@\glsdetoklabel{#1}@long}%
+ \ifdefempty\@glo@long
{#3}%
{%
- \expandafter\ifx\csname glo@#1@long\endcsname\@gls@default@value
- #3%
- \else
- #2%
- \fi
+ \ifdefequal\@glo@long\@gls@default@value
+ {#3}%
+ {#2}%
}%
}
\newcommand*{\ifglshasshort}[3]{%
- \ifcsempty{glo@#1@short}%
+ \letcs{\@glo@short}{glo@\glsdetoklabel{#1}@short}%
+ \ifdefempty\@glo@short
{#3}%
{%
- \expandafter\ifx\csname glo@#1@short\endcsname\@gls@default@value
- #3%
- \else
- #2%
- \fi
+ \ifdefequal\@glo@short\@gls@default@value
+ {#3}%
+ {#2}%
+ }%
+}
+\newcommand*{\ifglshasfield}[4]{%
+ \glsdoifexists{#2}%
+ {%
+ \letcs{\@glo@thisvalue}{glo@\glsdetoklabel{#2}@#1}%
+ \ifdef\@glo@thisvalue
+ {%
+ \ifdefempty\@glo@thisvalue
+ {%
+ #4%
+ }%
+ {%
+ \ifdefequal\@glo@thisvalue\@gls@default@value{#4}{#3}%
+ }%
+ }%
+ {%
+ \@gls@fetchfield{\@gls@thisfield}{#1}%
+ \ifdef\@gls@thisfield
+ {%
+ \letcs{\@glo@thisvalue}{glo@\glsdetoklabel{#2}@\@gls@thisfield}%
+ \ifdefempty\@glo@thisvalue
+ {%
+ #4%
+ }%
+ {%
+ \ifdefequal\@glo@thisvalue\@gls@default@value{#4}{#3}%
+ }%
+ }%
+ {%
+ \GlossariesWarning{Unknown entry field `#1'}%
+ #4%
+ }%
+ }%
}%
}
\newcommand*{\@glo@types}{,}
@@ -1609,13 +1649,15 @@ name=true]{%
{%
\string\ifglsentryexists{#1}{}\expandafter\@gobble\string\%^^J%
\expandafter\@gobble\string\{\expandafter\@gobble\string\%^^J%
- \string\gls@defglossaryentry{#1}\expandafter\@gobble\string\%^^J%
+ \string\gls@defglossaryentry{\glsdetoklabel{#1}}\expandafter
+ \@gobble\string\%^^J%
\expandafter\@gobble\string\{\expandafter\@gobble\string\%%
}%
\@for\@gls@map:=\@gls@keymap\do
{%
\edef\glo@value{\expandafter\expandonce
- \csname glo@#1@\expandafter\@secondoftwo\@gls@map\endcsname}%
+ \csname glo@\glsdetoklabel{#1}@\expandafter
+ \@secondoftwo\@gls@map\endcsname}%
\@onelevel@sanitize\glo@value
\immediate\write\@gls@deffile
{%
@@ -1657,6 +1699,18 @@ name=true]{%
{counter}{counter},%
{parent}{parent}%
}
+\newcommand*{\@gls@fetchfield}[2]{%
+ \edef\@gls@thisval{#2}%
+ \@for\@gls@map:=\@gls@keymap\do{%
+ \edef\@this@key{\expandafter\@firstoftwo\@gls@map}%
+ \ifdefequal{\@this@key}{\@gls@thisval}%
+ {%
+ \edef#1{\expandafter\@secondoftwo\@gls@map}%
+ \@endfortrue
+ }%
+ {}%
+ }%
+}
\newcommand*{\glsaddkey}{\@ifstar\@sglsaddkey\@glsaddkey}
\newcommand*{\@sglsaddkey}[1]{%
\key@ifundefined{glossentry}{#1}%
@@ -1679,11 +1733,8 @@ name=true]{%
\letcs{\@glo@tmp}{@glo@#1}%
\gls@assign@field{#2}{\@glo@label}{#1}{\@glo@tmp}%
}%
- \newcommand*{#3}[1]{\csuse{glo@##1@#1}}%
- \newcommand*{#4}[1]{%
- \letcs{\@glo@text}{glo@##1@#1}%
- \xmakefirstuc\@glo@text
- }%
+ \newcommand*{#3}[1]{\@gls@entry@field{##1}{#1}}%
+ \newcommand*{#4}[1]{\@Gls@entry@field{##1}{#1}}%
\ifcsdef{@gls@user@#1@}%
{%
\PackageError{glossaries}%
@@ -1703,11 +1754,7 @@ name=true]{%
{\csuse{@gls@user@#1@}{##1}{##2}}%
{\csuse{@gls@user@#1@}{##1}{##2}[]}}%
\csdef{@gls@user@#1@}##1##2[##3]{%
- \glsdoifexists{##2}%
- {%
- \edef\@glo@type{\glsentrytype{##2}}%
- \@gls@link[##1]{##2}{#3{##2}##3}%
- }%
+ \@gls@field@link{##1}{##2}{#3{##2}##3}%
}%
}%
\ifcsdef{@Gls@user@#1@}%
@@ -1729,11 +1776,7 @@ name=true]{%
{\csuse{@Gls@user@#1@}{##1}{##2}}%
{\csuse{@Gls@user@#1@}{##1}{##2}[]}}%
\csdef{@Gls@user@#1@}##1##2[##3]{%
- \glsdoifexists{##2}%
- {%
- \edef\@glo@type{\glsentrytype{##2}}%
- \@gls@link[##1]{##2}{#4{##2}##3}%
- }%
+ \@gls@field@link{##1}{##2}{#4{##2}##3}%
}%
}%
\ifcsdef{@GLS@user@#1@}%
@@ -1755,11 +1798,7 @@ name=true]{%
{\csuse{@GLS@user@#1@}{##1}{##2}}%
{\csuse{@GLS@user@#1@}{##1}{##2}[]}}%
\csdef{@GLS@user@#1@}##1##2[##3]{%
- \glsdoifexists{##2}%
- {%
- \edef\@glo@type{\glsentrytype{##2}}%
- \@gls@link[##1]{##2}{\mfirstucMakeUppercase{#3{##2}##3}}%
- }%
+ \@gls@field@link{##1}{##2}{\mfirstucMakeUppercase{#3{##2}##3}}%
}%
}%
}%
@@ -1782,8 +1821,8 @@ name=true]{%
\@org@newglossaryentryprehook
}%
\renewcommand*{\gls@assign@desc}[1]{%
- \global\cslet{glo@#1@desc}{\@glo@desc}%
- \global\cslet{glo@#1@descplural}{\@glo@desc}%
+ \global\cslet{glo@\glsdetoklabel{#1}@desc}{\@glo@desc}%
+ \global\cslet{glo@\glsdetoklabel{#1}@descplural}{\@glo@desc}%
}
\gls@defglossaryentry{#1}{#2}%
\egroup
@@ -1796,7 +1835,7 @@ name=true]{%
}
\@onlypreamble{\longprovideglossaryentry}
\newcommand{\gls@defglossaryentry}[2]{%
- \def\@glo@label{#1}%
+ \edef\@glo@label{\glsdetoklabel{#1}}%
\let\glslabel\@glo@label
\let\@glo@name\@glsnoname
\let\@glo@desc\@glsnodesc
@@ -1833,8 +1872,8 @@ name=true]{%
a new glossary before you can define entries}%
}%
{}%
- \gls@assign@field{\glsdefaulttype}{#1}{type}{\@glo@type}%
- \edef\@glo@type{\glsentrytype{#1}}%
+ \gls@assign@field{\glsdefaulttype}{\@glo@label}{type}{\@glo@type}%
+ \edef\@glo@type{\glsentrytype{\@glo@label}}%
\ifcsundef{glolist@\@glo@type}%
{%
\PackageError{glossaries}%
@@ -1844,22 +1883,24 @@ name=true]{%
}%
{%
\protected@edef\@glolist@{\csname glolist@\@glo@type\endcsname}%
- \expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}%
+ \expandafter\xdef\csname glolist@\@glo@type\endcsname{%
+ \@glolist@{\@glo@label},}%
}%
\gls@level=0\relax
\ifx\@glo@parent\@empty
- \expandafter\gdef\csname glo@#1@parent\endcsname{}%
+ \expandafter\gdef\csname glo@\@glo@label @parent\endcsname{}%
\else
- \ifthenelse{\equal{#1}{\@glo@parent}}%
+ \ifdefequal\@glo@label\@glo@parent%
{%
- \PackageError{glossaries}{Entry `#1' can't be its own parent}{}%
+ \PackageError{glossaries}{Entry `\@glo@label' can't be its own parent}{}%
\def\@glo@parent{}%
- \expandafter\gdef\csname glo@#1@parent\endcsname{}%
+ \expandafter\gdef\csname glo@\@glo@label @parent\endcsname{}%
}%
{%
\ifglsentryexists{\@glo@parent}%
{%
- \expandafter\xdef\csname glo@#1@parent\endcsname{\@glo@parent}%
+ \expandafter\xdef\csname glo@\@glo@label @parent\endcsname{%
+ \@glo@parent}%
\gls@level=\csname glo@\@glo@parent @level\endcsname\relax
\advance\gls@level by 1\relax
\ifx\@glo@name\@glsnoname
@@ -1875,34 +1916,34 @@ name=true]{%
\PackageError{glossaries}%
{%
Invalid parent `\@glo@parent'
- for entry `#1' - parent doesn't exist%
+ for entry `\@glo@label' - parent doesn't exist%
}%
{%
Parent entries must be defined before their children%
}%
\def\@glo@parent{}%
- \expandafter\gdef\csname glo@#1@parent\endcsname{}%
+ \expandafter\gdef\csname glo@\@glo@label @parent\endcsname{}%
}%
}%
\fi
- \expandafter\xdef\csname glo@#1@level\endcsname{\number\gls@level}%
- \gls@assign@field{\@glo@name}{#1}{sortvalue}{\@glo@sort}%
- \letcs\@glo@sort{glo@#1@sortvalue}%
- \gls@assign@field{\@glo@name}{#1}{text}{\@glo@text}%
+ \expandafter\xdef\csname glo@\@glo@label @level\endcsname{\number\gls@level}%
+ \gls@assign@field{\@glo@name}{\@glo@label}{sortvalue}{\@glo@sort}%
+ \letcs\@glo@sort{glo@\@glo@label @sortvalue}%
+ \gls@assign@field{\@glo@name}{\@glo@label}{text}{\@glo@text}%
\expandafter\gls@assign@field\expandafter
- {\csname glo@#1@text\endcsname\glspluralsuffix}%
- {#1}{plural}{\@glo@plural}%
+ {\csname glo@\@glo@label @text\endcsname\glspluralsuffix}%
+ {\@glo@label}{plural}{\@glo@plural}%
\expandafter\gls@assign@field\expandafter
- {\csname glo@#1@text\endcsname}%
- {#1}{first}{\@glo@first}%
+ {\csname glo@\@glo@label @text\endcsname}%
+ {\@glo@label}{first}{\@glo@first}%
\ifx\@glo@first\@gls@default@value
\expandafter\gls@assign@field\expandafter
- {\csname glo@#1@plural\endcsname}%
- {#1}{firstpl}{\@glo@firstplural}%
+ {\csname glo@\@glo@label @plural\endcsname}%
+ {\@glo@label}{firstpl}{\@glo@firstplural}%
\else
\expandafter\gls@assign@field\expandafter
- {\csname glo@#1@first\endcsname\glspluralsuffix}%
- {#1}{firstpl}{\@glo@firstplural}%
+ {\csname glo@\@glo@label @first\endcsname\glspluralsuffix}%
+ {\@glo@label}{firstpl}{\@glo@firstplural}%
\fi
\ifcsundef{@glotype@\@glo@type @counter}%
{%
@@ -1911,25 +1952,26 @@ name=true]{%
{%
\letcs\@glo@defaultcounter{@glotype@\@glo@type @counter}%
}%
- \gls@assign@field{\@glo@defaultcounter}{#1}{counter}{\@glo@counter}%
- \gls@assign@field{}{#1}{useri}{\@glo@useri}%
- \gls@assign@field{}{#1}{userii}{\@glo@userii}%
- \gls@assign@field{}{#1}{useriii}{\@glo@useriii}%
- \gls@assign@field{}{#1}{useriv}{\@glo@useriv}%
- \gls@assign@field{}{#1}{userv}{\@glo@userv}%
- \gls@assign@field{}{#1}{uservi}{\@glo@uservi}%
- \gls@assign@field{}{#1}{short}{\@glo@short}%
- \gls@assign@field{}{#1}{shortpl}{\@glo@shortpl}%
- \gls@assign@field{}{#1}{long}{\@glo@long}%
- \gls@assign@field{}{#1}{longpl}{\@glo@longpl}%
+ \gls@assign@field{\@glo@defaultcounter}{\@glo@label}{counter}{\@glo@counter}%
+ \gls@assign@field{}{\@glo@label}{useri}{\@glo@useri}%
+ \gls@assign@field{}{\@glo@label}{userii}{\@glo@userii}%
+ \gls@assign@field{}{\@glo@label}{useriii}{\@glo@useriii}%
+ \gls@assign@field{}{\@glo@label}{useriv}{\@glo@useriv}%
+ \gls@assign@field{}{\@glo@label}{userv}{\@glo@userv}%
+ \gls@assign@field{}{\@glo@label}{uservi}{\@glo@uservi}%
+ \gls@assign@field{}{\@glo@label}{short}{\@glo@short}%
+ \gls@assign@field{}{\@glo@label}{shortpl}{\@glo@shortpl}%
+ \gls@assign@field{}{\@glo@label}{long}{\@glo@long}%
+ \gls@assign@field{}{\@glo@label}{longpl}{\@glo@longpl}%
\ifx\@glo@name\@glsnoname
\@glsnoname
\let\@gloname\@gls@default@value
\fi
- \gls@assign@field{}{#1}{name}{\@glo@name}%
- \ifcsundef{glo@#1@numberlist}%
+ \gls@assign@field{}{\@glo@label}{name}{\@glo@name}%
+ \ifcsundef{glo@\@glo@label @numberlist}%
{%
- \csxdef{glo@#1@numberlist}{\noexpand\@gls@missingnumberlist{\@glo@label}}%
+ \csxdef{glo@\@glo@label @numberlist}{%
+ \noexpand\@gls@missingnumberlist{\@glo@label}}%
}%
{}%
\def\@glo@@desc{\@glo@first}%
@@ -1940,48 +1982,52 @@ name=true]{%
\@glsnodesc
\let\@glodesc\@gls@default@value
\fi
- \gls@assign@desc{#1}%
- \@gls@defsort{\@glo@type}{#1}%
+ \gls@assign@desc{\@glo@label}%
+ \@gls@defsort{\@glo@type}{\@glo@label}%
\def\@glo@@symbol{\@glo@text}%
\ifx\@glo@symbol\@glo@@symbol
\let\@glo@symbol\@glo@text
\fi
- \gls@assign@field{\relax}{#1}{symbol}{\@glo@symbol}%
+ \gls@assign@field{\relax}{\@glo@label}{symbol}{\@glo@symbol}%
\expandafter
\gls@assign@field\expandafter
- {\csname glo@#1@symbol\endcsname}
- {#1}{symbolplural}{\@glo@symbolplural}%
- \expandafter\gdef\csname glo@#1@flagfalse\endcsname{%
- \expandafter\global\expandafter
- \let\csname ifglo@#1@flag\endcsname\iffalse
+ {\csname glo@\@glo@label @symbol\endcsname}
+ {\@glo@label}{symbolplural}{\@glo@symbolplural}%
+ \expandafter\xdef\csname glo@\@glo@label @flagfalse\endcsname{%
+ \noexpand\global
+ \noexpand\let\expandafter\noexpand
+ \csname ifglo@\@glo@label @flag\endcsname\noexpand\iffalse
}%
- \expandafter\gdef\csname glo@#1@flagtrue\endcsname{%
- \expandafter\global\expandafter
- \let\csname ifglo@#1@flag\endcsname\iftrue
+ \expandafter\xdef\csname glo@\@glo@label @flagtrue\endcsname{%
+ \noexpand\global
+ \noexpand\let\expandafter\noexpand
+ \csname ifglo@\@glo@label @flag\endcsname\noexpand\iftrue
}%
- \csname glo@#1@flagfalse\endcsname
+ \csname glo@\@glo@label @flagfalse\endcsname
\ifx\@glo@see\@empty
\else
\protected@edef\@do@glssee{%
\noexpand\@gls@fixbraces\noexpand\@glo@list\@glo@see
\noexpand\@nil
- \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{#1}}%
+ \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{\@glo@label}}%
\@do@glssee
\fi
- \do@glo@storeentry{#1}%
+ \do@glo@storeentry{\@glo@label}%
\@newglossaryentryposthook
}
\newcommand*{\@newglossaryentryprehook}{}
\newcommand*{\@newglossaryentryposthook}{}
\newcommand*{\glsmoveentry}[2]{%
- \edef\glo@type{\csname glo@#1@type\endcsname}%
+ \edef\@glo@thislabel{\glsdetoklabel{#1}}%
+ \edef\glo@type{\csname glo@\@glo@thislabel @type\endcsname}%
\def\glo@list{,}%
\forglsentries[\glo@type]{\glo@label}%
{%
- \ifthenelse{\equal{\glo@label}{#1}}{}{\eappto\glo@list{\glo@label,}}%
+ \ifdefequal\@glo@thislabel\glo@label
+ {}{\eappto\glo@list{\glo@label,}}%
}%
\cslet{glolist@\glo@type}{\glo@list}%
- \csdef{glo@#1@type}{#2}%
+ \csdef{glo@\@glo@thislabel @type}{#2}%
}
\ifglsxindy
\newcommand*{\@glossaryentryfield}{\string\\glossentry}
@@ -1996,8 +2042,8 @@ name=true]{%
\string\subglossentry}
\fi
\newcommand{\@glo@storeentry}[1]{%
- \def\@glo@label{#1}%
- \@gls@checkmkidxchars\@glo@label
+ \edef\@glo@esclabel{#1}%
+ \@gls@checkmkidxchars\@glo@esclabel
\protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}%
\@gls@checkmkidxchars\@glo@sort
\@gls@checkmkidxchars\@glo@prefix
@@ -2006,14 +2052,14 @@ name=true]{%
\ifx\@glo@parent\@empty
\expandafter\protected@xdef\csname glo@#1@index\endcsname{%
(\string"\@glo@sort\string" %
- \string"\@glo@prefix\@glossaryentryfield{\@glo@label}\string") %
+ \string"\@glo@prefix\@glossaryentryfield{\@glo@esclabel}\string") %
}%
\else
\expandafter\protected@xdef\csname glo@#1@index\endcsname{%
\csname glo@\@glo@parent @index\endcsname
(\string"\@glo@sort\string" %
\string"\@glo@prefix\@glossarysubentryfield
- {\csname glo@#1@level\endcsname}{\@glo@label}\string") %
+ {\csname glo@#1@level\endcsname}{\@glo@esclabel}\string") %
}%
\fi
\else
@@ -2021,14 +2067,14 @@ name=true]{%
\@onelevel@sanitize\@glo@prefix
\expandafter\protected@xdef\csname glo@#1@index\endcsname{%
\@glo@sort\@gls@actualchar\@glo@prefix
- \@glossaryentryfield{\@glo@label}%
+ \@glossaryentryfield{\@glo@esclabel}%
}%
\else
\expandafter\protected@xdef\csname glo@#1@index\endcsname{%
\csname glo@\@glo@parent @index\endcsname\@gls@levelchar
\@glo@sort\@gls@actualchar\@glo@prefix
\@glossarysubentryfield
- {\csname glo@#1@level\endcsname}{\@glo@label}%
+ {\csname glo@#1@level\endcsname}{\@glo@esclabel}%
}%
\fi
\fi
@@ -2050,7 +2096,7 @@ name=true]{%
{%
\glsdoifexists{#1}%
{%
- \expandafter\global\csname glo@#1@flagfalse\endcsname
+ \expandafter\global\csname glo@\glsdetoklabel{#1}@flagfalse\endcsname
}%
}%
}
@@ -2059,7 +2105,7 @@ name=true]{%
{%
\glsdoifexists{#1}%
{%
- \expandafter\let\csname ifglo@#1@flag\endcsname\iffalse
+ \expandafter\let\csname ifglo@\glsdetoklabel{#1}@flag\endcsname\iffalse
}%
}%
}
@@ -2068,7 +2114,7 @@ name=true]{%
{%
\glsdoifexists{#1}%
{%
- \expandafter\global\csname glo@#1@flagtrue\endcsname
+ \expandafter\global\csname glo@\glsdetoklabel{#1}@flagtrue\endcsname
}%
}%
}
@@ -2077,7 +2123,7 @@ name=true]{%
{%
\glsdoifexists{#1}%
{%
- \expandafter\let\csname ifglo@#1@flag\endcsname\iftrue
+ \expandafter\let\csname ifglo@\glsdetoklabel{#1}@flag\endcsname\iftrue
}%
}%
}
@@ -2471,7 +2517,7 @@ name=true]{%
}%
}
\define@key{glslink}{format}{%
-\def\@glsnumberformat{#1}}
+ \def\@glsnumberformat{#1}}
\define@boolkey{glslink}{hyper}[true]{}
\define@boolkey{glslink}{local}[true]{}
\newrobustcmd*{\glslink}{%
@@ -2491,10 +2537,12 @@ name=true]{%
}
\def\@gls@link[#1]#2#3{%
\leavevmode
- \def\glslabel{#2}%
+ \edef\glslabel{\glsdetoklabel{#2}}%
+ \def\@gls@link@opts{#1}%
+ \let\@gls@link@label\glslabel
\def\@glsnumberformat{glsnumberformat}%
- \edef\@gls@counter{\csname glo@#2@counter\endcsname}%
- \edef\gls@type{\csname glo@#2@type\endcsname}%
+ \edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}%
+ \edef\gls@type{\csname glo@\glslabel @type\endcsname}%
\expandafter\DTLifinlist\expandafter
{\gls@type}{\@gls@nohyperlist}%
{%
@@ -2505,10 +2553,10 @@ name=true]{%
}%
\setkeys{glslink}{#1}%
\@gls@saveentrycounter
- \@gls@setsort{#2}%
+ \@gls@setsort{\glslabel}%
\@do@wrglossary{#2}%
\ifKV@glslink@hyper
- \@glslink{\glolinkprefix#2}{\glstextformat{#3}}%
+ \@glslink{\glolinkprefix\glslabel}{\glstextformat{#3}}%
\else
\glstextformat{#3}%
\fi
@@ -2925,9 +2973,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glscustomtext\@empty
@@ -2966,9 +3011,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@secondofthree
\let\glscustomtext\@empty
@@ -3008,9 +3050,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@thirdofthree
\let\glscustomtext\@empty
@@ -3048,9 +3087,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@firstoftwo
\let\glscapscase\@firstofthree
\let\glscustomtext\@empty
@@ -3090,9 +3126,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
\let\glscustomtext\@empty
@@ -3132,9 +3165,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
\let\glscustomtext\@empty
@@ -3170,9 +3200,6 @@ name=true]{%
\newcommand*{\@glsdisp}[3][]{%
\glsdoifexists{#2}{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\def\glscustomtext{#3}%
@@ -3200,499 +3227,327 @@ name=true]{%
\fi
}%
}
+\newcommand{\@gls@field@link}[3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \@gls@link[#1]{#2}{#3}%
+ }%
+}
\newrobustcmd*{\glstext}{\@ifstar\@sglstext\@glstext}
\newcommand*{\@sglstext}[1][]{\@glstext[hyper=false,#1]}
\newcommand*{\@glstext}[2][]{%
\new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}}
\def\@glstext@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentrytext{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentrytext{#2}#3}%
}
\newrobustcmd*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
\newcommand*{\@sGLStext}[1][]{\@GLStext[hyper=false,#1]}
\newcommand*{\@GLStext}[2][]{%
\new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}}
\def\@GLStext@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrytext{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentrytext{#2}#3}}%
}
\newrobustcmd*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
\newcommand*{\@sGlstext}[1][]{\@Glstext[hyper=false,#1]}
\newcommand*{\@Glstext}[2][]{%
\new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}}
\def\@Glstext@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentrytext{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentrytext{#2}#3}%
}
\newrobustcmd*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
\newcommand*{\@sglsfirst}[1][]{\@glsfirst[hyper=false,#1]}
\newcommand*{\@glsfirst}[2][]{%
\new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}}
\def\@glsfirst@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryfirst{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryfirst{#2}#3}%
}
\newrobustcmd*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
\newcommand*{\@sGlsfirst}[1][]{\@Glsfirst[hyper=false,#1]}
\newcommand*{\@Glsfirst}[2][]{%
\new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}}
\def\@Glsfirst@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryfirst{#2}#3}}%
+ \@gls@field@link{#1}{#2}{\Glsentryfirst{#2}#3}%
}
\newrobustcmd*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
\newcommand*{\@sGLSfirst}[1][]{\@GLSfirst[hyper=false,#1]}
\newcommand*{\@GLSfirst}[2][]{%
\new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}}
\def\@GLSfirst@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}%
}
\newrobustcmd*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
\newcommand*{\@sglsplural}[1][]{\@glsplural[hyper=false,#1]}
\newcommand*{\@glsplural}[2][]{%
\new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}}
\def\@glsplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryplural{#2}#3}%
}
\newrobustcmd*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
\newcommand*{\@sGlsplural}[1][]{\@Glsplural[hyper=false,#1]}
\newcommand*{\@Glsplural}[2][]{%
\new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}}
\def\@Glsplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryplural{#2}#3}%
}
\newrobustcmd*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
\newcommand*{\@sGLSplural}[1][]{\@GLSplural[hyper=false,#1]}
\newcommand*{\@GLSplural}[2][]{%
\new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}}
\def\@GLSplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}%
}
\newrobustcmd*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
\newcommand*{\@sglsfirstplural}[1][]{\@glsfirstplural[hyper=false,#1]}
\newcommand*{\@glsfirstplural}[2][]{%
\new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}}
\def\@glsfirstplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryfirstplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryfirstplural{#2}#3}%
}
\newrobustcmd*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
\newcommand*{\@sGlsfirstplural}[1][]{\@Glsfirstplural[hyper=false,#1]}
\newcommand*{\@Glsfirstplural}[2][]{%
\new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}}
\def\@Glsfirstplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryfirstplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryfirstplural{#2}#3}%
}
\newrobustcmd*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
\newcommand*{\@sGLSfirstplural}[1][]{\@GLSfirstplural[hyper=false,#1]}
\newcommand*{\@GLSfirstplural}[2][]{%
\new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}}
\def\@GLSfirstplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}%
}
\newrobustcmd*{\glsname}{\@ifstar\@sglsname\@glsname}
\newcommand*{\@sglsname}[1][]{\@glsname[hyper=false,#1]}
\newcommand*{\@glsname}[2][]{%
\new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}}
\def\@glsname@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryname{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryname{#2}#3}%
}
\newrobustcmd*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
\newcommand*{\@sGlsname}[1][]{\@Glsname[hyper=false,#1]}
\newcommand*{\@Glsname}[2][]{%
\new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}}
\def\@Glsname@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryname{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryname{#2}#3}%
}
\newrobustcmd*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
\newcommand*{\@sGLSname}[1][]{\@GLSname[hyper=false,#1]}
\newcommand*{\@GLSname}[2][]{%
\new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}}
\def\@GLSname@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}%
}
\newrobustcmd*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
\newcommand*{\@sglsdesc}[1][]{\@glsdesc[hyper=false,#1]}
\newcommand*{\@glsdesc}[2][]{%
\new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}}
\def\@glsdesc@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentrydesc{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentrydesc{#2}#3}%
}
\newrobustcmd*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
\newcommand*{\@sGlsdesc}[1][]{\@Glsdesc[hyper=false,#1]}
\newcommand*{\@Glsdesc}[2][]{%
\new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}}
\def\@Glsdesc@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentrydesc{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentrydesc{#2}#3}%
}
\newrobustcmd*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
\newcommand*{\@sGLSdesc}[1][]{\@GLSdesc[hyper=false,#1]}
\newcommand*{\@GLSdesc}[2][]{%
\new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}}
\def\@GLSdesc@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}%
}
\newrobustcmd*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
\newcommand*{\@sglsdescplural}[1][]{\@glsdescplural[hyper=false,#1]}
\newcommand*{\@glsdescplural}[2][]{%
\new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}}
\def\@glsdescplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentrydescplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentrydescplural{#2}#3}%
}
\newrobustcmd*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
\newcommand*{\@sGlsdescplural}[1][]{\@Glsdescplural[hyper=false,#1]}
\newcommand*{\@Glsdescplural}[2][]{%
\new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}}
\def\@Glsdescplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentrydescplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentrydescplural{#2}#3}%
}
\newrobustcmd*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
\newcommand*{\@sGLSdescplural}[1][]{\@GLSdescplural[hyper=false,#1]}
\newcommand*{\@GLSdescplural}[2][]{%
\new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}}
\def\@GLSdescplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}%
}
\newrobustcmd*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
\newcommand*{\@sglssymbol}[1][]{\@glssymbol[hyper=false,#1]}
\newcommand*{\@glssymbol}[2][]{%
\new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}}
\def\@glssymbol@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentrysymbol{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentrysymbol{#2}#3}%
}
\newrobustcmd*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
\newcommand*{\@sGlssymbol}[1][]{\@Glssymbol[hyper=false,#1]}
\newcommand*{\@Glssymbol}[2][]{%
\new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}}
\def\@Glssymbol@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentrysymbol{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentrysymbol{#2}#3}%
}
\newrobustcmd*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
\newcommand*{\@sGLSsymbol}[1][]{\@GLSsymbol[hyper=false,#1]}
\newcommand*{\@GLSsymbol}[2][]{%
\new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}}
\def\@GLSsymbol@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}%
}
\newrobustcmd*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
\newcommand*{\@sglssymbolplural}[1][]{\@glssymbolplural[hyper=false,#1]}
\newcommand*{\@glssymbolplural}[2][]{%
\new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}}
\def\@glssymbolplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentrysymbolplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentrysymbolplural{#2}#3}%
}
\newrobustcmd*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
\newcommand*{\@sGlssymbolplural}[1][]{\@Glssymbolplural[hyper=false,#1]}
\newcommand*{\@Glssymbolplural}[2][]{%
\new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}}
\def\@Glssymbolplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentrysymbolplural{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentrysymbolplural{#2}#3}%
}
\newrobustcmd*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
\newcommand*{\@sGLSsymbolplural}[1][]{\@GLSsymbolplural[hyper=false,#1]}
\newcommand*{\@GLSsymbolplural}[2][]{%
\new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}}
\def\@GLSsymbolplural@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}%
}
\newrobustcmd*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri}
\newcommand*{\@sglsuseri}[1][]{\@glsuseri[hyper=false,#1]}
\newcommand*{\@glsuseri}[2][]{%
\new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}}
\def\@glsuseri@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryuseri{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryuseri{#2}#3}%
}
\newrobustcmd*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri}
\newcommand*{\@sGlsuseri}[1][]{\@Glsuseri[hyper=false,#1]}
\newcommand*{\@Glsuseri}[2][]{%
\new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}}
\def\@Glsuseri@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryuseri{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryuseri{#2}#3}%
}
\newrobustcmd*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri}
\newcommand*{\@sGLSuseri}[1][]{\@GLSuseri[hyper=false,#1]}
\newcommand*{\@GLSuseri}[2][]{%
\new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}}
\def\@GLSuseri@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}%
}
\newrobustcmd*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii}
\newcommand*{\@sglsuserii}[1][]{\@glsuserii[hyper=false,#1]}
\newcommand*{\@glsuserii}[2][]{%
\new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}}
\def\@glsuserii@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryuserii{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryuserii{#2}#3}%
}
\newrobustcmd*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii}
\newcommand*{\@sGlsuserii}[1][]{\@Glsuserii[hyper=false,#1]}
\newcommand*{\@Glsuserii}[2][]{%
\new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}}
\def\@Glsuserii@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryuserii{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryuserii{#2}#3}%
}
\newrobustcmd*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii}
\newcommand*{\@sGLSuserii}[1][]{\@GLSuserii[hyper=false,#1]}
\newcommand*{\@GLSuserii}[2][]{%
\new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}}
\def\@GLSuserii@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}%
}
\newrobustcmd*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii}
\newcommand*{\@sglsuseriii}[1][]{\@glsuseriii[hyper=false,#1]}
\newcommand*{\@glsuseriii}[2][]{%
\new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}}
\def\@glsuseriii@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryuseriii{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryuseriii{#2}#3}%
}
\newrobustcmd*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii}
\newcommand*{\@sGlsuseriii}[1][]{\@Glsuseriii[hyper=false,#1]}
\newcommand*{\@Glsuseriii}[2][]{%
\new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}}
\def\@Glsuseriii@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryuseriii{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryuseriii{#2}#3}%
}
\newrobustcmd*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii}
\newcommand*{\@sGLSuseriii}[1][]{\@GLSuseriii[hyper=false,#1]}
\newcommand*{\@GLSuseriii}[2][]{%
\new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}}
\def\@GLSuseriii@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}%
}
\newrobustcmd*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv}
\newcommand*{\@sglsuseriv}[1][]{\@glsuseriv[hyper=false,#1]}
\newcommand*{\@glsuseriv}[2][]{%
\new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}}
\def\@glsuseriv@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryuseriv{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryuseriv{#2}#3}%
}
\newrobustcmd*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv}
\newcommand*{\@sGlsuseriv}[1][]{\@Glsuseriv[hyper=false,#1]}
\newcommand*{\@Glsuseriv}[2][]{%
\new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}}
\def\@Glsuseriv@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryuseriv{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryuseriv{#2}#3}%
}
\newrobustcmd*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv}
\newcommand*{\@sGLSuseriv}[1][]{\@GLSuseriv[hyper=false,#1]}
\newcommand*{\@GLSuseriv}[2][]{%
\new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}}
\def\@GLSuseriv@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}%
}
\newrobustcmd*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv}
\newcommand*{\@sglsuserv}[1][]{\@glsuserv[hyper=false,#1]}
\newcommand*{\@glsuserv}[2][]{%
\new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}}
\def\@glsuserv@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryuserv{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryuserv{#2}#3}%
}
\newrobustcmd*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv}
\newcommand*{\@sGlsuserv}[1][]{\@Glsuserv[hyper=false,#1]}
\newcommand*{\@Glsuserv}[2][]{%
\new@ifnextchar[{\@Glsuserv@{#1}{#2}}{\@Glsuserv@{#1}{#2}[]}}
\def\@Glsuserv@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryuserv{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryuserv{#2}#3}%
}
\newrobustcmd*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv}
\newcommand*{\@sGLSuserv}[1][]{\@GLSuserv[hyper=false,#1]}
\newcommand*{\@GLSuserv}[2][]{%
\new@ifnextchar[{\@GLSuserv@{#1}{#2}}{\@GLSuserv@{#1}{#2}[]}}
\def\@GLSuserv@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}%
}
\newrobustcmd*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi}
\newcommand*{\@sglsuservi}[1][]{\@glsuservi[hyper=false,#1]}
\newcommand*{\@glsuservi}[2][]{%
\new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}}
\def\@glsuservi@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\glsentryuservi{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\glsentryuservi{#2}#3}%
}
\newrobustcmd*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi}
\newcommand*{\@sGlsuservi}[1][]{\@Glsuservi[hyper=false,#1]}
\newcommand*{\@Glsuservi}[2][]{%
\new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}}
\def\@Glsuservi@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\Glsentryuservi{#2}#3}%
- }%
+ \@gls@field@link{#1}{#2}{\Glsentryuservi{#2}#3}%
}
\newrobustcmd*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi}
\newcommand*{\@sGLSuservi}[1][]{\@GLSuservi[hyper=false,#1]}
\newcommand*{\@GLSuservi}[2][]{%
\new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}}
\def\@GLSuservi@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}%
- }%
+ \@gls@field@link{#1}{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}%
}
\newrobustcmd*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
\newcommand*{\s@acrshort}[2][]{%
@@ -3706,7 +3561,6 @@ name=true]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
@@ -3958,89 +3812,117 @@ name=true]{%
\@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
}%
}
-\newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname}
+\newcommand*{\@gls@entry@field}[2]{%
+ \csname glo@\glsdetoklabel{#1}@#2\endcsname
+}
+\newcommand*{\@Gls@entry@field}[2]{%
+ \letcs\@glo@text{glo@\glsdetoklabel{#1}@#2}%
+ \xmakefirstuc{\@glo@text}%
+}
+\newcommand*{\glsentryname}[1]{\@gls@entry@field{#1}{name}}
\newrobustcmd*{\Glsentryname}[1]{%
- \protected@edef\@glo@text{\csname glo@#1@name\endcsname}%
- \expandafter\makefirstuc\expandafter{\@glo@text}%
+ \@Gls@entry@field{#1}{name}%
}
-\newcommand*{\glsentrydesc}[1]{\csname glo@#1@desc\endcsname}
+\newcommand*{\glsentrydesc}[1]{\@gls@entry@field{#1}{desc}}
\newrobustcmd*{\Glsentrydesc}[1]{%
- \protected@edef\@glo@text{\csname glo@#1@desc\endcsname}%
- \expandafter\makefirstuc\expandafter{\@glo@text}%
+ \@Gls@entry@field{#1}{desc}%
}
\newcommand*{\glsentrydescplural}[1]{%
- \csname glo@#1@descplural\endcsname}
+ \@gls@entry@field{#1}{descplural}%
+}
\newrobustcmd*{\Glsentrydescplural}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@descplural\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentrytext}[1]{\csname glo@#1@text\endcsname}
+ \@Gls@entry@field{#1}{descplural}%
+}
+\newcommand*{\glsentrytext}[1]{\@gls@entry@field{#1}{text}}
\newrobustcmd*{\Glsentrytext}[1]{%
- \protected@edef\@glo@text{\csname glo@#1@text\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryplural}[1]{\csname glo@#1@plural\endcsname}
+ \@Gls@entry@field{#1}{text}%
+}
+\newcommand*{\glsentryplural}[1]{%
+ \@gls@entry@field{#1}{plural}%
+}
\newrobustcmd*{\Glsentryplural}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@plural\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentrysymbol}[1]{\csname glo@#1@symbol\endcsname}
+ \@Gls@entry@field{#1}{plural}%
+}
+\newcommand*{\glsentrysymbol}[1]{%
+ \@gls@entry@field{#1}{symbol}%
+}
\newrobustcmd*{\Glsentrysymbol}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@symbol\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
+ \@Gls@entry@field{#1}{symbol}%
+}
\newcommand*{\glsentrysymbolplural}[1]{%
- \csname glo@#1@symbolplural\endcsname}
+ \@gls@entry@field{#1}{symbolplural}%
+}
\newrobustcmd*{\Glsentrysymbolplural}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@symbolplural\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryfirst}[1]{\csname glo@#1@first\endcsname}
+ \@Gls@entry@field{#1}{symbolplural}%
+}
+\newcommand*{\glsentryfirst}[1]{%
+ \@gls@entry@field{#1}{first}%
+}
\newrobustcmd*{\Glsentryfirst}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@first\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
+ \@Gls@entry@field{#1}{first}%
+}
\newcommand*{\glsentryfirstplural}[1]{%
- \csname glo@#1@firstpl\endcsname}
+ \@gls@entry@field{#1}{firstpl}%
+}
\newrobustcmd*{\Glsentryfirstplural}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@firstpl\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentrytype}[1]{\csname glo@#1@type\endcsname}
-\newcommand*{\glsentrysort}[1]{\csname glo@#1@sort\endcsname}
-\newcommand*{\glsentryuseri}[1]{\csname glo@#1@useri\endcsname}
+ \@Gls@entry@field{#1}{firstpl}%
+}
+\newcommand*{\glsentrytype}[1]{\@gls@entry@field{#1}{type}}
+\newcommand*{\glsentrysort}[1]{%
+ \@gls@entry@field{#1}{sort}%
+}
+\newcommand*{\glsentryuseri}[1]{%
+ \@gls@entry@field{#1}{useri}%
+}
\newrobustcmd*{\Glsentryuseri}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@useri\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryuserii}[1]{\csname glo@#1@userii\endcsname}
+ \@Gls@entry@field{#1}{useri}%
+}
+\newcommand*{\glsentryuserii}[1]{%
+ \@gls@entry@field{#1}{userii}%
+}
\newrobustcmd*{\Glsentryuserii}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@userii\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryuseriii}[1]{\csname glo@#1@useriii\endcsname}
+ \@Gls@entry@field{#1}{userii}%
+}
+\newcommand*{\glsentryuseriii}[1]{%
+ \@gls@entry@field{#1}{useriii}%
+}
\newrobustcmd*{\Glsentryuseriii}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@useriii\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryuseriv}[1]{\csname glo@#1@useriv\endcsname}
+ \@Gls@entry@field{#1}{useriii}%
+}
+\newcommand*{\glsentryuseriv}[1]{%
+ \@gls@entry@field{#1}{useriv}%
+}
\newrobustcmd*{\Glsentryuseriv}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@useriv\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryuserv}[1]{\csname glo@#1@userv\endcsname}
+ \@Gls@entry@field{#1}{useriv}%
+}
+\newcommand*{\glsentryuserv}[1]{%
+ \@gls@entry@field{#1}{userv}%
+}
\newrobustcmd*{\Glsentryuserv}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@userv\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryuservi}[1]{\csname glo@#1@uservi\endcsname}
+ \@Gls@entry@field{#1}{userv}%
+}
+\newcommand*{\glsentryuservi}[1]{%
+ \@gls@entry@field{#1}{uservi}%
+}
\newrobustcmd*{\Glsentryuservi}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@uservi\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryshort}[1]{\csname glo@#1@short\endcsname}
+ \@Gls@entry@field{#1}{uservi}%
+}
+\newcommand*{\glsentryshort}[1]{\@gls@entry@field{#1}{short}}
\newrobustcmd*{\Glsentryshort}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@short\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentryshortpl}[1]{\csname glo@#1@shortpl\endcsname}
+ \@Gls@entry@field{#1}{short}%
+}
+\newcommand*{\glsentryshortpl}[1]{\@gls@entry@field{#1}{shortpl}}
\newrobustcmd*{\Glsentryshortpl}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@shortpl\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentrylong}[1]{\csname glo@#1@long\endcsname}
+ \@Gls@entry@field{#1}{shortpl}%
+}
+\newcommand*{\glsentrylong}[1]{\@gls@entry@field{#1}{long}}
\newrobustcmd*{\Glsentrylong}[1]{%
- \protected@edef\@glo@text{\csname glo@#1@long\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glsentrylongpl}[1]{\csname glo@#1@longpl\endcsname}
+ \@Gls@entry@field{#1}{long}%
+}
+\newcommand*{\glsentrylongpl}[1]{\@gls@entry@field{#1}{longpl}}
\newrobustcmd*{\Glsentrylongpl}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@longpl\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
+ \@Gls@entry@field{#1}{longpl}%
+}
\newcommand*{\glsentryfull}[1]{%
\acrfullformat{\glsentrylong{#1}}{\acronymfont{\glsentryshort{#1}}}%
}
@@ -4056,7 +3938,7 @@ name=true]{%
\newcommand*{\glsentrynumberlist}[1]{%
\glsdoifexists{#1}%
{%
- \csname glo@#1@numberlist\endcsname
+ \@gls@entry@field{#1}{numberlist}%
}%
}
\@ifpackageloaded{hyperref} {%
@@ -4075,10 +3957,11 @@ name=true]{%
\glsdoifexists{#1}%
{%
\bgroup
- \def\@glo@label{#1}%
+ \edef\@glo@label{\glsdetoklabel{#1}}%
\let\@org@glsnumberformat\glsnumberformat
\def\glsnumberformat##1{##1}%
- \protected@edef\the@numberlist{\csname glo@\@glo@label @numberlist\endcsname}%
+ \protected@edef\the@numberlist{%
+ \csname glo@\@glo@label @numberlist\endcsname}%
\def\@gls@numlist@sep{}%
\def\@gls@numlist@nextsep{}%
\def\@gls@numlist@lastsep{}%
@@ -4107,8 +3990,8 @@ name=true]{%
\newcommand*{\glsnumlistsep}{, }
\newcommand*{\glsnumlistlastsep}{ \& }
\newcommand*{\glshyperlink}[2][\glsentrytext{\@glo@label}]{%
-\def\@glo@label{#2}%
-\@glslink{\glolinkprefix#2}{#1}}
+ \def\@glo@label{#2}%
+ \@glslink{\glolinkprefix\glsdetoklabel{#2}}{#1}}
\define@key{glossadd}{counter}{\def\@gls@counter{#1}}
\define@key{glossadd}{format}{\def\@glsnumberformat{#1}}
\define@key{glossadd}{types}{\def\@glo@type{#1}}
@@ -4116,7 +3999,7 @@ name=true]{%
\glsdoifexists{#2}%
{%
\def\@glsnumberformat{glsnumberformat}%
- \edef\@gls@counter{\csname glo@#2@counter\endcsname}%
+ \edef\@gls@counter{\csname glo@\glsdetoklabel{#2}@counter\endcsname}%
\setkeys{glossadd}{#1}%
\@gls@saveentrycounter
\@do@wrglossary{#2}%
@@ -4540,6 +4423,7 @@ you
}%
\@do@gls@getcounterprefix
\fi
+ \edef\@gls@label{\glsdetoklabel{#1}}%
\ifglsxindy
\expandafter\@glo@check@mkidxrangechar\@glsnumberformat\@nil
\def\@glo@range{}%
@@ -4550,8 +4434,8 @@ you
\def\@glo@range{:close-range}%
\fi
\fi
- \glossary[\csname glo@#1@type\endcsname]{%
- (indexentry :tkey (\csname glo@#1@index\endcsname)
+ \glossary[\csname glo@\@gls@label @type\endcsname]{%
+ (indexentry :tkey (\csname glo@\@gls@label @index\endcsname)
:locref \string"{\@glo@counterprefix}{\@glslocref}\string" %
:attr \string"\@gls@counter\@glo@suffix\string"
\@glo@range
@@ -4560,8 +4444,8 @@ you
\else
\@set@glo@numformat{\@glo@numfmt}{\@gls@counter}{\@glsnumberformat}%
{\@glo@counterprefix}%
- \glossary[\csname glo@#1@type\endcsname]{%
- \string\glossaryentry{\csname glo@#1@index\endcsname
+ \glossary[\csname glo@\@gls@label @type\endcsname]{%
+ \string\glossaryentry{\csname glo@\@gls@label @index\endcsname
\@gls@encapchar\@glo@numfmt}{\@glslocref}}%
\fi
}
@@ -4621,7 +4505,7 @@ you
\else
\@gls@donext
\fi
- \glsseeitem{\@gls@thislabel}%
+ \expandafter\glsseeitem\expandafter{\@gls@thislabel}%
\let\@gls@dolast\glsseelastsep
\let\@gls@donext\glsseesep
}%
@@ -4675,11 +4559,11 @@ you
\let\gls@org@glossaryentryfield\glossentry
\let\gls@org@glossarysubentryfield\subglossentry
\renewcommand{\glossentry}[1]{%
- \gdef\glscurrententrylabel{##1}%
+ \xdef\glscurrententrylabel{\glsdetoklabel{##1}}%
\gls@org@glossaryentryfield{##1}%
}%
\renewcommand{\subglossentry}[2]{%
- \gdef\glscurrententrylabel{##2}%
+ \xdef\glscurrententrylabel{\glsdetoklabel{##2}}%
\gls@org@glossarysubentryfield{##1}{##2}%
}%
\makeatletter
@@ -4820,25 +4704,25 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\ifglsentrycounter
\newcommand*{\glsstepentry}[1]{%
\refstepcounter{glossaryentry}%
- \label{glsentry-#1}%
+ \label{glsentry-\glsdetoklabel{#1}}%
}
\else
\newcommand*{\glsstepentry}[1]{}
\fi
\ifglssubentrycounter
\newcommand*{\glsstepsubentry}[1]{%
- \def\currentglssubentry{#1}%
+ \edef\currentglssubentry{\glsdetoklabel{#1}}%
\refstepcounter{glossarysubentry}%
- \label{glsentry-#1}%
+ \label{glsentry-\currentglssubentry}%
}
\else
\newcommand*{\glsstepsubentry}[1]{}
\fi
\ifglsentrycounter
- \newcommand*{\glsrefentry}[1]{\ref{glsentry-#1}}
+ \newcommand*{\glsrefentry}[1]{\ref{glsentry-\glsdetoklabel{#1}}}
\else
\ifglssubentrycounter
- \newcommand*{\glsrefentry}[1]{\ref{glsentry-#1}}
+ \newcommand*{\glsrefentry}[1]{\ref{glsentry-\glsdetoklabel{#1}}}
\else
\newcommand*{\glsrefentry}[1]{\gls{#1}}
\fi
@@ -4889,38 +4773,38 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\@do@glossentry
}
\newcommand*{\glossentryname}[1]{%
- \glsdoifexists{#1}%
+ \glsdoifexistsorwarn{#1}%
{%
- \letcs{\glo@name}{glo@#1@name}%
+ \letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
\expandafter\glsnamefont\expandafter{\glo@name}%
}%
}
\newcommand*{\Glossentryname}[1]{%
- \glsdoifexists{#1}%
+ \glsdoifexistsorwarn{#1}%
{%
\glsnamefont{\Glsentryname{#1}}%
}%
}
\newcommand*{\glossentrydesc}[1]{%
- \glsdoifexists{#1}%
+ \glsdoifexistsorwarn{#1}%
{%
\glsentrydesc{#1}%
}%
}
\newcommand*{\Glossentrydesc}[1]{%
- \glsdoifexists{#1}%
+ \glsdoifexistsorwarn{#1}%
{%
\Glsentrydesc{#1}%
}%
}
\newcommand*{\glossentrysymbol}[1]{%
- \glsdoifexists{#1}%
+ \glsdoifexistsorwarn{#1}%
{%
\glsentrysymbol{#1}%
}%
}
\newcommand*{\Glossentrysymbol}[1]{%
- \glsdoifexists{#1}%
+ \glsdoifexistsorwarn{#1}%
{%
\Glsentrysymbol{#1}%
}%
@@ -5319,6 +5203,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\csdef{@glsacr@styledefs@#1}{#3}%
}%
}
+\newcommand*{\renewacronymstyle}[3]{%
+ \ifcsdef{@glsacr@dispstyle@#1}%
+ {%
+ \csdef{@glsacr@dispstyle@#1}{#2}%
+ \csdef{@glsacr@styledefs@#1}{#3}%
+ }%
+ {%
+ \PackageError{glossaries}{Acronym style `#1' doesn't exist}{}%
+ }%
+}
\newcommand*{\GlsUseAcrEntryDispStyle}[1]{\csuse{@glsacr@dispstyle@#1}}
\newcommand*{\GlsUseAcrStyleDefs}[1]{\csuse{@glsacr@styledefs@#1}}
\newacronymstyle{long-short}%
@@ -5371,7 +5265,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\protect\firstacronymfont{\Glsentryshortpl{##1}}##2\space
(\glsentrylongpl{##1})%
}%
- \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
+ \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}%
\renewcommand*{\acronymsort}[2]{##1}%
\renewcommand*{\acronymfont}[1]{##1}%
\renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}%
@@ -5522,7 +5416,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
\renewcommand*{\acrfullfmt}[3]{%
- \glslink[##1]{##2}{\glsentryshort{##2}##3\space
+ \glslink[##1]{##2}{\glsentrylong{##2}##3\space
(\acronymfont{\glsentryshort{##2}})}}%
\renewcommand*{\Acrfullfmt}[3]{%
\glslink[##1]{##2}{\Glsentrylong{##2}##3\space
@@ -5532,10 +5426,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\mfirstucMakeUppercase{\glsentrylong{##2}##3\space
(\acronymfont{\glsentryshort{##2}})}}}%
\renewcommand*{\acrfullplfmt}[3]{%
- \glslink[##1]{##2}{\glsentryshortpl{##2}##3\space
+ \glslink[##1]{##2}{\glsentrylongpl{##2}##3\space
(\acronymfont{\glsentryshortpl{##2}})}}%
\renewcommand*{\Acrfullplfmt}[3]{%
- \glslink[##1]{##2}{\Glsentryshortpl{##2}##3\space
+ \glslink[##1]{##2}{\Glsentrylongpl{##2}##3\space
(\acronymfont{\glsentryshortpl{##2}})}}%
\renewcommand*{\ACRfullplfmt}[3]{%
\glslink[##1]{##2}{%
@@ -5565,7 +5459,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\GlsUseAcrStyleDefs{dua}%
\renewcommand*{\GenericAcronymFields}{}%
- \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentrylong{##1}}}
+ \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentrylong{##1}}}%
\renewcommand*{\acronymsort}[2]{##2}%
}%
\newacronymstyle{footnote}%
@@ -6402,76 +6296,76 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\setglossarystyle{\@glossary@default@style}
\fi
\newcommand*{\showgloparent}[1]{%
- \expandafter\show\csname glo@#1@parent\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@parent\endcsname
}
\newcommand*{\showglolevel}[1]{%
- \expandafter\show\csname glo@#1@level\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@level\endcsname
}
\newcommand*{\showglotext}[1]{%
- \expandafter\show\csname glo@#1@text\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@text\endcsname
}
\newcommand*{\showgloplural}[1]{%
- \expandafter\show\csname glo@#1@plural\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@plural\endcsname
}
\newcommand*{\showglofirst}[1]{%
- \expandafter\show\csname glo@#1@first\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@first\endcsname
}
\newcommand*{\showglofirstpl}[1]{%
- \expandafter\show\csname glo@#1@firstpl\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@firstpl\endcsname
}
\newcommand*{\showglotype}[1]{%
- \expandafter\show\csname glo@#1@type\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@type\endcsname
}
\newcommand*{\showglocounter}[1]{%
- \expandafter\show\csname glo@#1@counter\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@counter\endcsname
}
\newcommand*{\showglouseri}[1]{%
- \expandafter\show\csname glo@#1@useri\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@useri\endcsname
}
\newcommand*{\showglouserii}[1]{%
- \expandafter\show\csname glo@#1@userii\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@userii\endcsname
}
\newcommand*{\showglouseriii}[1]{%
- \expandafter\show\csname glo@#1@useriii\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@useriii\endcsname
}
\newcommand*{\showglouseriv}[1]{%
- \expandafter\show\csname glo@#1@useriv\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@useriv\endcsname
}
\newcommand*{\showglouserv}[1]{%
- \expandafter\show\csname glo@#1@userv\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@userv\endcsname
}
\newcommand*{\showglouservi}[1]{%
- \expandafter\show\csname glo@#1@uservi\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@uservi\endcsname
}
\newcommand*{\showgloname}[1]{%
- \expandafter\show\csname glo@#1@name\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@name\endcsname
}
\newcommand*{\showglodesc}[1]{%
- \expandafter\show\csname glo@#1@desc\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@desc\endcsname
}
\newcommand*{\showglodescplural}[1]{%
- \expandafter\show\csname glo@#1@descplural\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@descplural\endcsname
}
\newcommand*{\showglosort}[1]{%
- \expandafter\show\csname glo@#1@sort\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@sort\endcsname
}
\newcommand*{\showglosymbol}[1]{%
- \expandafter\show\csname glo@#1@symbol\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@symbol\endcsname
}
\newcommand*{\showglosymbolplural}[1]{%
- \expandafter\show\csname glo@#1@symbolplural\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@symbolplural\endcsname
}
\newcommand*{\showgloshort}[1]{%
- \expandafter\show\csname glo@#1@short\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@short\endcsname
}
\newcommand*{\showglolong}[1]{%
- \expandafter\show\csname glo@#1@long\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@long\endcsname
}
\newcommand*{\showgloindex}[1]{%
- \expandafter\show\csname glo@#1@index\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@index\endcsname
}
\newcommand*{\showgloflag}[1]{%
- \expandafter\show\csname ifglo@#1@flag\endcsname
+ \expandafter\show\csname ifglo@\glsdetoklabel{#1}@flag\endcsname
}
\newcommand*{\showacronymlists}{%
\show\@glsacronymlists
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index f6791eb582a..15fc320613b 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 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Brazilian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
index 7880c550996..cea3034b3ee 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Brazilian.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
index 3ba19bed470..10a32ffac18 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Danish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Dutch.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
index dc293734ecb..562d104443f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Dutch.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-English.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
index 49085eb0c0e..f42a60ea6d2 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-English.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-French.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
index 02de0418dcc..3f222bb9446 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-French.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-German.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
index ea95ee503d1..ea0cfcb77f8 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-German.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Irish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
index 650644e8eef..c6cf04fc177 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Irish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Italian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
index 0ba4beba2e1..1156d2e1d9e 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Italian.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Magyar.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
index 5bef7ed92bb..a44427a9f4c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Magyar.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Polish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
index c136b0d60d7..5908c8bdec9 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Polish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Serbian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
index 2bbd7fa32d1..5755245f731 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Serbian.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/dict/glossaries-dictionary-Spanish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
index 6db707a1608..ea04ece6a04 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Spanish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
index 545b8c4072e..4e6e4a2a6ec 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-accsupp.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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-accsupp}[2013/11/14 v4.0 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2014/01/20 v4.03 (NLCT)
Experimental glossaries accessibility]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
@@ -48,9 +48,9 @@
\protected@edef\@do@glossentry{%
\noexpand\accsuppglossaryentryfield{#1}%
{\noexpand\glsnamefont
- {\expandafter\expandonce\csname glo@#1@name\endcsname}}%
- {\expandafter\expandonce\csname glo@#1@desc\endcsname}%
- {\expandafter\expandonce\csname glo@#1@symbol\endcsname}%
+ {\expandafter\expandonce\csname glo@\glsdetoklabel{#1}@name\endcsname}}%
+ {\expandafter\expandonce\csname glo@\glsdetoklabel{#1}@desc\endcsname}%
+ {\expandafter\expandonce\csname glo@\glsdetoklabel{#1}@symbol\endcsname}%
{\the\toks@}%
}%
\@do@glossentry
@@ -61,9 +61,9 @@
\noexpand\accsuppglossarysubentryfield{\number#1}%
{#2}%
{\noexpand\glsnamefont
- {\expandafter\expandonce\csname glo@#2@name\endcsname}}%
- {\expandafter\expandonce\csname glo@#2@desc\endcsname}%
- {\expandafter\expandonce\csname glo@#2@symbol\endcsname}%
+ {\expandafter\expandonce\csname glo@\glsdetoklabel{#2}@name\endcsname}}%
+ {\expandafter\expandonce\csname glo@\glsdetoklabel{#2}@desc\endcsname}%
+ {\expandafter\expandonce\csname glo@\glsdetoklabel{#2}@symbol\endcsname}%
{\the\toks@}%
}%
\@do@subglossentry
@@ -186,43 +186,43 @@
\@glo@longpluralaccess}%
}
\newcommand*{\glsentryaccess}[1]{%
- \csname glo@#1@access\endcsname
+ \@gls@entry@field{#1}{access}%
}
\newcommand*{\glsentrytextaccess}[1]{%
- \csname glo@#1@textaccess\endcsname
+ \@gls@entry@field{#1}{textaccess}%
}
\newcommand*{\glsentryfirstaccess}[1]{%
- \csname glo@#1@firstaccess\endcsname
+ \@gls@entry@field{#1}{firstaccess}%
}
\newcommand*{\glsentrypluralaccess}[1]{%
- \csname glo@#1@pluralaccess\endcsname
+ \@gls@entry@field{#1}{pluralaccess}%
}
\newcommand*{\glsentryfirstpluralaccess}[1]{%
\csname glo@#1@firstpluralaccess\endcsname
}
\newcommand*{\glsentrysymbolaccess}[1]{%
- \csname glo@#1@symbolaccess\endcsname
+ \@gls@entry@field{#1}{symbolaccess}%
}
\newcommand*{\glsentrysymbolpluralaccess}[1]{%
- \csname glo@#1@symbolpluralaccess\endcsname
+ \@gls@entry@field{#1}{symbolpluralaccess}%
}
\newcommand*{\glsentrydescaccess}[1]{%
- \csname glo@#1@descaccess\endcsname
+ \@gls@entry@field{#1}{descaccess}%
}
\newcommand*{\glsentrydescpluralaccess}[1]{%
- \csname glo@#1@descaccess\endcsname
+ \@gls@entry@field{#1}{descaccess}%
}
\newcommand*{\glsentryshortaccess}[1]{%
- \csname glo@#1@shortaccess\endcsname
+ \@gls@entry@field{#1}{shortaccess}%
}
\newcommand*{\glsentryshortpluralaccess}[1]{%
- \csname glo@#1@shortpluralaccess\endcsname
+ \@gls@entry@field{#1}{shortpluralaccess}%
}
\newcommand*{\glsentrylongaccess}[1]{%
- \csname glo@#1@longaccess\endcsname
+ \@gls@entry@field{#1}{longaccess}%
}
\newcommand*{\glsentrylongpluralaccess}[1]{%
- \csname glo@#1@longpluralaccess\endcsname
+ \@gls@entry@field{#1}{longpluralaccess}%
}
\newcommand*{\glsaccsupp}[2]{%
\BeginAccSupp{ActualText=#1}#2\EndAccSupp{}%
@@ -231,109 +231,52 @@
\protected@edef\@gls@replacementtext{#1}%
\expandafter\glsaccsupp\expandafter{\@gls@replacementtext}{#2}%
}
-\DeclareRobustCommand*{\glsnameaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentryaccess{#2}}%
+\newcommand*{\@gls@access@display}[2]{%
+ \protected@edef\@glo@access{#2}%
\ifx\@glo@access\@gls@noaccess
#1%
\else
\xglsaccsupp{\@glo@access}{#1}%
\fi
}
+\DeclareRobustCommand*{\glsnameaccessdisplay}[2]{%
+ \@gls@access@display{#1}{\glsentryaccess{#2}}%
+}
\DeclareRobustCommand*{\glstextaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrytextaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrytextaccess{#2}}%
}
\DeclareRobustCommand*{\glspluralaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrypluralaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrypluralaccess{#2}}%
}
\DeclareRobustCommand*{\glsfirstaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentryfirstaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentryfirstaccess{#2}}%
}
\DeclareRobustCommand*{\glsfirstpluralaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentryfirstpluralaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentryfirstpluralaccess{#2}}%
}
\DeclareRobustCommand*{\glssymbolaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrysymbolaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrysymbolaccess{#2}}%
}
\DeclareRobustCommand*{\glssymbolpluralaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrysymbolpluralaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrysymbolpluralaccess{#2}}%
}
\DeclareRobustCommand*{\glsdescriptionaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrydescaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrydescaccess{#2}}%
}
\DeclareRobustCommand*{\glsdescriptionpluralaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrydescpluralaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrydescpluralaccess{#2}}%
}
\DeclareRobustCommand*{\glsshortaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentryshortaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentryshortaccess{#2}}%
}
\DeclareRobustCommand*{\glsshortpluralaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentryshortpluralaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentryshortpluralaccess{#2}}%
}
\DeclareRobustCommand*{\glslongaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrylongaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrylongaccess{#2}}%
}
\DeclareRobustCommand*{\glslongpluralaccessdisplay}[2]{%
- \protected@edef\@glo@access{\glsentrylongpluralaccess{#2}}%
- \ifx\@glo@access\@gls@noaccess
- #1%
- \else
- \xglsaccsupp{\@glo@access}{#1}%
- \fi
+ \@gls@access@display{#1}{\glsentrylongpluralaccess{#2}}%
}
\DeclareRobustCommand*{\glsaccessdisplay}[3]{%
\@ifundefined{gls#1accessdisplay}%
@@ -506,11 +449,201 @@
}%
}%
}
+\renewcommand*{\glsgenentryfmt}{%
+ \ifdefempty\glscustomtext
+ {%
+ \glsifplural
+ {%
+ \glscapscase
+ {%
+ \ifglsused\glslabel
+ {%
+ \glspluralaccessdisplay
+ {\glsentryplural{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ {%
+ \glsfirstpluralaccessdisplay
+ {\glsentryfirstplural{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ }%
+ {%
+ \ifglsused\glslabel
+ {%
+ \glspluralaccessdisplay
+ {\Glsentryplural{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ {%
+ \glsfirstpluralaccessdisplay
+ {\Glsentryfirstplural{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ }%
+ {%
+ \ifglsused\glslabel
+ {%
+ \glspluralaccessdisplay
+ {\mfirstucMakeUppercase{\glsentryplural{\glslabel}}}%
+ {\glslabel}%
+ \mfirstucMakeUppercase{\glsinsert}%
+ }%
+ {%
+ \glsfirstpluralacessdisplay
+ {\mfirstucMakeUppercase{\glsentryfirstplural{\glslabel}}}%
+ {\glslabel}%
+ \mfirstucMakeUppercase{\glsinsert}%
+ }%
+ }%
+ }%
+ {%
+ \glscapscase
+ {%
+ \ifglsused\glslabel
+ {%
+ \glstextaccessdisplay{\glsentrytext{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ {%
+ \glsfirstaccessdisplay{\glsentryfirst{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ }%
+ {%
+ \ifglsused\glslabel
+ {%
+ \glstextaccessdisplay{\Glsentrytext{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ {%
+ \glsfirstaccessdisplay{\Glsentryfirst{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ }%
+ {%
+ \ifglsused\glslabel
+ {%
+ \glstextaccessdisplay
+ {\mfirstucMakeUppercase{\glsentrytext{\glslabel}}}{\glslabel}%
+ \mfirstucMakeUppercase{\glsinsert}%
+ }%
+ {%
+ \glsfirstaccessdisplay
+ {\mfirstucMakeUppercase{\glsentryfirst{\glslabel}}}{\glslabel}%
+ \mfirstucMakeUppercase{\glsinsert}%
+ }%
+ }%
+ }%
+ }%
+ {%
+ \glscustomtext\glsinsert
+ }%
+}
+\renewcommand*{\glsgenacfmt}{%
+ \ifdefempty\glscustomtext
+ {%
+ \ifglsused\glslabel
+ {%
+ \glsifplural
+ {%
+ \glscapscase
+ {%
+ \acronymfont
+ {\glsshortpluralaccessdisplay
+ {\glsentryshortpl{\glslabel}}{\glslabel}}%
+ \glsinsert
+ }%
+ {%
+ \acronymfont
+ {\glsshortpluralaccessdisplay
+ {\Glsentryshortpl{\glslabel}}{\glslabel}}%
+ \glsinsert
+ }%
+ {%
+ \mfirstucMakeUppercase
+ {\acronymfont
+ {\glsshortpluralaccessdisplay
+ {\glsentryshortpl{\glslabel}}{\glslabel}}%
+ \glsinsert}%
+ }%
+ }%
+ {%
+ \glscapscase
+ {%
+ \acronymfont
+ {\glsshortaccessdisplay{\glsentryshort{\glslabel}}{\glslabel}}%
+ \glsinsert
+ }%
+ {%
+ \acronymfont
+ {\glsshortaccessdisplay{\Glsentryshort{\glslabel}}{\glslabel}}%
+ \glsinsert
+ }%
+ {%
+ \mfirstucMakeUppercase
+ {\acronymfont{%
+ \glsshortaccessdisplay{\glsentryshort{\glslabel}}{\glslabel}}%
+ \glsinsert}%
+ }%
+ }%
+ }%
+ {%
+ \glsifplural
+ {%
+ \glscapscase
+ {%
+ \genplacrfullformat{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \Genplacrfullformat{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \mfirstucMakeUppercase
+ {\genplacrfullformat{\glslabel}{\glsinsert}}%
+ }%
+ }%
+ {%
+ \glscapscase
+ {%
+ \genacrfullformat{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \Genacrfullformat{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \mfirstucMakeUppercase
+ {\genacrfullformat{\glslabel}{\glsinsert}}%
+ }%
+ }%
+ }%
+ }%
+ {%
+ \glscustomtext
+ }%
+}
+\renewcommand*{\genacrfullformat}[2]{%
+ \glslongaccessdisplay{\glsentrylong{#1}}{#1}#2\space
+ (\glsshortaccessdisplay{\protect\firstacronymfont{\glsentryshort{#1}}}{#1})%
+}
+\renewcommand*{\Genacrfullformat}[2]{%
+ \glslongaccessdisplay{\Glsentrylong{#1}}{#1}#2\space
+ (\glsshortaccessdisplay{\protect\firstacronymfont{\Glsentryshort{#1}}}{#1})%
+}
+\renewcommand*{\genplacrfullformat}[2]{%
+ \glslongpluralaccessdisplay{\glsentrylongpl{#1}}{#1}#2\space
+ (\glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\glsentryshortpl{#1}}}{#1})%
+}
+\renewcommand*{\Genplacrfullformat}[2]{%
+ \glslongpluralaccessdisplay{\Glsentrylongpl{#1}}{#1}#2\space
+ (\glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\glsentryshortpl{#1}}}{#1})%
+}
\def\@acrshort#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
@@ -524,7 +657,6 @@
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
@@ -538,7 +670,6 @@
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
@@ -553,7 +684,6 @@
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
@@ -567,7 +697,6 @@
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
@@ -581,7 +710,6 @@
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\glslabel{#2}%
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
@@ -640,6 +768,391 @@
{\glsdescriptionaccessdisplay{#4}{#2}}%
{\glssymbolaccessdisplay{#5}{#2}}{#6}%
}
+\renewacronymstyle{long-short}%
+{%
+ \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}%
+}%
+{%
+ \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+ \renewcommand*{\genacrfullformat}[2]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}##2\space
+ (\glsshortaccessdisplay
+ {\protect\firstacronymfont{\glsentryshort{##1}}}{##1})%
+ }%
+ \renewcommand*{\Genacrfullformat}[2]{%
+ \glslongaccessdisplay{\Glsentrylong{##1}}{##1}##2\space
+ (\glsshortaccessdisplay
+ {\protect\firstacronymfont{\glsentryshort{##1}}}{##1})%
+ }%
+ \renewcommand*{\genplacrfullformat}[2]{%
+ \glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1}##2\space
+ (\glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\glsentryshortpl{##1}}}{##1})%
+ }%
+ \renewcommand*{\Genplacrfullformat}[2]{%
+ \glslongpluralaccessdisplay{\Glsentrylongpl{##1}}{##1}##2\space
+ (\glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\glsentryshortpl{##1}}}{##1})%
+ }%
+ \renewcommand*{\acronymentry}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}}
+ \renewcommand*{\acronymsort}[2]{##1}%
+ \renewcommand*{\acronymfont}[1]{##1}%
+ \renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}%
+ \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\renewacronymstyle{short-long}%
+{%
+ \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}%
+}%
+{%
+ \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+ \renewcommand*{\genacrfullformat}[2]{%
+ \glsshortaccessdisplay
+ {\protect\firstacronymfont{\glsentryshort{##1}}}{##1}##2\space
+ (\glslongaccessdisplay{\glsentrylong{##1}}{##1})%
+ }%
+ \renewcommand*{\Genacrfullformat}[2]{%
+ \glsshortaccessdisplay
+ {\protect\firstacronymfont{\Glsentryshort{##1}}}{##1}##2\space
+ (\glslongaccessdisplay{\glsentrylong{##1}}{##1})%
+ }%
+ \renewcommand*{\genplacrfullformat}[2]{%
+ \glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\glsentryshortpl{##1}}}{##1}##2\space
+ (\glslongpluralaccessdisplay
+ {\glsentrylongpl{##1}}{##1})%
+ }%
+ \renewcommand*{\Genplacrfullformat}[2]{%
+ \glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\Glsentryshortpl{##1}}}{##1}##2\space
+ (\glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1})%
+ }%
+ \renewcommand*{\acronymentry}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}}%
+ \renewcommand*{\acronymsort}[2]{##1}%
+ \renewcommand*{\acronymfont}[1]{##1}%
+ \renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}%
+ \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\renewacronymstyle{long-short-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{long-short}%
+}%
+{%
+ \GlsUseAcrStyleDefs{long-short}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{long-sc-short-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{long-sc-short}%
+}%
+{%
+ \GlsUseAcrStyleDefs{long-sc-short}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{long-sm-short-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{long-sm-short}%
+}%
+{%
+ \GlsUseAcrStyleDefs{long-sm-short}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{short-long-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{short-long}%
+}%
+{%
+ \GlsUseAcrStyleDefs{short-long}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{sc-short-long-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{sc-short-long}%
+}%
+{%
+ \GlsUseAcrStyleDefs{sc-short-long}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{sm-short-long-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{sm-short-long}%
+}%
+{%
+ \GlsUseAcrStyleDefs{sm-short-long}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{dua}%
+{%
+ \ifdefempty\glscustomtext
+ {%
+ \ifglshaslong{\glslabel}%
+ {%
+ \glsifplural
+ {%
+ \glscapscase
+ {%
+ \glslongpluralaccessdisplay{\glsentrylongpl{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ {%
+ \glslongpluralaccessdisplay{\Glsentrylongpl{\glslabel}}{\glslabel}%
+ \glsinsert
+ }%
+ {%
+ \glslongpluralaccessdisplay
+ {\mfirstucMakeUppercase{\glsentrylongpl{\glslabel}}}{\glslabel}%
+ \mfirstucMakeUppercase{\glsinsert}%
+ }%
+ }%
+ {%
+ \glscapscase
+ {%
+ \glslongaccessdisplay{\glsentrylong{\glslabel}}{\glslabel}\glsinsert
+ }%
+ {%
+ \glslongaccessdisplay{\Glsentrylong{\glslabel}}{\glslabel}\glsinsert
+ }%
+ {%
+ \glslongaccessdisplay
+ {\mfirstucMakeUppercase
+ {\glsentrylong{\glslabel}\glsinsert}}{\glslabel}%
+ \mfirstucMakeUppercase{\glsinsert}%
+ }%
+ }%
+ }%
+ {%
+ \glsgenentryfmt
+ }%
+ }%
+ {\glscustomtext\glsinsert}%
+}%
+{%
+ \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+ \renewcommand*{\acrfullfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glslongaccessdisplay{\glsentrylong{##2}}{##2}##3\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##2}}}{##2})}}%
+ \renewcommand*{\Acrfullfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glslongaccessdisplay{\Glsentrylong{##2}}{##2}##3\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##2}}}{##2})}}%
+ \renewcommand*{\ACRfullfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glslongaccessdisplay
+ {\mfirstucMakeUppercase{\glsentrylong{##2}}{##2}##3\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##2}}}{##2})}}}%
+ \renewcommand*{\acrfullplfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glslongpluralaccessdisplay
+ {\glsentrylongpl{##2}}{##2}##3\space
+ (\glsshortpluralaccessdisplay
+ {\acronymfont{\glsentryshortpl{##2}}}{##2})}}%
+ \renewcommand*{\Acrfullplfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glslongpluralaccessdisplay
+ {\Glsentrylongpl{##2}}{##2}##3\space
+ (\glsshortpluralaccessdisplay
+ {\acronymfont{\glsentryshortpl{##2}}}{##2})}}%
+ \renewcommand*{\ACRfullplfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glslongpluralaccessdisplay
+ {\mfirstucMakeUppercase{\glsentrylongpl{##2}}{##2}##3\space
+ (\glsshortpluralaccessdisplay
+ {\acronymfont{\glsentryshortpl{##2}}}{##2})}}}%
+ \renewcommand*{\glsentryfull}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})%
+ }%
+ \renewcommand*{\Glsentryfull}[1]{%
+ \glslongaccessdisplay{\Glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})%
+ }%
+ \renewcommand*{\glsentryfullpl}[1]{%
+ \glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1}\space
+ (\glsshortpluralaccessdisplay{\acronymfont{\glsentryshortpl{##1}}}{##1})%
+ }%
+ \renewcommand*{\Glsentryfullpl}[1]{%
+ \glslongpluralaccessdisplay{\Glsentrylongpl{##1}}{##1}\space
+ (\glsshortpluralaccessdisplay{\acronymfont{\glsentryshortpl{##1}}}{##1})%
+ }%
+ \renewcommand*{\acronymentry}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}}%
+ \renewcommand*{\acronymsort}[2]{##1}%
+ \renewcommand*{\acronymfont}[1]{##1}%
+ \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\renewacronymstyle{dua-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{dua}%
+}%
+{%
+ \GlsUseAcrStyleDefs{dua}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\acronymfont{\glsentrylong{##1}}}{##1}}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+}%
+\renewacronymstyle{footnote}%
+{%
+ \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}%
+}%
+{%
+ \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+ \glshyperfirstfalse
+ \renewcommand*{\genacrfullformat}[2]{%
+ \glsshortaccessdisplay
+ {\protect\firstacronymfont{\glsentryshort{##1}}}{##1}##2%
+ \protect\footnote{\glslongaccessdisplay{\glsentrylong{##1}}{##1}}%
+ }%
+ \renewcommand*{\Genacrfullformat}[2]{%
+ \glsshortaccessdisplay
+ {\firstacronymfont{\Glsentryshort{##1}}}{##1}##2%
+ \protect\footnote{\glslongaccessdisplay{\glsentrylong{##1}}{##1}}%
+ }%
+ \renewcommand*{\genplacrfullformat}[2]{%
+ \glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\glsentryshortpl{##1}}}{##1}##2%
+ \protect\footnote{\glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1}}%
+ }%
+ \renewcommand*{\Genplacrfullformat}[2]{%
+ \glsshortpluralaccessdisplay
+ {\protect\firstacronymfont{\Glsentryshortpl{##1}}}{##1}##2%
+ \protect\footnote{\glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1}}%
+ }%
+ \renewcommand*{\acronymentry}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}}%
+ \renewcommand*{\acronymsort}[2]{##1}%
+ \renewcommand*{\acronymfont}[1]{##1}%
+ \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrfullfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##2}}}{##2}##3\space
+ (\glslongaccessdisplay{\glsentrylong{##2}}{##2})}}%
+ \renewcommand*{\Acrfullfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glsshortaccessdisplay{\acronymfont{\Glsentryshort{##2}}}{##2}##3\space
+ (\glslongaccessdisplay{\glsentrylong{##2}}{##2})}}%
+ \renewcommand*{\ACRfullfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glsshortaccessdisplay
+ {\mfirstucMakeUppercase
+ {\acronymfont{\glsentryshort{##2}}}{##2}##3\space
+ (\glslongaccessdisplay{\glsentrylong{##2}}{##2})}}}%
+ \renewcommand*{\acrfullplfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glsshortpluralaccessdisplay
+ {\acronymfont{\glsentryshortpl{##2}}}{##2}##3\space
+ (\glslongpluralaccessdisplay{\glsentrylongpl{##2}}{##2})}}%
+ \renewcommand*{\Acrfullplfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glsshortpluralaccessdisplay
+ {\acronymfont{\Glsentryshortpl{##2}}}{##2}##3\space
+ (\glslongpluralaccessdisplay{\glsentrylongpl{##2}})}}%
+ \renewcommand*{\ACRfullplfmt}[3]{%
+ \glslink[##1]{##2}{%
+ \glsshortpluralaccessdisplay
+ {\mfirstucMakeUppercase
+ {\acronymfont{\glsentryshortpl{##2}}}{##2}##3\space
+ (\glslongpluralaccessdisplay{\glsentrylongpl{##2}}{##2})}}}%
+ \renewcommand*{\glsentryfull}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}\space
+ (\glslongaccessdisplay{\glsentrylong{##1}}{##1})}%
+ \renewcommand*{\Glsentryfull}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\Glsentryshort{##1}}}{##1}\space
+ (\glslongaccessdisplay{\glsentrylong{##1}}{##1})}%
+ \renewcommand*{\glsentryfullpl}[1]{%
+ \glsshortpluralaccessdisplay
+ {\acronymfont{\glsentryshortpl{##1}}}{##1}\space
+ (\glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1})}%
+ \renewcommand*{\Glsentryfullpl}[1]{%
+ \glsshortpluralaccessdisplay
+ {\acronymfont{\Glsentryshortpl{##1}}}{##1}\space
+ (\glslongpluralaccessdisplay{\glsentrylongpl{##1}}{##1})}%
+}
+\renewacronymstyle{footnote-sc}%
+{%
+ \GlsUseAcrEntryDispStyle{footnote}%
+}%
+{%
+ \GlsUseAcrStyleDefs{footnote}%
+ \renewcommand{\acronymentry}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}}
+ \renewcommand{\acronymfont}[1]{\textsc{##1}}%
+ \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+}%
+\renewacronymstyle{footnote-sm}%
+{%
+ \GlsUseAcrEntryDispStyle{footnote}%
+}%
+{%
+ \GlsUseAcrStyleDefs{footnote}%
+ \renewcommand{\acronymentry}[1]{%
+ \glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1}}
+ \renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
+ \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}%
+\renewacronymstyle{footnote-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{footnote}%
+}%
+{%
+ \GlsUseAcrStyleDefs{footnote}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{footnote-sc-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{footnote-sc}%
+}%
+{%
+ \GlsUseAcrStyleDefs{footnote-sc}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
+\renewacronymstyle{footnote-sm-desc}%
+{%
+ \GlsUseAcrEntryDispStyle{footnote-sm}%
+}%
+{%
+ \GlsUseAcrStyleDefs{footnote-sm}%
+ \renewcommand*{\GenericAcronymFields}{}%
+ \renewcommand*{\acronymsort}[2]{##2}%
+ \renewcommand*{\acronymentry}[1]{%
+ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space
+ (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}%
+}
\renewcommand*{\newacronymhook}{%
\edef\@gls@keylist{shortaccess=\the\glslongtok,%
\the\glskeylisttok}%
@@ -677,7 +1190,22 @@
\the\glskeylisttok
}%
}%
+ \let\@org@gls@assign@firstpl\gls@assign@firstpl
+ \let\@org@gls@assign@plural\gls@assign@plural
+ \let\@org@gls@assign@descplural\gls@assign@descplural
+ \def\gls@assign@firstpl##1##2{%
+ \@@gls@expand@field{##1}{firstpl}{##2}%
+ }%
+ \def\gls@assign@plural##1##2{%
+ \@@gls@expand@field{##1}{plural}{##2}%
+ }%
+ \def\gls@assign@descplural##1##2{%
+ \@@gls@expand@field{##1}{descplural}{##2}%
+ }%
\@do@newglossaryentry
+ \let\gls@assign@firstpl\@org@gls@assign@firstpl
+ \let\gls@assign@plural\@org@gls@assign@plural
+ \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
}
\renewcommand*{\DescriptionFootnoteNewAcronymDef}{%
\edef\@do@newglossaryentry{%
@@ -701,7 +1229,22 @@
\the\glskeylisttok
}%
}%
+ \let\@org@gls@assign@firstpl\gls@assign@firstpl
+ \let\@org@gls@assign@plural\gls@assign@plural
+ \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+ \def\gls@assign@firstpl##1##2{%
+ \@@gls@expand@field{##1}{firstpl}{##2}%
+ }%
+ \def\gls@assign@plural##1##2{%
+ \@@gls@expand@field{##1}{plural}{##2}%
+ }%
+ \def\gls@assign@symbolplural##1##2{%
+ \@@gls@expand@field{##1}{symbolplural}{##2}%
+ }%
\@do@newglossaryentry
+ \let\gls@assign@plural\@org@gls@assign@plural
+ \let\gls@assign@firstpl\@org@gls@assign@firstpl
+ \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
}
\renewcommand*{\DescriptionNewAcronymDef}{%
\edef\@do@newglossaryentry{%
@@ -730,7 +1273,22 @@
textaccess={\noexpand\@glo@shortaccess},%
\the\glskeylisttok}%
}%
+ \let\@org@gls@assign@firstpl\gls@assign@firstpl
+ \let\@org@gls@assign@plural\gls@assign@plural
+ \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+ \def\gls@assign@firstpl##1##2{%
+ \@@gls@expand@field{##1}{firstpl}{##2}%
+ }%
+ \def\gls@assign@plural##1##2{%
+ \@@gls@expand@field{##1}{plural}{##2}%
+ }%
+ \def\gls@assign@symbolplural##1##2{%
+ \@@gls@expand@field{##1}{symbolplural}{##2}%
+ }%
\@do@newglossaryentry
+ \let\gls@assign@firstpl\@org@gls@assign@firstpl
+ \let\gls@assign@plural\@org@gls@assign@plural
+ \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
}
\renewcommand*{\FootnoteNewAcronymDef}{%
\edef\@do@newglossaryentry{%
@@ -752,7 +1310,22 @@
\the\glskeylisttok
}%
}%
+ \let\@org@gls@assign@plural\gls@assign@plural
+ \let\@org@gls@assign@firstpl\gls@assign@firstpl
+ \let\@org@gls@assign@descplural\gls@assign@descplural
+ \def\gls@assign@firstpl##1##2{%
+ \@@gls@expand@field{##1}{firstpl}{##2}%
+ }%
+ \def\gls@assign@plural##1##2{%
+ \@@gls@expand@field{##1}{plural}{##2}%
+ }%
+ \def\gls@assign@descplural##1##2{%
+ \@@gls@expand@field{##1}{descplural}{##2}%
+ }%
\@do@newglossaryentry
+ \let\gls@assign@plural\@org@gls@assign@plural
+ \let\gls@assign@firstpl\@org@gls@assign@firstpl
+ \let\gls@assign@descplural\@org@gls@assign@descplural
}
\renewcommand*{\SmallNewAcronymDef}{%
\edef\@do@newglossaryentry{%
@@ -781,50 +1354,70 @@
\the\glskeylisttok
}%
}%
+ \let\@org@gls@assign@firstpl\gls@assign@firstpl
+ \let\@org@gls@assign@plural\gls@assign@plural
+ \let\@org@gls@assign@descplural\gls@assign@descplural
+ \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+ \def\gls@assign@firstpl##1##2{%
+ \@@gls@expand@field{##1}{firstpl}{##2}%
+ }%
+ \def\gls@assign@plural##1##2{%
+ \@@gls@expand@field{##1}{plural}{##2}%
+ }%
+ \def\gls@assign@descplural##1##2{%
+ \@@gls@expand@field{##1}{descplural}{##2}%
+ }%
+ \def\gls@assign@symbolplural##1##2{%
+ \@@gls@expand@field{##1}{symbolplural}{##2}%
+ }%
\@do@newglossaryentry
+ \let\gls@assign@firstpl\@org@gls@assign@firstpl
+ \let\gls@assign@plural\@org@gls@assign@plural
+ \let\gls@assign@descplural\@org@gls@assign@descplural
+ \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
}
\newcommand*{\glsshortaccesskey}{\glsshortkey access}%
\newcommand*{\glsshortpluralaccesskey}{\glsshortpluralkey access}%
\newcommand*{\glslongaccesskey}{\glslongkey access}%
\newcommand*{\glslongpluralaccesskey}{\glslongpluralkey access}%
\newcommand*{\showglonameaccess}[1]{%
- \expandafter\show\csname glo@#1@textaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@textaccess\endcsname
}
\newcommand*{\showglotextaccess}[1]{%
- \expandafter\show\csname glo@#1@textaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@textaccess\endcsname
}
\newcommand*{\showglopluralaccess}[1]{%
- \expandafter\show\csname glo@#1@pluralaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@pluralaccess\endcsname
}
\newcommand*{\showglofirstaccess}[1]{%
- \expandafter\show\csname glo@#1@firstaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@firstaccess\endcsname
}
\newcommand*{\showglofirstpluralaccess}[1]{%
- \expandafter\show\csname glo@#1@firstpluralaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@firstpluralaccess\endcsname
}
\newcommand*{\showglosymbolaccess}[1]{%
- \expandafter\show\csname glo@#1@symbolaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@symbolaccess\endcsname
}
\newcommand*{\showglosymbolpluralaccess}[1]{%
- \expandafter\show\csname glo@#1@symbolpluralaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@symbolpluralaccess\endcsname
}
\newcommand*{\showglodescaccess}[1]{%
- \expandafter\show\csname glo@#1@descaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@descaccess\endcsname
}
\newcommand*{\showglodescpluralaccess}[1]{%
- \expandafter\show\csname glo@#1@descpluralaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@descpluralaccess\endcsname
}
\newcommand*{\showgloshortaccess}[1]{%
- \expandafter\show\csname glo@#1@shortaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@shortaccess\endcsname
}
\newcommand*{\showgloshortpluralaccess}[1]{%
- \expandafter\show\csname glo@#1@shortpluralaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@shortpluralaccess\endcsname
}
\newcommand*{\showglolongaccess}[1]{%
- \expandafter\show\csname glo@#1@longaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@longaccess\endcsname
}
\newcommand*{\showglolongpluralaccess}[1]{%
- \expandafter\show\csname glo@#1@longpluralaccess\endcsname
+ \expandafter\show\csname glo@\glsdetoklabel{#1}@longpluralaccess\endcsname
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
index f6f9ca6f80d..b511719400d 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-hypernav.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
index 49329c6bbec..11a6e98494f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-inline.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
index 3f9e207dc89..6476799549c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-list.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
index 82adcae3aab..19689903576 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-long.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
index 3374df02639..5d40e29467a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-longragged.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
index bf8a64521c8..8e519073513 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-mcols.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
index 39748f84638..63dfc412197 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-super.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
index 58631275dd1..a4ac46d5631 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-superragged.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 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/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
index b84359acecd..74c4f0c18f3 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-tree.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3