summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-16 22:54:42 +0000
committerKarl Berry <karl@freefriends.org>2016-12-16 22:54:42 +0000
commit8ea673e9cfeb30456e238a5f138bea79990c46dd (patch)
tree00dafaf3f57d2475e6038328d4609bcb763bc942 /Master/texmf-dist/tex
parent0751ef0ea3c6b74aa979ef539047923778544790 (diff)
glossaries-extra (16dec16)
git-svn-id: svn://tug.org/texlive/trunk@42725 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-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.sty75
2 files changed, 63 insertions, 14 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 1473e5a9780..69c44bef957 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}[2016/12/13 v1.08 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2016/12/16 v1.09 (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 1982328daed..97992cb9046 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}[2016/12/13 v1.08 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2016/12/16 v1.09 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -650,8 +650,8 @@
\GlossariesExtraWarning{The options `\@glsxtr@optlist' have
been ignored for entry `##2' as it has already been defined}%
}
- \let\@glsxtr@orgprintglossary\@printglossary
\renewcommand\@printglossary[2]{%
+ \def\@glsxtr@printglossopts{##1}%
\@glsxtr@orgprintglossary{##1}{##2}%
\def\@glsxtr{\@glsxtr@disabledflycommand\glsxtr}%
\def\@glsxtrpl{\@glsxtr@disabledflycommand\glsxtrpl}%
@@ -2462,6 +2462,7 @@
\string\@istfilename[1]{}}
\protected@write\@auxout{}{\string\@istfilename{\istfilename}}%
\protected@write\@auxout{}{\string\@glsorder{\glsorder}}
+ \protected@write\@auxout{}{\string\glsxtr@makeglossaries{#1}}
\write\@auxout{\string\providecommand\string\@gls@reference[3]{}}%
\@for\@glo@type:=#1\do{%
\ifdefempty{\@glo@type}{}{\@makeglossary{\@glo@type}}%
@@ -2473,9 +2474,29 @@
\string\newglossary\space commands}}%
\let\@makeglossary\relax
\let\makeglossary\relax
- \let\makeglossaries\relax
+ \renewcommand\makeglossaries[1][]{}%
\@disable@onlypremakeg
\let\gls@checkseeallowed\relax
+ \let\@glsxtr@org@doseeglossary\@do@seeglossary
+ \renewcommand*{\@do@seeglossary}[2]{%
+ \edef\@gls@label{\glsdetoklabel{##1}}%
+ \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
+ \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
+ {\@glsxtr@org@doseeglossary{##1}{##2}}%
+ {%
+ \protected@write\@auxout{}{%
+ \string\@gls@reference
+ {\gls@type}{\@gls@label}{\string\glsseeformat##2{}}%
+ }%
+ }%
+ }%
+ \let\@glsxtr@@do@@wrglossary\@@do@@wrglossary
+ \def\@@do@@wrglossary{%
+ \edef\@gls@type{\csname glo@\@gls@label @type\endcsname}%
+ \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
+ {\@glsxtr@@do@@wrglossary}%
+ {\gls@noidxglossary}%
+ }%
\let\warn@nomakeglossaries\relax
\def\warn@noprintglossary{%
\GlossariesWarningNoLine{No \string\printglossary\space
@@ -2483,6 +2504,22 @@
found.^^J(Remove \string\makeglossaries\space if you don't want
any glossaries.)^^JThis document will not have a glossary}%
}%
+ \renewcommand{\@gls@noref@warn}[1]{%
+ \edef\@gls@type{##1}%
+ \expandafter\DTLifinlist\expandafter{\@gls@type}{\@glsxtr@reg@glosslist}%
+ {%
+ \GlossariesExtraWarning{Can't use
+ \string\printnoidxglossary[type={\@gls@type}]
+ when `\@gls@type' is listed in the optional argument of
+ \string\makeglossaries}%
+ }%
+ {%
+ \GlossariesWarning{Empty glossary for
+ \string\printnoidxglossary[type={##1}].
+ Rerun may be required (or you may have forgotten to use
+ commands like \string\gls)}%
+ }%
+ }%
\renewcommand*{\glsdisplaynumberlist}[1]{%
\expandafter\DTLifinlist\expandafter{##1}{\@glsxtr@reg@glosslist}%
{\@glsxtr@idx@displaynumberlist{##1}}%
@@ -2521,17 +2558,10 @@
preamble or don't use the optional argument of
\string\makeglossaries}%
}%
+ \let\@glo@assign@sortkey\@glsxtr@mixed@assign@sortkey
\renewcommand*{\@printgloss@setsort}{%
- \renewcommand*{\@glo@assign@sortkey}{%
- \edef\@glo@type{\@glo@type}%
- \expandafter\DTLifinlist\expandafter{\@glo@type}{\@glsxtr@reg@glosslist}%
- {%
- \@@glo@no@assign@sortkey
- }%
- {%
- \@@glo@assign@sortkey
- }%
- }%
+ \expandafter\@glsxtr@gettype\expandafter,\@glsxtr@printglossopts,%
+ type=\glsdefaulttype,\@end@glsxtr@gettype
\def\@glo@sorttype{\@glo@default@sorttype}%
}%
\ifglsautomake
@@ -2543,6 +2573,25 @@
\fi
}%
}
+\let\@glsxtr@orgprintglossary\@printglossary
+\renewcommand{\@printglossary}[2]{%
+ \def\@glsxtr@printglossopts{#1}%
+ \@glsxtr@orgprintglossary{#1}{#2}%
+}
+\newcommand*{\glsxtr@makeglossaries}[1]{}
+\def\@glsxtr@gettype#1,type=#2,#3\@end@glsxtr@gettype{%
+ \def\@glo@type{#2}%
+}
+\newcommand\@glsxtr@mixed@assign@sortkey[1]{%
+ \edef\@glo@type{\@glo@type}%
+ \expandafter\DTLifinlist\expandafter{\@glo@type}{\@glsxtr@reg@glosslist}%
+ {%
+ \@glo@no@assign@sortkey{#1}%
+ }%
+ {%
+ \@@glo@assign@sortkey{#1}%
+ }%
+}%
\let\@glsxtr@idx@displaynumberlist\glsdisplaynumberlist
\newcommand*{\@glsxtr@noidx@displaynumberlist}[1]{%
\letcs{\@gls@loclist}{glo@\glsdetoklabel{#1}@loclist}%