summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries/expl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-14 22:52:09 +0000
committerKarl Berry <karl@freefriends.org>2013-11-14 22:52:09 +0000
commit033271bfdf58e2563bd3fbdbeb0f1facfb0c02e5 (patch)
tree1ca0cddf673e09a878c83db761e4dc52c65ba48b /Master/texmf-dist/tex/latex/glossaries/expl
parente537bba01fd3f3a532b7fc1f6186c24065208638 (diff)
glossaries (14nov13)
git-svn-id: svn://tug.org/texlive/trunk@32147 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/expl')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty512
1 files changed, 265 insertions, 247 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
index 5588e541771..06879015604 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,10 +39,35 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-accsupp}[2011/04/02 v3.0 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2013/11/14 v4.0 (NLCT)
Experimental glossaries accessibility]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
+\newcommand*{\compatibleglossentry}[2]{%
+ \toks@{#2}%
+ \protected@edef\@do@glossentry{%
+ \noexpand\accsuppglossaryentryfield{#1}%
+ {\noexpand\glsnamefont
+ {\expandafter\expandonce\csname glo@#1@name\endcsname}}%
+ {\expandafter\expandonce\csname glo@#1@desc\endcsname}%
+ {\expandafter\expandonce\csname glo@#1@symbol\endcsname}%
+ {\the\toks@}%
+ }%
+ \@do@glossentry
+}
+\newcommand*{\compatiblesubglossentry}[3]{%
+ \toks@{#3}%
+ \protected@edef\@do@subglossentry{%
+ \noexpand\accsuppglossarysubentryfield{\number#1}%
+ {#2}%
+ {\noexpand\glsnamefont
+ {\expandafter\expandonce\csname glo@#2@name\endcsname}}%
+ {\expandafter\expandonce\csname glo@#2@desc\endcsname}%
+ {\expandafter\expandonce\csname glo@#2@symbol\endcsname}%
+ {\the\toks@}%
+ }%
+ \@do@subglossentry
+}
\RequirePackage{glossaries}
\RequirePackage{accsupp}
\define@key{glossentry}{access}{%
@@ -84,6 +109,21 @@
\define@key{glossentry}{longpluralaccess}{%
\def\@glo@longpluralaccess{#1}%
}
+\appto\@gls@keymap{,%
+ {access}{access},%
+ {textaccess}{textaccess},%
+ {firstaccess}{firstaccess},%
+ {pluralaccess}{pluralaccess},%
+ {firstpluralaccess}{firstpluralaccess},%
+ {symbolaccess}{symbolaccess},%
+ {symbolpluralaccess}{symbolpluralaccess},%
+ {descaccess}{descaccess},%
+ {descpluralaccess}{descpluralaccess},%
+ {shortaccess}{shortaccess},%
+ {shortpluralaccess}{shortpluralaccess},%
+ {longaccess}{longaccess},%
+ {longpluralaccess}{longpluralaccess}%
+}
\def\@gls@noaccess{\relax}
\let\@gls@oldnewglossaryentryprehook\@newglossaryentryprehook
\renewcommand*{\@newglossaryentryprehook}{%
@@ -305,311 +345,289 @@
\csname gls#1accessdisplay\endcsname{#2}{#3}%
}%
}
-\def\@gls@#1#2[#3]{%
- \glsdoifexists{#2}%
+\renewcommand*{\@@gls@default@entryfmt}[2]{%
+ \ifdefempty\glscustomtext
{%
- \edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \ifglsused{#2}%
+ \glsifplural
{%
- \def\@glo@text{\csname gls@\@glo@type @display\endcsname
- {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}%
- {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
- {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
- {#3}}%
- }%
- {%
- \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
- {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}%
- {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
- {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
- {#3}}%
- }%
- \ifglsused{#2}%
- {%
- \@gls@link[#1]{#2}{\@glo@text}%
- }%
- {%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}%
+ \glscapscase
{%
- \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ \ifglsused\glslabel
+ {%
+ #2{\glspluralaccessdisplay
+ {\glsentryplural{\glslabel}}{\glslabel}}%
+ {\glsdescriptionpluralaccessdisplay
+ {\glsentrydescplural{\glslabel}}{\glslabel}}%
+ {\glssymbolpluralaccessdisplay
+ {\glsentrysymbolplural{\glslabel}}{\glslabel}}
+ {\glsinsert}%
+ }%
+ {%
+ #1{\glsfirstpluralaccessdisplay
+ {\glsentryfirstplural{\glslabel}}{\glslabel}}%
+ {\glsdescriptionpluralaccessdisplay
+ {\glsentrydescplural{\glslabel}}{\glslabel}}%
+ {\glssymbolpluralaccessdisplay
+ {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
}%
{%
- \@gls@link[#1]{#2}{\@glo@text}%
- }%
- }%
- \glsunset{#2}%
- }%
-}
-\def\@Gls@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \ifglsused{#2}%
- {%
- \def\@glo@text{\csname gls@\@glo@type @display\endcsname
- {\glstextaccessdisplay{\Glsentrytext{#2}}{#2}}%
- {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
- {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
- {#3}}%
- }%
- {%
- \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
- {\glsfirstaccessdisplay{\Glsentryfirst{#2}}{#2}}%
- {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
- {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
- {#3}}%
- }%
- \ifglsused{#2}%
- {%
- \@gls@link[#1]{#2}{\@glo@text}%
- }%
- {%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}%
- {%
- \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
- }%
- {%
- \@gls@link[#1]{#2}{\@glo@text}%
- }%
- }%
- \glsunset{#2}%
- }%
-}
-\def\@GLS@#1#2[#3]{%
- \glsdoifexists{#2}{%
- \edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \ifglsused{#2}%
- {%
- \def\@glo@text{\csname gls@\@glo@type @display\endcsname
- {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}%
- {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
- {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
- {#3}}%
- }%
- {%
- \edef\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
- {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}%
- {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
- {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
- {#3}}%
- }%
- \ifglsused{#2}%
- {%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
- }%
- {%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}{%
- \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+ \ifglsused\glslabel
+ {%
+ #2{\glspluralaccessdisplay
+ {\Glsentryplural{\glslabel}}{\glslabel}}%
+ {\glsdescriptionpluralaccessdisplay
+ {\glsentrydescplural{\glslabel}}{\glslabel}}%
+ {\glssymbolpluralaccessdisplay
+ {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
+ {%
+ #1{\glsfirstpluralaccessdisplay
+ {\Glsentryfirstplural{\glslabel}}{\glslabel}}%
+ {\glsdescriptionpluralaccessdisplay
+ {\glsentrydescplural{\glslabel}}{\glslabel}}%
+ {\glssymbolpluralaccessdisplay
+ {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
}%
{%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ \ifglsused\glslabel
+ {%
+ \MakeUppercase{%
+ #2{\glspluralaccessdisplay
+ {\glsentryplural{\glslabel}}{\glslabel}}%
+ {\glsdescriptionpluralaccessdisplay
+ {\glsentrydescplural{\glslabel}}{\glslabel}}%
+ {\glssymbolpluralaccessdisplay
+ {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+ {\glsinsert}}%
+ }%
+ {%
+ \MakeUppercase{%
+ #1{\glsfirstpluralaccessdisplay
+ {\glsentryfirstplural{\glslabel}}{\glslabel}}%
+ {\glsdescriptionpluralaccessdisplay
+ {\glsentrydescplural{\glslabel}}{\glslabel}}%
+ {\glssymbolpluralaccessdisplay
+ {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+ {\glsinsert}}%
+ }%
}%
}%
- \glsunset{#2}%
- }%
-}
-\def\@glspl@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \ifglsused{#2}%
- {%
- \def\@glo@text{\csname gls@\@glo@type @display\endcsname
- {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}%
- {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
- {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
- {#3}}%
- }%
- {%
- \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
- {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}%
- {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
- {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
- {#3}}%
- }%
- \ifglsused{#2}%
- {%
- \@gls@link[#1]{#2}{\@glo@text}%
- }%
{%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}%
- {%
- \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
- }%
+ \glscapscase
{%
- \@gls@link[#1]{#2}{\@glo@text}%
+ \ifglsused\glslabel
+ {%
+ #2{\glstextaccessdisplay
+ {\glsentrytext{\glslabel}}{\glslabel}}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
+ {%
+ #1{\glsfirstaccessdisplay
+ {\glsentryfirst{\glslabel}}{\glslabel}}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
}%
- }%
- \glsunset{#2}%
- }%
-}
-\def\@Glspl@#1#2[#3]{%
- \glsdoifexists{#2}%
- {%
- \edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \ifglsused{#2}%
- {%
- \def\@glo@text{\csname gls@\@glo@type @display\endcsname
- {\glspluralaccessdisplay{\Glsentryplural{#2}}{#2}}%
- {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
- {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
- {#3}}%
- }%
- {%
- \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
- {\glsfirstpluralaccessdisplay{\Glsentryfirstplural{#2}}{#2}}%
- {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
- {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
- {#3}}%
- }%
- \ifglsused{#2}%
- {%
- \@gls@link[#1]{#2}{\@glo@text}%
- }%
- {%
- \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
- \boolean{glsacrfootnote}}%
{%
- \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ \ifglsused\glslabel
+ {%
+ #2{\glstextaccessdisplay
+ {\Glsentrytext{\glslabel}}{\glslabel}}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
+ {%
+ #1{\glsfirstaccessdisplay
+ {\Glsentryfirst{\glslabel}}{\glslabel}}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
+ }%
}%
{%
- \@gls@link[#1]{#2}{\@glo@text}%
+ \ifglsused\glslabel
+ {%
+ \MakeUppercase{%
+ #2{\glstextaccessdisplay
+ {\glsentrytext{\glslabel}}{\glslabel}}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}}%
+ }%
+ {%
+ \MakeUppercase{%
+ #1{\glsfirstaccessdisplay
+ {\glsentryfirst{\glslabel}}{\glslabel}}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}}%
+ }%
}%
}%
- \glsunset{#2}%
}%
-}
-\def\@GLSpl@#1#2[#3]{%
- \glsdoifexists{#2}%
{%
- \edef\@glo@type{\glsentrytype{#2}}%
- \def\@gls@link@opts{#1}%
- \def\@gls@link@label{#2}%
- \ifglsused{#2}%
+ \ifglsused{\glslabel}%
{%
- \def\@glo@text{\csname gls@\@glo@type @display\endcsname
- {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}%
- {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
- {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
- {#3}}%
+ #2{\glscustomtext}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
}%
{%
- \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
- {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}%
- {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
- {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
- {#3}}%
+ #1{\glscustomtext}%
+ {\glsdescriptionaccessdisplay
+ {\glsentrydesc{\glslabel}}{\glslabel}}%
+ {\glssymbolaccessdisplay
+ {\glsentrysymbol{\glslabel}}{\glslabel}}%
+ {\glsinsert}%
}%
- \ifglsused{#2}%
- {%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
- }%
- {%
- \gls@checkisacronymlist\@glo@type
- \ifthenelse{\(\boolean{@glsisacronymlist}\AND
- \boolean{glsacrfootnote}\)\OR\NOT\boolean{glshyperfirst}}%
- {%
- \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
- }%
- {%
- \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
- }%
- }%
- \glsunset{#2}%
}%
}
\def\@acrshort#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@glo@text{%
- \glsshortaccessdisplay{\glsentryshort{#2}}{#2}%
- }%
- \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+ \def\glslabel{#2}%
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@firstofthree
+ \let\glsinsert\@empty
+ \def\glscustomtext{%
+ \acronymfont{\glsshortaccessdisplay{\glsentryshort{#2}}{#2}}#3%
+ }%
+ \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
}%
}
\def\@Acrshort#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@glo@text{%
- \glsshortaccessdisplay{\Glsentryshort{#2}}{#2}%
- }%
- \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+ \def\glslabel{#2}%
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@secondofthree
+ \let\glsinsert\@empty
+ \def\glscustomtext{%
+ \acronymfont{\glsshortaccessdisplay{\Glsentryshort{#2}}{#2}}#3%
+ }%
+ \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
}%
}
\def\@ACRshort#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@glo@text{%
- \glsshortaccessdisplay{\MakeUppercase{\glsentryshort{#2}}}{#2}%
- }%
- \@gls@link[#1]{#2}{\acronymfont{\@glo@text#3}}%
+ \def\glslabel{#2}%
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@thirdofthree
+ \let\glsinsert\@empty
+ \def\glscustomtext{%
+ \acronymfont{\glsshortaccessdisplay
+ {\MakeUppercase{\glsentryshort{#2}}}{#2}}#3%
+ }%
+ \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
}%
}
\def\@acrlong#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@glo@text{%
- \glslongaccessdisplay{\glsentrylong{#2}}{#2}%
- }%
- \@gls@link[#1]{#2}{\@glo@text#3}%
+ \def\glslabel{#2}%
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@firstofthree
+ \let\glsinsert\@empty
+ \def\glscustomtext{%
+ \acronymfont{\glslongaccessdisplay{\glsentrylong{#2}}{#2}}#3%
+ }%
+ \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
}%
}
\def\@Acrlong#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@glo@text{%
- \glslongaccessdisplay{\Glsentrylong{#2}}{#2}%
- }%
- \@gls@link[#1]{#2}{\@glo@text#3}%
+ \def\glslabel{#2}%
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@firstofthree
+ \let\glsinsert\@empty
+ \def\glscustomtext{%
+ \acronymfont{\glslongaccessdisplay{\Glsentrylong{#2}}{#2}}#3%
+ }%
+ \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
}%
}
\def\@ACRlong#1#2[#3]{%
\glsdoifexists{#2}%
{%
\edef\@glo@type{\glsentrytype{#2}}%
- \def\@glo@text{%
- \glslongaccessdisplay{\MakeUppercase{\glsentrylong{#2}}}{#2}%
- }%
- \@gls@link[#1]{#2}{\@glo@text#3}%
+ \def\glslabel{#2}%
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@firstofthree
+ \let\glsinsert\@empty
+ \def\glscustomtext{%
+ \acronymfont{\glslongaccessdisplay{%
+ \MakeUppercase{\glsentrylong{#2}}}{#2}#3}%
+ }%
+ \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
+ }%
+}
+\renewcommand*{\glossentryname}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \glsnamefont{\glsnameaccessdisplay{\glsentryname{#1}}{#1}}%
+ }%
+}
+\renewcommand*{\glossentryname}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \glsnamefont{\glsnameaccessdisplay{\Glsentryname{#1}}{#1}}%
+ }%
+}
+\renewcommand*{\glossentrydesc}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \glsdescriptionaccessdisplay{\glsentrydesc{#1}}{#1}%
+ }%
+}
+\renewcommand*{\Glossentrydesc}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \glsdescriptionaccessdisplay{\Glsentrydesc{#1}}{#1}%
+ }%
+}
+\renewcommand*{\glossentrysymbol}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \glssymbolaccessdisplay{\glsentrysymbol{#1}}{#1}%
+ }%
+}
+\renewcommand*{\Glossentrysymbol}[1]{%
+ \glsdoifexists{#1}%
+ {%
+ \glssymbolaccessdisplay{\Glsentrysymbol{#1}}{#1}%
}%
}
-\ifglsxindy
- \renewcommand*{\@glossaryentryfield}{%
- \string\\accsuppglossaryentryfield}
-\else
- \renewcommand*{\@glossaryentryfield}{%
- \string\accsuppglossaryentryfield}
-\fi
-\ifglsxindy
- \renewcommand*{\@glossarysubentryfield}{%
- \string\\accsuppglossarysubentryfield}
-\else
- \renewcommand*{\@glossarysubentryfield}{%
- \string\accsuppglossarysubentryfield}
-\fi
\newcommand*{\accsuppglossaryentryfield}[5]{%
\glossaryentryfield{#1}%
{\glsnameaccessdisplay{#2}{#1}}%
@@ -617,7 +635,7 @@
{\glssymbolaccessdisplay{#4}{#1}}{#5}%
}
\newcommand*{\accsuppglossarysubentryfield}[6]{%
- \glossaryentryfield{#1}{#2}%
+ \glossarysubentryfield{#1}{#2}%
{\glsnameaccessdisplay{#3}{#2}}%
{\glsdescriptionaccessdisplay{#4}{#2}}%
{\glssymbolaccessdisplay{#5}{#2}}{#6}%