summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-13 23:52:25 +0000
committerKarl Berry <karl@freefriends.org>2017-11-13 23:52:25 +0000
commit1bbee619d358bad552a4d4aec4f8dc7637e1d846 (patch)
treeaa54f01b41f1d5dc7202bc08cc4c8c1c1546d116 /Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
parent4f7563fdd23498045c4b1909db16226856018cca (diff)
glossaries-extra (13nov17)
git-svn-id: svn://tug.org/texlive/trunk@45786 c570f23f-e606-0410-a88d-b1316a301751
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.sty72
1 files changed, 55 insertions, 17 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 c077b215f8c..c793e9bd7f9 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}[2017/11/08 v1.22 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/11/12 v1.23 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -470,7 +470,7 @@
\newcommand*{\ALP}{\GLSxtrlongpl}%
\newcommand*{\AF}{\GLSxtrfull}%
\newcommand*{\AFP}{\GLSxtrfullpl}%
- \newcommand*{\newabbr}{\newabbreviation}%
+ \providecommand*{\newabbr}{\newabbreviation}%
\let\GlsXtrDefineAbbreviationShortcuts\relax
}
\newcommand*{\GlsXtrDefineAcShortcuts}{%
@@ -498,7 +498,7 @@
\newcommand*{\ACLP}{\GLSxtrlongpl}%
\newcommand*{\ACF}{\GLSxtrfull}%
\newcommand*{\ACFP}{\GLSxtrfullpl}%
- \newcommand*{\newabbr}{\newabbreviation}%
+ \providecommand*{\newabbr}{\newabbreviation}%
\let\GlsXtrDefineAcShortcuts\relax
}
\newcommand*{\GlsXtrDefineOtherShortcuts}{%
@@ -780,19 +780,37 @@
}
\newcommand{\GlsXtrFmtField}{useri}
\newcommand{\GlsXtrFmtDefaultOptions}{noindex}
-\newrobustcmd*{\glsxtrfmt}[3][]{%
- \glsdoifexistsordo{#2}%
- {%
- \ifglshasfield{\GlsXtrFmtField}{#2}%
+\newrobustcmd*{\glsxtrfmt}{\@ifstar\s@glsxtrfmt\@glsxtrfmt}
+\newcommand*{\@glsxtrfmt}[3][]{\@@glsxtrfmt{#1}{#2}{#3}{}}
+\newcommand*{\s@glsxtrfmt}[3][]{%
+ \new@ifnextchar[{\s@@glsxtrfmt{#1}{#2}{#3}}%
+ {\@@glsxtrfmt{#1}{#2}{#3}{}}%
+}
+\def\s@@glsxtrfmt#1#2#3[#4]{\@@glsxtrfmt{#1}{#2}{#3}{#4}}
+\newcommand*{\@@glsxtrfmt}[4]{%
+ \begingroup
+ \def\glslabel{#2}%
+ \glsdoifexistsordo{#2}%
{%
- \let\do@gls@link@checkfirsthyper\relax
- \expandafter\@gls@link\expandafter[\GlsXtrFmtDefaultOptions,#1]{#2}%
- {\csuse{\glscurrentfieldvalue}{#3}}%
+ \ifglshasfield{\GlsXtrFmtField}{#2}%
+ {%
+ \let\do@gls@link@checkfirsthyper\relax
+ \expandafter\@gls@link\expandafter[\GlsXtrFmtDefaultOptions,#1]{#2}%
+ {\glsxtrfmtdisplay{\glscurrentfieldvalue}{#3}{#4}}%
+ }%
+ {\glsxtrfmtdisplay{@firstofone}{#3}{#4}}%
}%
- {#3}%
- }%
- {#3}%
+ {%
+ \begingroup
+ \@gls@setdefault@glslink@opts
+ \setkeys{glslink}{\GlsXtrFmtDefaultOptions,#1}%
+ \ifKV@glslink@noindex\else\glsadd{#2}\fi
+ \endgroup
+ \glsxtrfmtdisplay{@firstofone}{#3}{#4}%
+ }%
+ \endgroup
}
+\newcommand{\glsxtrfmtdisplay}[3]{\csuse{#1}{#2}#3}
\ifdef\texorpdfstring
{
\newcommand*{\glsxtrentryfmt}[2]{%
@@ -803,7 +821,7 @@
\newcommand*{\glsxtrentryfmt}{\@glsxtrentryfmt}
}
\newrobustcmd*{\@glsxtrentryfmt}[2]{%
- \glsdoifexistsordo
+ \glsdoifexistsordo{#1}%
{%
\ifglshasfield{\GlsXtrFmtField}{#1}%
{%
@@ -851,6 +869,9 @@
\ifdefempty\glscurrentfieldvalue{#4}{#3}%
}%
}
+\newcommand{\GlsXtrIfFieldUndef}[2]{%
+ \ifcsundef{glo@\glsdetoklabel{#2}@#1}%
+}
\newcommand*{\glsxtrusefield}[2]{%
\@gls@entry@field{#1}{#2}%
}
@@ -3739,14 +3760,27 @@
\renewcommand{\glspostdescription}{%
\glsnopostdottrue
\let\glspostdescription\@@glsxtr@org@postdescription
- \glsxtrpostdescription}%
+ \let\glsxtrrestorepostpunc\@glsxtr@restore@postpunc
+ \glsxtrpostdescription
+ \@glsxtr@nopostpunc@postdesc}%
\else
\renewcommand{\glspostdescription}{%
\let\glspostdescription\@@glsxtr@org@postdescription
- \glsxtrpostdescription}%
+ \let\glsxtrrestorepostpunc\@glsxtr@restore@postpunc
+ \glsxtrpostdescription
+ \@glsxtr@nopostpunc@postdesc}%
\fi
\glsnopostdotfalse
}
+\newcommand*{\@glsxtr@nopostpunc@postdesc}{}
+\newcommand*{\@glsxtr@restore@postpunc}{%
+ \def\@glsxtr@nopostpunc@postdesc{%
+ \@glsxtr@org@postdescription
+ \let\@glsxtr@nopostpunc@postdesc\@empty
+ \let\glsxtrrestorepostpunc\@empty
+ }%
+}
+\newcommand*{\glsxtrrestorepostpunc}{}
\renewcommand{\@printglossary}[2]{%
\def\@glsxtr@printglossopts{#1}%
\@glsxtr@orgprintglossary{#1}{#2}%
@@ -5835,8 +5869,12 @@ defined}{}%
\newcommand*{\glsxtrpostlinkhook}{%
\glsxtrdiscardperiod{\glslabel}%
{\glsxtrpostlinkendsentence}%
- {\glsxtrpostlink}%
+ {\glsxtrifcustomdiscardperiod
+ {\glsxtrifperiod{\glsxtrpostlinkendsentence}{\glsxtrpostlink}}%
+ {\glsxtrpostlink}%
+ }%
}
+\newcommand*{\glsxtrifcustomdiscardperiod}[2]{#2}
\newcommand*{\glsxtrpostlink}{%
\csuse{glsxtrpostlink\glscategory{\glslabel}}%
}