summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/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/tex/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/tex/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty5
-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.sty62
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty2
4 files changed, 40 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
index 508f3d9a557..25caee9c2f5 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2018/03/06 v1.28 (NLCT)]
\newcommand*{\glshex}{\string\u}
\newcommand*{\glsxtrprovidecommand}{\providecommand}
\providecommand*{\Alpha}{\mathrm{A}}
@@ -1269,10 +1269,13 @@
{}%
\ifdef\CurrentTrackedScript
{%
+ \let\gls@orgTrackLangRequireDialectPrefix\TrackLangRequireDialectPrefix
+ \def\TrackLangRequireDialectPrefix{glossariesxtr-}%
\let\CurrentTrackedTag\CurrentTrackedScript
\IfFileExists{\TrackLangRequireDialectPrefix\CurrentTrackedTag.ldf}
{\RequireGlossariesExtraLang{\CurrentTrackedTag}}%
{}%
+ \let\TrackLangRequireDialectPrefix\gls@orgTrackLangRequireDialectPrefix
}%
{}%
}
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 cc1a9518e1b..934ebf19961 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}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2018/03/06 v1.28 (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 c7dd6d4acaa..4e62d174a71 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}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2018/03/06 v1.28 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -101,10 +101,11 @@
}%
}%
}%
-\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
@@ -296,12 +297,12 @@
\newcommand*{\@glsxtr@record@setting@alsoindex}{alsoindex}
\newcommand*{\@glsxtr@record@setting@only}{only}
\newcommand*{\@glsxtr@record@setting@off}{off}
-\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
\def\glsxtr@setup@record{%
\renewcommand*{\@do@seeglossary}{\@glsxtr@doseeglossary}%
\renewcommand*{\@glsxtr@record}[3]{}%
@@ -345,14 +346,14 @@
}%
\fi
}
-\newcount\@glsxtr@docdefval
+\newcommand*{\@glsxtr@docdefval}{0}
\newcommand*{\if@glsxtrdocdef}{\ifnum\@glsxtr@docdefval>0 }
-\newcommand*{\@glsxtrdocdeftrue}{\@glsxtr@docdefval=1 }
-\newcommand*{\@glsxtrdocdeffalse}{\@glsxtr@docdefval=0 }
-\define@choicekey{glossaries-extra.sty}{docdef}[\val\nr]%
+\newcommand*{\@glsxtrdocdeftrue}{\def\@glsxtr@docdefval{1}}
+\newcommand*{\@glsxtrdocdeffalse}{\def\@glsxtr@docdefval{0}}
+\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
@@ -516,10 +517,10 @@
}
\newcommand*{\@glsxtr@setupshortcuts}{}
\newcommand*{\@glsxtr@shortcutsval}{\ifglsacrshortcuts acro\else none\fi}%
-\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
@@ -570,12 +571,11 @@
\newcommand{\glsxtrNoGlossaryWarning}[1]{%
\@glsxtr@defaultnoglossarywarning{#1}%
}
-\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}%
@@ -629,9 +629,10 @@
\newcommand*{\@@glsxtrwrglossmark}{}
\AtBeginDocument{\renewcommand*{\@@glsxtrwrglossmark}{\@glsxtrwrglossmark}}
\newcommand*{\glsxtrwrglossmark}{\ensuremath{\cdot}}
-\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
@@ -889,7 +890,7 @@
\@gls@entry@field{#1}{#2}%
}
\newcommand*{\glsxtrdeffield}[2]{\csdef{glo@\glsdetoklabel{#1}@#2}}
-\newcommand*{\glsxtredeffield}[2]{\csedef{glo@\glsdetoklabel{#1}@#2}}
+\newcommand*{\glsxtredeffield}[2]{\protected@csedef{glo@\glsdetoklabel{#1}@#2}}
\newcommand*{\glsxtrsetfieldifexists}[3]{\glsdoifexists{#1}{#3}}
\newrobustcmd*{\GlsXtrSetField}[3]{%
\glsxtrsetfieldifexists{#1}{#2}%
@@ -1806,9 +1807,11 @@
}
\newif\ifglsxtrinitwrglossbefore
\glsxtrinitwrglossbeforetrue
-\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
@@ -3800,8 +3803,11 @@
\def\@glsxtr@printglossopts{#1}%
\@glsxtr@orgprintglossary{#1}{#2}%
}
-\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
@@ -3934,12 +3940,12 @@
\newcommand{\glsxtrsetgrouptitle}[2]{%
\protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}%
\@onelevel@sanitize\@glsxtr@titlelabel
- \csxdef{\@glsxtr@titlelabel}{#2}%
+ \protected@csxdef{\@glsxtr@titlelabel}{#2}%
}
\newcommand{\glsxtrlocalsetgrouptitle}[2]{%
\protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}%
\@onelevel@sanitize\@glsxtr@titlelabel
- \csedef{\@glsxtr@titlelabel}{#2}%
+ \protected@csedef{\@glsxtr@titlelabel}{#2}%
}
\renewcommand*{\glsnavigation}{%
\def\@gls@between{}%
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 c19a916f187..0269a636744 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2018/02/26 v1.27 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2018/03/06 v1.28 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}