summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-07 22:43:09 +0000
committerKarl Berry <karl@freefriends.org>2017-02-07 22:43:09 +0000
commit78b80c8f82cee519019d6d57283681efc46bebf6 (patch)
treeef7947c950ecabeb13352f31088dc01fad5a65ff /Master/texmf-dist/tex/latex
parent2ebe2779edac8cb53ee6d49d058c3ce1aac3f685 (diff)
glossaries-extra (7feb17)
git-svn-id: svn://tug.org/texlive/trunk@43163 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty24
2 files changed, 21 insertions, 5 deletions
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 5b47d114020..946575a1845 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
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/02/03 v1.12 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/02/07 v1.13 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption*{%
\IfFileExists{glossary-\CurrentOption.sty}
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 ee66803885f..888488ab869 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/02/03 v1.12 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/02/07 v1.13 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -211,6 +211,7 @@
\let\glsxtr@warnonexistsordo\@gobble
\let\@@glsxtr@recordcounter\@glsxtr@noop@recordcounter
\def\printunsrtglossaryunit{\print@noop@unsrtglossaryunit}%
+ \undef\glsxtrsetaliasnoindex
}%
\or
\def\glsxtr@setup@record{%
@@ -223,6 +224,7 @@
\renewcommand*{\@glsxtr@autoindexcrossrefs}{}%
\let\@@glsxtr@recordcounter\@glsxtr@op@recordcounter
\def\printunsrtglossaryunit{\print@op@unsrtglossaryunit}%
+ \def\glsxtrsetaliasnoindex{}%
}%
\or
\def\glsxtr@setup@record{%
@@ -234,6 +236,7 @@
\glsxtr@addloclistfield
\let\@@glsxtr@recordcounter\@glsxtr@op@recordcounter
\def\printunsrtglossaryunit{\print@op@unsrtglossaryunit}%
+ \undef\glsxtrsetaliasnoindex
}%
\fi
}
@@ -1297,10 +1300,23 @@
\@glsxtr@record{#1}{#2}%
\@glsxtr@org@GLSpl@{#1}{#2}%
}%
-\let\@glsxtr@org@glsdisp\@glsdisp
\renewcommand*{\@glsdisp}[3][]{%
\@glsxtr@record{#1}{#2}%
- \@glsxtr@org@glsdisp[#1]{#2}{#3}%
+ \glsdoifexists{#2}{%
+ \let\do@gls@link@checkfirsthyper\@gls@link@checkfirsthyper
+ \let\glsifplural\@secondoftwo
+ \let\glscapscase\@firstofthree
+ \def\glscustomtext{#3}%
+ \def\glsinsert{}%
+ \def\@glo@text{\csname gls@\glstype @entryfmt\endcsname}%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ \ifKV@glslink@local
+ \glslocalunset{#2}%
+ \else
+ \glsunset{#2}%
+ \fi
+ }%
+ \glspostlinkhook
}
\renewcommand*{\@gls@@link}[3][]{%
\@glsxtr@record{#1}{#2}%
@@ -1907,7 +1923,7 @@
}
\preto\do@glsdisablehyperinlist{\@gls@setdefault@glslink@opts}
}
-\newcommand*{\glsxtrsetaliasnoindex}{%
+\providecommand*{\glsxtrsetaliasnoindex}{%
\KV@glslink@noindextrue
}
\newcommand*{\@glsxtrsetaliasnoindex}{%