summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-07 21:47:52 +0000
committerKarl Berry <karl@freefriends.org>2018-03-07 21:47:52 +0000
commit4fa439e0226fee506c74cf2b08d8e666a1d497db (patch)
tree3213e86d25649bcab31024a692eec8c5e3a4e519 /Master/texmf-dist/source/latex/glossaries-extra
parentc5ba7c59f808b748529b8c2addcff69f25fe522c (diff)
glossaries-extra (7mar18)
git-svn-id: svn://tug.org/texlive/trunk@46871 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.dtx101
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins2
2 files changed, 60 insertions, 43 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 aeebd5cc020..bdcc4aed7e8 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,10 +1,8 @@
%\iffalse
% glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
-% -doc "glossaries-extra-codedoc.tex"
-% -section "chapter"
-% -author "Nicola Talbot"
+% -macrocode ".*\.tex"
+% -macrocode ".*\.bib"
% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
% -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty"
% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
@@ -12,12 +10,14 @@
% -src "(example-glossaries-.+\.tex)\Z=>\1"
% -src "(example-glossaries-.+\.bib)\Z=>\1"
% -setambles ".*\.bib=>\nopreamble\nopostamble"
-% -macrocode ".*\.tex"
-% -macrocode ".*\.bib"
% -comment ".*\.tex"
% -comment ".*\.bib"
+% -doc "glossaries-extra-codedoc.tex"
+% -author "Nicola Talbot"
+% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
+% -section "chapter"
% glossaries-extra
-% Created on 2018/2/26 21:37
+% Created on 2018/3/6 23:39
%\fi
%\iffalse
%<*package>
@@ -127,7 +127,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{22518}
+\CheckSum{22519}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -167,13 +167,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\raggedright
}
-\title{glossaries-extra.sty v1.27:
+\title{glossaries-extra.sty v1.28:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2018-02-26}
+\date{2018-03-06}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -218,7 +218,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2018/03/06 v1.28 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -360,10 +360,11 @@ Dickimaw Books\\
%\end{macro}
%
% \begin{macrocode}
-\define@choicekey{glossaries-extra.sty}{undefaction}[\val\nr]%
+\define@choicekey{glossaries-extra.sty}{undefaction}%
+ [\glsxtr@undefaction@val\glsxtr@undefaction@nr]%
{warn,error}%
{%
- \ifcase\nr\relax
+ \ifcase\glsxtr@undefaction@nr\relax
\let\glsxtrundefaction\@glsxtr@warn@undefaction
\let\glsxtr@warnonexistsordo\@glsxtr@warn@onexistsordo
\let\@glsxtr@redef@forglsentries\@glsxtr@do@redef@forglsentries
@@ -776,12 +777,12 @@ Dickimaw Books\\
%Now define the \pkgopt{record} package option.
%\changes{1.08}{2016-12-13}{added \pkgopt{record} package option}
% \begin{macrocode}
-\define@choicekey{glossaries-extra.sty}{record}[\val\nr]%
+\define@choicekey{glossaries-extra.sty}{record}
+ [\@glsxtr@record@setting\glsxtr@record@nr]%
{off,only,alsoindex}%
[only]%
{%
- \let\@glsxtr@record@setting\val
- \ifcase\nr\relax
+ \ifcase\glsxtr@record@nr\relax
% \end{macrocode}
%Don't record.
% \begin{macrocode}
@@ -862,8 +863,9 @@ Dickimaw Books\\
%\changes{1.06}{2016-06-18}{new}
%The \pkgopt{docdef} value is stored as an integer: 0 (false), 1
%(true) and 2 (restricted).
+%\changes{1.28}{2018-03-06}{changed from count register to macro}
% \begin{macrocode}
-\newcount\@glsxtr@docdefval
+\newcommand*{\@glsxtr@docdefval}{0}
% \end{macrocode}
%\end{macro}
%
@@ -875,12 +877,12 @@ Dickimaw Books\\
%\end{macro}
%\begin{macro}{\@glsxtrdocdeftrue}
% \begin{macrocode}
-\newcommand*{\@glsxtrdocdeftrue}{\@glsxtr@docdefval=1 }
+\newcommand*{\@glsxtrdocdeftrue}{\def\@glsxtr@docdefval{1}}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\@glsxtrdocdeffalse}
% \begin{macrocode}
-\newcommand*{\@glsxtrdocdeffalse}{\@glsxtr@docdefval=0 }
+\newcommand*{\@glsxtrdocdeffalse}{\def\@glsxtr@docdefval{0}}
% \end{macrocode}
%\end{macro}
%
@@ -890,10 +892,10 @@ Dickimaw Books\\
% is really determined to define them in the document allow them to
% request this.
% \begin{macrocode}
-\define@choicekey{glossaries-extra.sty}{docdef}[\val\nr]%
+\define@choicekey{glossaries-extra.sty}{docdef}
+ [\@glsxtr@docdefsetting\@glsxtr@docdefval]%
{false,true,restricted}[true]%
{%
- \@glsxtr@docdefval=\nr\relax
\ifnum\@glsxtr@docdefval=2\relax
\renewcommand*{\@glsdoifexistsorwarn}{\glsdoifexists}%
\fi
@@ -1235,10 +1237,10 @@ Dickimaw Books\\
%\cs{GlsXtrDefineAcShortcuts} (not included in
%\pkgopt[all]{shortcuts} as it conflicts with other shortcuts).
% \begin{macrocode}
-\define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]%
+\define@choicekey{glossaries-extra.sty}{shortcuts}%
+ [\@glsxtr@shortcutsval\@glsxtr@shortcutsnr]%
{acronyms,acro,abbreviations,abbr,other,all,true,ac,none,false}[true]{%
- \let\@glsxtr@shortcutsval\val
- \ifcase\nr\relax % acronyms
+ \ifcase\@glsxtr@shortcutsnr\relax % acronyms
\renewcommand*{\@glsxtr@setupshortcuts}{%
\glsacrshortcutstrue
\DefineAcronymSynonyms
@@ -1329,12 +1331,11 @@ Dickimaw Books\\
% If true, suppress the text produced if the external glossary file
% is missing.
% \begin{macrocode}
-\define@choicekey{glossaries-extra.sty}{nomissingglstext}[\val\nr]%
+\define@choicekey{glossaries-extra.sty}{nomissingglstext}
+ [\@glsxtr@nomissingglstextval\@glsxtr@nomissingglstextnr]%
{true,false}[true]{%
- \ifcase\nr\relax % true
- \renewcommand{\glsxtrNoGlossaryWarning}[1]{%
- \null
- }%
+ \ifcase\@glsxtr@nomissingglstextnr\relax % true
+ \renewcommand{\glsxtrNoGlossaryWarning}[1]{\null}%
\else % false
\renewcommand{\glsxtrNoGlossaryWarning}[1]{%
\@glsxtr@defaultnoglossarywarning{#1}%
@@ -1456,9 +1457,10 @@ Dickimaw Books\\
%\changes{1.21}{2017-11-03}{new}
% Provide extra debug options.
% \begin{macrocode}
-\define@choicekey{glossaries-extra.sty}{debug}[\val\nr]%
+\define@choicekey{glossaries-extra.sty}{debug}
+ [\@glsxtr@debugval\@glsxtr@debugnr]%
{true,false,showtargets,showwrgloss,all}[true]{%
- \ifcase\nr\relax % true
+ \ifcase\@glsxtr@debugnr\relax % true
\glsxtr@dooption{debug=true}%
\renewcommand*{\@glsxtrwrglossmark}{}%
\or % false
@@ -2131,8 +2133,10 @@ Dickimaw Books\\
%\begin{macro}{\glsxtredeffield}
%\changes{1.12}{2017-02-03}{new}
%Just use \cs{csedef} to provide a field value for the given entry.
+%\changes{1.28}{2018-03-06}{changed \cs{csedef} to
+%\cs{protected@csedef}}
% \begin{macrocode}
-\newcommand*{\glsxtredeffield}[2]{\csedef{glo@\glsdetoklabel{#1}@#2}}
+\newcommand*{\glsxtredeffield}[2]{\protected@csedef{glo@\glsdetoklabel{#1}@#2}}
% \end{macrocode}
%\end{macro}
%
@@ -3915,9 +3919,11 @@ Dickimaw Books\\
% Define a \gloskey[glslink]{wrgloss} key to determine whether to
% write the glossary information before or after the link text.
% \begin{macrocode}
-\define@choicekey{glslink}{wrgloss}[\val\nr]{before,after}%
+\define@choicekey{glslink}{wrgloss}%
+[\@glsxtr@wrglossval\@glsxtr@wrglossnr]%
+{before,after}%
{%
- \ifcase\nr\relax
+ \ifcase\@glsxtr@wrglossnr\relax
\glsxtrinitwrglossbeforetrue
\or
\glsxtrinitwrglossbeforefalse
@@ -7722,8 +7728,11 @@ Dickimaw Books\\
%Add a key that switches off the entry targets:
%\changes{1.12}{2017-02-03}{added target key to printgloss family}
% \begin{macrocode}
-\define@choicekey{printgloss}{target}[\val\nr]{true,false}[true]{%
- \ifcase\nr
+\define@choicekey{printgloss}{target}
+[\@glsxtr@printglossval\@glsxtr@printglossnr]%
+{true,false}[true]%
+{%
+ \ifcase\@glsxtr@printglossnr
\let\@glstarget\glsdohypertarget
\else
\let\@glstarget\@secondoftwo
@@ -7964,11 +7973,12 @@ Dickimaw Books\\
%\begin{macro}{\glsxtrsetgrouptitle}
%\changes{1.14}{2017-04-18}{new}
%Sets the title for the given group label.
+%\changes{1.28}{2018-03-06}{changed \cs{csxdef} \cs{protected@csxdef}}
% \begin{macrocode}
\newcommand{\glsxtrsetgrouptitle}[2]{%
\protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}%
\@onelevel@sanitize\@glsxtr@titlelabel
- \csxdef{\@glsxtr@titlelabel}{#2}%
+ \protected@csxdef{\@glsxtr@titlelabel}{#2}%
}
% \end{macrocode}
%\end{macro}
@@ -7976,11 +7986,12 @@ Dickimaw Books\\
%\begin{macro}{\glsxtrlocalsetgrouptitle}
%\changes{1.24}{2017-11-14}{new}
%As above put only locally defines the title.
+%\changes{1.28}{2018-03-06}{changed \cs{csedef} \cs{protected@csedef}}
% \begin{macrocode}
\newcommand{\glsxtrlocalsetgrouptitle}[2]{%
\protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}%
\@onelevel@sanitize\@glsxtr@titlelabel
- \csedef{\@glsxtr@titlelabel}{#2}%
+ \protected@csedef{\@glsxtr@titlelabel}{#2}%
}
% \end{macrocode}
%\end{macro}
@@ -11741,7 +11752,7 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\glsxtrautoindexsort}
+%\begin{macro}{\glsxtrautoindexassignsort}
%\changes{1.16}{2017-06-15}{new}
%Used to assign the sort value when auto-indexing.
% \begin{macrocode}
@@ -21120,7 +21131,7 @@ defined}{}%
%automatically loaded by the record option.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2018/03/06 v1.28 (NLCT)]
% \end{macrocode}
%
%These are some convenient macros for use with custom rules.
@@ -23301,7 +23312,9 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\@glsxtrdialecthook}
%Check for scripts associated with the document dialects.
+%\changes{1.28}{2018-03-06}{save and restore \cs{TrackLangRequireDialectPrefix}}
% \begin{macrocode}
\renewcommand{\@glsxtrdialecthook}{%
\ifundef\CurrentTrackedScript
@@ -23316,14 +23329,18 @@ defined}{}%
{}%
\ifdef\CurrentTrackedScript
{%
+ \let\gls@orgTrackLangRequireDialectPrefix\TrackLangRequireDialectPrefix
+ \def\TrackLangRequireDialectPrefix{glossariesxtr-}%
\let\CurrentTrackedTag\CurrentTrackedScript
\IfFileExists{\TrackLangRequireDialectPrefix\CurrentTrackedTag.ldf}
{\RequireGlossariesExtraLang{\CurrentTrackedTag}}%
{}%
+ \let\TrackLangRequireDialectPrefix\gls@orgTrackLangRequireDialectPrefix
}%
{}%
}
% \end{macrocode}
+%\end{macro}
%If \cs{glsxtr@loaddialect} has been defined, then
%\sty{glossaries-extra-bib2gls} has been loaded after
%\sty{glossaries-extra}. (For example, through
@@ -23363,7 +23380,7 @@ defined}{}%
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2018/03/06 v1.28 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
@@ -25420,7 +25437,7 @@ defined}{}%
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2018/03/06 v1.28 (NLCT)]
% \end{macrocode}
%Load required packages.
% \begin{macrocode}
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 5be521b6253..aca8e50b65c 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.2 2018/2/26 21:37
+% glossaries-extra.ins generated using makedtx version 1.2 2018/3/6 23:39
\input docstrip
\preamble