summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-14 22:32:40 +0000
committerKarl Berry <karl@freefriends.org>2020-02-14 22:32:40 +0000
commitf8984c096c7871551016e012a01478e1a193fccd (patch)
tree8713cc0e08398842b20895b396e2b799138dcc3b /Master/texmf-dist/tex/latex/glossaries-extra
parentac2299dd56d45edf3052e6b12fe27f79bf65527d (diff)
glossaries-extra (14feb20)
git-svn-id: svn://tug.org/texlive/trunk@53780 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty20
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty77
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty1325
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty7
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty4
7 files changed, 1142 insertions, 297 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex b/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex
index 18f24b920de..64b733582da 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `example-glossaries-xr.tex,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
index 218686c492a..6f47e1b1c3f 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `glossaries-extra-bib2gls.sty,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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-extra-bib2gls}[2019/04/09 v1.41 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2020/02/13 v1.42 (NLCT)]
\ifglsacronym
\providecommand*{\printunsrtacronyms}[1][]{%
\printunsrtglossary[type=\acronymtype,#1]}%
@@ -64,6 +64,17 @@
\providecommand*{\printunsrtabbreviations}[1][]{%
\printunsrtglossary[type=abbreviations,#1]}%
}{}
+\renewcommand*{\glsdisplaynumberlist}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ {\let\bibglsdelimN\glsnumlistsep
+ \let\bibglslastDelimN\glsnumlistlastsep
+ \glsxtrusefield{#1}{location}%
+ }%
+ }%
+}
+\robustify\glsdisplaynumberlist
+\renewcommand*{\glsentrynumberlist}[1]{\glsxtrusefield{#1}{location}}
\newcommand*{\glshex}{\string\u}
\newcommand*{\glscapturedgroup}{\string\$}
\newcommand*{\GlsXtrIfHasNonZeroChildCount}[3]{%
@@ -155,8 +166,8 @@
}
{
\newcommand*{\glsxtrdisplaylocnameref}[8]{%
- \ifstrequal{#2}{equation}%
- {\glsxtrnamereflink{#3}{(#4)}{#2.#7}{#8}}%
+ \ifcsdef{glsxtr#2locfmt}%
+ {\glsxtrnamereflink{#3}{\csuse{glsxtr#2locfmt}{#4}{#5}}{#2.#7}{#8}}%
{%
\ifstrempty{#5}%
{%
@@ -170,6 +181,7 @@
}%
}
}
+\newcommand*{\glsxtrequationlocfmt}[2]{(#1)}
\newcommand*{\glsxtrnamereflink}[4]{%
\begingroup
\let\glshypernumber\@firstofone
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
index 7d67e17cfd5..4fe9f4b3143 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `glossaries-extra-stylemods.sty,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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-extra-stylemods}[2019/04/09 v1.41 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2020/02/13 v1.42 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption{all}{%
\appto\@glsxtr@loadstyles{%
@@ -546,7 +546,8 @@
{
\newcommand*{\glstreeprelocation}{\glsxtrprelocation}
\newcommand*{\glstreechildprelocation}{\glstreeprelocation}
- \newcommand{\glstreegroupskip}{\nopagebreak\indexspace\nobreak}
+ \newcommand{\glstreegroupskip}{\indexspace}
+ \newcommand{\glstreegroupheaderskip}{\nopagebreak\glstreegroupskip\nobreak}
\renewglossarystyle{index}{%
\renewenvironment{theglossary}%
{\setlength{\parindent}{0pt}%
@@ -589,7 +590,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\item\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}
@@ -600,13 +601,13 @@
\setglossarystyle{index}%
\renewcommand*{\glossaryheader}{%
\item\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\item\glstreegroupheaderfmt
{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
}%
}
{}
@@ -618,9 +619,10 @@
\newcommand{\glstreeDescLoc}[2]{%
\ifglshasdesc{#1}%
{\glstreedesc{#1}\glstreeprelocation}%
- {\ifglshassymbol{#1}{\glstreeprelocation}{}}%
+ {\ifglshassymbol{#1}{\glstreeprelocation}{\glstreeNoDescSymbolPreLocation}}%
#2%
}
+ \newcommand{\glstreeNoDescSymbolPreLocation}{\space}
\newcommand{\glstreesymbol}[1]{%
\ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}%
}%
@@ -630,7 +632,9 @@
\newcommand{\glstreeChildDescLoc}[2]{%
\ifglshasdesc{#1}%
{\glstreechilddesc{#1}\glstreechildprelocation}%
- {\ifglshassymbol{#1}{\glstreechildprelocation}{}}%
+ {\ifglshassymbol{#1}{\glstreechildprelocation}%
+ {\glstreeNoDescSymbolPreLocation}%
+ }%
#2%
}%
\newcommand{\glstreechildsymbol}[1]{%
@@ -672,7 +676,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
}
}
{}
@@ -682,14 +686,14 @@
\setglossarystyle{tree}%
\renewcommand*{\glossaryheader}{%
\par\noindent\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent
\glstreegroupheaderfmt
{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
}
}
{}
@@ -717,7 +721,7 @@
\glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
\glstreenonamesymbol{##1}%
\glstreenonamedesc{##1}%
- \glstreeprelocation##2\par
+ \glstreeDescLoc{##1}{##2}\par
}%
\renewcommand{\subglossentry}[3]{%
\hangindent##1\glstreeindent\relax
@@ -741,7 +745,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}
@@ -752,13 +756,13 @@
\setglossarystyle{treenoname}%
\renewcommand*{\glossaryheader}{%
\par\noindent\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
}
}
{}
@@ -768,9 +772,8 @@
{%
\let\par\glsxtrAltTreePar
\ifglshassymbol{#1}{(\glossentrysymbol{#1})\space}{}%
- \ifglshasdesc{#1}%
- {\glossentrydesc{#1}\glspostdescription\glstreeprelocation}{}%
- #2\par
+ \ifglshasdesc{#1}{\glossentrydesc{#1}\glspostdescription}{}%
+ \glstreeDescLoc{#1}{#2}\par
}%
}
\newlength\glsxtrAltTreeIndent
@@ -1242,7 +1245,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
}%
}%
@@ -1258,7 +1261,7 @@
\hangindent0pt\relax
\parindent0pt\relax
\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
@@ -1268,7 +1271,7 @@
\hangindent0pt\relax
\parindent0pt\relax
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
}
}%
@@ -1282,7 +1285,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\item\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1294,14 +1297,14 @@
\setglossarystyle{mcolindex}%
\renewcommand*{\glossaryheader}{%
\item\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip
+ \glstreegroupheaderskip\@afterheading
}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\item\glstreegroupheaderfmt
{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1323,7 +1326,7 @@
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\item\glstreegroupheaderfmt
{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1337,7 +1340,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1349,14 +1352,14 @@
\setglossarystyle{mcoltree}%
\renewcommand*{\glossaryheader}{%
\par\noindent\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1379,7 +1382,7 @@
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1393,7 +1396,7 @@
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip\@afterheading
+ \glstreegroupheaderskip\@afterheading
}%
}
}%
@@ -1405,14 +1408,14 @@
\setglossarystyle{mcoltreenoname}%
\renewcommand*{\glossaryheader}{%
\par\noindent\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
}
}%
{%
@@ -1434,7 +1437,7 @@
\glstreePreHeader{##1}{\glsxtr@grptitle}%
\par\noindent
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip\@afterheading}%
+ \glstreegroupheaderskip\@afterheading}%
}
}%
{%
@@ -1466,7 +1469,7 @@
\hangindent0pt\relax
\parindent0pt\relax
\glstreegroupheaderfmt{\glsxtr@grptitle}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
}
}%
@@ -1482,7 +1485,7 @@
\hangindent0pt\relax
\parindent0pt\relax
\glstreenavigationfmt{\glsnavigation}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
\renewcommand*{\glsgroupheading}[1]{%
\glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
@@ -1492,7 +1495,7 @@
\hangindent0pt\relax
\parindent0pt\relax
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
}
}%
@@ -1518,7 +1521,7 @@
\hangindent0pt\relax
\parindent0pt\relax
\glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
- \glstreegroupskip
+ \glstreegroupheaderskip
}%
}
}%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
index 9246f55b5d7..61c52fbbca0 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `glossaries-extra.sty,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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-extra}[2019/04/09 v1.41 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2020/02/13 v1.42 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -159,12 +159,12 @@
\@glsxtr@do@record@wrglossary{#1}%
}
\newcommand*{\@@glsxtr@record}[3]{%
+ \edef\@gls@label{\glsdetoklabel{#2}}%
+ \let\glslabel\@gls@label
\ifglsentryexists{#2}{}%
{%
\@@glsxtrwrglossmark
\begingroup
- \edef\@gls@label{\glsdetoklabel{#2}}%
- \let\glslabel\@gls@label
\let\@glsnumberformat\@glsxtr@defaultnumberformat
\def\@glsxtr@thevalue{}%
\def\@glsxtr@theHvalue{\@glsxtr@thevalue}%
@@ -661,6 +661,9 @@
\newcommand*{\@glsxtr@doaccsupp}{}
\@glsxtr@declareoption{accsupp}{%
\renewcommand*{\@glsxtr@doaccsupp}{\RequirePackage{glossaries-accsupp}}}
+\newcommand*{\@glsxtr@doloadprefix}{}
+\@glsxtr@declareoption{prefix}{%
+ \renewcommand*{\@glsxtr@doloadprefix}{\RequirePackage{glossaries-prefix}}}
\newcommand{\glsxtrNoGlossaryWarning}[1]{%
\GlossariesExtraWarning{Glossary `#1' is missing}%
\@glsxtr@defaultnoglossarywarning{#1}%
@@ -756,7 +759,7 @@
\newcommand*{\glsxtrwrglossmark}{\ensuremath{\cdot}}
\define@choicekey{glossaries-extra.sty}{debug}
[\@glsxtr@debugval\@glsxtr@debugnr]%
- {true,false,showtargets,showwrgloss,all}[true]{%
+ {true,false,showtargets,showwrgloss,all,showaccsupp}[true]{%
\ifcase\@glsxtr@debugnr\relax % true
\glsxtr@dooption{debug=true}%
\renewcommand*{\@glsxtrwrglossmark}{}%
@@ -769,8 +772,10 @@
\glsxtr@dooption{debug=true}%
\renewcommand*{\@glsxtrwrglossmark}{\glsxtrwrglossmark}%
\or % all
- \glsxtr@dooption{debug=showtargets}%
+ \glsxtr@dooption{debug=showtargets,debug=showaccsupp}%
\renewcommand*{\@glsxtrwrglossmark}{\glsxtrwrglossmark}%
+ \or % showaccsupp
+ \glsxtr@dooption{debug=showaccsupp}%
\fi
}
\DeclareOptionX*{%
@@ -778,22 +783,44 @@
\ProcessOptionsX
\RequirePackage{glossaries}
\@glsxtr@doaccsupp
+\@glsxtr@doloadprefix
\@glsxtr@defpostpunc
-\def\glsshowtarget#1{%
- \glsxtrtitleorpdforheading
- {%
- \ifmmode
- \texttt{\small [#1]}%
- \else
- \ifinner
+\ifdef\glsshowtargetouter
+{
+ \renewcommand*{\glsshowtarget}[1]{%
+ \glsxtrtitleorpdforheading
+ {%
+ \ifmmode
+ \nfss@text{\glsshowtargetfont [#1]}%
+ \else
+ \ifinner
+ {\glsshowtargetfont [#1]}%
+ \else
+ \glsshowtargetouter{#1}%
+ \fi
+ \fi
+ }%
+ {[#1]}%
+ {{\protect\glsshowtargetfont [#1]}}%
+ }
+}
+{
+ \def\glsshowtarget#1{%
+ \glsxtrtitleorpdforheading
+ {%
+ \ifmmode
\texttt{\small [#1]}%
\else
- \marginpar{\texttt{\small #1}}%
+ \ifinner
+ \texttt{\small [#1]}%
+ \else
+ \marginpar{\texttt{\small #1}}%
+ \fi
\fi
- \fi
- }%
- {[#1]}%
- {\texttt{\small [#1]}}%
+ }%
+ {[#1]}%
+ {\texttt{\small [#1]}}%
+ }
}
\let\@glsxtr@org@doseeglossary\@do@seeglossary
\newcommand*{\@glsxtr@doseeglossary}[2]{%
@@ -831,16 +858,19 @@
\@glsxtr@setupshortcuts
\@glsxtr@redef@forglsentries
\renewcommand{\glsxtr@dooption}[1]{\setupglossaries{#1}}%
+\disable@keys{glossaries-extra.sty}{accsupp}
\newcommand*{\glossariesextrasetup}[1]{%
\let\glsxtr@setup@record\relax
\let\@glsxtr@setupshortcuts\relax
\let\@glsxtr@redef@forglsentries\relax
+ \let\@glsxtr@doloadprefix\relax
\setkeys{glossaries-extra.sty}{#1}%
\@glsxtr@abbreviationsdef
\let\@glsxtr@abbreviationsdef\relax
\@glsxtr@setupshortcuts
\glsxtr@setup@record
\@glsxtr@redef@forglsentries
+ \@glsxtr@doloadprefix
}
\let\glsxtr@org@@do@wrglossary\@@do@wrglossary
\newcommand*{\glsxtr@@do@wrglossary}[1]{%
@@ -977,22 +1007,26 @@
\ifdef\texorpdfstring
{
\newcommand*{\glsxtrentryfmt}[2]{%
- \texorpdfstring{\@glsxtrentryfmt{#1}{#2}}{#2}%
+ \texorpdfstring{\@glsxtrentryfmt{#1}{#2}}{\glsxtrpdfentryfmt{#1}{#2}}%
}
}
{
\newcommand*{\glsxtrentryfmt}{\@glsxtrentryfmt}
}
+\newcommand*{\glsxtrpdfentryfmt}[2]{#2}
\newrobustcmd*{\@glsxtrentryfmt}[2]{%
- \glsdoifexistsordo{#1}%
{%
- \ifglshasfield{\GlsXtrFmtField}{#1}%
+ \def\glslabel{#1}%
+ \glsdoifexistsordo{#1}%
{%
- \csuse{\glscurrentfieldvalue}{#2}%
+ \ifglshasfield{\GlsXtrFmtField}{#1}%
+ {%
+ \csuse{\glscurrentfieldvalue}{#2}%
+ }%
+ {#2}%
}%
{#2}%
}%
- {#2}%
}
\newcommand*{\glsxtrfieldlistadd}[3]{%
\listcsadd{glo@\glsdetoklabel{#1}@#2}{#3}%
@@ -1012,6 +1046,16 @@
\newcommand*{\glsxtrfieldforlistloop}[3]{%
\forlistcsloop{#3}{glo@\glsdetoklabel{#1}@#2}%
}
+\newrobustcmd*{\glsxtrfieldformatlist}[2]{%
+ \begingroup
+ \def\@dtl@formatlist@itemsep{}%
+ \def\@dtl@formatlist@lastitem{}%
+ \def\@dtl@formatlist@prelastitem{}%
+ \def\@dtl@formatlist@prelastitemsep{}%
+ \forlistcsloop{\@dtl@formatlist@handler}{glo@\glsdetoklabel{#1}@#2}%
+ \@dtl@formatlist@prelastitem\@dtl@formatlist@lastitem
+ \endgroup
+}
\newcommand*{\glsxtrfieldifinlist}[5]{%
\ifinlistcs{#3}{glo@\glsdetoklabel{#1}@#2}{#4}{#5}%
}
@@ -1026,6 +1070,30 @@
{\expandafter#3\expandafter{\@glsxtr@label}}}%
{}%
}
+\newrobustcmd*{\glsxtrfieldformatcsvlist}[2]{%
+ \@glsxtrifhasfield{#2}{#1}%
+ {\@dtlformatlist\glscurrentfieldvalue}%
+ {}%
+}
+\newcommand*{\GlsXtrIfFieldValueInCsvList}{%
+ \@ifstar\s@GlsXtrIfFieldValueInCsvList\@GlsXtrIfFieldValueInCsvList
+}
+\newcommand*{\@GlsXtrIfFieldValueInCsvList}[5]{%
+ \@glsxtrifhasfield{#2}{#1}%
+ {%
+ \expandafter\DTLifinlist\expandafter{\glscurrentfieldvalue}%
+ {#3}{#4}{#5}%
+ }%
+ {#5}%
+}
+\newcommand*{\s@GlsXtrIfFieldValueInCsvList}[5]{%
+ \s@glsxtrifhasfield{#2}{#1}%
+ {%
+ \expandafter\DTLifinlist\expandafter{\glscurrentfieldvalue}%
+ {#3}{#4}{#5}%
+ }%
+ {#5}%
+}
\newrobustcmd{\glsxtrifhasfield}{%
\@ifstar{\s@glsxtrifhasfield}{\@glsxtrifhasfield}%
}
@@ -1334,6 +1402,11 @@
\GlossariesExtraWarning{Glossary `#1' is not defined}%
}%
}
+\ifdef\@gls@entry@field
+{
+ \renewcommand*{\@gls@entry@field}[2]{\csuse{glo@\glsdetoklabel{#1}@#2}}
+}
+{}
\renewcommand*{\ifglsused}[3]{%
\glsdoifexists{#1}{\ifbool{glo@\glsdetoklabel{#1}@flag}{#2}{#3}}%
}
@@ -1601,7 +1674,7 @@
\glsseeformat[#1]{#2}{}%
}
\renewcommand*{\glsseeitemformat}[1]{%
- \ifglshasshort{#1}{\glsaccesstext{#1}}{\glsaccessname{#1}}%
+ \ifglshasshort{#1}{\glsfmttext{#1}}{\glsfmtname{#1}}%
}
\newcommand*{\glsxtrhiername}[1]{%
\glsdoifexists{#1}%
@@ -1609,7 +1682,7 @@
\glsxtrifhasfield{parent}{#1}%
{\glsxtrhiername{\glscurrentfieldvalue}\glsxtrhiernamesep}%
{}%
- \ifglshasshort{#1}{\glsaccessshort{#1}}{\glsaccessname{#1}}%
+ \ifglshasshort{#1}{\glsfmttext{#1}}{\glsfmtname{#1}}%
}%
}
\newcommand*{\Glsxtrhiername}[1]{%
@@ -1618,9 +1691,9 @@
\glsxtrifhasfield{parent}{#1}%
{%
\Glsxtrhiername{\glscurrentfieldvalue}\glsxtrhiernamesep
- \ifglshasshort{#1}{\glsaccessshort{#1}}{\glsaccessname{#1}}%
+ \ifglshasshort{#1}{\glsfmttext{#1}}{\glsfmtname{#1}}%
}%
- {\ifglshasshort{#1}{\Glsaccessshort{#1}}{\Glsaccessname{#1}}}%
+ {\ifglshasshort{#1}{\Glsfmttext{#1}}{\Glsfmtname{#1}}}%
}%
}
\newcommand*{\GlsXtrhiername}[1]{%
@@ -1629,7 +1702,7 @@
\glsxtrifhasfield{parent}{#1}%
{\GlsXtrhiername{\glscurrentfieldvalue}\glsxtrhiernamesep}%
{}%
- \ifglshasshort{#1}{\Glsaccessshort{#1}}{\Glsaccessname{#1}}%
+ \ifglshasshort{#1}{\Glsfmttext{#1}}{\Glsfmtname{#1}}%
}%
}
\newcommand*{\GLSxtrhiername}[1]{%
@@ -1638,9 +1711,9 @@
\glsxtrifhasfield{parent}{#1}%
{%
\GLSxtrhiername{\glscurrentfieldvalue}\glsxtrhiernamesep
- \ifglshasshort{#1}{\glsaccessshort{#1}}{\glsaccessname{#1}}%
+ \ifglshasshort{#1}{\glsfmttext{#1}}{\glsfmtname{#1}}%
}%
- {\ifglshasshort{#1}{\GLSaccessshort{#1}}{\GLSaccessname{#1}}}%
+ {\ifglshasshort{#1}{\GLSfmttext{#1}}{\GLSfmtname{#1}}}%
}%
}
\newcommand*{\GLSXTRhiername}[1]{%
@@ -1649,7 +1722,7 @@
\glsxtrifhasfield{parent}{#1}%
{\GLSXTRhiername{\glscurrentfieldvalue}\glsxtrhiernamesep}%
{}
- \ifglshasshort{#1}{\GLSaccessshort{#1}}{\GLSaccessname{#1}}%
+ \ifglshasshort{#1}{\GLSfmttext{#1}}{\GLSfmtname{#1}}%
}%
}
\newcommand*{\glsxtrhiernamesep}{\,{\small$\triangleright$}\,}
@@ -1664,13 +1737,26 @@
}%
}%
}
+\newcommand*{\glsxtrusealias}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \letcs{\@glo@see}{glo@\glsdetoklabel{#1}@alias}%
+ \ifdefempty\@glo@see
+ {}%
+ {%
+ \glsxtruseseeformat{\seename}{\@glo@see}%
+ }%
+ }%
+}
\newcommand*{\glsxtruseseealsoformat}[1]{%
\glsseeformat[\seealsoname]{#1}{}%
}
\newrobustcmd{\glsxtrseelist}[1]{%
\edef\@glo@tmp{\noexpand\glsseelist{#1}}\@glo@tmp
}
-\providecommand{\seealsoname}{see also}
+\ifdef\alsoname
+{\providecommand{\seealsoname}{\alsoname}}
+{\providecommand{\seealsoname}{see also}}
\ifdef\@xdycrossrefhook
{
\appto\@xdycrossrefhook{%
@@ -1855,6 +1941,8 @@
}
\let\glsxtr@orgmakenoidxglossaries\makenoidxglossaries
\renewcommand{\makenoidxglossaries}{%
+ \@domakeglossaries
+ {%
\ifdefequal\@glsxtr@record@setting\@glsxtr@record@setting@off
{%
\glsxtr@orgmakenoidxglossaries
@@ -1893,6 +1981,7 @@
{You may only use \string\makenoidxglossaries\ space with the
record=off option}%
}%
+ }%
}
\renewcommand*{\gls@defdocnewglossaryentry}{%
\ifcase\@glsxtr@docdefval
@@ -2726,7 +2815,14 @@
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
{#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}}%
}
+\newcommand*{\@@glsxtr@base@acrcmd@warn}[2]{%
+ \GlossariesExtraWarning{Base acronym command \string#1\space
+ should not be used with new abbreviation definitions. Use
+ \string#2\space instead}%
+}
+\let\@glsxtr@base@acrcmd\@@glsxtr@base@acrcmd@warn
\def\@acrshort#1#2[#3]{%
+ \@glsxtr@base@acrcmd\acrshort\glsxtrshort
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2742,6 +2838,7 @@
\glspostlinkhook
}
\def\@Acrshort#1#2[#3]{%
+ \@glsxtr@base@acrcmd\Acrshort\Glsxtrshort
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2757,6 +2854,7 @@
\glspostlinkhook
}
\def\@ACRshort#1#2[#3]{%
+ \@glsxtr@base@acrcmd\ACRshort\GLSxtrshort
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2772,6 +2870,7 @@
\glspostlinkhook
}
\def\@acrshortpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\acrshortpl\glsxtrshortpl
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2787,6 +2886,7 @@
\glspostlinkhook
}
\def\@Acrshortpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\Acrshortpl\Glsxtrshortpl
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2802,6 +2902,7 @@
\glspostlinkhook
}
\def\@ACRshortpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\ACRshortpl\GLSxtrshortpl
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2817,6 +2918,7 @@
\glspostlinkhook
}
\def\@acrlong#1#2[#3]{%
+ \@glsxtr@base@acrcmd\acrlong\glsxtrlong
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2832,6 +2934,7 @@
\glspostlinkhook
}
\def\@Acrlong#1#2[#3]{%
+ \@glsxtr@base@acrcmd\Acrlong\Glsxtrlong
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2847,6 +2950,7 @@
\glspostlinkhook
}
\def\@ACRlong#1#2[#3]{%
+ \@glsxtr@base@acrcmd\ACRlong\GLSxtrlong
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2862,6 +2966,7 @@
\glspostlinkhook
}
\def\@acrlongpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\acrlongpl\glsxtrlongpl
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2877,6 +2982,7 @@
\glspostlinkhook
}
\def\@Acrlongpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\Acrlongpl\Glsxtrlongpl
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2892,6 +2998,7 @@
\glspostlinkhook
}
\def\@ACRlongpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\ACRlongpl\GLSxtrlongpl
\glsdoifexists{#2}%
{%
\let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper
@@ -2906,6 +3013,30 @@
}%
\glspostlinkhook
}
+\def\@acrfull#1#2[#3]{%
+ \@glsxtr@base@acrcmd\acrfull\glsxtrfull
+ \acrfullfmt{#1}{#2}{#3}%
+}
+\def\@Acrfull#1#2[#3]{%
+ \@glsxtr@base@acrcmd\Acrfull\Glsxtrfull
+ \Acrfullfmt{#1}{#2}{#3}%
+}
+\def\@ACRfull#1#2[#3]{%
+ \@glsxtr@base@acrcmd\ACRfull\GLSxtrfull
+ \ACRfullfmt{#1}{#2}{#3}%
+}
+\def\@acrfullpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\acrfullpl\glsxtrfullpl
+ \acrfullplfmt{#1}{#2}{#3}%
+}
+\def\@Acrfullpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\Acrfullpl\Glsxtrfullpl
+ \Acrfullplfmt{#1}{#2}{#3}%
+}
+\def\@ACRfullpl#1#2[#3]{%
+ \@glsxtr@base@acrcmd\ACRfullpl\GLSxtrfullpl
+ \ACRfullplfmt{#1}{#2}{#3}%
+}
\renewcommand*{\@glsaddkey}[7]{%
\key@ifundefined{glossentry}{#1}%
{%
@@ -3115,6 +3246,15 @@
\newcommand*{\@gls@alt@hyp@opt@keys}{}
\newcommand*{\GlsXtrSetAltModifier}[2]{%
\let\@gls@hyp@opt\@gls@alt@hyp@opt
+ \ifstrequal{#1}{+}%
+ {\PackageError{glossaries-extra}%
+ {Can't use '#1' as modifier (it's already in use)}{}}%
+ {%
+ \ifstrequal{#1}{*}%
+ {\PackageError{glossaries-extra}%
+ {Can't use '#1' as modifier (it's already in use)}{}}%
+ {}%
+ }%
\def\@gls@alt@hyp@opt@char{#1}%
\def\@gls@alt@hyp@opt@keys{#2}%
\ifdefequal\@glsxtr@record@setting\@glsxtr@record@setting@off
@@ -3130,13 +3270,13 @@
\renewcommand*{\glsnavhyperlink}[3][\@glo@type]{%
\edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
{%
- \let\glsdohyperlink\glsxtr@org@dohyperlink
+ \let\glsxtrdohyperlink\glsxtr@org@dohyperlink
\@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}%
}%
}%
}
{}
-\renewcommand*{\glsdohyperlink}[2]{%
+\newcommand*{\glsxtrdohyperlink}[2]{%
\glshasattribute{\glslabel}{targeturl}%
{%
\glshasattribute{\glslabel}{targetname}%
@@ -3199,7 +3339,7 @@
}
\renewcommand{\glsenablehyper}{%
\KV@glslink@hypertrue
- \def\@glslink{\glsdohyperlink}%
+ \def\@glslink{\glsxtrdohyperlink}%
\def\@glstarget{\glsdohypertarget}%
}
\def\glsdonohyperlink#1#2{{\glsxtrprotectlinks #2}}
@@ -3208,7 +3348,7 @@
\def\@glslink{\glsdonohyperlink}
}%
{%
- \def\@glslink{\glsdohyperlink}
+ \def\@glslink{\glsxtrdohyperlink}
}
\newcommand*{\glsxtrprotectlinks}{%
\KV@glslink@hyperfalse
@@ -3567,6 +3707,10 @@
\forlistloop\@glslocalunset\@glsxtr@unset@buffer
\let\@glsunset\@glsxtr@unset
}
+\newcommand*{\GlsXtrDiscardUnsetBuffering}{%
+ \let\@glsunset\@glsxtr@unset
+ \let\@glsxtr@unset@buffer\@glsxtr@org@unset@buffer
+}
\newcommand*{\GlsXtrForUnsetBufferedList}[1]{%
\forlistloop#1\@glsxtr@unset@buffer
}
@@ -4065,6 +4209,13 @@
}%
}
\renewcommand*{\SetGenericNewAcronym}{%
+ \ifdefequal\@addtoacronymlists\@glsxtr@org@addtoacronynlists
+ {}%
+ {%
+ \GlossariesWarning{\string\SetGenericNewAcronym\space used
+ without restoring base acronym functions with
+ \string\RestoreAcronyms}%
+ }%
\let\@Gls@entryname\@Gls@acrentryname
\renewcommand{\newacronym}[4][]{%
\ifdefempty{\@glsacronymlists}%
@@ -4118,7 +4269,39 @@
}
\let\@glsxtr@org@setacronymstyle\setacronymstyle
\let\@glsxtr@org@newacronymstyle\newacronymstyle
+\let\@glsxtr@acronymlists\@glsacronymlists
+\let\@glsxtr@org@addtoacronynlists\@addtoacronymlists
+\let\@glsxtr@org@setacronymlists\SetAcronymLists
+\newcommand{\@glsxtr@abbrlists}{}
+\newcommand*{\forallabbreviationlists}[2]{%
+ \@for#1:=\@glsxtr@abbrlists\do{\ifdefempty{#1}{}{#2}}%
+}
+\newcommand*{\@glsxtr@addabbreviationlist}[1]{%
+ \edef\@glo@type{#1}%
+ \ifdefempty\@glsxtr@abbrlists
+ {\let\@glsxtr@abbrlists\@glo@type}%
+ {%
+ \ifdefequal\@glsxtr@abbrlists\@glo@type
+ {}%
+ {%
+ \expandafter\DTLifinlist\expandafter{\@glo@type}{\@glsxtr@abbrlists}{}%
+ {\eappto\@glsxtr@abbrlists{,\@glo@type}}%
+ }%
+ }%
+}
+\renewcommand*{\forallacronyms}[2]{%
+ \@glsxtr@base@acrcmd\forallacronyms\forallabbreviationlists
+ \@for#1:=\@glsacronymlists\do{\ifx#1\@empty\else#2\fi}%
+}
\newcommand*{\MakeAcronymsAbbreviations}{%
+ \@for\@gls@type:=\@glsacronymlists\do{%
+ \csgdef{gls@\@gls@type @entryfmt}{\glsentryfmt}%
+ }%
+ \let\@glsxtr@acronymlists\@glsacronymlists
+ \let\@glsacronymlists\@empty
+ \let\@addtoacronymlists\@gobble
+ \let\SetAcronymLists\@gobble
+ \let\@glsxtr@base@acrcmd\@@glsxtr@base@acrcmd@warn
\renewcommand*{\newacronym}[4][]{%
\glsxtr@newabbreviation{type=\acronymtype,category=acronym,##1}{##2}{##3}{##4}%
}%
@@ -4127,7 +4310,7 @@
\renewcommand*{\setacronymstyle}[1]{%
\PackageError{glossaries-extra}{\string\setacronymstyle{##1}
unavailable.
- Use \string\setabbreviationstyle\space instead.
+ Use \string\setabbreviationstyle[acronym]\space instead.
The original acronym interface can be restored with
\string\RestoreAcronyms}{}%
}%
@@ -4140,6 +4323,13 @@
}
\MakeAcronymsAbbreviations
\newcommand*{\RestoreAcronyms}{%
+ \let\@glsacronymlists\@glsxtr@acronymlists
+ \let\@addtoacronymlists\@glsxtr@org@addtoacronynlists
+ \let\SetAcronymLists\@glsxtr@org@setacronymlists
+ \let\@glsxtr@base@acrcmd\@gobbletwo
+ \@for\@gls@type:=\@glsacronymlists\do{%
+ \SetDefaultAcronymDisplayStyle{\@gls@type}%
+ }%
\SetGenericNewAcronym
\renewcommand{\firstacronymfont}[1]{\acronymfont{##1}}%
\renewcommand{\acronymfont}[1]{##1}%
@@ -4161,148 +4351,151 @@
\newcommand*{\glsacspacemax}{3em}
\newcommand*{\@glsxtr@reg@glosslist}{}
\let\@glsxtr@org@makeglossaries\makeglossaries
+\providecommand{\@domakeglossaries}[1]{#1}
\renewcommand*{\makeglossaries}[1][]{%
- \@glsxtr@if@record@only
- {%
- \PackageError{glossaries-extra}{\string\makeglossaries\space
- not permitted\MessageBreak with record=\@glsxtr@record@setting\space
- package option}%
- {You may only use \string\makeglossaries\space with
- record=off or record=alsoindex options}%
- }%
+ \@domakeglossaries
{%
- \ifblank{#1}%
- {\@glsxtr@org@makeglossaries}%
+ \@glsxtr@if@record@only
{%
- \ifx\@glsxtr@record@setting\@glsxtr@record@setting@alsoindex
- \PackageError{glossaries-extra}{\string\makeglossaries[#1]\space
- not permitted\MessageBreak with record=alsoindex package option}%
- {You may only use the hybrid \string\makeglossaries[...]\space with
- record=off option}%
- \else
- \ifdef\@gls@@automake@immediate{\@gls@@automake@immediate}{}%
- \edef\@glsxtr@reg@glosslist{#1}%
- \ifundef{\glswrite}{\newwrite\glswrite}{}%
- \protected@write\@auxout{}{\string\providecommand
- \string\@glsorder[1]{}}
- \protected@write\@auxout{}{\string\providecommand
- \string\@istfilename[1]{}}
- \protected@write\@auxout{}{\string\@istfilename{\istfilename}}%
- \protected@write\@auxout{}{\string\@glsorder{\glsorder}}
- \protected@write\@auxout{}{\string\glsxtr@makeglossaries{#1}}
- \write\@auxout{\string\providecommand\string\@gls@reference[3]{}}%
- \@for\@glo@type:=#1\do{%
- \ifdefempty{\@glo@type}{}{\@makeglossary{\@glo@type}}%
- }%
- \renewcommand*\newglossary[4][]{%
- \PackageError{glossaries}{New glossaries
- must be created before \string\makeglossaries}{You need
- to move \string\makeglossaries\space after all your
- \string\newglossary\space commands}}%
- \let\@makeglossary\relax
- \let\makeglossary\relax
- \renewcommand\makeglossaries[1][]{}%
- \@disable@onlypremakeg
- \let\gls@checkseeallowed\relax
- \renewcommand*{\@do@seeglossary}[2]{%
- \glsdoifexists{##1}%
- {%
- \edef\@gls@label{\glsdetoklabel{##1}}%
- \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
- \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
- {\@glsxtr@org@doseeglossary{##1}{##2}}%
+ \PackageError{glossaries-extra}{\string\makeglossaries\space
+ not permitted\MessageBreak with record=\@glsxtr@record@setting\space
+ package option}%
+ {You may only use \string\makeglossaries\space with
+ record=off or record=alsoindex options}%
+ }%
+ {%
+ \ifblank{#1}%
+ {\@glsxtr@org@makeglossaries}%
+ {%
+ \ifx\@glsxtr@record@setting\@glsxtr@record@setting@alsoindex
+ \PackageError{glossaries-extra}{\string\makeglossaries[#1]\space
+ not permitted\MessageBreak with record=alsoindex package option}%
+ {You may only use the hybrid \string\makeglossaries[...]\space with
+ record=off option}%
+ \else
+ \ifdef\@gls@@automake@immediate{\@gls@@automake@immediate}{}%
+ \edef\@glsxtr@reg@glosslist{#1}%
+ \ifundef{\glswrite}{\newwrite\glswrite}{}%
+ \protected@write\@auxout{}{\string\providecommand
+ \string\@glsorder[1]{}}
+ \protected@write\@auxout{}{\string\providecommand
+ \string\@istfilename[1]{}}
+ \protected@write\@auxout{}{\string\@istfilename{\istfilename}}%
+ \protected@write\@auxout{}{\string\@glsorder{\glsorder}}
+ \protected@write\@auxout{}{\string\glsxtr@makeglossaries{#1}}
+ \write\@auxout{\string\providecommand\string\@gls@reference[3]{}}%
+ \@for\@glo@type:=#1\do{%
+ \ifdefempty{\@glo@type}{}{\@makeglossary{\@glo@type}}%
+ }%
+ \renewcommand*\newglossary[4][]{%
+ \PackageError{glossaries}{New glossaries
+ must be created before \string\makeglossaries}{You need
+ to move \string\makeglossaries\space after all your
+ \string\newglossary\space commands}}%
+ \let\@makeglossary\@gobble
+ \renewcommand\makeglossaries[1][]{}%
+ \@disable@onlypremakeg
+ \let\gls@checkseeallowed\relax
+ \renewcommand*{\@do@seeglossary}[2]{%
+ \glsdoifexists{##1}%
{%
- \@@glsxtrwrglossmark
- \protected@write\@auxout{}{%
- \string\@gls@reference
- {\gls@type}{\@gls@label}{\string\glsseeformat##2{}}%
+ \edef\@gls@label{\glsdetoklabel{##1}}%
+ \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
+ \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
+ {\@glsxtr@org@doseeglossary{##1}{##2}}%
+ {%
+ \@@glsxtrwrglossmark
+ \protected@write\@auxout{}{%
+ \string\@gls@reference
+ {\gls@type}{\@gls@label}{\string\glsseeformat##2{}}%
+ }%
}%
}%
}%
- }%
- \let\@glsxtr@@do@@wrglossary\@@do@@wrglossary
- \def\@@do@@wrglossary{%
- \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
- \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
- {\@glsxtr@@do@@wrglossary}%
- {\gls@noidxglossary}%
- }%
- \let\warn@nomakeglossaries\relax
- \def\warn@noprintglossary{%
- \GlossariesWarningNoLine{No \string\printglossary\space
- or \string\printglossaries\space
- found.^^J(Remove \string\makeglossaries\space if you don't want
- any glossaries.)^^JThis document will not have a glossary}%
- }%
- \renewcommand{\@gls@noref@warn}[1]{%
- \edef\@gls@type{##1}%
- \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
- {%
- \GlossariesExtraWarning{Can't use
- \string\printnoidxglossary[type={\@gls@type}]
- when `\@gls@type' is listed in the optional argument of
- \string\makeglossaries}%
+ \let\@glsxtr@@do@@wrglossary\@@do@@wrglossary
+ \def\@@do@@wrglossary{%
+ \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
+ \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
+ {\@glsxtr@@do@@wrglossary}%
+ {\gls@noidxglossary}%
}%
- {%
- \GlossariesWarning{Empty glossary for
- \string\printnoidxglossary[type={##1}].
- Rerun may be required (or you may have forgotten to use
- commands like \string\gls)}%
+ \let\warn@nomakeglossaries\relax
+ \def\warn@noprintglossary{%
+ \GlossariesWarningNoLine{No \string\printglossary\space
+ or \string\printglossaries\space
+ found.^^J(Remove \string\makeglossaries\space if you don't want
+ any glossaries.)^^JThis document will not have a glossary}%
}%
- }%
- \renewcommand*{\glsdisplaynumberlist}[1]{%
- \expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
- {\@glsxtr@idx@displaynumberlist{##1}}%
- {\@glsxtr@noidx@displaynumberlist{##1}}%
- }%
- \renewcommand*{\glsentrynumberlist}[1]{%
- \expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
- {\@glsxtr@idx@entrynumberlist{##1}}%
- {\@glsxtr@noidx@entrynumberlist{##1}}%
- }%
- \renewcommand*{\glsnumberlistloop}[2]{%
- \expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
- {%
- \PackageError{glossaries-extra}{\string\glsnumberlistloop\space
- not available for glossary `##1'}{}%
+ \renewcommand{\@gls@noref@warn}[1]{%
+ \edef\@gls@type{##1}%
+ \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
+ {%
+ \GlossariesExtraWarning{Can't use
+ \string\printnoidxglossary[type={\@gls@type}]
+ when `\@gls@type' is listed in the optional argument of
+ \string\makeglossaries}%
+ }%
+ {%
+ \GlossariesWarning{Empty glossary for
+ \string\printnoidxglossary[type={##1}].
+ Rerun may be required (or you may have forgotten to use
+ commands like \string\gls)}%
+ }%
}%
- {\@glsxtr@noidx@numberlistloop{##1}{##2}}%
- }%
- \renewcommand*{\glsprestandardsort}[3]{%
- \expandafter\DTLifinlist\expandafter{##2}{\@glsxtr@reg@glosslist}%
- {%
- \glsdosanitizesort
+ \renewcommand*{\glsdisplaynumberlist}[1]{%
+ \expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
+ {\@glsxtr@idx@displaynumberlist{##1}}%
+ {\@glsxtr@noidx@displaynumberlist{##1}}%
}%
- {%
- \ifglssanitizesort
- \@gls@noidx@sanitizesort
- \else
- \@gls@noidx@nosanitizesort
- \fi
+ \renewcommand*{\glsentrynumberlist}[1]{%
+ \expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
+ {\@glsxtr@idx@entrynumberlist{##1}}%
+ {\@glsxtr@noidx@entrynumberlist{##1}}%
}%
- }%
- \renewcommand*\new@glossaryentry[2]{%
- \PackageError{glossaries-extra}{Glossary entries must be defined
- in the preamble\MessageBreak when you use the optional argument
- of \string\makeglossaries}{Either move your definitions to the
- preamble or don't use the optional argument of
- \string\makeglossaries}%
- }%
- \let\@glo@assign@sortkey\@glsxtr@mixed@assign@sortkey
- \renewcommand*{\@printgloss@setsort}{%
- \expandafter\@glsxtr@gettype\expandafter,\@glsxtr@printglossopts,%
- type=\glsdefaulttype,\@end@glsxtr@gettype
- \def\@glo@sorttype{\@glo@default@sorttype}%
- }%
- \ifglsautomake
- \renewcommand*{\@gls@doautomake}{%
- \@for\@gls@type:=\@glsxtr@reg@glosslist\do{%
- \ifdefempty{\@gls@type}{}{\@gls@automake{\@gls@type}}%
+ \renewcommand*{\glsnumberlistloop}[2]{%
+ \expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
+ {%
+ \PackageError{glossaries-extra}{\string\glsnumberlistloop\space
+ not available for glossary `##1'}{}%
}%
+ {\@glsxtr@noidx@numberlistloop{##1}{##2}}%
}%
- \fi
- \ifdef\@glo@check@sortallowed{\@glo@check@sortallowed\makeglossaries}{}%
- \fi
+ \renewcommand*{\glsprestandardsort}[3]{%
+ \expandafter\DTLifinlist\expandafter{##2}{\@glsxtr@reg@glosslist}%
+ {%
+ \glsdosanitizesort
+ }%
+ {%
+ \ifglssanitizesort
+ \@gls@noidx@sanitizesort
+ \else
+ \@gls@noidx@nosanitizesort
+ \fi
+ }%
+ }%
+ \renewcommand*\new@glossaryentry[2]{%
+ \PackageError{glossaries-extra}{Glossary entries must be defined
+ in the preamble\MessageBreak when you use the optional argument
+ of \string\makeglossaries}{Either move your definitions to the
+ preamble or don't use the optional argument of
+ \string\makeglossaries}%
+ }%
+ \let\@glo@assign@sortkey\@glsxtr@mixed@assign@sortkey
+ \renewcommand*{\@printgloss@setsort}{%
+ \expandafter\@glsxtr@gettype\expandafter,\@glsxtr@printglossopts,%
+ type=\glsdefaulttype,\@end@glsxtr@gettype
+ \def\@glo@sorttype{\@glo@default@sorttype}%
+ }%
+ \ifglsautomake
+ \renewcommand*{\@gls@doautomake}{%
+ \@for\@gls@type:=\@glsxtr@reg@glosslist\do{%
+ \ifdefempty{\@gls@type}{}{\@gls@automake{\@gls@type}}%
+ }%
+ }%
+ \fi
+ \ifdef\@glo@check@sortallowed{\@glo@check@sortallowed\makeglossaries}{}%
+ \fi
+ }%
}%
}%
}
@@ -4990,6 +5183,14 @@
\let\@gls@doautomake\relax
\fi
\fi
+ \@glsxtr@if@record@only
+ {\ifdefstring{\glsorder}{letter}%
+ {\GlossariesExtraWarningNoLine{Package option `order=letter' isn't
+ supported with `record=\@glsxtr@record@setting'. Use `break-at=none'
+ resource option instead}}%
+ {}%
+ }%
+ {}%
}
\newcommand*{\@gls@doautomake@err}{%
\PackageError{glossaries}{You must use
@@ -5848,21 +6049,37 @@ defined}{}%
\define@key{glsxtrabbrv}{textaccess}{%
\def\@gls@textaccess{#1}%
}
+ \define@key{glsxtrabbrv}{pluralaccess}{%
+ \def\@gls@pluralaccess{#1}%
+ }
\define@key{glsxtrabbrv}{firstaccess}{%
\def\@gls@firstaccess{#1}%
}
+ \define@key{glsxtrabbrv}{firstpluralaccess}{%
+ \def\@gls@firstpluralaccess{#1}%
+ }
\define@key{glsxtrabbrv}{shortaccess}{%
\def\@gls@shortaccess{#1}%
}
\define@key{glsxtrabbrv}{shortpluralaccess}{%
\def\@gls@shortaccesspl{#1}%
}
+ \define@key{glsxtrabbrv}{longaccess}{%
+ \def\@gls@longaccess{#1}%
+ }
+ \define@key{glsxtrabbrv}{shortlonglaccess}{%
+ \def\@gls@longaccesspl{#1}%
+ }
\newcommand*{\@gls@initaccesskeys}{%
\def\@gls@nameaccess{}%
\def\@gls@textaccess{}%
+ \def\@gls@pluralaccess{}%
\def\@gls@firstaccess{}%
+ \def\@gls@firstpluralaccess{}%
\def\@gls@shortaccess{}%
\def\@gls@shortaccesspl{}%
+ \def\@gls@longaccess{}%
+ \def\@gls@longaccesspl{}%
}
\newcommand*{\@gls@ifaccessattribute@set}[3]{%
\glsifcategoryattribute{\glscategorylabel}{access#1}{true}%
@@ -5877,27 +6094,76 @@ defined}{}%
}%
}%
}
- \newcommand{\@gls@setup@default@short@access}[1]{%
+ \def\glsdefaultshortaccess#1#2{#1 (#2)}
+ \newcommand{\glsxtrassignactualsetup}{%
+ \let\@\empty
+ \let\emph\@firstofone
+ \let\textbf\@firstofone
+ \let\textmd\@firstofone
+ \let\textit\@firstofone
+ \let\textsl\@firstofone
+ \let\textsc\@firstofone
+ \let\textrm\@firstofone
+ \let\textsf\@firstofone
+ \let\texttt\@firstofone
+ }
+ \ifdef\pdfstringdef
+ {
+ \newcommand{\@gls@assign@actual}{%
+ \begingroup
+ \glsxtrassignactualsetup
+ \pdfstringdef\@gls@actualshort{\glsxtrorgshort}%
+ \pdfstringdef\@gls@actuallong{\glsxtrorglong}%
+ \pdfstringdef\@gls@actualshortpl{\@gls@shortpl}%
+ \pdfstringdef\@gls@actuallongpl{\@gls@longpl}%
+ \protected@edef\@gls@tmp{\endgroup
+ \def\noexpand\@gls@actualshort{\expandonce\@gls@actualshort}%
+ \def\noexpand\@gls@actuallong{\expandonce\@gls@actuallong}%
+ \def\noexpand\@gls@actualshortpl{\expandonce\@gls@actualshortpl}%
+ \def\noexpand\@gls@actuallongpl{\expandonce\@gls@actuallongpl}%
+ }%
+ \@gls@tmp
+ }
+ }
+ {
+ \newcommand{\@gls@assign@actual}{%
+ \begingroup
+ \glsxtrassignactualsetup
+ \protected@edef\@gls@tmp{\endgroup
+ \def\noexpand\@gls@actualshort{\glsxtrorgshort}%
+ \def\noexpand\@gls@actuallong{\glsxtrorglong}%
+ \def\noexpand\@gls@actualshortpl{\@gls@shortpl}%
+ \def\noexpand\@gls@actuallongpl{\@gls@longpl}%
+ }%
+ \@gls@tmp
+ }
+ }
+ \newcommand{\@gls@setup@default@access}{%
+ \@gls@assign@actual
\ifdefempty\@gls@shortaccess
{%
- \glsifcategoryattribute{\glscategorylabel}{accessinsertdots}{true}%
+ \@gls@ifaccessattribute@set{insertdots}%
{%
- \@glsxtr@insertdots\@gls@shortaccess{#1}%
- \eappto\ExtraCustomAbbreviationFields{%
- shortaccess={\expandonce\@gls@shortaccess},}%
+ \expandafter\@glsxtr@insertdots\expandafter\@gls@actualshort\expandafter
+ {\@gls@actualshort}%
}%
{}%
- }%
- {}%
- \ifdefempty\@gls@shortaccess
- {}%
- {%
+ \ifdefempty\@gls@longaccess
+ {%
+ \edef\@gls@shortaccess{\glsdefaultshortaccess
+ {\expandonce\@gls@actuallong}{\expandonce\@gls@actualshort}}%
+ }%
+ {%
+ \edef\@gls@shortaccess{\glsdefaultshortaccess
+ {\expandonce\@gls@longaccess}{\expandonce\@gls@actualshort}}%
+ }%
+ \eappto\ExtraCustomAbbreviationFields{shortaccess={\@gls@shortaccess},}%
\ifdefempty\@gls@shortaccesspl
{%
\@gls@ifaccessattribute@set{aposplural}%
{%
\expandafter\def\expandafter\@gls@shortaccesspl\expandafter{%
- \@gls@shortaccess'\abbrvpluralsuffix}%
+ \@gls@actualshort'\glsxtrabbrvpluralsuffix}%
}%
{%
\@gls@ifaccessattribute@set{noshortplural}%
@@ -5905,26 +6171,32 @@ defined}{}%
\let\@gls@shortaccesspl\@gls@shortaccess
}%
{%
- \expandafter\def\expandafter\@gls@shortaccesspl\expandafter{%
- \@gls@shortaccess\abbrvpluralsuffix}%
+ \let\@gls@shortaccesspl\@gls@actualshortpl
}%
}%
- \eappto\ExtraCustomAbbreviationFields{%
- shortpluralaccess={\expandonce\@gls@shortaccesspl},}%
+ \ifdefempty\@gls@longaccesspl
+ {%
+ \edef\@gls@shortaccesspl{\glsdefaultshortaccess
+ {\expandonce\@gls@actuallongpl}{\expandonce\@gls@actualshortpl}}%
+ }%
+ {%
+ \edef\@gls@shortaccesspl{\glsdefaultshortaccess
+ {\expandonce\@gls@longaccesspl}{\expandonce\@gls@actualshort}}%
+ }%
+ \eappto\ExtraCustomAbbreviationFields{shortpluralaccess={\@gls@shortaccesspl},}%
}%
{}%
}%
+ {%
+ \ifdefempty\@gls@shortaccesspl
+ {\let\@gls@shortaccesspl\@gls@shortaccess}%
+ {}%
+ }%
\ifdefempty\@gls@nameaccess
{%
\glsifcategoryattribute{\glscategorylabel}{nameshortaccess}{true}%
{%
- \ifdefempty\@gls@shortaccess
- {}%
- {%
- \eappto\ExtraCustomAbbreviationFields{%
- access={\expandonce\@gls@shortaccess},%
- }%
- }%
+ \eappto\ExtraCustomAbbreviationFields{access={\@gls@shortaccess},}%
}%
{}%
}%
@@ -5933,12 +6205,17 @@ defined}{}%
{%
\glsifcategoryattribute{\glscategorylabel}{textshortaccess}{true}%
{%
- \ifdefempty\@gls@shortaccess
- {}%
- {%
- \eappto\ExtraCustomAbbreviationFields{%
- textaccess={\expandonce\@gls@shortaccess},%
- }%
+ \eappto\ExtraCustomAbbreviationFields{textaccess={\@gls@shortaccess},}%
+ }%
+ {}%
+ }%
+ {}%
+ \ifdefempty\@gls@pluralaccess
+ {%
+ \glsifcategoryattribute{\glscategorylabel}{textshortaccess}{true}%
+ {%
+ \eappto\ExtraCustomAbbreviationFields{%
+ pluralaccess={\@gls@shortaccesspl},%
}%
}%
{}%
@@ -5948,18 +6225,62 @@ defined}{}%
{%
\glsifcategoryattribute{\glscategorylabel}{firstshortaccess}{true}%
{%
- \ifdefempty\@gls@shortaccess
- {}%
- {%
- \eappto\ExtraCustomAbbreviationFields{%
- firstaccess={\expandonce\@gls@shortaccess},%
- }%
+ \eappto\ExtraCustomAbbreviationFields{firstaccess={\@gls@shortaccess},}%
+ }%
+ {}%
+ }%
+ {}%
+ \ifdefempty\@gls@firstpluralaccess
+ {%
+ \glsifcategoryattribute{\glscategorylabel}{firstshortaccess}{true}%
+ {%
+ \eappto\ExtraCustomAbbreviationFields{%
+ firstpluralaccess={\@gls@shortaccesspl},%
}%
}%
{}%
}%
{}%
}
+ \newcommand*{\glsxtrprovideaccsuppcmd}[2]{%
+ \ifcsundef{glsxtr#1#2accsupp}%
+ {\csdef{glsxtr#1#2accsupp}{\glsshortaccsupp}}%
+ {}%
+ }
+ \newcommand*{\glsxtrAccSuppAbbrSetNoLongAttrs}[1]{%
+ \glssetcategoryattribute{#1}{nameshortaccess}{true}%
+ \glssetcategoryattribute{#1}{firstshortaccess}{true}%
+ \glssetcategoryattribute{#1}{textshortaccess}{true}%
+ \glsxtrprovideaccsuppcmd{#1}{name}%
+ \glsxtrprovideaccsuppcmd{#1}{first}%
+ \glsxtrprovideaccsuppcmd{#1}{firstpl}%
+ \glsxtrprovideaccsuppcmd{#1}{text}%
+ \glsxtrprovideaccsuppcmd{#1}{plural}%
+ }
+ \newcommand*{\glsxtrAccSuppAbbrSetFirstLongAttrs}[1]{%
+ \glssetcategoryattribute{#1}{nameshortaccess}{true}%
+ \glssetcategoryattribute{#1}{textshortaccess}{true}%
+ \glsxtrprovideaccsuppcmd{#1}{name}%
+ \glsxtrprovideaccsuppcmd{#1}{text}%
+ \glsxtrprovideaccsuppcmd{#1}{plural}%
+ }
+ \newcommand*{\glsxtrAccSuppAbbrSetTextShortAttrs}[1]{%
+ \glssetcategoryattribute{#1}{textshortaccess}{true}%
+ \glsxtrprovideaccsuppcmd{#1}{text}%
+ \glsxtrprovideaccsuppcmd{#1}{plural}%
+ }
+ \newcommand*{\glsxtrAccSuppAbbrSetNameShortAttrs}[1]{%
+ \glssetcategoryattribute{#1}{nameshortaccess}{true}%
+ \glsxtrprovideaccsuppcmd{#1}{name}%
+ }
+ \newcommand*{\glsxtrAccSuppAbbrSetNameLongAttrs}[1]{%
+ \glssetcategoryattribute{#1}{firstshortaccess}{true}%
+ \glssetcategoryattribute{#1}{textshortaccess}{true}%
+ \glsxtrprovideaccsuppcmd{#1}{first}%
+ \glsxtrprovideaccsuppcmd{#1}{firstpl}%
+ \glsxtrprovideaccsuppcmd{#1}{text}%
+ \glsxtrprovideaccsuppcmd{#1}{plural}%
+ }
}
{
\newcommand*{\glsaccessname}[1]{\glsentryname{#1}}
@@ -6015,7 +6336,12 @@ defined}{}%
\newcommand*{\GLSaccesslongpl}[1]{%
\protect\mfirstucMakeUppercase{\glsentrylongpl{#1}}}
\newcommand*{\@gls@initaccesskeys}{}
- \newcommand{\@gls@setup@default@short@access}[1]{}%
+ \newcommand{\@gls@setup@default@access}{}
+ \newcommand*{\glsxtrAccSuppAbbrSetNoLongAttrs}[1]{}
+ \newcommand*{\glsxtrAccSuppAbbrSetFirstLongAttrs}[1]{}
+ \newcommand*{\glsxtrAccSuppAbbrSetTextShortAttrs}[1]{}
+ \newcommand*{\glsxtrAccSuppAbbrSetNameShortAttrs}[1]{}
+ \newcommand*{\glsxtrAccSuppAbbrSetNameLongAttrs}[1]{}
}
\glsaddstoragekey{category}{general}{\glscategory}
\newcommand{\glsifcategory}[4]{%
@@ -6640,11 +6966,38 @@ defined}{}%
\Glsaccessdesc{#1}%
}%
}
-\renewcommand*{\glossentrysymbol}[1]{%
+\ifdef\texorpdfstring
+{
+ \renewcommand*{\glossentrysymbol}[1]{%
+ \texorpdfstring{\@glossentrysymbol{#1}}{\glsentrypdfsymbol{#1}}%
+ }
+}
+{
+ \renewcommand*{\glossentrysymbol}[1]{\@glossentrysymbol{#1}}
+}
+\newcommand{\glsentrypdfsymbol}[1]{\glsentrysymbol{#1}}
+\newrobustcmd*{\@glossentrysymbol}[1]{%
\glsdoifexistsorwarn{#1}%
{%
- \glssetabbrvfmt{\glscategory{#1}}%
- \glsaccesssymbol{#1}%
+ \begingroup
+ \glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glosssymbolfont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glosssymbolfont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glosssymbolfont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glosssymbolfont attribute
+ for entry `#1'. Ignoring}%
+ \let\@glsxtr@glosssymbolfont\@firstofone
+ }%
+ }%
+ {\let\@glsxtr@glosssymbolfont\@firstofone}%
+ \@glsxtr@glosssymbolfont{\glsaccesssymbol{#1}}%
+ \endgroup
}%
}
\renewcommand*{\Glossentrysymbol}[1]{%
@@ -6874,14 +7227,6 @@ defined}{}%
\newcommand{\@glsxtr@swaptwo}[2]{#2#1}
\define@key{glsxtrabbrv}{category}{%
\edef\glscategorylabel{#1}%
- \ifcsdef{@glsabbrv@current@#1}%
- {%
- \let\@glsxtr@orgwarndep\GlsXtrWarnDeprecatedAbbrStyle
- \let\GlsXtrWarnDeprecatedAbbrStyle\@gobbletwo
- \glsxtr@applyabbrvstyle{\csname @glsabbrv@current@#1\endcsname}%
- \let\GlsXtrWarnDeprecatedAbbrStyle\@glsxtr@orgwarndep
- }%
- {}%
}
\define@key{glsxtrabbrv}{shortplural}{%
\def\@gls@shortpl{#1}%
@@ -6938,8 +7283,17 @@ defined}{}%
\def\ExtraCustomAbbreviationFields{}%
\@gls@initaccesskeys
\def\glscategorylabel{abbreviation}%
- \glsxtr@applyabbrvstyle{\@glsabbrv@current@abbreviation}%
\setkeys*{glsxtrabbrv}[shortplural,longplural]{#1}%
+ \ifcsdef{@glsabbrv@current@\glscategorylabel}%
+ {%
+ \let\@glsxtr@orgwarndep\GlsXtrWarnDeprecatedAbbrStyle
+ \let\GlsXtrWarnDeprecatedAbbrStyle\@gobbletwo
+ \glsxtr@applyabbrvstyle{\csname @glsabbrv@current@\glscategorylabel\endcsname}%
+ \let\GlsXtrWarnDeprecatedAbbrStyle\@glsxtr@orgwarndep
+ }%
+ {%
+ \glsxtr@applyabbrvstyle{\@glsabbrv@current@abbreviation}%
+ }%
\def\@gls@longpl{#4\glspluralsuffix}%
\let\@gls@default@longpl\@gls@longpl
\glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
@@ -6959,7 +7313,7 @@ defined}{}%
\glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
{%
\@glsxtr@insertdots\@gls@short{#3}%
- \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
+ \appto\@gls@short{\@}%
}%
{\def\@gls@short{#3}}%
}%
@@ -6981,6 +7335,8 @@ defined}{}%
\expandafter\glsshorttok\expandafter{\@gls@short}%
\glsxtrnewabbrevpresetkeyhook{#1}{#2}{#3}%
\setkeys*{glsxtrabbrv}[category]{#1}%
+ \let\@gls@org@longpl\@gls@longpl
+ \let\@gls@org@shortpl\@gls@shortpl
\ifx\@gls@default@longpl\@gls@longpl
\else
\glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
@@ -6992,7 +7348,7 @@ defined}{}%
\fi
\expandafter\glsshortpltok\expandafter{\@gls@shortpl}%
\expandafter\glslongpltok\expandafter{\@gls@longpl}%
- \@gls@setup@default@short@access{#3}%
+ \@gls@setup@default@access
\newabbreviationhook
\protected@edef\@do@newglossaryentry{%
\noexpand\newglossaryentry{\the\glslabeltok}%
@@ -7010,6 +7366,7 @@ defined}{}%
}%
}%
\@do@newglossaryentry
+ \@glsxtr@addabbreviationlist{\glsentrytype{\the\glslabeltok}}%
\GlsXtrPostNewAbbreviation
}
\newcommand*{\glsxtrnewabbrevpresetkeyhook}[3]{}
@@ -7556,6 +7913,7 @@ defined}{}%
}%
\@glsxtr@dostylewarn
\csdef{@glsabbrv@current@#1}{#2}%
+ \edef\glscategorylabel{#1}%
\glsxtr@applyabbrvstyle{#2}%
}%
}%
@@ -7648,6 +8006,7 @@ defined}{}%
}
\newabbreviationstyle{long-short}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -7658,6 +8017,7 @@ defined}{}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
description={\the\glslongtok}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -7705,6 +8065,7 @@ defined}{}%
}
\newabbreviationstyle{long-short-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
@@ -7733,6 +8094,7 @@ defined}{}%
}
\newabbreviationstyle{short-long}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -7743,6 +8105,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -7788,6 +8151,7 @@ defined}{}%
}
\newabbreviationstyle{short-long-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},
sort={\glsxtrshortlongdescsort},
@@ -7819,6 +8183,7 @@ defined}{}%
}
\newabbreviationstyle{footnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
@@ -7829,6 +8194,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
\protect\glsxtrabbrvfootnote{\the\glslabeltok}%
{\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
@@ -7891,14 +8257,49 @@ defined}{}%
}%
}
\letabbreviationstyle{short-footnote}{footnote}
+\newcommand*{\glsxtrfootnotedescname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \protect\glsxtrparen{\protect\glslongfont{\the\glslongtok}}%
+}
+\newcommand*{\glsxtrfootnotedescsort}{\the\glsshorttok}
+\newabbreviationstyle{short-footnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{footnote}%
+}
+\letabbreviationstyle{footnote-desc}{short-footnote-desc}
\newabbreviationstyle{postfootnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvfont{\the\glsshorttok}},%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
@@ -7963,11 +8364,45 @@ defined}{}%
}%
}
\letabbreviationstyle{short-postfootnote}{postfootnote}
+\newabbreviationstyle{short-postfootnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{postfootnote}%
+}
+\letabbreviationstyle{postfootnote-desc}{short-postfootnote-desc}
\newcommand*{\glsxtrshortnolongname}{%
\protect\glsabbrvfont{\the\glsshorttok}%
}
\newabbreviationstyle{short}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
@@ -8049,6 +8484,7 @@ defined}{}%
}
\newabbreviationstyle{short-desc}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortdescname},
sort={\the\glsshorttok},
@@ -8257,6 +8693,7 @@ defined}{}%
}
\newabbreviationstyle{long}%
{%
+ \glsxtrAccSuppAbbrSetNameShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
@@ -8291,9 +8728,10 @@ defined}{}%
\newcommand*{\glsabbrvscfont}{\glsxtrscfont}
\newcommand*{\glsxtrfirstscfont}[1]{\glsabbrvscfont{#1}}
\newcommand*{\glsfirstabbrvscfont}{\glsxtrfirstscfont}
-\newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
+\newcommand*{\glsxtrscsuffix}{\protect\glstextup{\glsxtrabbrvpluralsuffix}}
\newabbreviationstyle{long-short-sc}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -8303,6 +8741,7 @@ defined}{}%
firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
plural={\protect\glsabbrvscfont{\the\glsshortpltok}},%
description={\the\glslongtok}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -8314,7 +8753,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -8343,6 +8782,7 @@ defined}{}%
}
\newabbreviationstyle{long-short-sc-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
@@ -8368,6 +8808,7 @@ defined}{}%
}
\newabbreviationstyle{short-sc-long}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -8378,6 +8819,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -8388,7 +8830,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -8418,6 +8860,7 @@ defined}{}%
}
\newabbreviationstyle{short-sc-long-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},
sort={\glsxtrshortlongdescsort},
@@ -8443,6 +8886,7 @@ defined}{}%
}
\newabbreviationstyle{short-sc}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
@@ -8455,7 +8899,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -8504,6 +8948,7 @@ defined}{}%
\letabbreviationstyle{short-sc-nolong}{short-sc}
\newabbreviationstyle{short-sc-desc}%
{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortdescname},
sort={\the\glsshorttok},
@@ -8515,7 +8960,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -8604,7 +9049,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -8668,7 +9113,7 @@ defined}{}%
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -8729,6 +9174,7 @@ defined}{}%
\@glsxtr@deprecated@abbrstyle{long-desc-sc}{long-noshort-sc-desc}
\newabbreviationstyle{short-sc-footnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
@@ -8739,6 +9185,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
\protect\glsxtrabbrvfootnote{\the\glslabeltok}%
{\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
@@ -8750,7 +9197,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
@@ -8801,14 +9248,42 @@ defined}{}%
}%
}
\@glsxtr@deprecated@abbrstyle{footnote-sc}{short-sc-footnote}
+\newabbreviationstyle{short-sc-footnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-sc-footnote}%
+}
\newabbreviationstyle{short-sc-postfootnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
@@ -8830,7 +9305,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
@@ -8873,6 +9348,38 @@ defined}{}%
}%
}
\@glsxtr@deprecated@abbrstyle{postfootnote-sc}{short-sc-postfootnote}
+\newabbreviationstyle{short-sc-postfootnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-sc-postfootnote}%
+}
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
\newcommand*{\glsabbrvsmfont}{\glsxtrsmfont}
\newcommand*{\glsxtrfirstsmfont}[1]{\glsabbrvsmfont{#1}}
@@ -8880,6 +9387,7 @@ defined}{}%
\newcommand*{\glsxtrsmsuffix}{\glsxtrabbrvpluralsuffix}
\newabbreviationstyle{long-short-sm}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -8889,6 +9397,7 @@ defined}{}%
firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},%
description={\the\glslongtok}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -8902,7 +9411,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
@@ -8929,6 +9438,7 @@ defined}{}%
}
\newabbreviationstyle{long-short-sm-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
@@ -8954,6 +9464,7 @@ defined}{}%
}
\newabbreviationstyle{short-sm-long}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -8964,6 +9475,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -8976,7 +9488,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
@@ -9004,6 +9516,7 @@ defined}{}%
}
\newabbreviationstyle{short-sm-long-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},
sort={\glsxtrshortlongdescsort},
@@ -9029,6 +9542,7 @@ defined}{}%
}
\newabbreviationstyle{short-sm}%
{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
@@ -9043,7 +9557,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
@@ -9090,6 +9604,7 @@ defined}{}%
\letabbreviationstyle{short-sm-nolong}{short-sm}
\newabbreviationstyle{short-sm-desc}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortdescname},
sort={\the\glsshorttok},
@@ -9103,7 +9618,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
@@ -9177,6 +9692,7 @@ defined}{}%
}
\newabbreviationstyle{long-noshort-sm}%
{%
+ \glsxtrAccSuppAbbrSetNameShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
@@ -9192,7 +9708,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrsubsequentfmt}[2]{%
@@ -9256,7 +9772,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrsubsequentfmt}[2]{%
@@ -9315,6 +9831,7 @@ defined}{}%
\@glsxtr@deprecated@abbrstyle{long-desc-sm}{long-noshort-sm-desc}
\newabbreviationstyle{short-sm-footnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
@@ -9325,6 +9842,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
\protect\glsxtrabbrvfootnote{\the\glslabeltok}%
{\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
@@ -9338,7 +9856,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
@@ -9387,14 +9905,42 @@ defined}{}%
}%
}
\@glsxtr@deprecated@abbrstyle{footnote-sm}{short-sm-footnote}
+\newabbreviationstyle{short-sm-footnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-sm-footnote}%
+}
\newabbreviationstyle{short-sm-postfootnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
@@ -9418,7 +9964,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrsmsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
@@ -9459,6 +10005,38 @@ defined}{}%
}%
}
\@glsxtr@deprecated@abbrstyle{postfootnote-sm}{short-sm-postfootnote}
+\newabbreviationstyle{short-sm-postfootnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-sm-postfootnote}%
+}
\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}%
\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}%
\newcommand*{\glsxtremsuffix}{\glsxtrabbrvpluralsuffix}
@@ -9466,6 +10044,7 @@ defined}{}%
\newcommand*{\glslongemfont}[1]{\emph{#1}}%
\newabbreviationstyle{long-short-em}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -9475,6 +10054,7 @@ defined}{}%
firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
description={\the\glslongtok}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -9488,7 +10068,7 @@ defined}{}%
{%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
@@ -9515,6 +10095,7 @@ defined}{}%
}
\newabbreviationstyle{long-short-em-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
@@ -9540,6 +10121,7 @@ defined}{}%
}
\newabbreviationstyle{long-em-short-em}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -9549,6 +10131,7 @@ defined}{}%
firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
description={\protect\glslongemfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -9560,7 +10143,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
@@ -9589,6 +10172,7 @@ defined}{}%
}
\newabbreviationstyle{long-em-short-em-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
@@ -9614,6 +10198,7 @@ defined}{}%
}
\newabbreviationstyle{short-em-long}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -9624,6 +10209,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -9634,7 +10220,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -9664,6 +10250,7 @@ defined}{}%
}
\newabbreviationstyle{short-em-long-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},
sort={\glsxtrshortlongdescsort},
@@ -9689,6 +10276,7 @@ defined}{}%
}
\newabbreviationstyle{short-em-long-em}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -9699,6 +10287,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -9709,7 +10298,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
@@ -9739,6 +10328,7 @@ defined}{}%
}
\newabbreviationstyle{short-em-long-em-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},%
sort={\glsxtrshortlongdescsort},%
@@ -9764,6 +10354,7 @@ defined}{}%
}
\newabbreviationstyle{short-em}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
@@ -9776,7 +10367,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -9825,6 +10416,7 @@ defined}{}%
\letabbreviationstyle{short-em-nolong}{short-em}
\newabbreviationstyle{short-em-desc}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortdescname},
sort={\the\glsshorttok},
@@ -9836,7 +10428,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -9912,6 +10504,7 @@ defined}{}%
}
\newabbreviationstyle{long-noshort-em}%
{%
+ \glsxtrAccSuppAbbrSetNameShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
@@ -9925,7 +10518,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -9986,6 +10579,7 @@ defined}{}%
\@glsxtr@deprecated@abbrstyle{long-em}{long-noshort-em}
\newabbreviationstyle{long-em-noshort-em}%
{%
+ \glsxtrAccSuppAbbrSetNameShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
@@ -9999,7 +10593,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
@@ -10059,6 +10653,7 @@ defined}{}%
}
\newabbreviationstyle{long-em-noshort-em-noreg}%
{%
+ \glsxtrAccSuppAbbrSetNameShortAttrs\glscategorylabel
\GlsXtrUseAbbrStyleSetup{long-em-noshort-em}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -10076,7 +10671,7 @@ defined}{}%
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
@@ -10149,7 +10744,7 @@ defined}{}%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
@@ -10223,6 +10818,7 @@ defined}{}%
}
\newabbreviationstyle{short-em-footnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
@@ -10233,6 +10829,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
\protect\glsxtrabbrvfootnote{\the\glslabeltok}%
{\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
@@ -10244,7 +10841,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
@@ -10295,14 +10892,42 @@ defined}{}%
}%
}
\@glsxtr@deprecated@abbrstyle{footnote-em}{short-em-footnote}
+\newabbreviationstyle{short-em-footnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-em-footnote}%
+}
\newabbreviationstyle{short-em-postfootnote}%
{%
+ \glsxtrAccSuppAbbrSetNoLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
@@ -10324,7 +10949,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
@@ -10367,6 +10992,38 @@ defined}{}%
}%
}
\@glsxtr@deprecated@abbrstyle{postfootnote-em}{short-em-postfootnote}
+\newabbreviationstyle{short-em-postfootnote-desc}%
+{%
+ \glsxtrAccSuppAbbrSetNameLongAttrs\glscategorylabel
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrfootnotedescname},
+ sort={\glsxtrfootnotedescsort},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-em-postfootnote}%
+}
\newcommand*{\glsxtruserfield}{useri}
\ifdef\glscurrentfieldvalue
{
@@ -10391,6 +11048,7 @@ defined}{}%
\newcommand*{\glsuserdescription}[2]{\glslonguserfont{#1}}
\newabbreviationstyle{long-short-user}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -10400,6 +11058,7 @@ defined}{}%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
\protect\glsxtruserparen
{\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glsuserdescription{\the\glslongtok}%
{\the\glslabeltok}}}%
@@ -10440,11 +11099,13 @@ defined}{}%
}
\newabbreviationstyle{long-postshort-user}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glsuserdescription{\the\glslongtok}%
{\the\glslabeltok}}}%
@@ -10515,6 +11176,7 @@ defined}{}%
}
\newabbreviationstyle{long-postshort-user-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortuserdescname},
sort={\the\glslongtok},
@@ -10545,11 +11207,13 @@ defined}{}%
}
\newabbreviationstyle{short-postlong-user}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glsuserdescription{\the\glslongtok}%
{\the\glslabeltok}}}%
@@ -10621,6 +11285,7 @@ defined}{}%
}
\newabbreviationstyle{short-postlong-user-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlonguserdescname},
sort={\the\glsshorttok},
@@ -10651,6 +11316,7 @@ defined}{}%
}
\newabbreviationstyle{long-short-user-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortuserdescname},
sort={\glsxtrlongshortdescsort},%
@@ -10676,6 +11342,7 @@ defined}{}%
}
\newabbreviationstyle{short-long-user}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -10687,6 +11354,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
\protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
{\the\glslabeltok}},%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -10725,6 +11393,7 @@ defined}{}%
}
\newabbreviationstyle{short-long-user-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlonguserdescname},
sort={\glsxtrshortlongdescsort},%
@@ -10776,6 +11445,7 @@ defined}{}%
\newcommand*{\glsxtrhyphensuffix}{\glsxtrabbrvpluralsuffix}
\newabbreviationstyle{long-hyphen-short-hyphen}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
@@ -10785,6 +11455,7 @@ defined}{}%
firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
description={\protect\glslonghyphenfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -10818,6 +11489,7 @@ defined}{}%
}
\newabbreviationstyle{long-hyphen-short-hyphen-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},
@@ -10855,6 +11527,7 @@ defined}{}%
sort={\expandonce\glsxtrorglong},
first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ text={\protect\glslonghyphenfont{\the\glslongtok}},%
plural={\protect\glslonghyphenfont{\the\glslongpltok}}%
}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -10919,6 +11592,7 @@ defined}{}%
}
\newabbreviationstyle{long-hyphen-noshort-noreg}%
{%
+ \glsxtrAccSuppAbbrSetNameShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
@@ -10962,11 +11636,13 @@ defined}{}%
}
\newabbreviationstyle{long-hyphen-postshort-hyphen}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
description={\protect\glslonghyphenfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -11039,6 +11715,7 @@ defined}{}%
}
\newabbreviationstyle{long-hyphen-postshort-hyphen-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
@@ -11079,6 +11756,7 @@ defined}{}%
}
\newabbreviationstyle{short-hyphen-long-hyphen}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
@@ -11088,6 +11766,7 @@ defined}{}%
firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
\glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
description={\protect\glslonghyphenfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -11121,6 +11800,7 @@ defined}{}%
}
\newabbreviationstyle{short-hyphen-long-hyphen-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},
sort={\glsxtrshortlongdescsort},
@@ -11163,11 +11843,13 @@ defined}{}%
}
\newabbreviationstyle{short-hyphen-postlong-hyphen}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
description={\protect\glslonghyphenfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -11240,6 +11922,7 @@ defined}{}%
}
\newabbreviationstyle{short-hyphen-postlong-hyphen-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtrshortlongdescname},
sort={\glsxtrshortlongdescsort},%
@@ -11278,11 +11961,13 @@ defined}{}%
}
\newabbreviationstyle{long-only-short-only}%
{%
+ \glsxtrAccSuppAbbrSetFirstLongAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtronlyname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvonlyfont{\the\glsshorttok}},%
plural={\protect\glsabbrvonlyfont{\the\glsshortpltok}},%
description={\protect\glslongonlyfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -11294,7 +11979,7 @@ defined}{}%
}%
}%
{%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtronlysuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtronlysuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvonlyfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvonlyfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongonlyfont{##1}}%
@@ -11346,6 +12031,7 @@ defined}{}%
}
\newabbreviationstyle{long-only-short-only-desc}%
{%
+ \glsxtrAccSuppAbbrSetTextShortAttrs\glscategorylabel
\renewcommand*{\CustomAbbreviationFields}{%
name={\glsxtronlydescname},
sort={\glsxtronlydescsort},%
@@ -11532,6 +12218,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitleshort}[1]{%
\Glsxtrshort[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitleshort}[1]{%
+ \GLSxtrshort[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\Glsxtrheadshortpl}[1]{%
\protect\NoCaseChange
{%
@@ -11547,6 +12236,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitleshortpl}[1]{%
\Glsxtrshortpl[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitleshortpl}[1]{%
+ \GLSxtrshortpl[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadname}[1]{%
\protect\NoCaseChange
{%
@@ -11577,6 +12269,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlename}[1]{%
\Glsname[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlename}[1]{%
+ \GLSname[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadtext}[1]{%
\protect\NoCaseChange
{%
@@ -11607,6 +12302,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitletext}[1]{%
\Glstext[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitletext}[1]{%
+ \GLStext[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadplural}[1]{%
\protect\NoCaseChange
{%
@@ -11637,6 +12335,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitleplural}[1]{%
\Glsplural[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitleplural}[1]{%
+ \GLSplural[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadfirst}[1]{%
\protect\NoCaseChange
{%
@@ -11667,6 +12368,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlefirst}[1]{%
\Glsfirst[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlefirst}[1]{%
+ \GLSfirst[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadfirstplural}[1]{%
\protect\NoCaseChange
{%
@@ -11697,6 +12401,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlefirstplural}[1]{%
\Glsfirstplural[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlefirstplural}[1]{%
+ \GLSfirstplural[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadlong}[1]{%
\protect\NoCaseChange
{%
@@ -11742,6 +12449,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlelong}[1]{%
\Glsxtrlong[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlelong}[1]{%
+ \GLSxtrlong[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\Glsxtrheadlongpl}[1]{%
\protect\NoCaseChange
{%
@@ -11757,6 +12467,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlelongpl}[1]{%
\Glsxtrlongpl[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlelongpl}[1]{%
+ \GLSxtrlongpl[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\glsxtrheadfull}[1]{%
\protect\NoCaseChange
{%
@@ -11802,6 +12515,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlefull}[1]{%
\Glsxtrfull[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlefull}[1]{%
+ \GLSxtrfull[noindex,hyper=false]{#1}[]%
+}
\newcommand*{\Glsxtrheadfullpl}[1]{%
\protect\NoCaseChange
{%
@@ -11817,6 +12533,9 @@ defined}{}%
\newrobustcmd*{\Glsxtrtitlefullpl}[1]{%
\Glsxtrfullpl[noindex,hyper=false]{#1}[]%
}
+\newrobustcmd*{\GLSxtrtitlefullpl}[1]{%
+ \GLSxtrfullpl[noindex,hyper=false]{#1}[]%
+}
\ifdef\texorpdfstring
{
\newcommand*{\glsfmtshort}[1]{%
@@ -11891,6 +12610,18 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtname}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlename{#1}}%
+ {\glsentryname{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtname}[1]{%
+ \GLSxtrtitlename{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmttext}[1]{%
\texorpdfstring
{\glsxtrtitletext{#1}}%
@@ -11915,6 +12646,18 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmttext}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitletext{#1}}%
+ {\glsentrytext{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmttext}[1]{%
+ \GLSxtrtitletext{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtplural}[1]{%
\texorpdfstring
{\glsxtrtitleplural{#1}}%
@@ -11939,6 +12682,18 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtplural}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitleplural{#1}}%
+ {\glsentryplural{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtplural}[1]{%
+ \GLSxtrtitleplural{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtfirst}[1]{%
\texorpdfstring
{\glsxtrtitlefirst{#1}}%
@@ -11963,6 +12718,18 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtfirst}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlefirst{#1}}%
+ {\glsentryfirst{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtfirst}[1]{%
+ \Glsxtrtitlefirst{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtfirstpl}[1]{%
\texorpdfstring
{\glsxtrtitlefirstplural{#1}}%
@@ -11987,6 +12754,18 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtfirstpl}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlefirstplural{#1}}%
+ {\glsentryfirstplural{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtfirstpl}[1]{%
+ \GLSxtrtitlefirstplural{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtlong}[1]{%
\texorpdfstring
{\glsxtrtitlelong{#1}}%
@@ -12011,6 +12790,18 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtlong}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlelong{#1}}%
+ {\glsentrylong{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtlong}[1]{%
+ \GLSxtrtitlelong{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtlongpl}[1]{%
\texorpdfstring
{\glsxtrtitlelongpl{#1}}%
@@ -12035,10 +12826,24 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtlongpl}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlelongpl{#1}}%
+ {\glsentrylongpl{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtlongpl}[1]{%
+ \GLSxtrtitlelongpl{#1}}
+}
+\newcommand*{\glspdffmtfull}[1]{\glsentrylong{#1} (\glsentryshort{#1})}%
+\newcommand*{\glspdffmtfullpl}[1]{\glsentrylongpl{#1} (\glsentryshortpl{#1})}%
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtfull}[1]{%
\texorpdfstring
{\glsxtrtitlefull{#1}}%
- {\glsxtrinlinefullformat{#1}{}}%
+ {\glspdffmtfull{#1}}%
}
}
{
@@ -12050,7 +12855,7 @@ defined}{}%
\newcommand*{\Glsfmtfull}[1]{%
\texorpdfstring
{\Glsxtrtitlefull{#1}}%
- {\Glsxtrinlinefullformat{#1}{}}%
+ {\glspdffmtfull{#1}{}}%
}
}
{
@@ -12059,10 +12864,22 @@ defined}{}%
}
\ifdef\texorpdfstring
{
+ \newcommand*{\GLSfmtfull}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlefull{#1}}%
+ {\glspdffmtfull{#1}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtfull}[1]{%
+ \GLSxtrtitlefull{#1}}
+}
+\ifdef\texorpdfstring
+{
\newcommand*{\glsfmtfullpl}[1]{%
\texorpdfstring
{\glsxtrtitlefullpl{#1}}%
- {\glsxtrinlinefullplformat{#1}{}}%
+ {\glspdffmtfullpl{#1}}%
}
}
{
@@ -12074,13 +12891,25 @@ defined}{}%
\newcommand*{\Glsfmtfullpl}[1]{%
\texorpdfstring
{\Glsxtrtitlefullpl{#1}}%
- {\Glsxtrinlinefullplformat{#1}{}}%
+ {\glspdffmtfullpl{#1}{}}%
}
}
{
\newcommand*{\Glsfmtfullpl}[1]{%
\Glsxtrtitlefullpl{#1}}
}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\GLSfmtfullpl}[1]{%
+ \texorpdfstring
+ {\GLSxtrtitlefullpl{#1}}%
+ {\glspdffmtfullpl{#1}{}}%
+ }
+}
+{
+ \newcommand*{\GLSfmtfullpl}[1]{%
+ \GLSxtrtitlefullpl{#1}}
+}
\newcommand*{\RequireGlossariesExtraLang}[1]{%
\@ifundefined{ver@glossariesxtr-#1.ldf}{\input{glossariesxtr-#1.ldf}}{}%
}
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
index 8b4851257aa..67b246421dc 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `glossary-bookindex.sty,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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{glossary-bookindex}[2019/04/09 v1.41 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2020/02/13 v1.42 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}
@@ -80,6 +80,7 @@
{%
\newcommand*{\glsxtrbookindexbookmark}[2]{}
}
+\newcommand*{\glsxtrbookindexbookmarkprefix}{\currentglossary.}
\newcommand*{\glsxtrbookindexcolspread}{}
\newcommand*{\glsxtrbookindexmulticolsenv}{multicols}
\newglossarystyle{bookindex}{%
@@ -195,7 +196,7 @@
\let\@glsxtr@bookindex@subatendgroup\relax
\let\@glsxtr@bookindex@subsubatendgroup\relax
\glsxtrgetgrouptitle{##1}{\glsxtrcurrentgrptitle}%
- \glsxtrbookindexbookmark{\glsxtrcurrentgrptitle}{index.##1}%
+ \glsxtrbookindexbookmark{\glsxtrcurrentgrptitle}{\glsxtrbookindexbookmarkprefix##1}%
\glsxtrbookindexformatheader{\glsxtrcurrentgrptitle}%
\nopagebreak\indexspace\nopagebreak\@afterheading
}%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty
index 5724ca61515..bd3118cb99a 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `glossary-longextra.sty,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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{glossary-longextra}[2019/04/09 v1.41 (NLCT)]
+\ProvidesPackage{glossary-longextra}[2020/02/13 v1.42 (NLCT)]
\RequirePackage{glossary-longbooktabs}
\newcommand{\glslongextraNameFmt}[1]{%
\glsentryitem{#1}\glstarget{#1}{\glossentryname{#1}}%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
index b73fe6dc74d..74bd967eb0f 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
@@ -7,7 +7,7 @@
%% glossaries-extra.dtx (with options: `glossary-topic.sty,package')
%%
%% glossaries-extra.dtx
-%% Copyright 2019 Nicola Talbot
+%% Copyright 2020 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{glossary-topic}[2019/04/09 v1.41 (NLCT)]
+\ProvidesPackage{glossary-topic}[2020/02/13 v1.42 (NLCT)]
\RequirePackage{multicol}
\newglossarystyle{topic}{%
\renewenvironment{theglossary}%