summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/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/source/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/source/latex/glossaries')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx458
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
2 files changed, 400 insertions, 60 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 657d60dabae..95b968bf56c 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,18 +1,14 @@
%\iffalse
% glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
-% -macrocode ".*\.perl"
-% -macrocode ".*\.tex"
-% -macrocode ".*\.xdy"
% -doc "glossaries-manual.tex"
-% -author "Nicola Talbot"
-% -section "chapter"
% -setambles ".*\.perl=>\nopreamble\nopostamble"
% -setambles ".*\.tex=>\nopreamble\nopostamble"
% -setambles ".*\.xdy=>\nopreamble\nopostamble"
% -comment ".*\.perl"
% -comment ".*\.tex"
% -comment ".*\.xdy"
+% -author "Nicola Talbot"
% -src "glossaries\.sty\Z=>glossaries.sty"
% -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -29,9 +25,13 @@
% -src "(samplexdy-mc.*\.xdy)\Z=>\1"
% -src "(database.*\.tex)\Z=>\1"
% -src "(.*\.perl)\Z=>\1"
+% -macrocode ".*\.perl"
+% -macrocode ".*\.tex"
+% -macrocode ".*\.xdy"
+% -section "chapter"
% -codetitle "Main Package Code"
% glossaries
-% Created on 2016/4/30 18:28
+% Created on 2016/6/9 19:36
%\fi
%\iffalse
%<*package>
@@ -143,7 +143,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{18583}
+\CheckSum{19165}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -171,12 +171,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{Documented Code For glossaries v4.23}
+% \title{Documented Code For glossaries v4.25}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2016-04-30}
+% \date{2016-06-09}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -192,7 +192,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%glossaries package}.
%
%\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.23:
+%For the main user guide, read \qt{glossaries.sty v4.25:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -247,7 +247,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
% Required packages:
@@ -342,6 +342,65 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% \end{macrocode}
%
% \section{Package Options}\label{sec:pkgopt}
+%\begin{option}{debug}
+%\changes{4.24}{2016-05-27}{new}
+% Switch on debug mode. This will also cancel the \pkgopt{nowarn}
+% option.
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+%\end{option}
+%Determine what to do if the \gloskey{see} key is used before
+%\cs{makeglossaries}. The default is to produce an error.
+%\begin{macro}{\@gls@see@noindex}
+%\changes{4.24}{2016-05-27}{new}
+% \begin{macrocode}
+\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}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{option}{seenoindex}
+%\changes{4.24}{2016-05-27}{new}
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+%\end{option}
+%
%\begin{option}{toc}
% The \pkgopt{toc} package option will add the glossaries
% to the table of contents. This is a boolean key, if the
@@ -1201,8 +1260,12 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Define package option to suppress warnings
% \begin{macrocode}
\@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
}
% \end{macrocode}
%\end{option}
@@ -2934,6 +2997,15 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsnomakeindexwarning}
+%\changes{4.24}{2016-05-27}{new}
+% Reverse for commands that may only be used with \app{makeindex}.
+% \begin{macrocode}
+\newcommand*{\glsnomakeindexwarning}[1]{%
+ \GlossariesWarning{Not in makeindex mode --- ignoring \string#1}%
+}
+% \end{macrocode}
+%\end{macro}
%
%\begin{macro}{\@xdyattributes}
% Define list of attributes (\cs{string} is used in case
@@ -4499,12 +4571,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\changes{3.13a}{2013-11-05}{new}
% \begin{macrocode}
\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
}
% \end{macrocode}
%\end{macro}
@@ -4541,13 +4608,62 @@ 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
}
% \end{macrocode}
%\end{key}
%
+%\begin{macro}{\@gls@savenonumberlist}
+%\changes{4.25}{2016-06-09}{new}
+%The \gloskey{nonumberlist} option isn't saved by default (as it
+%just sets the prefix) which isn't a problem when the entries are
+%defined in the preamble, but causes a problem when entries are
+%defined in the document. In this case, the value needs to be saved
+%so that it can be written to the \texttt{.glsdefs} file.
+% \begin{macrocode}
+\newcommand*{\@gls@savenonumberlist}[1]{}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@gls@initnonumberlist}
+%\changes{4.25}{2016-06-09}{new}
+% \begin{macrocode}
+\newcommand*{\@gls@initnonumberlist}{}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@gls@initnonumberlist}
+%\changes{4.25}{2016-06-09}{new}
+% \begin{macrocode}
+\newcommand*{\@gls@storenonumberlist}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@gls@enablesavenonumberlist}
+%\changes{4.25}{2016-06-09}{new}
+% Allow the \gloskey{nonumberlist} value to be saved.
+% \begin{macrocode}
+\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}}%
+}
+% \end{macrocode}
+%\end{macro}
+%
% Define some generic user keys. (Additional keys can be added by
% the user.)
%\begin{key}{user1}
@@ -4684,10 +4800,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.%
@@ -4857,7 +4973,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}
% \end{macrocode}
%\end{macro}
-
+%
%\begin{macro}{\gls@defdocnewglossaryentry}
%\changes{4.14}{2015-02-28}{new}
% The definition of \cs{newglossaryentry} is changed at the start of
@@ -4906,6 +5022,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}
\AtBeginDocument
{
+ \@gls@enablesavenonumberlist
\makeatletter
\InputIfFileExists{\jobname.glsdefs}{}{}%
\makeatother
@@ -4933,16 +5050,18 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\@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
+ }%
}%
+ {}%
}%
% \end{macrocode}
% Provide hook:
@@ -5481,6 +5600,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\newcommand{\gls@defglossaryentry}[2]{%
% \end{macrocode}
+% Prevent any further use of \cs{GlsSetQuote}:
+% \begin{macrocode}
+ \let\GlsSetQuote\gls@nosetquote
+% \end{macrocode}
% Store label
% \begin{macrocode}
\edef\@glo@label{\glsdetoklabel{#1}}%
@@ -5554,6 +5677,11 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\def\@glo@prefix{}%
% \end{macrocode}
+% Initialise nonumberlist setting if we're in the \env{document}
+% environment.
+% \begin{macrocode}
+ \@gls@initnonumberlist
+% \end{macrocode}
%\changes{2.04}{2009-11-10}{added user1-6 keys}
% \begin{macrocode}
\def\@glo@useri{}%
@@ -5773,6 +5901,11 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}%
{}%
% \end{macrocode}
+% Store nonumberlist setting if we're in the \env{document}
+% environment.
+% \begin{macrocode}
+ \@gls@storenonumberlist{\@glo@label}%
+% \end{macrocode}
% The smaller and smallcaps options set the description to
% \cs{@glo@first}. Need to check for this, otherwise it won't get
% expanded if the description gets sanitized.
@@ -11825,6 +11958,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\write\glswrite{^^J; additional sort rules^^J}
\write\glswrite{\@xdysortrules}%
% \end{macrocode}
+%Hook for any additional information:
+% \begin{macrocode}
+ \@gls@writeisthook
+% \end{macrocode}
% Close the style file
% \begin{macrocode}
\closeout\glswrite
@@ -11842,7 +11979,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
@@ -11907,6 +12045,13 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\else
\write\glswrite{suffix_3p \string"\gls@suffixFF\string"}
\fi
+% \end{macrocode}
+%Hook for any additional information:
+% \begin{macrocode}
+ \@gls@writeisthook
+% \end{macrocode}
+% Close the file and disable \cs{writeist}.
+% \begin{macrocode}
\closeout\glswrite
\let\writeist\relax
}
@@ -11914,6 +12059,177 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\GlsSetWriteIstHook}
+%\changes{4.24}{2016-05-27}{new}
+%Allow user to append information to the style file.
+% \begin{macrocode}
+\newcommand*{\GlsSetWriteIstHook}[1]{\renewcommand*{\@gls@writeisthook}{#1}}
+\@onlypremakeg\GlsSetWriteIstHook
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@gls@writeisthook}
+% \begin{macrocode}
+\newcommand*{\@gls@writeisthook}{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\GlsSetQuote}
+%\changes{4.24}{2016-05-27}{new}
+%Allow user to set the \app{makeindex} quote character. This is primarily for
+%\sty{ngerman} users who want to use \app{makeindex}'s -g option.
+% \begin{macrocode}
+\ifglsxindy
+ \newcommand*{\GlsSetQuote}[1]{\glsnomakeindexwarning\GlsSetQuote}
+ \newcommand*{\gls@nosetquote}[1]{\glsnomakeindexwarning\GlsSetQuote}
+\else
+ \newcommand*{\GlsSetQuote}[1]{\edef\@gls@quotechar{\string#1}%
+% \end{macrocode}
+% If German is in use, set
+% the extra \app{makeindex} option so \app{makeglossaries} can pick
+% it up.
+% \begin{macrocode}
+ \@ifpackageloaded{tracklang}%
+ {%
+ \IfTrackedLanguage{german}%
+ {%
+ \def\@@gls@extramakeindexopts{-g}%
+ }%
+ {}%
+ }%
+ {}%
+% \end{macrocode}
+% Need to redefine \cs{@gls@checkquote}
+% \begin{macrocode}
+ \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
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@gls@extramakeindexopts}
+%\changes{4.24}{2016-05-27}{new}
+% \begin{macrocode}
+\newcommand*{\@gls@extramakeindexopts}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
%The command \cs{noist} will suppress the creation of
% the \filetype{.ist} file. Obviously you need to use this
% command before \cs{writeist} to have any effect.
@@ -12082,6 +12398,17 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}}
\protected@write\@auxout{}{\string\providecommand\string\@istfilename[1]{}}
% \end{macrocode}
+%If \cs{@@gls@extramakeindexopts} has been defined, write it:
+% \begin{macrocode}
+ \ifundef\@@gls@extramakeindexopts
+ {}%
+ {%
+ \protected@write\@auxout{}{\string\providecommand
+ \string\@gls@extramakeindexopts[1]{}}
+ \protected@write\@auxout{}{\string\@gls@extramakeindexopts
+ {\@@gls@extramakeindexopts}}%
+ }%
+% \end{macrocode}
% Write the name of the style file to the aux file
% (needed by \app{makeglossaries})
% \begin{macrocode}
@@ -12125,10 +12452,17 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Activate warning about missing \cs{printglossary}
% \begin{macrocode}
\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}%
+ }%
}%
% \end{macrocode}
% Declare list parser for \cs{glsdisplaynumberlist}
@@ -12205,9 +12539,9 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\renewcommand{\@gls@noref@warn}[1]{%
\GlossariesWarning{Empty glossary for
- \string\printnoidxglossary[type={##1}].
+ \string\printnoidxglossary[type={##1}].
Rerun may be required (or you may have forgotten to use
- commands like \string\gls).}%
+ commands like \string\gls)}%
}%
% \end{macrocode}
% Don't escape makeindex/xindy characters
@@ -12298,7 +12632,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}%
}%
}%
}%
@@ -12327,7 +12661,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}%
}%
}%
}%
@@ -12348,7 +12682,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
@@ -12543,8 +12877,14 @@ you
%\cs{index} instead of \cs{@index}}
%\changes{4.10}{2014-08-27}{Renamed \cs{@glossary} to \cs{@gls@glossary}}
% The argument \verb|#1| is the glossary type.
+%\changes{4.24}{2016-05-27}{added check for debug mode}
% \begin{macrocode}
-\newcommand*{\@gls@glossary}[1]{\index}
+\newcommand*{\@gls@glossary}[2]{%
+ \if@gls@debug
+ \PackageInfo{glossaries}{wrglossary(#1)(#2)}%
+ \fi
+ \index{#2}%
+}
% \end{macrocode}
%\end{macro}
% This is a convenience command to set \cs{@gls@glossary}.
@@ -18008,7 +18348,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \cs{gls}\marg{label}} on subsequent use.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
% \begin{macrocode}
@@ -18423,7 +18763,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\label{sec:code:hypernav}
% Package Definition:
% \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%
% The commands defined in this package are provided to
@@ -18595,7 +18935,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% This defines an in-line style where the entries are
% comma-separated with just the name and description displayed.
% \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-inline}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%
%\begin{style}{inline}
@@ -18786,7 +19126,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \ics{item} command, it will appear in a bold font by
% default.
% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-list}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%\begin{macro}{\indexspace}
%\changes{4.13}{2015-02-03}{new}
@@ -19068,7 +19408,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-long} package
% used the \env{longtable} environment in the glossary.
% \begin{macrocode}
-\ProvidesPackage{glossary-long}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-long}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Requires the \isty{longtable} package:
% \begin{macrocode}
@@ -19565,7 +19905,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \url{http://tex.stackexchange.com/a/56890}
%
% \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Requires \sty{booktabs} package:
% \begin{macrocode}
@@ -19906,7 +20246,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% used the \env{longtable} environment in the glossary and use
% ragged right formatting for the multiline columns.
% \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -20339,7 +20679,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%use the \sty{multicol} package. These use the tree-like glossary
%styles in a multicol environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -20764,7 +21104,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-super} package
% use the \env{supertabular} environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-super}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-super}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Requires the \isty{supertabular} package:
% \begin{macrocode}
@@ -21296,7 +21636,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% are like those provided by the \isty{glossary-super} package,
% except that the multiline columns have ragged right justification.
% \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -21736,7 +22076,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% that have a tree-like structure. These are designed for
% hierarchical glossaries.
% \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossary-tree}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%
%\begin{macro}{\indexspace}
@@ -22217,8 +22557,8 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\changes{4.04}{2014-03-06}{moved hangindent and parindent assignments
%outside level test}
% \begin{macrocode}
- \hangindent\glstreeindent
- \parindent\glstreeindent
+ \hangindent\glstreeindent
+ \parindent\glstreeindent
% \end{macrocode}
% Put the name to the left of the paragraph block.
% \begin{macrocode}
@@ -22404,7 +22744,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% hyperlinks may not work properly.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%\begin{macro}{\GlsAddXdyAttribute}
% Adds an attribute in old format.
@@ -22765,7 +23105,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\section{glossaries-compatible-307}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
%
% Compatibility macros for predefined glossary styles:
@@ -23573,7 +23913,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Package version number now in line with main glossaries package number.
% \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2016/04/30 v4.23 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2016/06/09 v4.25 (NLCT)
Experimental glossaries accessibility]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
@@ -26004,7 +26344,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
@@ -26048,7 +26388,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2016/04/30 v4.23 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2016/06/09 v4.25 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index ad896d17a8d..fc31e40fc2a 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.1 2016/4/30 18:28
+% glossaries.ins generated using makedtx version 1.1 2016/6/9 19:36
\input docstrip
\preamble