summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-10 21:46:03 +0000
committerKarl Berry <karl@freefriends.org>2016-06-10 21:46:03 +0000
commit2a62139c9c5e9ae2cf691e316bf2176114e0a3c5 (patch)
tree5451333974a56fe572dbe0ebf7287b1b7c905a81 /Master/texmf-dist/tex/latex/glossaries
parent9bb046ed6f507a2cfcfe59984674922afe5d2ed9 (diff)
glossaries (10jun16)
git-svn-id: svn://tug.org/texlive/trunk@41343 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty288
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty6
17 files changed, 276 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
index 11a2d3f06e0..d4a01021221 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{tracklang}
\let\glsifusetranslator\@secondoftwo
\AnyTrackedLanguages
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
index 75b335c14a1..ca4ba320600 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2016/06/09 v4.25 (NLCT)]
\ifglsxindy
\renewcommand*\GlsAddXdyAttribute[1]{%
\edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
index 5801c472032..c2834467712 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2016/06/09 v4.25 (NLCT)]
\newcommand{\compatglossarystyle}[2]{%
\ifcsundef{@glscompstyle@#1}%
{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
index bbc6b2c9943..591f02e547a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{tracklang}
\let\glsifusetranslator\@secondoftwo
\AnyTrackedLanguages
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
index 7123a42cb10..c09b18a080e 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2016/06/09 v4.25 (NLCT)]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
\RequirePackage{glossaries}
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 0c1219f6478..b1587fd9413 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -69,6 +69,45 @@
\endgroup
}
\fi
+\define@boolkey{glossaries.sty}[@gls@]{debug}[true]{%
+ \if@gls@debug
+ \renewcommand*{\GlossariesWarning}[1]{%
+ \PackageWarning{glossaries}{##1}%
+ }%
+ \renewcommand*{\GlossariesWarningNoLine}[1]{%
+ \PackageWarningNoLine{glossaries}{##1}%
+ }%
+ \PackageInfo{glossaries}{debug mode ON (nowarn option disabled)}%
+ \else
+ \PackageInfo{glossaries}{debug mode OFF}%
+ \fi
+}
+\newcommand*{\@gls@see@noindex}{%
+ \PackageError{glossaries}%
+ {`see' key may only be used after \string\makeglossaries\space
+ or \string\makenoidxglossaries}%
+ {You must use \string\makeglossaries\space
+ or \string\makenoidxglossaries\space before defining
+ any entries that have a `see' key}%
+}
+\define@choicekey{glossaries.sty}{seenoindex}[\val\nr]{error,warn,ignore}{%
+ \ifcase\nr
+ \renewcommand*{\@gls@see@noindex}{%
+ \PackageError{glossaries}%
+ {`see' key may only be used after \string\makeglossaries\space
+ or \string\makenoidxglossaries}%
+ {You must use \string\makeglossaries\space
+ or \string\makenoidxglossaries\space before defining
+ any entries that have a `see' key}%
+ }%
+ \or
+ \renewcommand*{\@gls@see@noindex}{%
+ \GlossariesWarning{`see' key ignored}%
+ }%
+ \or
+ \renewcommand*{\@gls@see@noindex}{}%
+ \fi
+}
\define@boolkey{glossaries.sty}[gls]{toc}[true]{}
\define@boolkey{glossaries.sty}[gls]{numberline}[true]{}
\ifcsundef{chapter}%
@@ -345,8 +384,12 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\PackageWarningNoLine{glossaries}{#1}%
}
\@gls@declareoption{nowarn}{%
- \renewcommand*{\GlossariesWarning}[1]{}%
- \renewcommand*{\GlossariesWarningNoLine}[1]{}%
+ \if@gls@debug
+ \GlossariesWarning{Warnings can't be suppressed in debug mode}%
+ \else
+ \renewcommand*{\GlossariesWarning}[1]{}%
+ \renewcommand*{\GlossariesWarningNoLine}[1]{}%
+ \fi
}
\newcommand*{\@gls@warnonglossdefined}{%
\GlossariesWarning{Overriding \string\printglossary}%
@@ -1059,6 +1102,9 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\newcommand*{\glsnoxindywarning}[1]{%
\GlossariesWarning{Not in xindy mode --- ignoring \string#1}%
}
+\newcommand*{\glsnomakeindexwarning}[1]{%
+ \GlossariesWarning{Not in makeindex mode --- ignoring \string#1}%
+}
\ifglsxindy
\edef\@xdyattributes{\string"default\string"}%
\fi
@@ -1693,12 +1739,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\@glo@seeautonumberlist
}
\newcommand*{\gls@checkseeallowed}{%
- \PackageError{glossaries}%
- {`see' key may only be used after \string\makeglossaries\space
- or \string\makenoidxglossaries}%
- {You must use \string\makeglossaries\space
- or \string\makenoidxglossaries\space before defining
- any entries that have a `see' key}%
+ \@gls@see@noindex
}
\newcommand*{\gls@checkseeallowed@preambleonly}{%
\GlossariesWarning{glossaries}%
@@ -1712,10 +1753,31 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\define@choicekey{glossentry}{nonumberlist}[\val\nr]{true,false}[true]{%
\ifcase\nr\relax
\def\@glo@prefix{\glsnonextpages}%
+ \@gls@savenonumberlist{true}%
\else
\def\@glo@prefix{\glsnextpages}%
+ \@gls@savenonumberlist{false}%
\fi
}
+\newcommand*{\@gls@savenonumberlist}[1]{}
+\newcommand*{\@gls@initnonumberlist}{}%
+\newcommand*{\@gls@storenonumberlist}[1]{}
+\newcommand*{\@gls@enablesavenonumberlist}{%
+ \renewcommand*{\@gls@initnonumberlist}{%
+ \undef\@glo@nonumberlist
+ }%
+ \renewcommand*{\@gls@savenonumberlist}[1]{%
+ \def\@glo@nonumberlist{##1}%
+ }%
+ \renewcommand*{\@gls@storenonumberlist}[1]{%
+ \ifdef\@glo@nonumberlist
+ {%
+ \cslet{glo@\glsdetoklabel{##1}@nonumberlist}{\@glo@nonumberlist}%
+ }%
+ {}%
+ }%
+ \appto\@gls@keymap{,{nonumberlist}{nonumberlist}}%
+}
\define@key{glossentry}{user1}{%
\def\@glo@useri{#1}%
}
@@ -1765,10 +1827,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
??%
\ifglssavenumberlist
\GlossariesWarning{Missing number list for entry `#1'.
- Maybe makeglossaries + rerun required.}%
+ Maybe makeglossaries + rerun required}%
\else
\PackageError{glossaries}%
- {Package option `savenumberlist=true' required.}%
+ {Package option `savenumberlist=true' required}%
{%
You must use the `savenumberlist' package option
to reference location lists.%
@@ -1854,7 +1916,6 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\gls@defglossaryentry{#1}{#2}%
}%
}
-
\newcommand*{\gls@defdocnewglossaryentry}{%
\let\gls@checkseeallowed\gls@checkseeallowed@preambleonly
\let\newglossaryentry\new@glossaryentry
@@ -1882,6 +1943,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}
\AtBeginDocument
{
+ \@gls@enablesavenonumberlist
\makeatletter
\InputIfFileExists{\jobname.glsdefs}{}{}%
\makeatother
@@ -1898,16 +1960,18 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}%
\@for\@gls@map:=\@gls@keymap\do
{%
- \edef\glo@value{\expandafter\expandonce
- \csname glo@\glsdetoklabel{#1}@\expandafter
- \@secondoftwo\@gls@map\endcsname}%
- \@onelevel@sanitize\glo@value
- \immediate\write\@gls@deffile
+ \letcs\glo@value{glo@\glsdetoklabel{#1}@\expandafter\@secondoftwo\@gls@map}%
+ \ifdef\glo@value
{%
- \expandafter\@firstoftwo\@gls@map
- =\expandafter\@gobble\string\{\glo@value\expandafter\@gobble\string\},%
- \glspercentchar%
+ \@onelevel@sanitize\glo@value
+ \immediate\write\@gls@deffile
+ {%
+ \expandafter\@firstoftwo\@gls@map
+ =\expandafter\@gobble\string\{\glo@value\expandafter\@gobble\string\},%
+ \glspercentchar
+ }%
}%
+ {}%
}%
\glswritedefhook
\immediate\write\@gls@deffile
@@ -2202,6 +2266,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}
\@onlypreamble{\longprovideglossaryentry}
\newcommand{\gls@defglossaryentry}[2]{%
+ \let\GlsSetQuote\gls@nosetquote
\edef\@glo@label{\glsdetoklabel{#1}}%
\let\glslabel\@glo@label
\let\@glo@name\@glsnoname
@@ -2219,6 +2284,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\def\@glo@see{}%
\def\@glo@parent{}%
\def\@glo@prefix{}%
+ \@gls@initnonumberlist
\def\@glo@useri{}%
\def\@glo@userii{}%
\def\@glo@useriii{}%
@@ -2349,6 +2415,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\noexpand\@gls@missingnumberlist{\@glo@label}}%
}%
{}%
+ \@gls@storenonumberlist{\@glo@label}%
\def\@glo@@desc{\@glo@first}%
\ifx\@glo@desc\@glo@@desc
\let\@glo@desc\@glo@first
@@ -4642,6 +4709,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\write\glswrite{\@xdylettergroups}%
\write\glswrite{^^J; additional sort rules^^J}
\write\glswrite{\@xdysortrules}%
+ \@gls@writeisthook
\closeout\glswrite
\let\writeist\relax
}
@@ -4649,7 +4717,8 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\edef\@gls@actualchar{\string?}
\edef\@gls@encapchar{\string|}
\edef\@gls@levelchar{\string!}
- \edef\@gls@quotechar{\string"}
+ \edef\@gls@quotechar{\string"}%
+ \let\GlsSetQuote\gls@nosetquote
\def\writeist{\relax
\ifundef{\glswrite}{\newwrite\glswrite}{}\relax
\openout\glswrite=\istfilename
@@ -4710,10 +4779,149 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\else
\write\glswrite{suffix_3p \string"\gls@suffixFF\string"}
\fi
+ \@gls@writeisthook
\closeout\glswrite
\let\writeist\relax
}
\fi
+\newcommand*{\GlsSetWriteIstHook}[1]{\renewcommand*{\@gls@writeisthook}{#1}}
+\@onlypremakeg\GlsSetWriteIstHook
+\newcommand*{\@gls@writeisthook}{}
+\ifglsxindy
+ \newcommand*{\GlsSetQuote}[1]{\glsnomakeindexwarning\GlsSetQuote}
+ \newcommand*{\gls@nosetquote}[1]{\glsnomakeindexwarning\GlsSetQuote}
+\else
+ \newcommand*{\GlsSetQuote}[1]{\edef\@gls@quotechar{\string#1}%
+ \@ifpackageloaded{tracklang}%
+ {%
+ \IfTrackedLanguage{german}%
+ {%
+ \def\@@gls@extramakeindexopts{-g}%
+ }%
+ {}%
+ }%
+ {}%
+ \edef\@gls@docheckquotedef{%
+ \noexpand\def\noexpand\@gls@checkquote####1#1####2#1####3\noexpand\null{%
+ \noexpand\@gls@tmpb=\noexpand\expandafter{\noexpand\@gls@checkedmkidx}%
+ \noexpand\toks@={####1}%
+ \noexpand\ifx\noexpand\null####2\noexpand\null
+ \noexpand\ifx\noexpand\null####3\noexpand\null
+ \noexpand\edef\noexpand\@gls@checkedmkidx{%
+ \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@}%
+ \noexpand\def\noexpand\@@gls@checkquote{\noexpand\relax}%
+ \noexpand\else
+ \noexpand\edef\noexpand\@gls@checkedmkidx{%
+ \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@
+ \noexpand\@gls@quotechar\noexpand\@gls@quotechar
+ \noexpand\@gls@quotechar\noexpand\@gls@quotechar}%
+ \noexpand\def\noexpand\@@gls@checkquote{%
+ \noexpand\@gls@checkquote####3\noexpand\null}%
+ \noexpand\fi
+ \noexpand\else
+ \noexpand\edef\noexpand\@gls@checkedmkidx{%
+ \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@
+ \noexpand\@gls@quotechar\noexpand\@gls@quotechar}%
+ \noexpand\ifx\noexpand\null####3\noexpand\null
+ \noexpand\def\noexpand\@@gls@checkquote{%
+ \noexpand\@gls@checkquote####2#1#1\noexpand\null}%
+ \noexpand\else
+ \noexpand\def\noexpand\@@gls@checkquote{%
+ \noexpand\@gls@checkquote####2#1####3\noexpand\null}%
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\@@gls@checkquote
+ }%
+ }%
+ \@gls@docheckquotedef
+ \edef\@gls@docheckquotedef{%
+ \noexpand\renewcommand{\noexpand\@gls@checkmkidxchars}[1]{%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checkquote####1\noexpand\@nil
+ #1#1\noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checkescquote####1\noexpand\@nil
+ \expandonce{\csname#1\endcsname}\expandonce{\csname#1\endcsname}%
+ \noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checkescactual####1\noexpand\@nil
+ \noexpand\?\noexpand\?\noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checkactual####1\noexpand\@nil
+ \noexpand?\noexpand?\noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checkbar####1\noexpand\@nil
+ \noexpand|\noexpand|\noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checkescbar####1\noexpand\@nil
+ \noexpand\|\noexpand\|\noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ \noexpand\def\noexpand\@gls@checkedmkidx{}%
+ \noexpand\expandafter\noexpand\@gls@checklevel####1\noexpand\@nil
+ \noexpand!\noexpand!\noexpand\null
+ \noexpand\expandafter\noexpand\@gls@updatechecked
+ \noexpand\@gls@checkedmkidx{####1}%
+ }%
+ }%
+ \@gls@docheckquotedef
+ \edef\@gls@docheckquotedef{%
+ \noexpand\def\noexpand\@gls@checkescquote####1%
+ \expandonce{\csname#1\endcsname}####2\expandonce{\csname#1\endcsname}%
+ ####3\noexpand\null{%
+ \noexpand\@gls@tmpb=\noexpand\expandafter{\noexpand\@gls@checkedmkidx}%
+ \noexpand\toks@={####1}%
+ \noexpand\ifx\noexpand\null####2\noexpand\null
+ \noexpand\ifx\noexpand\null####3\noexpand\null
+ \noexpand\edef\noexpand\@gls@checkedmkidx{%
+ \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@}%
+ \noexpand\def\noexpand\@@gls@checkescquote{\noexpand\relax}%
+ \noexpand\else
+ \noexpand\edef\noexpand\@gls@checkedmkidx{%
+ \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@
+ \noexpand\@gls@quotechar\noexpand\string\expandonce{%
+ \csname#1\endcsname}\noexpand\@gls@quotechar
+ \noexpand\@gls@quotechar\noexpand\string\expandonce{%
+ \csname#1\endcsname}\noexpand\@gls@quotechar}%
+ \noexpand\def\noexpand\@@gls@checkescquote{%
+ \noexpand\@gls@checkescquote####3\noexpand\null}%
+ \noexpand\fi
+ \noexpand\else
+ \noexpand\edef\noexpand\@gls@checkedmkidx{%
+ \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@
+ \noexpand\@gls@quotechar\noexpand\string
+ \expandonce{\csname#1\endcsname}\noexpand\@gls@quotechar}%
+ \noexpand\ifx\noexpand\null####3\noexpand\null
+ \noexpand\def\noexpand\@@gls@checkescquote{%
+ \noexpand\@gls@checkescquote####2\expandonce{\csname#1\endcsname}%
+ \expandonce{\csname#1\endcsname}\noexpand\null}%
+ \noexpand\else
+ \noexpand\def\noexpand\@@gls@checkescquote{%
+ \noexpand\@gls@checkescquote####2\expandonce{\csname#1\endcsname}%
+ ####3\noexpand\null}%
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\@@gls@checkescquote
+ }%
+ }%
+ \@gls@docheckquotedef
+ }
+ \newcommand*{\gls@nosetquote}[1]{\PackageError{glossaries}%
+ {\string\GlsSetQuote\space not permitted here}%
+ {Move \string\GlsSetQuote\space earlier in the preamble, as
+ soon as possible after glossaries.sty has been loaded}}
+\fi
+\newcommand*{\@gls@extramakeindexopts}[1]{}
\newcommand{\noist}{%
\@gls@addpredefinedattributes
\let\writeist\relax
@@ -4798,6 +5006,14 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\ifundef{\glswrite}{\newwrite\glswrite}{}%
\protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}}
\protected@write\@auxout{}{\string\providecommand\string\@istfilename[1]{}}
+ \ifundef\@@gls@extramakeindexopts
+ {}%
+ {%
+ \protected@write\@auxout{}{\string\providecommand
+ \string\@gls@extramakeindexopts[1]{}}
+ \protected@write\@auxout{}{\string\@gls@extramakeindexopts
+ {\@@gls@extramakeindexopts}}%
+ }%
\protected@write\@auxout{}{\string\@istfilename{\istfilename}}%
\protected@write\@auxout{}{\string\@glsorder{\glsorder}}
\@for\@glo@type:=\@glo@types\do{%
@@ -4816,10 +5032,17 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\let\gls@checkseeallowed\relax
\let\warn@nomakeglossaries\relax
\def\warn@noprintglossary{%
- \GlossariesWarningNoLine{No \string\printglossary\space
- or \string\printglossaries\space
- found.^^J(Remove \string\makeglossaries\space if you don't want
- any glossaries.)^^JThis document will not have a glossary}%
+ \ifdefstring{\@glo@types}{,}%
+ {%
+ \GlossariesWarningNoLine{No glossaries have been defined}%
+ }%
+ {%
+ \GlossariesWarningNoLine{No \string\printglossary\space
+ or \string\printglossaries\space
+ found. ^^J(Remove \string\makeglossaries\space if you
+ don't want any glossaries.) ^^JThis document will not
+ have a glossary}%
+ }%
}%
\ifglssavenumberlist
\edef\@gls@dodeflistparser{\noexpand\DeclareListParser
@@ -4850,7 +5073,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\GlossariesWarning{Empty glossary for
\string\printnoidxglossary[type={##1}].
Rerun may be required (or you may have forgotten to use
- commands like \string\gls).}%
+ commands like \string\gls)}%
}%
\let\@gls@checkmkidxchars\@gobble
\let\@@do@@wrglossary\gls@noidxglossary
@@ -4900,7 +5123,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
??\glsdoifexists{##1}%
{%
\GlossariesWarning{Missing location list for `##1'. Either
- a rerun is required or you haven't referenced the entry.}%
+ a rerun is required or you haven't referenced the entry}%
}%
}%
}%
@@ -4926,7 +5149,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
??\glsdoifexists{##1}%
{%
\GlossariesWarning{Missing location list for `##1'. Either
- a rerun is required or you haven't referenced the entry.}%
+ a rerun is required or you haven't referenced the entry}%
}%
}%
}%
@@ -4944,7 +5167,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
??\glsdoifexists{##1}%
{%
\GlossariesWarning{Missing location list for `##1'. Either
- a rerun is required or you haven't referenced the entry.}%
+ a rerun is required or you haven't referenced the entry}%
}%
}%
\let\glsnoidxdisplayloc\@gls@org@glsnoidxdisplayloc
@@ -5025,7 +5248,12 @@ you
\newcommand*{\gls@glossary}[1]{%
\@gls@glossary{#1}%
}
-\newcommand*{\@gls@glossary}[1]{\index}
+\newcommand*{\@gls@glossary}[2]{%
+ \if@gls@debug
+ \PackageInfo{glossaries}{wrglossary(#1)(#2)}%
+ \fi
+ \index{#2}%
+}
\newcommand{\@gls@renewglossary}{%
\gdef\@gls@glossary##1{\@bsphack\begingroup\gls@wrglossary{##1}}%
\let\@gls@renewglossary\@empty
diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
index b22c1ede11b..8a7d16e0e32 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-accsupp}[2016/04/30 v4.23 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2016/06/09 v4.25 (NLCT)
Experimental glossaries accessibility]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
index 1edb24e42c4..b6417524b70 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-hypernav}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2016/06/09 v4.25 (NLCT)]
\newcommand*{\glsnavhyperlink}[3][\@glo@type]{%
\edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
\@glslink{glsn:#1@#2}{#3}}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
index b2064b52146..d6992550d9f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-inline}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-inline}[2016/06/09 v4.25 (NLCT)]
\newglossarystyle{inline}{%
\renewenvironment{theglossary}%
{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
index bc3443ae10e..3d374db1a99 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-list}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-list}[2016/06/09 v4.25 (NLCT)]
\providecommand{\indexspace}{%
\par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
index 072fcf05d06..7630a3bc8ee 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-long}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-long}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{longtable}
\@ifundefined{glsdescwidth}{%
\newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
index eb8374b54a6..13cc858d83a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-longbooktabs}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{booktabs}
\RequirePackage{glossary-long}
\RequirePackage{glossary-longragged}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
index acfb865a197..7b60de92aca 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-longragged}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{array}
\RequirePackage{longtable}
\@ifundefined{glsdescwidth}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
index edb25af211b..122063e85c5 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-mcols}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\providecommand{\indexspace}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
index 6e680c251e4..1f7f4b7827a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-super}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-super}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{supertabular}
\@ifundefined{glsdescwidth}{%
\newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
index c83317b031b..837f9cb47dc 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-superragged}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2016/06/09 v4.25 (NLCT)]
\RequirePackage{array}
\RequirePackage{supertabular}
\@ifundefined{glsdescwidth}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
index 7343376adc6..79aeabc8e95 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-tree}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-tree}[2016/06/09 v4.25 (NLCT)]
\providecommand{\indexspace}{%
\par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
}
@@ -215,8 +215,8 @@
\else
\settowidth{\glstreeindent}{\glstreenamefmt{\@glswidestname\space}}%
\fi
- \hangindent\glstreeindent
- \parindent\glstreeindent
+ \hangindent\glstreeindent
+ \parindent\glstreeindent
\makebox[0pt][r]{\glstreenamebox{\glstreeindent}{%
\glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}}}%
\ifglshassymbol{##1}{(\glossentrysymbol{##1})\space}{}%