summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-05 21:49:40 +0000
committerKarl Berry <karl@freefriends.org>2018-01-05 21:49:40 +0000
commit5add5510b8b8121f5575f0c8cc8397a36abb3eab (patch)
tree73404b86be8e89ade21b16da0d34c5fec5c3f77f /Master/texmf-dist/tex/latex/glossaries-extra
parentfe0e333e467cf6e0d1a533da3ff7caa679aeb1dc (diff)
glossaries-extra (5jan18)
git-svn-id: svn://tug.org/texlive/trunk@46225 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.tex2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty54
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty4
4 files changed, 57 insertions, 7 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 0e041579df0..8ca4d216b5b 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 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
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 21be266918d..5eaff9953a6 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 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/11/24 v1.25 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2018/01/05 v1.26 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption{all}{%
\appto\@glsxtr@loadstyles{%
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 b316e74887e..2cd704b5a24 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 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2017/11/24 v1.25 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2018/01/05 v1.26 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -1825,6 +1825,8 @@
\glsxtr@hyperoutsidetrue
}%
}
+\newcommand*{\glsxtr@inc@linkcount}{}
+\newcommand*{\glslinkpresetkeys}{}
\def\@gls@link[#1]#2#3{%
\leavevmode
\edef\glslabel{\glsdetoklabel{#2}}%
@@ -1839,8 +1841,10 @@
\glsxtrinitwrgloss
\glsxtrinithyperoutside
\@gls@setdefault@glslink@opts
+ \glsxtr@inc@linkcount
\do@glsdisablehyperinlist
\do@gls@link@checkfirsthyper
+ \glslinkpresetkeys
\setkeys{glslink}{#1}%
\glslinkpostsetkeys
\ifdefempty{\@glsxtr@thevalue}%
@@ -4716,6 +4720,7 @@ defined}{}%
\def\@glsxtr@thevalue{}%
\def\@glsxtr@theHvalue{\@glsxtr@thevalue}%
\glsxtrinitwrgloss
+ \glslinkpresetkeys
\setkeys{glslink}{#1}%
\glslinkpostsetkeys
\ifdefempty{\@glsxtr@thevalue}%
@@ -4845,6 +4850,51 @@ defined}{}%
\newcommand*{\rGLSplformat}[2]{%
\expandafter\mfirstucMakeUppercase\expandafter{\rglsplformat{#1}{#2}}%
}
+\newcommand{\@glsxtr@do@inc@linkcount}{%
+ \glsifattribute{\glslabel}{linkcount}{true}%
+ {%
+ \ifcsdef{c@glsxtr@linkcount@\glslabel}{}%
+ {%
+ \newcounter{glsxtr@linkcount@\glslabel}%
+ \glshasattribute{\glslabel}{linkcountmaster}%
+ {%
+ \begingroup
+ \edef\x{\endgroup\noexpand\@addtoreset{glsxtr@linkcount@\glslabel}%
+ {\glsgetattribute{\glslabel}{linkcountmaster}}}%
+ \x
+ }%
+ {}%
+ }%
+ \glsxtrinclinkcounter{glsxtr@linkcount@\glslabel}%
+ }%
+ {}%
+}
+\newcommand*{\glsxtrinclinkcounter}[1]{\stepcounter{#1}}
+\newcommand*{\GlsXtrLinkCounterValue}[1]{%
+ \ifcsundef{c@glsxtr@linkcount@#1}{0}{\csname c@glsxtr@linkcount@#1\endcsname}%
+}
+\newcommand*{\GlsXtrTheLinkCounter}[1]{%
+ \ifcsundef{theglsxtr@linkcount@#1}{0}%
+ {\csname theglsxtr@linkcount@#1\endcsname}%
+}
+\newcommand*{\GlsXtrIfLinkCounterDef}[3]{%
+ \ifcsundef{theglsxtr@linkcount@#1}{#3}{#2}%
+}
+\newcommand*{\GlsXtrLinkCounterName}[1]{glsxtr@linkcount@#1}
+\newcommand*{\GlsXtrEnableLinkCounting}[2][]{%
+ \let\glsxtr@inc@linkcount\@glsxtr@do@inc@linkcount
+ \@for\@glsxtr@label:=#2\do
+ {%
+ \glssetcategoryattribute{\@glsxtr@label}{linkcount}{true}%
+ \ifstrempty{#1}{}%
+ {%
+ \ifcsundef{c@#1}%
+ {\@nocounterr{#1}}%
+ {\glssetcategoryattribute{\@glsxtr@label}{linkcountmaster}{#1}}%
+ }%
+ }%
+}
+\@onlypreamble\GlsXtrEnableLinkCounting
\@ifpackageloaded{glossaries-accsupp}
{
\newcommand*{\glsaccessname}[1]{%
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 883a46c8dc4..0fa722e7893 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 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2017/11/24 v1.25 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2018/01/05 v1.26 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}