diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty')
| -rw-r--r-- | Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty | 1002 |
1 files changed, 776 insertions, 226 deletions
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 fe0f3ceda2e..45d8d8ccdfd 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2016/04/27 v1.03 (NLCT)] +\ProvidesPackage{glossaries-extra}[2016/05/02 v1.04 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -251,7 +251,7 @@ \PackageError{glossaries-extra}% {Glossaries style package `glossary-\@glsxtr@tmp.sty' doesn't exist (did you mean to use the `style' key?)}% - {The list of values (#1) in the `styles' key should + {The list of values (#1) in the `stylemods' key should match the glossary-xxx.sty files provided with glossaries.sty}% }% @@ -259,6 +259,13 @@ \appto\@glsxtr@redefstyles{\RequirePackage{glossaries-extra-stylemods}}% }% } +\newcommand*{\@glsxtr@do@style}{} +\define@key{glossaries-extra.sty}{style}{% + \renewcommand*{\@glsxtr@do@style}{% + \setkeys{glossaries.sty}{style={#1}}% + \setglossarystyle{#1}% + }% +} \DeclareOptionX*{% \expandafter\glsxtr@dooption\expandafter{\CurrentOption}} \ProcessOptionsX @@ -583,16 +590,79 @@ \fi } {}% - \def\org@glossaryentrynumbers#1{#1\gls@save@numberlist{#1}}% - \ifx\org@glossaryentrynumbers\glossaryentrynumbers - \glsnonumberlistfalse - \renewcommand*{\glossaryentrynumbers}[1]{% - \GlsXtrFormatLocationList{#1}\gls@save@numberlist{#1}}% - \else - \glsnonumberlisttrue - \renewcommand*{\glossaryentrynumbers}[1]{\gls@save@numberlist{#1}}% - \fi +\def\org@glossaryentrynumbers#1{#1\gls@save@numberlist{#1}}% +\ifx\org@glossaryentrynumbers\glossaryentrynumbers + \glsnonumberlistfalse + \renewcommand*{\glossaryentrynumbers}[1]{% + \ifglsentryexists{\glscurrententrylabel}% + {% + \@glsxtrpreloctag + \GlsXtrFormatLocationList{#1}% + \@glsxtrpostloctag + \gls@save@numberlist{#1}% + }{}% + }% +\else + \glsnonumberlisttrue + \renewcommand*{\glossaryentrynumbers}[1]{% + \ifglsentryexists{\glscurrententrylabel}% + {% + \gls@save@numberlist{#1}% + }{}% + }% +\fi \newcommand*{\GlsXtrFormatLocationList}[1]{#1} +\newcommand*{\GlsXtrEnablePreLocationTag}[2]{% + \let\@glsxtrpreloctag\@@glsxtrpreloctag + \let\@glsxtrpostloctag\@@glsxtrpostloctag + \renewcommand*{\@glsxtr@pagetag}{#1}% + \renewcommand*{\@glsxtr@pagestag}{#2}% + \renewcommand*{\@glsxtr@savepreloctag}[2]{% + \csgdef{@glsxtr@preloctag@##1}{##2}% + }% + \renewcommand*{\@glsxtr@doloctag}{% + \ifcsundef{@glsxtr@preloctag@\glscurrententrylabel}% + {% + \GlossariesWarning{Missing pre-location tag for `\glscurrententrylabel'. + Rerun required}% + }% + {% + \csuse{@glsxtr@preloctag@\glscurrententrylabel}% + }% + }% +} +\@onlypreamble\GlsXtrEnablePreLocationTag +\newcommand*{\@@glsxtrpreloctag}{% + \let\@glsxtr@org@delimN\delimN + \let\@glsxtr@org@delimR\delimR + \let\@glsxtr@org@glsignore\glsignore + \gdef\@glsxtr@thisloctag{\@glsxtr@pagetag}% + \renewcommand*{\delimN}{% + \gdef\@glsxtr@thisloctag{\@glsxtr@pagestag}% + \@glsxtr@org@delimN}% + \renewcommand*{\delimR}{% + \gdef\@glsxtr@thisloctag{\@glsxtr@pagestag}% + \@glsxtr@org@delimR}% + \renewcommand*{\glsignore}[1]{% + \gdef\@glsxtr@thisloctag{\relax}% + \@glsxtr@org@glsignore{##1}}% + \@glsxtr@doloctag +} +\newcommand*{\@glsxtrpreloctag}{} +\newcommand*{\@glsxtr@pagetag}{}% +\newcommand*{\@glsxtr@pagestag}{}% +\newcommand*{\@@glsxtrpostloctag}{% + \let\delimN\@glsxtr@org@delimN + \let\delimR\@glsxtr@org@delimR + \let\glsignore\@glsxtr@org@glsignore + \protected@write\@auxout{}% + {\string\@glsxtr@savepreloctag{\glscurrententrylabel}{\@glsxtr@thisloctag}}% +} +\newcommand*{\@glsxtrpostloctag}{} +\newcommand*{\@glsxtr@savepreloctag}[2]{} +\protected@write\@auxout{}{% + \string\providecommand\string\@glsxtr@savepreloctag[2]{}} +\newcommand*{\@glsxtr@doloctag}{} \renewcommand*{\KV@printgloss@nonumberlist}[1]{% \XKV@plfalse \XKV@sttrue @@ -603,7 +673,9 @@ \def\glossaryentrynumbers##1{\gls@save@numberlist{##1}}% \else \def\glossaryentrynumbers##1{% + \@glsxtrpreloctag \GlsXtrFormatLocationList{##1}% + \@glsxtrpostloctag \gls@save@numberlist{##1}}% \fi }% @@ -611,9 +683,14 @@ \renewcommand*{\glsentryfmt}{% \ifglshasshort{\glslabel}{\glssetabbrvfmt{\glscategory{\glslabel}}}{}% \glsifregular{\glslabel}% - {\glsgenentryfmt}% - {\ifglshasshort{\glslabel}{\glsxtrgenabbrvfmt}{\glsgenentryfmt}}% + {\glsxtrregularfont{\glsgenentryfmt}}% + {% + \ifglshasshort{\glslabel}% + {\glsxtrgenabbrvfmt}% + {\glsxtrregularfont{\glsgenentryfmt}}% + }% } +\newcommand*{\glsxtrregularfont}[1]{#1} \renewcommand{\@gls@field@link}[4][]{% \glsdoifexists{#3}% {% @@ -631,182 +708,261 @@ \let\glscapscase\@firstofthree \let\glsinsert\@empty } +\newcommand*{\glsxtrassignfieldfont}[1]{% + \ifglshasshort{#1}% + {% + \glssetabbrvfmt{\glscategory{#1}}% + \glsifregular{#1}% + {\let\@gls@field@font\glsxtrregularfont}% + {\let\@gls@field@font\@firstofone}% + }% + {% + \glsifnotregular{#1}% + {\let\@gls@field@font\@firstofone}% + {\let\@gls@field@font\glsxtrregularfont}% + }% +} +\def\@glstext@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% + \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccesstext{#2}#3}}% +} \def\@GLStext@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdofthree]{#1}{#2}% - {\mfirstucMakeUppercase{\glsentrytext{#2}#3}}% + {\@gls@field@font{\GLSaccesstext{#2}\mfirstucMakeUppercase{#3}}}% } \def\@Glstext@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@secondofthree]{#1}{#2}% - {\Glsentrytext{#2}#3}% + {\@gls@field@font{\Glsaccesstext{#2}#3}}% } \def\@glsfirst@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glsxtrifwasfirstuse\@firstoftwo]{#1}{#2}% - {\glsentryfirst{#2}#3}% + {\@gls@field@font{\glsaccessfirst{#2}#3}}% } \def\@Glsfirst@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsxtrifwasfirstuse\@firstoftwo \let\glscapscase\@secondofthree ]% - {#1}{#2}{\Glsentryfirst{#2}#3}% + {#1}{#2}{\@gls@field@font{\Glsaccessfirst{#2}#3}}% } \def\@GLSfirst@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsxtrifwasfirstuse\@firstoftwo \let\glscapscase\@thirdofthree ]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}% + {#1}{#2}{\@gls@field@font{\GLSaccessfirst{#2}\mfirstucMakeUppercase{#3}}}% } \def\@glsplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glsifplural\@firstoftwo]{#1}{#2}% - {\glsentryplural{#2}#3}% + {\@gls@field@font{\glsaccessplural{#2}#3}}% } \def\@Glsplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsifplural\@firstoftwo \let\glscapscase\@secondofthree ]% - {#1}{#2}{\Glsentryplural{#2}#3}% + {#1}{#2}{\@gls@field@font{\Glsaccessplural{#2}#3}}% } \def\@GLSplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsifplural\@firstoftwo \let\glscapscase\@thirdofthree ]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}% + {#1}{#2}{\@gls@field@font{\GLSaccessplural{#2}\mfirstucMakeUppercase{#3}}}% } \def\@glsfirstplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsxtrifwasfirstuse\@firstoftwo \let\glsifplural\@firstoftwo ]% - {#1}{#2}{\glsentryfirstplural{#2}#3}% + {#1}{#2}{\@gls@field@font{\glsaccessfirstplural{#2}#3}}% } \def\@Glsfirstplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsxtrifwasfirstuse\@firstoftwo \let\glsifplural\@firstoftwo \let\glscapscase\@secondofthree ]% - {#1}{#2}{\Glsentryfirstplural{#2}#3}% + {#1}{#2}{\@gls@field@font{\Glsaccessfirstplural{#2}#3}}% } \def\@GLSfirstplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glsxtrifwasfirstuse\@firstoftwo \let\glsifplural\@firstoftwo \let\glscapscase\@thirdofthree ]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}% + {#1}{#2}% + {\@gls@field@font{\GLSaccessfirstplural{#2}\mfirstucMakeUppercase{#3}}}% +} +\def\@glsname@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% + \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccessname{#2}#3}}% } \def\@Glsname@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryname{#2}#3}% + [\let\glscapscase\@secondoftwo]{#1}{#2}% + {\@gls@field@font{\Glsaccessname{#2}#3}}% } \def\@GLSname@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}% + {#1}{#2}% + {\@gls@field@font{\GLSaccessname{#2}\mfirstucMakeUppercase{#3}}}% +} +\def\@glsdesc@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% + \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccessdesc{#2}#3}}% } \def\@Glsdesc@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentrydesc{#2}#3}% + [\let\glscapscase\@secondoftwo]{#1}{#2}% + {\@gls@field@font{\Glsaccessdesc{#2}#3}}% } \def\@GLSdesc@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}% + {#1}{#2}{\@gls@field@font{\GLSaccessdesc{#2}\mfirstucMakeUppercase{#3}}}% } \def\@glsdescplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glscapscase\@secondoftwo \let\glsifplural\@firstoftwo - ]{#1}{#2}{\glsentrydescplural{#2}#3}% + ]{#1}{#2}{\@gls@field@font{\glsaccessdescplural{#2}#3}}% } \def\@Glsdescplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glscapscase\@secondoftwo \let\glsifplural\@firstoftwo - ]{#1}{#2}{\Glsentrydescplural{#2}#3}% + ]{#1}{#2}{\@gls@field@font{\Glsaccessdescplural{#2}#3}}% } \def\@GLSdesc@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glscapscase\@thirdoftwo \let\glsifplural\@firstoftwo ]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}% + {#1}{#2}% + {\@gls@field@font{\GLSaccessdescplural{#2}\mfirstucMakeUppercase{#3}}}% +} +\def\@glssymbol@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% + \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccesssymbol{#2}#3}}% } \def\@Glssymbol@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentrysymbol{#2}#3}% + [\let\glscapscase\@secondoftwo]% + {#1}{#2}{\@gls@field@font{\Glsaccesssymbol{#2}#3}}% } \def\@GLSsymbol@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}% + {#1}{#2}{\@gls@field@font{\GLSaccesssymbol{#2}\mfirstucMakeUppercase{#3}}}% } \def\@glssymbolplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glscapscase\@secondoftwo \let\glsifplural\@firstoftwo - ]{#1}{#2}{\glsentrysymbolplural{#2}#3}% + ]{#1}{#2}{\@gls@field@font{\glsaccesssymbolplural{#2}#3}}% } \def\@Glssymbolplural@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glscapscase\@secondoftwo \let\glsifplural\@firstoftwo - ]{#1}{#2}{\Glsentrysymbolplural{#2}#3}% + ]{#1}{#2}{\@gls@field@font{\Glsaccesssymbolplural{#2}#3}}% } \def\@GLSsymbol@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link [\let\glscapscase\@thirdoftwo \let\glsifplural\@firstoftwo ]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}% + {#1}{#2}% + {\@gls@field@font{\GLSaccesssymbolplural{#2}\mfirstucMakeUppercase{#3}}}% } \def\@Glsuseri@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseri{#2}#3}% + [\let\glscapscase\@secondoftwo]{#1}{#2}% + {\@gls@field@font{\Glsentryuseri{#2}#3}}% } \def\@GLSuseri@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}% + {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}}% } \def\@Glsuserii@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuserii{#2}#3}% + [\let\glscapscase\@secondoftwo]% + {#1}{#2}{\@gls@field@font{\Glsentryuserii{#2}#3}}% } \def\@GLSuserii@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}% + {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}}% } \def\@Glsuseriii@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseriii{#2}#3}% + [\let\glscapscase\@secondoftwo]% + {#1}{#2}{\@gls@field@font{\Glsentryuseriii{#2}#3}}% } \def\@GLSuseriii@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}% + {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}}% } \def\@Glsuseriv@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseriv{#2}#3}% + [\let\glscapscase\@secondoftwo]% + {#1}{#2}{\@gls@field@font{\Glsentryuseriv{#2}#3}}% } \def\@GLSuseriv@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}% + {#1}{#2}% + {\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}}% } \def\@Glsuserv@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuserv{#2}#3}% + [\let\glscapscase\@secondoftwo]% + {#1}{#2}{\@gls@field@font{\Glsentryuserv{#2}#3}}% } \def\@GLSuserv@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}% + {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}}% } \def\@Glsuservi@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link - [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuservi{#2}#3}% + [\let\glscapscase\@secondoftwo]% + {#1}{#2}{\@gls@field@font{\Glsentryuservi{#2}#3}}% } \def\@GLSuservi@#1#2[#3]{% + \glsxtrassignfieldfont{#2}% \@gls@field@link[\let\glscapscase\@thirdoftwo]% - {#1}{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}% + {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}}% } \def\@acrshort#1#2[#3]{% \glsdoifexists{#2}% @@ -1262,11 +1418,11 @@ \def\@glsxtr@p@long@#1#2[#3]{{\glsentrylong{#2}#3}} \def\@Glsxtr@p@long@#1#2[#3]{{\Glsentrylong{#2}#3}} \def\@GLSxtr@p@long@#1#2[#3]{% - {\mfirstucMakeUppercase{\glsentrylong{#2}#3}}} + {\mfirstucMakeUppercase{\glslongfont{\glsentrylong{#2}}#3}}} \def\@glsxtr@p@longpl@#1#2[#3]{{\glsentrylongpl{#2}#3}} -\def\@Glsxtr@p@longpl@#1#2[#3]{{\Glsentrylongpl{#2}#3}} +\def\@Glsxtr@p@longpl@#1#2[#3]{{\glslongfont{\Glsentrylongpl{#2}}#3}} \def\@GLSxtr@p@longpl@#1#2[#3]{% - {\mfirstucMakeUppercase{\glsentrylongpl{#2}#3}}} + {\mfirstucMakeUppercase{\glslongfont{\glsentrylongpl{#2}}#3}}} \def\@glsxtr@p@acrshort@#1#2[#3]{{\acronymfont{\glsentryshort{#2}}#3}} \def\@Glsxtr@p@acrshort@#1#2[#3]{{\acronymfont{\Glsentryshort{#2}}#3}} \def\@GLSxtr@p@acrshort@#1#2[#3]{% @@ -2008,7 +2164,7 @@ want }% }% }% -\let\@glsxtr@idx@entrynumberlist\glsentrynumberlist +\newcommand*{\@glsxtr@idx@entrynumberlist}[1]{\glsentrynumberlist{#1}} \renewcommand{\@print@glossary}{% \makeatletter \@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% @@ -2094,7 +2250,7 @@ want \begin{itemize} \item Run the external (Lua) application: - \texttt{makeglossaries-lite \string"\jobname\string"} + \texttt{makeglossaries-lite.lua \string"\jobname\string"} \item Run the external (Perl) application: @@ -2125,7 +2281,7 @@ want \item Run the external (Lua) application: - \texttt{makeglossaries-lite \string"\jobname\string"} + \texttt{makeglossaries-lite.lua \string"\jobname\string"} \item Run the external (Perl) application: @@ -2207,9 +2363,6 @@ want }% {#1}% } -\def\@glsname@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccessname{#2}#3}% -} \newcommand*{\Glsaccessname}[1]{% \glsnameaccessdisplay {% @@ -2217,9 +2370,6 @@ want }% {#1}% } -\def\@Glsname@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccessname{#2}#3}% -} \newcommand*{\GLSaccessname}[1]{% \glsnameaccessdisplay {% @@ -2227,9 +2377,6 @@ want }% {#1}% } -\def\@GLSname@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccessname{#2}#3}% -} \newcommand*{\glsaccesstext}[1]{% \glstextaccessdisplay {% @@ -2237,9 +2384,6 @@ want }% {#1}% } -\def\@glstext@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccesstext{#2}#3}% -} \newcommand*{\Glsaccesstext}[1]{% \glstextaccessdisplay {% @@ -2247,9 +2391,6 @@ want }% {#1}% } -\def\@Glstext@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccesstext{#2}#3}% -} \newcommand*{\GLSaccesstext}[1]{% \glstextaccessdisplay {% @@ -2257,9 +2398,6 @@ want }% {#1}% } -\def\@GLStext@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccesstext{#2}#3}% -} \newcommand*{\glsaccessplural}[1]{% \glspluralaccessdisplay {% @@ -2267,9 +2405,6 @@ want }% {#1}% } -\def\@glsplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccessplural{#2}#3}% -} \newcommand*{\Glsaccessplural}[1]{% \glspluralaccessdisplay {% @@ -2277,9 +2412,6 @@ want }% {#1}% } -\def\@glsplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccessplural{#2}#3}% -} \newcommand*{\GLSaccessplural}[1]{% \glspluralaccessdisplay {% @@ -2287,9 +2419,6 @@ want }% {#1}% } -\def\@GLSplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccessplural{#2}#3}% -} \newcommand*{\glsaccessfirst}[1]{% \glsfirstaccessdisplay {% @@ -2297,9 +2426,6 @@ want }% {#1}% } -\def\@glsfirst@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccessfirst{#2}#3}% -} \newcommand*{\Glsaccessfirst}[1]{% \glsfirstaccessdisplay {% @@ -2307,9 +2433,6 @@ want }% {#1}% } -\def\@Glsfirst@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccessfirst{#2}#3}% -} \newcommand*{\GLSaccessfirst}[1]{% \glsfirstaccessdisplay {% @@ -2317,9 +2440,6 @@ want }% {#1}% } -\def\@GLSfirst@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccessfirst{#2}#3}% -} \newcommand*{\glsaccessfirstplural}[1]{% \glsfirstpluralaccessdisplay {% @@ -2327,9 +2447,6 @@ want }% {#1}% } -\def\@glsfirstplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccessfirstplural{#2}#3}% -} \newcommand*{\Glsaccessfirstplural}[1]{% \glsfirstpluralaccessdisplay {% @@ -2337,9 +2454,6 @@ want }% {#1}% } -\def\@Glsfirstplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccessfirstplural{#2}#3}% -} \newcommand*{\GLSaccessfirstplural}[1]{% \glsfirstpluralaccessdisplay {% @@ -2347,9 +2461,6 @@ want }% {#1}% } -\def\@GLSfirstplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccessfirstplural{#2}#3}% -} \newcommand*{\glsaccesssymbol}[1]{% \glssymbolaccessdisplay {% @@ -2357,9 +2468,6 @@ want }% {#1}% } -\def\@glssymbol@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccesssymbol{#2}#3}% -} \newcommand*{\Glsaccesssymbol}[1]{% \glssymbolaccessdisplay {% @@ -2367,9 +2475,6 @@ want }% {#1}% } -\def\@Glssymbol@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccesssymbol{#2}#3}% -} \newcommand*{\GLSaccesssymbol}[1]{% \glssymbolaccessdisplay {% @@ -2377,9 +2482,6 @@ want }% {#1}% } -\def\@GLSsymbol@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccesssymbol{#2}#3}% -} \newcommand*{\glsaccesssymbolplural}[1]{% \glssymbolpluralaccessdisplay {% @@ -2387,9 +2489,6 @@ want }% {#1}% } -\def\@glssymbolplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccesssymbolplural{#2}#3}% -} \newcommand*{\Glsaccesssymbolplural}[1]{% \glssymbolpluralaccessdisplay {% @@ -2397,9 +2496,6 @@ want }% {#1}% } -\def\@Glssymbolplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccesssymbolplural{#2}#3}% -} \newcommand*{\GLSaccesssymbolplural}[1]{% \glssymbolpluralaccessdisplay {% @@ -2407,9 +2503,6 @@ want }% {#1}% } -\def\@GLSsymbolplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccesssymbolplural{#2}#3}% -} \newcommand*{\glsaccessdesc}[1]{% \glsdescriptionaccessdisplay {% @@ -2417,9 +2510,6 @@ want }% {#1}% } -\def\@glsdesc@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccessdesc{#2}#3}% -} \newcommand*{\Glsaccessdesc}[1]{% \glsdescriptionaccessdisplay {% @@ -2427,9 +2517,6 @@ want }% {#1}% } -\def\@Glsdesc@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccessdesc{#2}#3}% -} \newcommand*{\GLSaccessdesc}[1]{% \glsdescriptionaccessdisplay {% @@ -2437,9 +2524,6 @@ want }% {#1}% } -\def\@GLSdesc@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccessdesc{#2}#3}% -} \newcommand*{\glsaccessdescplural}[1]{% \glsdescriptionpluralaccessdisplay {% @@ -2447,9 +2531,6 @@ want }% {#1}% } -\def\@glsdescplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\glsaccessdescplural{#2}#3}% -} \newcommand*{\Glsaccessdescplural}[1]{% \glsdescriptionpluralaccessdisplay {% @@ -2457,9 +2538,6 @@ want }% {#1}% } -\def\@Glsdescplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\Glsaccessdescplural{#2}#3}% -} \newcommand*{\GLSaccessdescplural}[1]{% \glsdescriptionpluralaccessdisplay {% @@ -2467,9 +2545,6 @@ want }% {#1}% } -\def\@GLSdescplural@#1#2[#3]{% - \@gls@field@link{#1}{#2}{\GLSaccessdescplural{#2}#3}% -} \newcommand*{\glsaccessshort}[1]{% \glsshortaccessdisplay {% @@ -2637,9 +2712,15 @@ want \newcommand{\glsifregularcategory}[3]{% \glsifcategoryattribute{#1}{regular}{true}{#2}{#3}% } +\newcommand{\glsifnotregularcategory}[3]{% + \glsifcategoryattribute{#1}{regular}{false}{#2}{#3}% +} \newcommand{\glsifregular}[3]{% \glsifregularcategory{\glscategory{#1}}{#2}{#3}% } +\newcommand{\glsifnotregular}[3]{% + \glsifnotregularcategory{\glscategory{#1}}{#2}{#3}% +} \newcommand{\glsforeachincategory}[5][\@glo@types]{% \forallglossaries[#1]{#3}% {% @@ -2712,9 +2793,24 @@ want \glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glshasattribute{#1}{glossdescfont}% + {% + \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossdescfont attribute + for entry `#1'. Ignoring}% + \let\@glsxtr@glossdescfont\@firstofone + }% + }% + {\let\@glsxtr@glossdescfont\@firstofone}% \glsifattribute{#1}{glossdesc}{firstuc}% {% - \Glsaccessdesc{#1}% + \@glsxtr@glossdescfont{\Glsaccessdesc{#1}}% }% {% \glsifattribute{#1}{glossdesc}{title}% @@ -2722,12 +2818,12 @@ want \@glsxtr@do@titlecaps@warn \glsdescriptionaccessdisplay {% - \glsxtrfieldtitlecase{#1}{desc}% + \@glsxtr@glossdescfont{\glsxtrfieldtitlecase{#1}{desc}}% }% {#1}% }% {% - \glsaccessdesc{#1}% + \@glsxtr@glossdescfont{\glsaccessdesc{#1}}% }% }% }% @@ -2738,18 +2834,33 @@ want \glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glshasattribute{#1}{glossdescfont}% + {% + \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossdescfont attribute + for entry `#1'. Ignoring}% + \let\@glsxtr@glossdescfont\@firstofone + }% + }% + {\let\@glsxtr@glossdescfont\@firstofone}% \glsifattribute{#1}{glossdesc}{firstuc}% {% - \Glsentrydesc{#1}% + \@glsxtr@glossdescfont{\Glsentrydesc{#1}}% }% {% \glsifattribute{#1}{glossdesc}{title}% {% \@glsxtr@do@titlecaps@warn - \glsxtrfieldtitlecase{#1}{desc}% + \@glsxtr@glossdescfont{\glsxtrfieldtitlecase{#1}{desc}}% }% {% - \glsentrydesc{#1}% + \@glsxtr@glossdescfont{\glsentrydesc{#1}}% }% }% }% @@ -2761,11 +2872,26 @@ want \glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glshasattribute{#1}{glossnamefont}% + {% + \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossnamefont attribute + for entry `#1'. Reverting to default \string\glsnamefont}% + \let\@glsxtr@glossnamefont\glsnamefont + }% + }% + {\let\@glsxtr@glossnamefont\glsnamefont}% \glsifattribute{#1}{glossname}{firstuc}% {% \glsnameaccessdisplay {% - \glsnamefont{\Glsentryname{#1}}% + \@glsxtr@glossnamefont{\Glsentryname{#1}}% }% {#1}% }% @@ -2775,7 +2901,7 @@ want \@glsxtr@do@titlecaps@warn \glsnameaccessdisplay {% - \glsnamefont{\glsxtrfieldtitlecase{#1}{name}}% + \@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{name}}% }% {#1}% }% @@ -2785,7 +2911,7 @@ want \glsnameaccessdisplay {% \letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}% - \glsnamefont{\mfirstucMakeUppercase{\glo@name}}% + \@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}% }% {#1}% }% @@ -2793,7 +2919,7 @@ want \letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}% \glsnameaccessdisplay {% - \expandafter\glsnamefont\expandafter{\glo@name}% + \expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}% }% {#1}% }% @@ -2808,30 +2934,45 @@ want \glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glshasattribute{#1}{glossnamefont}% + {% + \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossnamefont attribute + for entry `#1'. Reverting to default \string\glsnamefont}% + \let\@glsxtr@glossnamefont\glsnamefont + }% + }% + {\let\@glsxtr@glossnamefont\glsnamefont}% \glsifattribute{#1}{glossname}{firstuc}% {% - \glsnamefont{\Glsentryname{#1}}% + \@glsxtr@glossnamefont{\Glsentryname{#1}}% }% {% \glsifattribute{#1}{glossname}{title}% {% \@glsxtr@do@titlecaps@warn - \glsnamefont{\glsxtrfieldtitlecase{#1}{name}}% + \@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{name}}% }% {% \glsifattribute{#1}{glossname}{uc}% {% \letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}% - \glsnamefont{\mfirstucMakeUppercase{\glo@name}}% + \@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}% }% {% \letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}% - \expandafter\glsnamefont\expandafter{\glo@name}% + \expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}% }% }% }% + \glsxtrpostnamehook{#1}% }% - \glsxtrpostnamehook{#1}% } } \@ifpackageloaded{glossaries-accsupp} @@ -2840,9 +2981,24 @@ want \glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glshasattribute{#1}{glossnamefont}% + {% + \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossnamefont attribute + for entry `#1'. Reverting to default \string\glsnamefont}% + \let\@glsxtr@glossnamefont\glsnamefont + }% + }% + {\let\@glsxtr@glossnamefont\glsnamefont}% \glsnameaccessdisplay {% - \glsnamefont{\Glsentryname{#1}}% + \@glsxtr@glossnamefont{\Glsentryname{#1}}% }% {#1}% \glsxtrpostnamehook{#1}% @@ -2854,7 +3010,22 @@ want \glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% - \glsnamefont{\Glsentryname{#1}}% + \glshasattribute{#1}{glossnamefont}% + {% + \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossnamefont attribute + for entry `#1'. Reverting to default \string\glsnamefont}% + \let\@glsxtr@glossnamefont\glsnamefont + }% + }% + {\let\@glsxtr@glossnamefont\glsnamefont}% + \@glsxtr@glossnamefont{\Glsentryname{#1}}% \glsxtrpostnamehook{#1}% }% } @@ -2862,6 +3033,7 @@ want \newcommand*{\glsxtrpostnamehook}[1]{% \def\@glsnumberformat{glsnumberformat}% \glsxtrdoautoindexname{#1}{indexname}% + \csuse{glsxtrpostname\glscategory{\glscurrententrylabel}}% } \newif\if@glsxtr@format@override \@glsxtr@format@overridefalse @@ -3105,8 +3277,11 @@ want \@glsxtr@activate@initialtagging \let\@glsxtr@org@postdescription\glspostdescription \renewcommand*{\glspostdescription}{% - \glsxtrpostdescription - \@glsxtr@org@postdescription + \ifglsentryexists{\glscurrententrylabel}% + {% + \glsxtrpostdescription + \@glsxtr@org@postdescription + }{}% }% }% } @@ -3225,7 +3400,10 @@ want \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 }% {}% } @@ -3352,8 +3530,10 @@ want \newcommand*{\glsfirstabbrvdefaultfont}[1]{\glsabbrvfont{#1}} \newcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{#1}} \newcommand*{\glsabbrvdefaultfont}[1]{#1} -\newcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{#1}} -\newcommand*{\glsfirstlongdefaultfont}[1]{#1} +\newcommand*{\glslongfont}[1]{\glslongdefaultfont{#1}} +\newcommand*{\glslongdefaultfont}[1]{#1} +\newcommand*{\glsfirstlongfont}[1]{\glslongfont{#1}} +\newcommand*{\glsfirstlongdefaultfont}[1]{\glslongdefaultfont{#1}} \newcommand*{\abbrvpluralsuffix}{\glspluralsuffix} \newrobustcmd*{\glsxtrfull}{\@gls@hyp@opt\ns@glsxtrfull} \newcommand*\ns@glsxtrfull[2][]{% @@ -3486,7 +3666,8 @@ want \let\glscapscase\@firstofthree \let\glsinsert\@empty \def\glscustomtext{% - \glsabbrvfont{\glsaccessshort{#2}}#3% + \glsabbrvfont{\glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% @@ -3506,7 +3687,8 @@ want \let\glscapscase\@secondofthree \let\glsinsert\@empty \def\glscustomtext{% - \glsabbrvfont{\Glsaccessshort{#2}}#3% + \glsabbrvfont{\Glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% @@ -3526,7 +3708,10 @@ want \let\glscapscase\@thirdofthree \let\glsinsert\@empty \def\glscustomtext{% - \mfirstucMakeUppercase{\glsabbrvfont{\glsaccessshort{#2}}#3}% + \mfirstucMakeUppercase + {\glsabbrvfont{\glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% @@ -3544,7 +3729,10 @@ want \let\glsifplural\@secondoftwo \let\glscapscase\@firstofthree \let\glsinsert\@empty - \def\glscustomtext{\glsaccesslong{#2}#3}% + \def\glscustomtext{% + \glslongfont{\glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% \glspostlinkhook @@ -3561,7 +3749,10 @@ want \let\glsifplural\@secondoftwo \let\glscapscase\@secondofthree \let\glsinsert\@empty - \def\glscustomtext{\Glsaccesslong{#2}#3}% + \def\glscustomtext{% + \glslongfont{\Glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% \glspostlinkhook @@ -3578,7 +3769,12 @@ want \let\glsifplural\@secondoftwo \let\glscapscase\@thirdofthree \let\glsinsert\@empty - \def\glscustomtext{\mfirstucMakeUppercase{\glsaccesslong{#2}#3}}% + \def\glscustomtext{% + \mfirstucMakeUppercase + {\glslongfont{\glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% + }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% \glspostlinkhook @@ -3597,7 +3793,8 @@ want \let\glscapscase\@firstofthree \let\glsinsert\@empty \def\glscustomtext{% - \glsabbrvfont{\glsaccessshortpl{#2}}#3% + \glsabbrvfont{\glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% @@ -3617,7 +3814,8 @@ want \let\glscapscase\@secondofthree \let\glsinsert\@empty \def\glscustomtext{% - \glsabbrvfont{\Glsaccessshortpl{#2}}#3% + \glsabbrvfont{\Glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% @@ -3637,7 +3835,10 @@ want \let\glscapscase\@thirdofthree \let\glsinsert\@empty \def\glscustomtext{% - \mfirstucMakeUppercase{\glsabbrvfont{\glsaccessshortpl{#2}}#3}% + \mfirstucMakeUppercase + {\glsabbrvfont{\glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% @@ -3655,7 +3856,10 @@ want \let\glsifplural\@firstoftwo \let\glscapscase\@firstofthree \let\glsinsert\@empty - \def\glscustomtext{\glsaccesslongpl{#2}#3}% + \def\glscustomtext{% + \glslongfont{\glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% \glspostlinkhook @@ -3672,7 +3876,10 @@ want \let\glsifplural\@firstoftwo \let\glscapscase\@secondofthree \let\glsinsert\@empty - \def\glscustomtext{\Glsaccesslongpl{#2}#3}% + \def\glscustomtext{% + \glslongfont{\Glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% \glspostlinkhook @@ -3689,7 +3896,12 @@ want \let\glsifplural\@firstoftwo \let\glscapscase\@thirdofthree \let\glsinsert\@empty - \def\glscustomtext{\mfirstucMakeUppercase{\glsaccesslongpl{#2}#3}}% + \def\glscustomtext{% + \mfirstucMakeUppercase + {\glslongfont{\glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}% + \ifglsxtrinsertinside\else#3\fi + }% + }% \@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}% }% \glspostlinkhook @@ -3801,7 +4013,7 @@ want \csuse{@glsabbrv@dispstyle@fmts@#1}% } \newcommand*{\newabbreviationstyle}[3]{% - \ifcsdef{@glsabbrv@dispstyle@#1} + \ifcsdef{@glsabbrv@dispstyle@setup@#1} {% \PackageError{glossaries-extra}{Abbreviation style `#1' already defined}{}% @@ -3818,6 +4030,38 @@ want #3}% }% } +\newcommand*{\renewabbreviationstyle}[3]{% + \ifcsundef{@glsabbrv@dispstyle@setup@#1} + {% + \PackageError{glossaries-extra}{Abbreviation style `#1' not defined}{}% + }% + {% + \csdef{@glsabbrv@dispstyle@setup@#1}{% + \renewcommand*{\GlsXtrPostNewAbbreviation}{}% + #2}% + \csdef{@glsabbrv@dispstyle@fmts@#1}{% + \renewcommand*{\glsxtrinlinefullformat}{\glsxtrfullformat}% + \renewcommand*{\Glsxtrinlinefullformat}{\Glsxtrfullformat}% + \renewcommand*{\glsxtrinlinefullplformat}{\glsxtrfullplformat}% + \renewcommand*{\Glsxtrinlinefullplformat}{\Glsxtrfullplformat}% + #3}% + }% +} +\newcommand*{\letabbreviationstyle}[2]{% + \csletcs{@glsabbrv@dispstyle@setup@#1}{@glsabbrv@dispstyle@setup@#2}% + \csletcs{@glsabbrv@dispstyle@fmts@#1}{@glsabbrv@dispstyle@fmts@#2}% +} +\newcommand*{\@glsxtr@deprecated@abbrstyle}[2]{% + \csdef{@glsabbrv@dispstyle@setup@#1}{% + \GlsXtrWarnDeprecatedAbbrStyle{#1}{#2}% + \csuse{@glsabbrv@dispstyle@setup@#2}% + }% + \csletcs{@glsabbrv@dispstyle@fmts@#1}{@glsabbrv@dispstyle@fmts@#2}% +} +\newcommand*{\GlsXtrWarnDeprecatedAbbrStyle}[2]{% + \GlossariesExtraWarning{Deprecated abbreviation style name `#1', + use `#2' instead}% +} \newcommand*{\GlsXtrUseAbbrStyleSetup}[1]{% \ifcsundef{@glsabbrv@dispstyle@setup@#1}% {% @@ -3866,6 +4110,7 @@ want \renewcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% \ifglsxtrinsertinside\else##2\fi @@ -3889,11 +4134,12 @@ want }% } \setabbreviationstyle{long-short} +\newcommand*{\glsxtrlongshortdescsort}{\the\glslongtok\space(\the\glsshorttok)} \newabbreviationstyle{long-short-desc}% {% \renewcommand*{\CustomAbbreviationFields}{% name={\protect\glsxtrfullformat{\the\glslabeltok}{}}, - sort={\the\glsshorttok},% + sort={\glsxtrlongshortdescsort},% first={\protect\glsfirstlongfont{\the\glslongtok}% \protect\glsxtrfullsep{\the\glslabeltok}% (\protect\glsfirstabbrvfont{\the\glsshorttok})},% @@ -3938,6 +4184,7 @@ want \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% \ifglsxtrinsertinside\else##2\fi @@ -4009,6 +4256,7 @@ want \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% \ifglsxtrinsertinside\else##2\fi @@ -4050,6 +4298,7 @@ want (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } +\letabbreviationstyle{short-footnote}{footnote} \newabbreviationstyle{postfootnote}% {% \renewcommand*{\CustomAbbreviationFields}{% @@ -4085,6 +4334,7 @@ want \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% \ifglsxtrinsertinside\else##2\fi @@ -4122,6 +4372,7 @@ want (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } +\letabbreviationstyle{short-postfootnote}{postfootnote} \newabbreviationstyle{short}% {% \renewcommand*{\CustomAbbreviationFields}{% @@ -4140,6 +4391,7 @@ want \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrinlinefullformat}[2]{% \protect\glsfirstabbrvfont{\glsaccessshort{##1}% \ifglsxtrinsertinside##2\fi}% @@ -4182,6 +4434,7 @@ want }% } \setabbreviationstyle[acronym]{short} +\letabbreviationstyle{short-nolong}{short} \newabbreviationstyle{short-desc}% {% \renewcommand*{\CustomAbbreviationFields}{% @@ -4200,6 +4453,7 @@ want \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrinlinefullformat}[2]{% \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% @@ -4237,6 +4491,7 @@ want \ifglsxtrinsertinside\else##2\fi }% } +\letabbreviationstyle{short-nolong-desc}{short-desc} \newabbreviationstyle{long-desc}% {% \renewcommand*{\CustomAbbreviationFields}{% @@ -4255,6 +4510,7 @@ want \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}% \renewcommand*{\glsxtrinlinefullformat}[2]{% \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% @@ -4292,6 +4548,7 @@ want \ifglsxtrinsertinside\else##2\fi }% } +\letabbreviationstyle{long-noshort-desc}{long-desc} \newabbreviationstyle{long}% {% \renewcommand*{\CustomAbbreviationFields}{% @@ -4309,7 +4566,9 @@ want {% \GlsXtrUseAbbrStyleFmts{long-desc}% } +\letabbreviationstyle{long-noshort}{long} \newcommand*{\glsxtrscfont}[1]{\textsc{#1}} +\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}} \newcommand*{\glsxtrscsuffix}{\glstextup{\glspluralsuffix}} \newabbreviationstyle{long-short-sc}% {% @@ -4319,6 +4578,7 @@ want \GlsXtrUseAbbrStyleFmts{long-short}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } \newabbreviationstyle{long-short-sc-desc}% {% @@ -4328,6 +4588,7 @@ want \GlsXtrUseAbbrStyleFmts{long-short-desc}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } \newabbreviationstyle{short-sc-long}% {% @@ -4337,6 +4598,7 @@ want \GlsXtrUseAbbrStyleFmts{short-long}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } \newabbreviationstyle{short-sc-long-desc}% {% @@ -4346,16 +4608,19 @@ want \GlsXtrUseAbbrStyleFmts{short-long-desc}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } \newabbreviationstyle{short-sc}% {% - \GlsXtrUseAbbrStyleSetup{short}% + \GlsXtrUseAbbrStyleSetup{short-nolong}% }% {% - \GlsXtrUseAbbrStyleFmts{short}% + \GlsXtrUseAbbrStyleFmts{short-nolong}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } +\letabbreviationstyle{short-sc-nolong}{short-sc} \newabbreviationstyle{short-sc-desc}% {% \GlsXtrUseAbbrStyleSetup{short-desc}% @@ -4364,44 +4629,55 @@ want \GlsXtrUseAbbrStyleFmts{short-desc}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } -\newabbreviationstyle{long-sc}% +\letabbreviationstyle{short-sc-nolong-desc}{short-sc-desc} +\newabbreviationstyle{long-noshort-sc}% {% - \GlsXtrUseAbbrStyleSetup{long}% + \GlsXtrUseAbbrStyleSetup{long-noshort}% }% {% - \GlsXtrUseAbbrStyleFmts{long}% + \GlsXtrUseAbbrStyleFmts{long-noshort}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } -\newabbreviationstyle{long-desc-sc}% +\@glsxtr@deprecated@abbrstyle{long-sc}{long-noshort-sc} +\newabbreviationstyle{long-noshort-sc-desc}% {% - \GlsXtrUseAbbrStyleSetup{long-desc}% + \GlsXtrUseAbbrStyleSetup{long-noshort-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{long-desc}% + \GlsXtrUseAbbrStyleFmts{long-noshort-desc}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } -\newabbreviationstyle{footnote-sc}% +\@glsxtr@deprecated@abbrstyle{long-desc-sc}{long-noshort-sc-desc} +\newabbreviationstyle{short-sc-footnote}% {% - \GlsXtrUseAbbrStyleSetup{footnote}% + \GlsXtrUseAbbrStyleSetup{short-footnote}% }% {% - \GlsXtrUseAbbrStyleFmts{footnote}% + \GlsXtrUseAbbrStyleFmts{short-footnote}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } -\newabbreviationstyle{postfootnote-sc}% +\@glsxtr@deprecated@abbrstyle{footnote-sc}{short-sc-footnote} +\newabbreviationstyle{short-sc-postfootnote}% {% - \GlsXtrUseAbbrStyleSetup{postfootnote}% + \GlsXtrUseAbbrStyleSetup{short-postfootnote}% }% {% - \GlsXtrUseAbbrStyleFmts{postfootnote}% + \GlsXtrUseAbbrStyleFmts{short-postfootnote}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}% \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}% } +\@glsxtr@deprecated@abbrstyle{postfootnote-sc}{short-sc-postfootnote} \newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}} +\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}} \newcommand*{\glsxtrsmsuffix}{\glspluralsuffix} \newabbreviationstyle{long-short-sm}% {% @@ -4410,6 +4686,7 @@ want {% \GlsXtrUseAbbrStyleFmts{long-short}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } \newabbreviationstyle{long-short-sm-desc}% @@ -4419,6 +4696,7 @@ want {% \GlsXtrUseAbbrStyleFmts{long-short-desc}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } \newabbreviationstyle{short-sm-long}% @@ -4428,6 +4706,7 @@ want {% \GlsXtrUseAbbrStyleFmts{short-long}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } \newabbreviationstyle{short-sm-long-desc}% @@ -4437,69 +4716,86 @@ want {% \GlsXtrUseAbbrStyleFmts{short-long-desc}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } \newabbreviationstyle{short-sm}% {% - \GlsXtrUseAbbrStyleSetup{short}% + \GlsXtrUseAbbrStyleSetup{short-nolong}% }% {% - \GlsXtrUseAbbrStyleFmts{short}% + \GlsXtrUseAbbrStyleFmts{short-nolong}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } +\letabbreviationstyle{short-sm-nolong}{short-sm} \newabbreviationstyle{short-sm-desc}% {% - \GlsXtrUseAbbrStyleSetup{short-desc}% + \GlsXtrUseAbbrStyleSetup{short-nolong-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{short-desc}% + \GlsXtrUseAbbrStyleFmts{short-nolong-desc}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } -\newabbreviationstyle{long-sm}% +\letabbreviationstyle{short-sm-nolong-desc}{short-sm-desc} +\newabbreviationstyle{long-noshort-sm}% {% - \GlsXtrUseAbbrStyleSetup{long}% + \GlsXtrUseAbbrStyleSetup{long-noshort}% }% {% - \GlsXtrUseAbbrStyleFmts{long}% + \GlsXtrUseAbbrStyleFmts{long-noshort}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } -\newabbreviationstyle{long-desc-sm}% +\@glsxtr@deprecated@abbrstyle{long-sm}{long-noshort-sm} +\newabbreviationstyle{long-noshort-sm-desc}% {% - \GlsXtrUseAbbrStyleSetup{long-desc}% + \GlsXtrUseAbbrStyleSetup{long-noshort-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{long-desc}% + \GlsXtrUseAbbrStyleFmts{long-noshort-desc}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } -\newabbreviationstyle{footnote-sm}% +\@glsxtr@deprecated@abbrstyle{long-desc-sm}{long-noshort-sm-desc} +\newabbreviationstyle{short-sm-footnote}% {% - \GlsXtrUseAbbrStyleSetup{footnote}% + \GlsXtrUseAbbrStyleSetup{short-footnote}% }% {% - \GlsXtrUseAbbrStyleFmts{footnote}% + \GlsXtrUseAbbrStyleFmts{short-footnote}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } -\newabbreviationstyle{postfootnote-sm}% +\@glsxtr@deprecated@abbrstyle{footnote-sm}{short-sm-footnote} +\newabbreviationstyle{short-sm-postfootnote}% {% - \GlsXtrUseAbbrStyleSetup{postfootnote}% + \GlsXtrUseAbbrStyleSetup{short-postfootnote}% }% {% - \GlsXtrUseAbbrStyleFmts{postfootnote}% + \GlsXtrUseAbbrStyleFmts{short-postfootnote}% \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}% \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% } +\@glsxtr@deprecated@abbrstyle{postfootnote-sm}{short-sm-postfootnote} +\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}% +\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}% +\newcommand*{\glsfirstlongemfont}[1]{\glslongemfont{#1}}% +\newcommand*{\glslongemfont}[1]{\emph{#1}}% \newabbreviationstyle{long-short-em}% {% \GlsXtrUseAbbrStyleSetup{long-short}% }% {% \GlsXtrUseAbbrStyleFmts{long-short}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% } \newabbreviationstyle{long-short-em-desc}% {% @@ -4507,7 +4803,46 @@ want }% {% \GlsXtrUseAbbrStyleFmts{long-short-desc}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% +} +\newabbreviationstyle{long-em-short-em}% +{% + \renewcommand*{\CustomAbbreviationFields}{% + name={\protect\glsabbrvfont{\the\glsshorttok}}, + sort={\the\glsshorttok}, + first={\protect\glsfirstlongfont{\the\glslongtok}% + \protect\glsxtrfullsep{\the\glslabeltok}% + (\protect\glsfirstabbrvfont{\the\glsshorttok})},% + firstplural={\protect\glsfirstlongfont{\the\glslongpltok}% + \protect\glsxtrfullsep{\the\glslabeltok}% + (\protect\glsfirstabbrvfont{\the\glsshortpltok})},% + plural={\protect\glsabbvfont{\the\glsshortpltok}},% + description={\protect\glslongemfont{\the\glslongtok}}}% + \renewcommand*{\GlsXtrPostNewAbbreviation}{% + \glshasattribute{\the\glslabeltok}{regular}% + {% + \glssetattribute{\the\glslabeltok}{regular}{false}% + }% + {}% + }% +}% +{% + \GlsXtrUseAbbrStyleFmts{long-short}% + \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% +} +\newabbreviationstyle{long-em-short-em-desc}% +{% + \GlsXtrUseAbbrStyleSetup{long-short-desc}% +}% +{% + \GlsXtrUseAbbrStyleFmts{long-short-desc}% + \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% } \newabbreviationstyle{short-em-long}% {% @@ -4515,7 +4850,10 @@ want }% {% \GlsXtrUseAbbrStyleFmts{short-long}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% } \newabbreviationstyle{short-em-long-desc}% {% @@ -4523,55 +4861,266 @@ want }% {% \GlsXtrUseAbbrStyleFmts{short-long-desc}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% +} +\newabbreviationstyle{short-em-long-em}% +{% + \renewcommand*{\CustomAbbreviationFields}{% + name={\protect\glsabbrvfont{\the\glsshorttok}}, + sort={\the\glsshorttok}, + description={\protect\glslongemfont{\the\glslongtok}},% + first={\protect\glsfirstabbrvfont{\the\glsshorttok}% + \protect\glsxtrfullsep{\the\glslabeltok}% + (\protect\glsfirstlongfont{\the\glslongtok})},% + firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}% + \protect\glsxtrfullsep{\the\glslabeltok}% + (\protect\glsfirstlongfont{\the\glslongpltok})},% + plural={\protect\glsabbvfont{\the\glsshortpltok}}}% + \renewcommand*{\GlsXtrPostNewAbbreviation}{% + \glshasattribute{\the\glslabeltok}{regular}% + {% + \glssetattribute{\the\glslabeltok}{regular}{false}% + }% + {}% + }% +}% +{% + \GlsXtrUseAbbrStyleFmts{short-long}% + \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% +} +\newabbreviationstyle{short-em-long-em-desc}% +{% + \GlsXtrUseAbbrStyleSetup{short-long-desc}% +}% +{% + \GlsXtrUseAbbrStyleFmts{short-long-desc}% + \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% } \newabbreviationstyle{short-em}% {% - \GlsXtrUseAbbrStyleSetup{short}% + \GlsXtrUseAbbrStyleSetup{short-nolong}% }% {% - \GlsXtrUseAbbrStyleFmts{short}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \GlsXtrUseAbbrStyleFmts{short-nolong}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% } +\letabbreviationstyle{short-em-nolong}{short-em} \newabbreviationstyle{short-em-desc}% {% - \GlsXtrUseAbbrStyleSetup{short-desc}% + \GlsXtrUseAbbrStyleSetup{short-nolong-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{short-desc}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \GlsXtrUseAbbrStyleFmts{short-nolong-desc}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% +} +\letabbreviationstyle{short-em-nolong-desc}{short-em-desc} +\newabbreviationstyle{long-noshort-em}% +{% + \GlsXtrUseAbbrStyleSetup{long-noshort}% +}% +{% + \GlsXtrUseAbbrStyleFmts{long-noshort}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% +} +\@glsxtr@deprecated@abbrstyle{long-em}{long-noshort-em} +\newabbreviationstyle{long-em-noshort-em}% +{% + \renewcommand*{\CustomAbbreviationFields}{% + name={\protect\glsabbrvfont{\the\glsshorttok}}, + sort={\the\glsshorttok}, + first={\protect\glsfirstlongfont{\the\glslongtok}}, + firstplural={\protect\glsfirstlongfont{\the\glslongpltok}}, + text={\the\glslongtok}, + plural={\the\glslongpltok},% + description={\protect\glslongemfont{\the\glslongtok}}% + }% + \renewcommand*{\GlsXtrPostNewAbbreviation}{% + \glssetattribute{\the\glslabeltok}{regular}{true}}% +}% +{% + \GlsXtrUseAbbrStyleFmts{long-noshort}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% } -\newabbreviationstyle{long-em}% +\newabbreviationstyle{long-noshort-em-desc}% {% - \GlsXtrUseAbbrStyleSetup{long}% + \GlsXtrUseAbbrStyleSetup{long-noshort-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{long}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \GlsXtrUseAbbrStyleFmts{long-noshort-desc}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% } -\newabbreviationstyle{long-desc-em}% +\@glsxtr@deprecated@abbrstyle{long-desc-em}{long-noshort-em-desc} +\newabbreviationstyle{long-em-noshort-em-desc}% {% - \GlsXtrUseAbbrStyleSetup{long-desc}% + \GlsXtrUseAbbrStyleSetup{long-noshort-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{long-desc}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \GlsXtrUseAbbrStyleFmts{long-noshort-desc}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}% } -\newabbreviationstyle{footnote-em}% +\newabbreviationstyle{short-em-footnote}% {% - \GlsXtrUseAbbrStyleSetup{footnote}% + \GlsXtrUseAbbrStyleSetup{short-footnote}% }% {% - \GlsXtrUseAbbrStyleFmts{footnote}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \GlsXtrUseAbbrStyleFmts{short-footnote}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% } -\newabbreviationstyle{postfootnote-em}% +\@glsxtr@deprecated@abbrstyle{footnote-em}{short-em-footnote} +\newabbreviationstyle{short-em-postfootnote}% {% - \GlsXtrUseAbbrStyleSetup{postfootnote}% + \GlsXtrUseAbbrStyleSetup{short-postfootnote}% +}% +{% + \GlsXtrUseAbbrStyleFmts{short-postfootnote}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}% +} +\@glsxtr@deprecated@abbrstyle{postfootnote-em}{short-em-postfootnote} +\newcommand*{\glsxtruserfield}{useri} +\ifdef\glscurrentfieldvalue +{ + \newcommand*{\glsxtruserparen}[2]{% + \glsxtrfullsep{#2}% + (#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{})% + } +} +{ + \newcommand*{\glsxtruserparen}[2]{% + \glsxtrfullsep{#2}% + (#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{})% + } +} +\newcommand*{\glsabbrvuserfont}[1]{#1} +\newcommand*{\glsfirstabbrvuserfont}[1]{\glsabbrvuserfont{#1}} +\newcommand*{\glslonguserfont}[1]{#1} +\newcommand*{\glsfirstlonguserfont}[1]{\glslonguserfont{#1}} +\newcommand*{\glsxtrusersuffix}{\glspluralsuffix} +\newabbreviationstyle{long-short-user}% +{% + \renewcommand*{\CustomAbbreviationFields}{% + name={\protect\glsabbrvfont{\the\glsshorttok}}, + sort={\the\glsshorttok}, + first={\protect\glsfirstlongfont{\the\glslongtok}% + \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},% + firstplural={\protect\glsfirstlongfont{\the\glslongpltok}% + \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}{\the\glslabeltok}},% + plural={\protect\glsabbvfont{\the\glsshortpltok}},% + description={\protect\glslonguserfont{\the\glslongtok}}}% + \renewcommand*{\GlsXtrPostNewAbbreviation}{% + \glshasattribute{\the\glslabeltok}{regular}% + {% + \glssetattribute{\the\glslabeltok}{regular}{false}% + }% + {}% + }% +}% +{% + \renewcommand*{\abbrvpluralsuffix}{\glsxtrusersuffix}% + \renewcommand*{\glsabbrvfont}[1]{\glsabbrvuserfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvuserfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}% + \renewcommand*{\glsxtrfullformat}[2]{% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}% + }% + \renewcommand*{\glsxtrfullplformat}[2]{% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}% + }% + \renewcommand*{\Glsxtrfullformat}[2]{% + \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}% + }% + \renewcommand*{\Glsxtrfullplformat}[2]{% + \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}% + }% +} +\newabbreviationstyle{long-short-user-desc}% +{% + \GlsXtrUseAbbrStyleSetup{long-short-desc}% +}% +{% + \GlsXtrUseAbbrStyleFmts{long-short-user}% +} +\newabbreviationstyle{short-long-user}% +{% + \renewcommand*{\CustomAbbreviationFields}{% + name={\protect\glsabbrvfont{\the\glsshorttok}}, + sort={\the\glsshorttok}, + description={\protect\glslonguserfont{\the\glslongtok}},% + first={\protect\glsfirstabbrvfont{\the\glsshorttok}% + \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongtok}}{\the\glslabeltok}},% + firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}% + \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongpltok}}{\the\glslabeltok}},% + plural={\protect\glsabbvfont{\the\glsshortpltok}}}% + \renewcommand*{\GlsXtrPostNewAbbreviation}{% + \glshasattribute{\the\glslabeltok}{regular}% + {% + \glssetattribute{\the\glslabeltok}{regular}{false}% + }% + {}% + }% +}% +{% + \renewcommand*{\abbrvpluralsuffix}{\glsxtrusersuffix}% + \renewcommand*\glsabbrvfont[1]{\glsabbrvuserfont{##1}}% + \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvuserfont{##1}}% + \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}% + \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}% + \renewcommand*{\glsxtrfullformat}[2]{% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}% + }% + \renewcommand*{\glsxtrfullplformat}[2]{% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}% + }% + \renewcommand*{\Glsxtrfullformat}[2]{% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}% + }% + \renewcommand*{\Glsxtrfullplformat}[2]{% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}% + }% +} +\newabbreviationstyle{short-long-user-desc}% +{% + \GlsXtrUseAbbrStyleSetup{short-long-desc}% }% {% - \GlsXtrUseAbbrStyleFmts{postfootnote}% - \renewcommand*\glsabbrvfont[1]{\emph{##1}}% + \GlsXtrUseAbbrStyleFmts{short-long-user}% } \let\@glsxtr@org@markright\markright \renewcommand*{\markright}[1]{% @@ -5221,6 +5770,7 @@ want } {} \@glsxtr@redefstyles +\@glsxtr@do@style \endinput %% %% End of file `glossaries-extra.sty'. |