summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries-extra
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/source/latex/glossaries-extra
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/source/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx48
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins2
2 files changed, 38 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
index 890b246d395..13ee7144aca 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,14 +1,14 @@
%\iffalse
% glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
-% -section "chapter"
% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
% -author "Nicola Talbot"
+% -section "chapter"
% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
% -doc "glossaries-extra-codedoc.tex"
% glossaries-extra
-% Created on 2017/2/3 20:32
+% Created on 2017/2/7 9:40
%\fi
%\iffalse
%<*package>
@@ -118,7 +118,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{11390}
+\CheckSum{11419}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -154,13 +154,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\raggedright
}
-\title{glossaries-extra.sty v1.12:
+\title{glossaries-extra.sty v1.13:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2017-02-03}
+\date{2017-02-07}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -205,7 +205,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2017/02/03 v1.12 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/02/07 v1.13 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -558,6 +558,7 @@ Dickimaw Books\\
\let\glsxtr@warnonexistsordo\@gobble
\let\@@glsxtr@recordcounter\@glsxtr@noop@recordcounter
\def\printunsrtglossaryunit{\print@noop@unsrtglossaryunit}%
+ \undef\glsxtrsetaliasnoindex
}%
\or
% \end{macrocode}
@@ -573,6 +574,11 @@ Dickimaw Books\\
\renewcommand*{\@glsxtr@autoindexcrossrefs}{}%
\let\@@glsxtr@recordcounter\@glsxtr@op@recordcounter
\def\printunsrtglossaryunit{\print@op@unsrtglossaryunit}%
+% \end{macrocode}
+%Switch off the index suppression for aliased entries.
+%(bib2gls will deal with them.)
+% \begin{macrocode}
+ \def\glsxtrsetaliasnoindex{}%
}%
\or
% \end{macrocode}
@@ -587,6 +593,7 @@ Dickimaw Books\\
\glsxtr@addloclistfield
\let\@@glsxtr@recordcounter\@glsxtr@op@recordcounter
\def\printunsrtglossaryunit{\print@op@unsrtglossaryunit}%
+ \undef\glsxtrsetaliasnoindex
}%
\fi
}
@@ -2802,14 +2809,30 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsdispl}
+%\begin{macro}{\@glsdisp}
%\changes{1.08}{2016-12-13}{added \cs{@glsxtr@record}}
+%\changes{1.13}{2017-02-07}{removed \cs{@glsxtr@org@glsdisp}}
%Save the original definition and redefine.
+%Can't save and restore \cs{@glsdisp} since it has an optional
+%argument.
% \begin{macrocode}
-\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
}
% \end{macrocode}
%\end{macro}
@@ -3995,10 +4018,13 @@ Dickimaw Books\\
%
%\begin{macro}{\glsxtrsetaliasnoindex}
%\changes{1.12}{2017-02-03}{new}
+%\changes{1.13}{2017-02-07}{switched to \cs{providecommand}}
%Allow user to hook into the alias noindex setting.
%Default behaviour switches off indexing for aliases.
+%If the record option is on, this will have been defined to do
+%nothing. (bib2gls will deal with records for aliased entries.)
% \begin{macrocode}
-\newcommand*{\glsxtrsetaliasnoindex}{%
+\providecommand*{\glsxtrsetaliasnoindex}{%
\KV@glslink@noindextrue
}
% \end{macrocode}
@@ -14543,7 +14569,7 @@ Dickimaw Books\\
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/02/03 v1.12 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/02/07 v1.13 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
index 0491f42a41c..98905986c4f 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
@@ -1,4 +1,4 @@
-% glossaries-extra.ins generated using makedtx version 1.1 2017/2/3 20:32
+% glossaries-extra.ins generated using makedtx version 1.1 2017/2/7 9:40
\input docstrip
\preamble