summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-23 20:13:37 +0000
committerKarl Berry <karl@freefriends.org>2021-09-23 20:13:37 +0000
commita0a43165d11c155e15abb9051332c8b4e5576db6 (patch)
tree770e587afe49fb8d1ccc3871191ceb14abad9dfa /Master/texmf-dist/tex/latex/glossaries-extra
parent2ff72e851f8c73db1db4d2bc2d11714779abba5c (diff)
glossaries-extra (23sep21)
git-svn-id: svn://tug.org/texlive/trunk@60590 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.tex4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty22
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty24
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty235
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty6
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty17
7 files changed, 186 insertions, 128 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 64b733582da..ec47f031124 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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
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 9098bed7dc0..0bb6af8411c 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2021/09/20 v1.46 (NLCT)]
\ifglsacronym
\providecommand*{\printunsrtacronyms}[1][]{%
\printunsrtglossary[type=\acronymtype,#1]}%
@@ -204,17 +204,17 @@
\def\@glsxtr@bibgls@removespaces#1 #2\@nil{%
\toks@=\expandafter{\the\toks@#1}%
\ifx\\#2\\%
- \edef\x{\the\toks@}%
- \ifx\x\empty
+ \edef\@glo@tmp{\the\toks@}%
+ \ifx\@glo@tmp\empty
\else
- \protected@edef\x{\glsentrycounter\@glo@counterprefix\the\toks@}%
+ \protected@edef\@glo@tmp{\glsentrycounter\@glo@counterprefix\the\toks@}%
\ifdefvoid\glsxtrsupplocationurl
{%
- \expandafter\glsxtrfmtinternalnameref\expandafter{\x}%
+ \expandafter\glsxtrfmtinternalnameref\expandafter{\@glo@tmp}%
{\@glsnumberformat}{\glsxtr@locationhypertext}%
}%
{%
- \expandafter\glsxtrfmtexternalnameref\expandafter{\x}%
+ \expandafter\glsxtrfmtexternalnameref\expandafter{\@glo@tmp}%
{\@glsnumberformat}{\glsxtr@locationhypertext}{\glsxtrsupplocationurl}%
}%
\fi
@@ -381,13 +381,13 @@
}
\newcommand*{\@glsxtr@get@prefixedlabel}[1]{%
\begingroup
- \edef\@gls@thislabel{#1}%
+ \protected@edef\@gls@thislabel{#1}%
\@for\@glsxtr@prefix:=\@glsxtr@labelprefixes\do
{%
- \edef\@gls@thislabel{\@glsxtr@prefix#1}%
+ \protected@edef\@gls@thislabel{\@glsxtr@prefix#1}%
\ifglsentryexists{\@gls@thislabel}{\@endfortrue}{}%
}%
- \edef\x{\endgroup\noexpand\def\noexpand\@gls@thislabel{\@gls@thislabel}}\x
+ \edef\@glo@tmp{\endgroup\noexpand\def\noexpand\@gls@thislabel{\@gls@thislabel}}\@glo@tmp
}
\newrobustcmd*{\dgls}{\@gls@hyp@opt\@dgls}
\newcommand*{\@dgls}[2][]{%
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 f9fff6d26d3..483f01b3752 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2021/09/20 v1.46 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption{all}{%
\appto\@glsxtr@loadstyles{%
@@ -613,8 +613,10 @@
{}
\ifdef{\@glsstyle@tree}
{%
+\newcommand{\glsxtrtreepredesc}{\glstreepredesc}
+\newcommand{\glsxtrtreechildpredesc}{\glstreechildpredesc}
\newcommand{\glstreedesc}[1]{%
- \glstreepredesc\glossentrydesc{#1}\glspostdescription
+ \glsxtrtreepredesc\glossentrydesc{#1}\glspostdescription
}
\newcommand{\glstreeDescLoc}[2]{%
\ifglshasdesc{#1}%
@@ -627,7 +629,7 @@
\ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}%
}%
\newcommand{\glstreechilddesc}[1]{%
- \glstreechildpredesc\glossentrydesc{#1}\glspostdescription
+ \glsxtrtreechildpredesc\glossentrydesc{#1}\glspostdescription
}%
\newcommand{\glstreeChildDescLoc}[2]{%
\ifglshasdesc{#1}%
@@ -772,9 +774,13 @@
{}
\ifdef{\@glsstyle@alttree}
{%
+\newcommand{\glsalttreepredesc}{}
+\newcommand{\glsalttreechildpredesc}{\glsalttreepredesc}
\newcommand{\glsxtralttreeSymbolDescLocation}[2]{%
{%
\let\par\glsxtrAltTreePar
+ \let\glsxtrtreepredesc\glsalttreepredesc
+ \let\glsxtrtreechildpredesc\glsalttreechildpredesc
\ifglshassymbol{#1}{(\glossentrysymbol{#1})\space}{}%
\glstreeDescLoc{#1}{#2}\par
}%
@@ -925,10 +931,10 @@
{%
\ifglshasparent{\@glo@label}%
{%
- \edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@label}@parent}}%
+ \protected@edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@label}@parent}}%
\ifglshasparent{\@glo@parent}%
{%
- \edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@parent}@parent}}%
+ \protected@edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@parent}@parent}}%
\ifglshasparent{\@glo@parent}%
{}%
{%
@@ -972,10 +978,10 @@
{%
\ifglshasparent{\@glo@label}%
{%
- \edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@label}@parent}}%
+ \protected@edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@label}@parent}}%
\ifglshasparent{\@glo@parent}%
{%
- \edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@parent}@parent}}%
+ \protected@edef\@glo@parent{\csuse{glo@\glsdetoklabel{\@glo@parent}@parent}}%
\ifglshasparent{\@glo@parent}%
{}%
{%
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 cb1b1cded9a..4a465675d14 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2021/09/20 v1.46 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -88,7 +88,7 @@
\newcommand*{\@glsxtr@redef@forglsentries}{}
\newcommand*{\@glsxtr@do@redef@forglsentries}{%
\renewcommand*{\forglsentries}[3][\glsdefaulttype]{%
- \edef\@@glo@list{\csname glolist@##1\endcsname}%
+ \protected@edef\@@glo@list{\csname glolist@##1\endcsname}%
\ifdefstring{\@@glo@list}{,}%
{%
\GlossariesExtraWarning{No entries defined in glossary `##1'}%
@@ -125,7 +125,7 @@
\begingroup
\ifKV@glslink@noindex
\else
- \edef\@gls@label{\glsdetoklabel{#1}}%
+ \protected@edef\@gls@label{\glsdetoklabel{#1}}%
\let\glslabel\@gls@label
\glswriteentry{#1}%
{%
@@ -159,7 +159,7 @@
\@glsxtr@do@record@wrglossary{#1}%
}
\newcommand*{\@@glsxtr@record}[3]{%
- \edef\@gls@label{\glsdetoklabel{#2}}%
+ \protected@edef\@gls@label{\glsdetoklabel{#2}}%
\let\glslabel\@gls@label
\ifglsentryexists{#2}{}%
{%
@@ -291,10 +291,10 @@
}
\newcommand*{\@glsxtr@noop@recordcounter}[1]{%
\PackageError{glossaries-extra}{\string\GlsXtrRecordCounter\space
- requires record=only or record=alsoindex package option}{}%
+ requires record=only or record=hybrid package option}{}%
}
\newcommand*{\@glsxtr@op@recordcounter}[1]{%
- \eappto\@glsxtr@counterrecordhook{\noexpand\@glsxtr@docounterrecord{#1}}%
+ \protected@eappto\@glsxtr@counterrecordhook{\noexpand\@glsxtr@docounterrecord{#1}}%
}
\newcommand*{\@glsxtr@recordsee}[2]{%
\@@glsxtrwrglossmark
@@ -363,6 +363,21 @@
\fi
}
\newcommand*{\@glsxtr@record@setting@off}{off}
+\newcommand\@glsxtr@warn@hybrid@noprintgloss{%
+ \ifdefstring{\@glo@types}{,}%
+ {%
+ \GlossariesExtraWarningNoLine{No glossaries have been defined}%
+ }%
+ {%
+ \GlossariesExtraWarningNoLine{No \string\printglossary\space
+ or \string\printglossaries\space
+ found. ^^JYou have requested the hybrid setting
+ record=\@glsxtr@record@setting\space which requires a
+ combination of bib2gls (to fetch entries) and makeindex/xindy
+ (to sort and collate the entries). If you only want to use
+ bib2gls then change the option to record=only or record=nameref}%
+ }%
+}
\newcommand*{\@glsxtr@record@only@setup}{%
\def\glsxtr@setup@record{%
\@glsxtr@autoseeindexfalse
@@ -384,7 +399,7 @@
}
\define@choicekey{glossaries-extra.sty}{record}
[\@glsxtr@record@setting\glsxtr@record@nr]%
- {off,only,alsoindex,nameref}%
+ {off,only,alsoindex,nameref,hybrid}%
[only]%
{%
\ifcase\glsxtr@record@nr\relax
@@ -403,6 +418,7 @@
\@glsxtr@record@only@setup
\or
\def\glsxtr@setup@record{%
+ \renewcommand*{\@glsxtr@record@setting@alsoindex}{alsoindex}%
\renewcommand*{\@do@seeglossary}{\@glsxtr@dosee@alsoindex@glossary}%
\let\@glsxtr@record\@@glsxtr@record
\let\@@do@wrglossary\glsxtr@do@alsoindex@wrglossary
@@ -420,6 +436,20 @@
{\GlossariesExtraWarning{You have requested record=nameref but
the document doesn't support hyperlinks}}%
{}%
+ \or
+ \def\glsxtr@setup@record{%
+ \renewcommand*{\@glsxtr@record@setting@alsoindex}{hybrid}%
+ \renewcommand*{\@do@seeglossary}{\@glsxtr@dosee@alsoindex@glossary}%
+ \let\@glsxtr@record\@@glsxtr@record
+ \let\@@do@wrglossary\glsxtr@do@alsoindex@wrglossary
+ \let\@gls@saveentrycounter\glsxtr@indexonly@saveentrycounter
+ \let\glsxtrundefaction\@glsxtr@warn@undefaction
+ \let\glsxtr@warnonexistsordo\@glsxtr@warn@onexistsordo
+ \glsxtr@addloclistfield
+ \let\@@glsxtr@recordcounter\@glsxtr@op@recordcounter
+ \def\printunsrtglossaryunit{\print@op@unsrtglossaryunit}%
+ \undef\glsxtrsetaliasnoindex
+ }%
\fi
}
\newcommand*{\@glsxtr@docdefval}{0}
@@ -1029,7 +1059,7 @@
\newcommand*{\glsxtrpdfentryfmt}[2]{#2}
\newrobustcmd*{\@glsxtrentryfmt}[2]{%
{%
- \edef\glslabel{#1}%
+ \protected@edef\glslabel{#1}%
\glsdoifexistsordo{#1}%
{%
\ifglshasfield{\GlsXtrFmtField}{#1}%
@@ -1472,10 +1502,10 @@
{%
\ifdefempty\@ignored@glossaries
{%
- \edef\@ignored@glossaries{#1}%
+ \protected@edef\@ignored@glossaries{#1}%
}%
{%
- \eappto\@ignored@glossaries{,#1}%
+ \protected@eappto\@ignored@glossaries{,#1}%
}%
\csgdef{glolist@#1}{,}%
\ifcsundef{gls@#1@entryfmt}%
@@ -1488,7 +1518,7 @@
\renewcommand*{\@gls@nohyperlist}{#1}%
}%
{%
- \eappto\@gls@nohyperlist{,#1}%
+ \protected@eappto\@gls@nohyperlist{,#1}%
}%
}%
}
@@ -1500,10 +1530,10 @@
{%
\ifdefempty\@ignored@glossaries
{%
- \edef\@ignored@glossaries{#1}%
+ \protected@edef\@ignored@glossaries{#1}%
}%
{%
- \eappto\@ignored@glossaries{,#1}%
+ \protected@eappto\@ignored@glossaries{,#1}%
}%
\csgdef{glolist@#1}{,}%
\ifcsundef{gls@#1@entryfmt}%
@@ -1543,10 +1573,10 @@
{%
\ifdefempty\@ignored@glossaries
{%
- \edef\@ignored@glossaries{#1}%
+ \protected@edef\@ignored@glossaries{#1}%
}%
{%
- \eappto\@ignored@glossaries{,#1}%
+ \protected@eappto\@ignored@glossaries{,#1}%
}%
\csgdef{glolist@#1}{,}%
\ifcsundef{gls@#1@entryfmt}%
@@ -1559,7 +1589,7 @@
\renewcommand*{\@gls@nohyperlist}{#1}%
}%
{%
- \eappto\@gls@nohyperlist{,#1}%
+ \protected@eappto\@gls@nohyperlist{,#1}%
}%
}%
}
@@ -1569,10 +1599,10 @@
{%
\ifdefempty\@ignored@glossaries
{%
- \edef\@ignored@glossaries{#1}%
+ \protected@edef\@ignored@glossaries{#1}%
}%
{%
- \eappto\@ignored@glossaries{,#1}%
+ \protected@eappto\@ignored@glossaries{,#1}%
}%
\csgdef{glolist@#1}{,}%
\ifcsundef{gls@#1@entryfmt}%
@@ -1597,7 +1627,7 @@
\renewcommand{\glsdoifexists}[2]{%
\ifglsentryexists{#1}{#2}%
{%
- \edef\glslabel{\glsdetoklabel{#1}}%
+ \protected@edef\glslabel{\glsdetoklabel{#1}}%
\glsxtrundefaction{Glossary entry `\glslabel'
has not been defined}{You need to define a glossary entry before
you can reference it.}%
@@ -1765,7 +1795,7 @@
\glsseeformat[\seealsoname]{#1}{}%
}
\newrobustcmd{\glsxtrseelist}[1]{%
- \edef\@glo@tmp{\noexpand\glsseelist{#1}}\@glo@tmp
+ \protected@edef\@glo@tmp{\noexpand\glsseelist{#1}}\@glo@tmp
}
\ifdef\alsoname
{\providecommand{\seealsoname}{\alsoname}}
@@ -1837,7 +1867,7 @@
\ifdefvoid\@glo@seealso
{}%
{%
- \edef\@do@glssee{\noexpand\glsxtrindexseealso
+ \protected@edef\@do@glssee{\noexpand\glsxtrindexseealso
{\@glo@label}{\@glo@seealso}}%
\@do@glssee
}%
@@ -1845,7 +1875,7 @@
{%
\ifdefvoid\@glo@see
{%
- \edef\@do@glssee{\noexpand\glssee{\@glo@label}{\@glo@alias}}%
+ \protected@edef\@do@glssee{\noexpand\glssee{\@glo@label}{\@glo@alias}}%
\@do@glssee
}%
{}%
@@ -1861,7 +1891,7 @@
\ifcsvoid{glo@\@glo@label @seealso}%
{}%
{%
- \edef\@do@glssee{\noexpand\glsxtrindexseealso
+ \protected@edef\@do@glssee{\noexpand\glsxtrindexseealso
{\@glo@label}{\csuse{glo@\@glo@label @seealso}}}%
\@do@glssee
}%
@@ -1869,7 +1899,7 @@
{%
\ifdefvoid\@glo@see
{%
- \edef\@do@glssee{\noexpand\glssee
+ \protected@edef\@do@glssee{\noexpand\glssee
{\@glo@label}{\csuse{glo@\@glo@label @alias}}}%
\@do@glssee
}%
@@ -1961,7 +1991,7 @@
\glsxtr@orgmakenoidxglossaries
\renewcommand{\@do@seeglossary}[2]{%
\@@glsxtrwrglossmark
- \edef\@gls@label{\glsdetoklabel{##1}}%
+ \protected@edef\@gls@label{\glsdetoklabel{##1}}%
\protected@write\@auxout{}{%
\string\@gls@reference
{\csname glo@\@gls@label @type\endcsname}%
@@ -2433,12 +2463,12 @@
}
\def\@gls@link[#1]#2#3{%
\leavevmode
- \edef\glslabel{\glsdetoklabel{#2}}%
+ \protected@edef\glslabel{\glsdetoklabel{#2}}%
\def\@gls@link@opts{#1}%
\let\@gls@link@label\glslabel
\let\@glsnumberformat\@glsxtr@defaultnumberformat
- \edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}%
- \edef\glstype{\csname glo@\glslabel @type\endcsname}%
+ \protected@edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}%
+ \protected@edef\glstype{\csname glo@\glslabel @type\endcsname}%
\let\org@ifKV@glslink@hyper\ifKV@glslink@hyper
\let\@glsxtr@org@glolinkprefix\glolinkprefix
\let\@glsxtr@local@textformat\relax
@@ -2469,7 +2499,7 @@
\ifx\@glsxtr@local@textformat\relax
\glshasattribute{\glslabel}{textformat}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{\glslabel}{textformat}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{\glslabel}{textformat}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@textformat}{\@glsxtr@attrval}%
@@ -2525,7 +2555,7 @@
\glsdoifexists{#2}%
{%
\let\@glsnumberformat\@glsxtr@defaultnumberformat
- \edef\@gls@counter{\csname glo@\glsdetoklabel{#2}@counter\endcsname}%
+ \protected@edef\@gls@counter{\csname glo@\glsdetoklabel{#2}@counter\endcsname}%
\def\@glsxtr@thevalue{}%
\def\@glsxtr@theHvalue{\@glsxtr@thevalue}%
\glsaddpresetkeys
@@ -3135,7 +3165,7 @@
\ifglsused{\glslabel}%
{\let\glsxtrifwasfirstuse\@secondoftwo}
{\let\glsxtrifwasfirstuse\@firstoftwo}%
- \edef\glscategorylabel{\glscategory{\glslabel}}%
+ \protected@edef\glscategorylabel{\glscategory{\glslabel}}%
\ifglsused{\glslabel}%
{%
\glsifcategoryattribute{\glscategorylabel}{nohypernext}{true}%
@@ -3176,7 +3206,7 @@
\KV@glslink@noindextrue
}
\newcommand*{\@glsxtrsetaliasnoindex}{%
- \glsxtrifhasfield{alias}{\glslabel}%
+ \s@glsxtrifhasfield{alias}{\glslabel}%
{%
\let\glsxtrindexaliased\@glsxtrindexaliased
\glsxtrsetaliasnoindex
@@ -3189,7 +3219,7 @@
\else
\begingroup
\let\@glsnumberformat\@glsxtr@defaultnumberformat
- \edef\@gls@counter{\csname glo@\glsdetoklabel{\glslabel}@counter\endcsname}%
+ \protected@edef\@gls@counter{\csname glo@\glsdetoklabel{\glslabel}@counter\endcsname}%
\glsxtr@saveentrycounter
\@@do@wrglossary{\glsxtralias{\glslabel}}%
\endgroup
@@ -3281,7 +3311,7 @@
\ifdef\glsnavhyperlink
{
\renewcommand*{\glsnavhyperlink}[3][\@glo@type]{%
- \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
+ \protected@edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
{%
\let\glsxtrdohyperlink\glsxtr@org@dohyperlink
\@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}%
@@ -3341,7 +3371,7 @@
\glsdoifexists{#2}%
{%
\def\@glo@label{#2}%
- {\edef\glslabel{#2}%
+ {\protected@edef\glslabel{#2}%
\@glslink{\glolinkprefix\glslabel}{#1}}%
}%
}
@@ -3981,7 +4011,7 @@
{\ifglshaslong{#1}{\Glsentrylongpl{#1}}{\Glsentryfirstplural{#1}}}#2%
}
\newcommand*{\@@newglossaryentry@defunitcounters}{%
- \edef\@glo@countunit{\csuse{@glsxtr@categoryattr@@\@glo@category @unitcount}}%
+ \protected@edef\@glo@countunit{\csuse{@glsxtr@categoryattr@@\@glo@category @unitcount}}%
\ifdefvoid\@glo@countunit
{}%
{%
@@ -4015,7 +4045,7 @@
\newcommand*{\@gls@increment@currunitcount}[1]{%
\glshasattribute{#1}{unitcount}%
{%
- \edef\@glsxtr@csname{\@glsxtr@currentunitcount{#1}}%
+ \protected@edef\@glsxtr@csname{\@glsxtr@currentunitcount{#1}}%
\ifcsundef{\@glsxtr@csname}%
{%
\csgdef{\@glsxtr@csname}{1}%
@@ -4035,7 +4065,7 @@
\newcommand*{\@gls@local@increment@currunitcount}[1]{%
\glshasattribute{#1}{unitcount}%
{%
- \edef\@glsxtr@csname{\@glsxtr@currentunitcount{#1}}%
+ \protected@edef\@glsxtr@csname{\@glsxtr@currentunitcount{#1}}%
\ifcsundef{\@glsxtr@csname}%
{%
\csdef{\@glsxtr@csname}{1}%
@@ -4111,7 +4141,7 @@
\renewcommand*{\glsxtrpostreset}[1]{%
\glshasattribute{##1}{unitcount}%
{%
- \edef\@glsxtr@csname{\@glsxtr@currentunitcount{##1}}%
+ \protected@edef\@glsxtr@csname{\@glsxtr@currentunitcount{##1}}%
\ifcsundef{\@glsxtr@csname}%
{}%
{\csgdef{\@glsxtr@csname}{0}}%
@@ -4123,7 +4153,7 @@
\@glsxtr@entryunitcount@org@localreset{##1}%
\glshasattribute{##1}{unitcount}%
{%
- \edef\@glsxtr@csname{\@glsxtr@currentunitcount{##1}}%
+ \protected@edef\@glsxtr@csname{\@glsxtr@currentunitcount{##1}}%
\ifcsundef{\@glsxtr@csname}%
{}%
{\csdef{\@glsxtr@csname}{0}}%
@@ -4290,7 +4320,7 @@
\@for#1:=\@glsxtr@abbrlists\do{\ifdefempty{#1}{}{#2}}%
}
\newcommand*{\@glsxtr@addabbreviationlist}[1]{%
- \edef\@glo@type{#1}%
+ \protected@edef\@glo@type{#1}%
\ifdefempty\@glsxtr@abbrlists
{\let\@glsxtr@abbrlists\@glo@type}%
{%
@@ -4298,7 +4328,7 @@
{}%
{%
\expandafter\DTLifinlist\expandafter{\@glo@type}{\@glsxtr@abbrlists}{}%
- {\eappto\@glsxtr@abbrlists{,\@glo@type}}%
+ {\protected@eappto\@glsxtr@abbrlists{,\@glo@type}}%
}%
}%
}
@@ -4364,6 +4394,19 @@
\newcommand*{\glsacspacemax}{3em}
\newcommand*{\@glsxtr@reg@glosslist}{}
\let\@glsxtr@org@makeglossaries\makeglossaries
+\providecommand\@makeglossaries@warn@noprintglossary{%
+ \ifdefstring{\@glo@types}{,}%
+ {%
+ \GlossariesWarningNoLine{No glossaries have been defined}%
+ }%
+ {%
+ \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}%
+ }%
+}%
\providecommand{\@domakeglossaries}[1]{#1}
\renewcommand*{\makeglossaries}[1][]{%
\@domakeglossaries
@@ -4374,20 +4417,25 @@
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}%
+ record=off or record=hybrid options}%
}%
{%
\ifblank{#1}%
- {\@glsxtr@org@makeglossaries}%
+ {%
+ \@glsxtr@org@makeglossaries
+ \ifx\@glsxtr@record@setting\@glsxtr@record@setting@alsoindex
+ \let\warn@noprintglossary\@glsxtr@warn@hybrid@noprintgloss
+ \fi
+ }%
{%
\ifx\@glsxtr@record@setting\@glsxtr@record@setting@alsoindex
\PackageError{glossaries-extra}{\string\makeglossaries[#1]\space
- not permitted\MessageBreak with record=alsoindex package option}%
+ not permitted\MessageBreak with record=\@glsxtr@record@setting\space 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}%
+ \protected@edef\@glsxtr@reg@glosslist{#1}%
\ifundef{\glswrite}{\newwrite\glswrite}{}%
\protected@write\@auxout{}{\string\providecommand
\string\@glsorder[1]{}}
@@ -4412,8 +4460,8 @@
\renewcommand*{\@do@seeglossary}[2]{%
\glsdoifexists{##1}%
{%
- \edef\@gls@label{\glsdetoklabel{##1}}%
- \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
+ \protected@edef\@gls@label{\glsdetoklabel{##1}}%
+ \protected@edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
\expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
{\@glsxtr@org@doseeglossary{##1}{##2}}%
{%
@@ -4427,20 +4475,15 @@
}%
\let\@glsxtr@@do@@wrglossary\@@do@@wrglossary
\def\@@do@@wrglossary{%
- \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
+ \protected@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}%
- }%
+ \let\warn@noprintglossary\@makeglossaries@warn@noprintglossary
\renewcommand{\@gls@noref@warn}[1]{%
- \edef\@gls@type{##1}%
+ \protected@edef\@gls@type{##1}%
\expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
{%
\GlossariesExtraWarning{Can't use
@@ -4552,11 +4595,11 @@
\let\gls@org@glossaryentryfield\glossentry
\let\gls@org@glossarysubentryfield\subglossentry
\renewcommand{\glossentry}[1]{%
- \xdef\glscurrententrylabel{\glsdetoklabel{##1}}%
+ \protected@xdef\glscurrententrylabel{\glsdetoklabel{##1}}%
\gls@org@glossaryentryfield{##1}%
}%
\renewcommand{\subglossentry}[2]{%
- \xdef\glscurrententrylabel{\glsdetoklabel{##2}}%
+ \protected@xdef\glscurrententrylabel{\glsdetoklabel{##2}}%
\gls@org@glossarysubentryfield{##1}{##2}%
}%
\@gls@preglossaryhook
@@ -4653,7 +4696,7 @@
\def\@glo@type{#2}%
}
\newcommand\@glsxtr@mixed@assign@sortkey[1]{%
- \edef\@glo@type{\@glo@type}%
+ \protected@edef\@glo@type{\@glo@type}%
\expandafter\DTLifinlist\expandafter{\@glo@type}{\@glsxtr@reg@glosslist}%
{%
\@glo@no@assign@sortkey{#1}%
@@ -4837,7 +4880,7 @@
\csuse{#1}{#2}%
}
\newcommand*{\glsxtrdisplaystartloc}[2]{%
- \edef\glsxtrlocrangefmt{#1}%
+ \protected@edef\glsxtrlocrangefmt{#1}%
\ifx\glsxtrlocrangefmt\empty
\def\glsxtrlocrangefmt{glsnumberformat}%
\fi
@@ -4845,7 +4888,7 @@
\expandafter{\glsxtrlocrangefmt}{#2}%
}
\newcommand*{\glsxtrdisplayendloc}[2]{%
- \edef\@glsxtr@tmp{#1}%
+ \protected@edef\@glsxtr@tmp{#1}%
\ifdefempty{\@glsxtr@tmp}{\def\@glsxtr@tmp{glsnumberformat}}{}%
\ifx\glsxtrlocrangefmt\@glsxtr@tmp
\else
@@ -5256,8 +5299,8 @@
\glsdoifexists{#1}%
{%
\begingroup
- \edef\glscurrententrylabel{\glsdetoklabel{#1}}%
- \edef\currentglossary{\GlsXtrStandaloneGlossaryType}%
+ \protected@edef\glscurrententrylabel{\glsdetoklabel{#1}}%
+ \protected@edef\currentglossary{\GlsXtrStandaloneGlossaryType}%
\ifglshasparent{#1}%
{\GlsXtrStandaloneSubEntryItem{#1}}%
{\glsentryitem{#1}}%
@@ -5305,8 +5348,8 @@
\glsdoifexists{#1}%
{%
\begingroup
- \edef\glscurrententrylabel{\glsdetoklabel{#1}}%
- \edef\currentglossary{\GlsXtrStandaloneGlossaryType}%
+ \protected@edef\glscurrententrylabel{\glsdetoklabel{#1}}%
+ \protected@edef\currentglossary{\GlsXtrStandaloneGlossaryType}%
\ifglshasparent{#1}%
{\GlsXtrStandaloneSubEntryItem{#1}}%
{\glsentryitem{#1}}%
@@ -5381,7 +5424,7 @@
{\@glsxtr@groupheading}%
}%
\fi
- \eappto\@glsxtr@doglossary{%
+ \protected@eappto\@glsxtr@doglossary{%
\noexpand\@printunsrt@glossary@handler{\glscurrententrylabel}}%
}%
}%
@@ -5443,11 +5486,11 @@
\let\gls@org@glossaryentryfield\glossentry
\let\gls@org@glossarysubentryfield\subglossentry
\renewcommand{\glossentry}[1]{%
- \xdef\glscurrententrylabel{\glsdetoklabel{##1}}%
+ \protected@xdef\glscurrententrylabel{\glsdetoklabel{##1}}%
\gls@org@glossaryentryfield{##1}%
}%
\renewcommand{\subglossentry}[2]{%
- \xdef\glscurrententrylabel{\glsdetoklabel{##2}}%
+ \protected@xdef\glscurrententrylabel{\glsdetoklabel{##2}}%
\gls@org@glossarysubentryfield{##1}{##2}%
}%
\@gls@preglossaryhook
@@ -5493,7 +5536,7 @@
{\@glsxtr@groupheading}%
}%
\fi
- \eappto\@glsxtr@doglossary{%
+ \protected@eappto\@glsxtr@doglossary{%
\noexpand\@printunsrt@glossary@handler{\glscurrententrylabel}}%
}%
}%
@@ -5512,7 +5555,7 @@ can only be used within \string\printunsrtglossaryentryprocesshook}{}%
}
\newcommand*{\printunsrtglossarypredoglossary}{}
\newcommand{\@printunsrt@glossary@handler}[1]{%
- \xdef\glscurrententrylabel{#1}%
+ \protected@xdef\glscurrententrylabel{#1}%
\printunsrtglossaryhandler\glscurrententrylabel
}
\newcommand{\printunsrtglossaryhandler}[1]{%
@@ -5572,7 +5615,7 @@ can only be used within \string\printunsrtglossaryentryprocesshook}{}%
{%
\ifdefempty{\@gls@currentlettergroup}{}%
{\def\@glsxtr@groupheading{\glsgroupskip}}%
- \eappto\@glsxtr@groupheading{%
+ \protected@eappto\@glsxtr@groupheading{%
\noexpand\glsgroupheading{\expandonce\@glo@thislettergrp}%
}%
}%
@@ -5754,13 +5797,13 @@ defined}{}%
{#3}%
}
\newcommand*{\@glsxtr@rglstrigger@record}[3]{%
- \edef\glslabel{\glsdetoklabel{#2}}%
+ \protected@edef\glslabel{\glsdetoklabel{#2}}%
\let\@gls@link@label\glslabel
\def\@glsxtr@thevalue{}%
\def\@glsxtr@theHvalue{\@glsxtr@thevalue}%
\def\@glsnumberformat{glstriggerrecordformat}%
- \edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}%
- \edef\glstype{\csname glo@\glslabel @type\endcsname}%
+ \protected@edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}%
+ \protected@edef\glstype{\csname glo@\glslabel @type\endcsname}%
\def\@glsxtr@thevalue{}%
\def\@glsxtr@theHvalue{\@glsxtr@thevalue}%
\glsxtrinitwrgloss
@@ -5903,9 +5946,9 @@ defined}{}%
\glshasattribute{\glslabel}{linkcountmaster}%
{%
\begingroup
- \edef\x{\endgroup\noexpand\@addtoreset{glsxtr@linkcount@\glslabel}%
+ \edef\@glo@tmp{\endgroup\noexpand\@addtoreset{glsxtr@linkcount@\glslabel}%
{\glsgetattribute{\glslabel}{linkcountmaster}}}%
- \x
+ \@glo@tmp
}%
{}%
}%
@@ -6307,11 +6350,11 @@ defined}{}%
{}%
\ifdefempty\@gls@longaccess
{%
- \edef\@gls@shortaccess{\glsdefaultshortaccess
+ \protected@edef\@gls@shortaccess{\glsdefaultshortaccess
{\expandonce\@gls@actuallong}{\expandonce\@gls@actualshort}}%
}%
{%
- \edef\@gls@shortaccess{\glsdefaultshortaccess
+ \protected@edef\@gls@shortaccess{\glsdefaultshortaccess
{\expandonce\@gls@longaccess}{\expandonce\@gls@actualshort}}%
}%
\eappto\ExtraCustomAbbreviationFields{shortaccess={\@gls@shortaccess},}%
@@ -6333,11 +6376,11 @@ defined}{}%
}%
\ifdefempty\@gls@longaccesspl
{%
- \edef\@gls@shortaccesspl{\glsdefaultshortaccess
+ \protected@edef\@gls@shortaccesspl{\glsdefaultshortaccess
{\expandonce\@gls@actuallongpl}{\expandonce\@gls@actualshortpl}}%
}%
{%
- \edef\@gls@shortaccesspl{\glsdefaultshortaccess
+ \protected@edef\@gls@shortaccesspl{\glsdefaultshortaccess
{\expandonce\@gls@longaccesspl}{\expandonce\@gls@actualshort}}%
}%
\eappto\ExtraCustomAbbreviationFields{shortpluralaccess={\@gls@shortaccesspl},}%
@@ -6626,7 +6669,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossdescfont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}%
@@ -6667,7 +6710,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossdescfont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}%
@@ -6705,7 +6748,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossnamefont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
@@ -6767,7 +6810,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossnamefont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
@@ -6814,7 +6857,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossnamefont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
@@ -6843,7 +6886,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossnamefont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
@@ -6877,12 +6920,12 @@ defined}{}%
\ifcsdef{gls#1accessdisplay}%
{\letcs\@glsxtr@accessdisplay{gls#1accessdisplay}}%
{%
- \edef\@gls@thisval{#1}%
+ \protected@edef\@gls@thisval{#1}%
\@for\@gls@map:=\@gls@keymap\do{%
- \edef\@this@key{\expandafter\@secondoftwo\@gls@map}%
+ \protected@edef\@this@key{\expandafter\@secondoftwo\@gls@map}%
\ifdefequal{\@this@key}{\@gls@thisval}%
{%
- \edef\@gls@thisval{\expandafter\@firstoftwo\@gls@map}%
+ \protected@edef\@gls@thisval{\expandafter\@firstoftwo\@gls@map}%
\@endfortrue
}%
{}%
@@ -6904,7 +6947,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glossnamefont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
@@ -6985,7 +7028,7 @@ defined}{}%
\fi
\ifdefstring{\@glsxtr@attrval}{true}%
{}%
- {\eappto\@glo@name{\@glsxtr@autoindex@encap\@glsxtr@attrval}}%
+ {\protected@eappto\@glo@name{\@glsxtr@autoindex@encap\@glsxtr@attrval}}%
\expandafter\glsxtrautoindex\expandafter{\@glo@name}%
}%
{}%
@@ -7140,7 +7183,7 @@ defined}{}%
\glssetabbrvfmt{\glscategory{#1}}%
\glshasattribute{#1}{glosssymbolfont}%
{%
- \edef\@glsxtr@attrval{\glsgetattribute{#1}{glosssymbolfont}}%
+ \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glosssymbolfont}}%
\ifcsdef{\@glsxtr@attrval}%
{%
\letcs{\@glsxtr@glosssymbolfont}{\@glsxtr@attrval}%
@@ -7383,7 +7426,7 @@ defined}{}%
}
\newcommand{\@glsxtr@swaptwo}[2]{#2#1}
\define@key{glsxtrabbrv}{category}{%
- \edef\glscategorylabel{#1}%
+ \protected@edef\glscategorylabel{#1}%
}
\define@key{glsxtrabbrv}{shortplural}{%
\def\@gls@shortpl{#1}%
@@ -8070,7 +8113,7 @@ defined}{}%
}%
\@glsxtr@dostylewarn
\csdef{@glsabbrv@current@#1}{#2}%
- \edef\glscategorylabel{#1}%
+ \protected@edef\glscategorylabel{#1}%
\glsxtr@applyabbrvstyle{#2}%
}%
}%
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 db0c97bc566..f121012709c 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2021/09/20 v1.46 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}
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 9c3e6fbad5c..05d82587e14 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (NLCT)]
+\ProvidesPackage{glossary-longextra}[2021/09/20 v1.46 (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 041e54d8d06..19c88da5d3a 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 2020 Nicola Talbot
+%% Copyright 2021 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
%%
%% \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,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)]
+\ProvidesPackage{glossary-topic}[2021/09/20 v1.46 (NLCT)]
\RequirePackage{multicol}
\newglossarystyle{topic}{%
\renewenvironment{theglossary}%
@@ -69,8 +69,11 @@
\renewcommand{\subglossentry}[3]{%
\ifnum\glstopic@prevlevel=0\relax\glstopic@prechildren\fi
\def\glstopic@prevlevel{##1}%
+ \begingroup
\glstopicAssignSubIndent{##1}%
\glstopicSubItem{##1}{##2}{##3}%
+ \par
+ \endgroup
}%
\renewcommand*{\glsgroupskip}{}%
}
@@ -104,8 +107,14 @@
\par
\parindent\dimexpr#1\glstopicSubIndent-\glstopicSubIndent\relax
\glstopicAssignWidest{#1}%
- \hangindent\dimexpr\parindent+\glstopicwidest\relax
+ \glstopicsubitemhangindent=\dimexpr\parindent+\glstopicwidest\relax
+ \hangindent\glstopicsubitemhangindent\relax
+ \everypar{\hangindent\glstopicsubitemhangindent\relax
+ \parindent\dimexpr\glstopicSubItemParIndent+\glstopicsubitemhangindent\relax}%
}
+\newlength\glstopicsubitemhangindent
+\newlength\glstopicSubItemParIndent
+\glstopicSubItemParIndent\parindent
\newlength\glstopicwidest
\newcommand*{\glstopicAssignWidest}[1]{%
\ifcsundef{@glswidestlength\romannumeral#1}%