summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-17 00:50:23 +0000
committerKarl Berry <karl@freefriends.org>2011-04-17 00:50:23 +0000
commitddb181442c75e8cc1bd5c45a049086cf23346a8d (patch)
treedad30b2aba5f6ae1b3f2146cae74133186abb3ba /Master/texmf-dist/source/latex/glossaries
parentb69e4a3602ebc7d4526af84b680cf63ed0cf9021 (diff)
glossaries 3.01 (13apr11)
git-svn-id: svn://tug.org/texlive/trunk@22100 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx265
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
2 files changed, 175 insertions, 92 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 6de6f15c633..caa101c7e40 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -27,7 +27,7 @@
% -author "Nicola Talbot"
% -codetitle "Main Package Code"
% glossaries
-% Created on 2011/4/3 22:26
+% Created on 2011/4/13 19:39
%\fi
%\iffalse
%<*package>
@@ -79,7 +79,7 @@ glossaries.dtx
\setcounter{IndexColumns}{2}
-\CheckSum{13110}
+\CheckSum{13130}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{first use\ifirstuse}
@@ -107,7 +107,7 @@ glossaries.dtx
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{Documented Code For glossaries v3.0}
+% \title{Documented Code For glossaries v3.01}
% \author{Nicola L.C. Talbot\\[10pt]
%School of Computing Sciences\\
%University of East Anglia\\
@@ -115,7 +115,7 @@ glossaries.dtx
%NR4 7TJ. United Kingdom.\\
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{2011-04-02}
+% \date{2011-04-12}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -131,7 +131,7 @@ glossaries.dtx
%glossaries package}.
%
%\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v3.0:
+%For the main user guide, read \qt{glossaries.sty v3.01:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -172,7 +172,7 @@ glossaries.dtx
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2011/04/02 v3.0 (NLCT)]
+\ProvidesPackage{glossaries}[2011/04/12 v3.01 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -1573,7 +1573,7 @@ name=true]{%
%\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with
%\cs{ifcsundef}}
% \begin{macrocode}
-\ifcsdef{hyperlink}%
+\ifcsundef{hyperlink}%
{%
\newcommand*{\glsnumberformat}[1]{#1}%
}%
@@ -3793,8 +3793,9 @@ name=true]{%
%
% First determine whether or not we are using the starred version:
%\begin{macro}{\glslink}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand{\glslink}{%
+\newrobustcmd*{\glslink}{%
\@ifstar\@sgls@link\@gls@@link}
% \end{macrocode}
%\end{macro}
@@ -4434,7 +4435,7 @@ name=true]{%
% First determine if we are using the starred form:
%\begin{macro}{\gls}
% \begin{macrocode}
-\newcommand*{\gls}{\@ifstar\@sgls\@gls}
+\newrobustcmd*{\gls}{\@ifstar\@sgls\@gls}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4513,8 +4514,9 @@ name=true]{%
% be grouped when you define the entry). It is mainly intended
% for terms that start a sentence:
%\begin{macro}{\Gls}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Gls}{\@ifstar\@sGls\@Gls}
+\newrobustcmd*{\Gls}{\@ifstar\@sGls\@Gls}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4591,9 +4593,10 @@ name=true]{%
%
% \cs{GLS} behaves like \ics{gls}, but the link
% text is converted to uppercase:
+%\changes{3.01}{2011/04/12}{made robust}
%\begin{macro}{\GLS}
% \begin{macrocode}
-\newcommand*{\GLS}{\@ifstar\@sGLS\@GLS}
+\newrobustcmd*{\GLS}{\@ifstar\@sGLS\@GLS}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4660,8 +4663,9 @@ name=true]{%
% \cs{glspl} behaves in the same way as \ics{gls} except
% it uses the plural form.
%\begin{macro}{\glspl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glspl}{\@ifstar\@sglspl\@glspl}
+\newrobustcmd*{\glspl}{\@ifstar\@sglspl\@glspl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4739,8 +4743,9 @@ name=true]{%
% (as with \ics{Gls}, if the first letter has an accent, it
% will need to be grouped).
%\begin{macro}{\Glspl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glspl}{\@ifstar\@sGlspl\@Glspl}
+\newrobustcmd*{\Glspl}{\@ifstar\@sGlspl\@Glspl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4821,8 +4826,9 @@ name=true]{%
% \cs{GLSpl} behaves like \ics{glspl} except that all the
% link text is converted to uppercase.
%\begin{macro}{\GLSpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSpl}{\@ifstar\@sGLSpl\@GLSpl}
+\newrobustcmd*{\GLSpl}{\@ifstar\@sGLSpl\@GLSpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4900,7 +4906,7 @@ name=true]{%
%
% First determine if we are using the starred form:
% \begin{macrocode}
-\newcommand*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
+\newrobustcmd*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -4979,8 +4985,9 @@ name=true]{%
% given by the \gloskey{text} key and it doesn't mark the entry as
% used.
%\begin{macro}{\glstext}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glstext}{\@ifstar\@sglstext\@glstext}
+\newrobustcmd*{\glstext}{\@ifstar\@sglstext\@glstext}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5017,7 +5024,7 @@ name=true]{%
% to uppercase.
%\begin{macro}{\GLStext}
% \begin{macrocode}
-\newcommand*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
+\newrobustcmd*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5053,8 +5060,9 @@ name=true]{%
% \cs{Glstext} behaves like \cs{glstext} except that the first letter
% of the text is converted to uppercase.
%\begin{macro}{\Glstext}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
+\newrobustcmd*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5092,8 +5100,9 @@ name=true]{%
% given by the \gloskey{first} key and it doesn't mark the entry as
% used.
%\begin{macro}{\glsfirst}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
+\newrobustcmd*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5130,7 +5139,7 @@ name=true]{%
% first letter in uppercase.
%\begin{macro}{\Glsfirst}
% \begin{macrocode}
-\newcommand*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
+\newrobustcmd*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5168,7 +5177,7 @@ name=true]{%
% text in uppercase.
%\begin{macro}{\GLSfirst}
% \begin{macrocode}
-\newcommand*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
+\newrobustcmd*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5206,7 +5215,7 @@ name=true]{%
% used.
%\begin{macro}{\glsplural}
% \begin{macrocode}
-\newcommand*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
+\newrobustcmd*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5243,7 +5252,7 @@ name=true]{%
% letter is converted to uppercase.
%\begin{macro}{\Glsplural}
% \begin{macrocode}
-\newcommand*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
+\newrobustcmd*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5280,8 +5289,9 @@ name=true]{%
% \cs{GLSplural} behaves like \ics{glsplural} except that the
% text is converted to uppercase.
%\begin{macro}{\GLSplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
+\newrobustcmd*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5318,8 +5328,9 @@ name=true]{%
% given by the \gloskey{firstplural} key and it doesn't mark the entry as
% used.
%\begin{macro}{\glsfirstplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
+\newrobustcmd*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5355,8 +5366,9 @@ name=true]{%
% \cs{Glsfirstplural} behaves like \ics{glsfirstplural} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsfirstplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
+\newrobustcmd*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5393,8 +5405,9 @@ name=true]{%
% \cs{GLSfirstplural} behaves like \ics{glsfirstplural} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSfirstplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
+\newrobustcmd*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5431,8 +5444,9 @@ name=true]{%
% given by the \gloskey{name} key and it doesn't mark the entry as
% used.
%\begin{macro}{\glsname}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsname}{\@ifstar\@sglsname\@glsname}
+\newrobustcmd*{\glsname}{\@ifstar\@sglsname\@glsname}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5468,8 +5482,9 @@ name=true]{%
% \cs{Glsname} behaves like \ics{glsname} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsname}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
+\newrobustcmd*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5506,8 +5521,9 @@ name=true]{%
% \cs{GLSname} behaves like \ics{glsname} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSname}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
+\newrobustcmd*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5544,8 +5560,9 @@ name=true]{%
% given by the \gloskey{description} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsdesc}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
+\newrobustcmd*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5581,8 +5598,9 @@ name=true]{%
% \cs{Glsdesc} behaves like \ics{glsdesc} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsdesc}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
+\newrobustcmd*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5619,8 +5637,9 @@ name=true]{%
% \cs{GLSdesc} behaves like \ics{glsdesc} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSdesc}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
+\newrobustcmd*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5657,8 +5676,9 @@ name=true]{%
% given by the \gloskey{descriptionplural} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsdescplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
+\newrobustcmd*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5692,8 +5712,9 @@ name=true]{%
% \cs{Glsdescplural} behaves like \ics{glsdescplural} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsdescplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
+\newrobustcmd*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5728,8 +5749,9 @@ name=true]{%
% \cs{GLSdescplural} behaves like \ics{glsdescplural} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSdescplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
+\newrobustcmd*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5764,8 +5786,9 @@ name=true]{%
% given by the \gloskey{symbol} key and it doesn't mark the entry as
% used.
%\begin{macro}{\glssymbol}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
+\newrobustcmd*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5801,8 +5824,9 @@ name=true]{%
% \cs{Glssymbol} behaves like \ics{glssymbol} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glssymbol}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
+\newrobustcmd*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5839,8 +5863,9 @@ name=true]{%
% \cs{GLSsymbol} behaves like \ics{glssymbol} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSsymbol}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
+\newrobustcmd*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5877,8 +5902,9 @@ name=true]{%
% given by the \gloskey{symbolplural} key and it doesn't mark the entry as
% used.
%\begin{macro}{\glssymbolplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
+\newrobustcmd*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5914,8 +5940,9 @@ name=true]{%
% \cs{Glssymbolplural} behaves like \ics{glssymbolplural} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glssymbolplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
+\newrobustcmd*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5950,8 +5977,9 @@ name=true]{%
% \cs{GLSsymbolplural} behaves like \ics{glssymbolplural} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSsymbolplural}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
+\newrobustcmd*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -5986,8 +6014,9 @@ name=true]{%
% given by the \gloskey{user1} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsuseri}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri}
+\newrobustcmd*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6020,8 +6049,9 @@ name=true]{%
% \cs{Glsuseri} behaves like \ics{glsuseri} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsuseri}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri}
+\newrobustcmd*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6055,8 +6085,9 @@ name=true]{%
% \cs{GLSuseri} behaves like \ics{glsuseri} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSuseri}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri}
+\newrobustcmd*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6090,8 +6121,9 @@ name=true]{%
% given by the \gloskey{user2} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsuserii}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii}
+\newrobustcmd*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6124,8 +6156,9 @@ name=true]{%
% \cs{Glsuserii} behaves like \ics{glsuserii} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsuserii}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii}
+\newrobustcmd*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6159,8 +6192,9 @@ name=true]{%
% \cs{GLSuserii} behaves like \ics{glsuserii} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSuserii}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii}
+\newrobustcmd*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6194,8 +6228,9 @@ name=true]{%
% given by the \gloskey{user3} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsuseriii}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii}
+\newrobustcmd*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6228,8 +6263,9 @@ name=true]{%
% \cs{Glsuseriii} behaves like \ics{glsuseriii} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsuseriii}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii}
+\newrobustcmd*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6263,8 +6299,9 @@ name=true]{%
% \cs{GLSuseriii} behaves like \ics{glsuseriii} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSuseriii}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii}
+\newrobustcmd*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6298,8 +6335,9 @@ name=true]{%
% given by the \gloskey{user4} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsuseriv}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv}
+\newrobustcmd*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6332,8 +6370,9 @@ name=true]{%
% \cs{Glsuseriv} behaves like \ics{glsuseriv} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsuseriv}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv}
+\newrobustcmd*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6367,8 +6406,9 @@ name=true]{%
% \cs{GLSuseriv} behaves like \ics{glsuseriv} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSuseriv}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv}
+\newrobustcmd*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6402,8 +6442,9 @@ name=true]{%
% given by the \gloskey{user5} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsuserv}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv}
+\newrobustcmd*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6436,8 +6477,9 @@ name=true]{%
% \cs{Glsuserv} behaves like \ics{glsuserv} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsuserv}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv}
+\newrobustcmd*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6471,8 +6513,9 @@ name=true]{%
% \cs{GLSuserv} behaves like \ics{glsuserv} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSuserv}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv}
+\newrobustcmd*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6506,8 +6549,9 @@ name=true]{%
% given by the \gloskey{user6} key and it doesn't mark the entry
% as used.
%\begin{macro}{\glsuservi}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi}
+\newrobustcmd*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6540,8 +6584,9 @@ name=true]{%
% \cs{Glsuservi} behaves like \ics{glsuservi} except that the
% first letter is converted to uppercase.
%\begin{macro}{\Glsuservi}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi}
+\newrobustcmd*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6575,8 +6620,9 @@ name=true]{%
% \cs{GLSuservi} behaves like \ics{glsuservi} except that the
% link text is converted to uppercase.
%\begin{macro}{\GLSuservi}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi}
+\newrobustcmd*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6608,8 +6654,9 @@ name=true]{%
%
% Now deal with acronym related keys. First the short form:
%\begin{macro}{\acrshort}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
+\newrobustcmd*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6646,8 +6693,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\Acrshort}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort}
+\newrobustcmd*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6687,8 +6735,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\ACRshort}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort}
+\newrobustcmd*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6726,8 +6775,9 @@ name=true]{%
%
% Short plural:
%\begin{macro}{\acrshortpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl}
+\newrobustcmd*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6764,8 +6814,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\Acrshortpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl}
+\newrobustcmd*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6805,8 +6856,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\ACRshortpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl}
+\newrobustcmd*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6843,8 +6895,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\acrlong}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong}
+\newrobustcmd*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6881,8 +6934,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\Acrlong}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong}
+\newrobustcmd*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6922,8 +6976,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\ACRlong}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong}
+\newrobustcmd*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6961,8 +7016,9 @@ name=true]{%
%
% Short plural:
%\begin{macro}{\acrlongpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl}
+\newrobustcmd*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -6999,8 +7055,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\Acrlongpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl}
+\newrobustcmd*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -7040,8 +7097,9 @@ name=true]{%
% \end{macrocode}
%
%\begin{macro}{\ACRlongpl}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl}
+\newrobustcmd*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl}
% \end{macrocode}
%\end{macro}
% Define the starred form:
@@ -7443,7 +7501,7 @@ name=true]{%
%\begin{macro}{\Glsentryfull}
% \begin{macrocode}
\newcommand*{\Glsentryfull}[1]{%
- \Glsentrylong{#1}\space(\glsentryshort{#1})%
+ \Glsentrylong{#1}\space(\glsentryshortpl{#1})%
}
% \end{macrocode}
%\end{macro}
@@ -7457,7 +7515,7 @@ name=true]{%
%\begin{macro}{\Glsentryfullpl}
% \begin{macrocode}
\newcommand*{\Glsentryfullpl}[1]{%
- \Glsentrylongpl{#1}\space(\glsentryshort{#1})%
+ \Glsentrylongpl{#1}\space(\glsentryshortpl{#1})%
}
% \end{macrocode}
%\end{macro}
@@ -7505,8 +7563,9 @@ name=true]{%
%\begin{macro}{\glsadd}
%\changes{1.07}{2007 Sep 13}{fixed bug caused by \cs{theglsentrycounter} setting the page number too soon}
%\changes{2.04}{2009 November 10}{fixed bug that ignored counter}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsadd}[2][]{%
+\newrobustcmd*{\glsadd}[2][]{%
\glsdoifexists{#2}%
{%
\def\@glsnumberformat{glsnumberformat}%
@@ -7528,8 +7587,9 @@ name=true]{%
% any text). If \gloskey[glsaddall]{types} key is omitted, apply to all
% glossary types.
%\begin{macro}{\glsaddall}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\glsaddall}[1][]{%
+\newrobustcmd*{\glsaddall}[1][]{%
\edef\@glo@type{\@glo@types}%
\setkeys{glossadd}{#1}%
\forallglsentries[\@glo@type]{\@glo@entry}{%
@@ -8147,12 +8207,28 @@ name=true]{%
\newcommand*{\glswritefiles}{%
% \end{macrocode}
% Iterate through all the glossaries
+%\changes{3.01}{2011/04/12}{added check for empty glossaries}
% \begin{macrocode}
\forallglossaries{\@glo@type}{%
- \@glsopenfile{\glswrite}{\@glo@type}%
- \immediate\write\glswrite{%
- \expandafter\the\csname glo@\@glo@type @filetok\endcsname}%
- \immediate\closeout\glswrite
+ \edef\gls@tmp{\expandafter\the\csname glo@\@glo@type
+@filetok\endcsname}%
+ \ifx\gls@tmp\@empty
+ \ifx\@glo@type\glsdefaulttype
+ \GlossariesWarningNoLine{Glossary `\@glo@type' has no
+ entries.^^JRemember to use package option `nomain' if
+you
+ don't want to^^Juse the main glossary}%
+ \else
+ \GlossariesWarningNoLine{Glossary `\@glo@type' has no
+ entries}%
+ \fi
+ \else
+ \@glsopenfile{\glswrite}{\@glo@type}%
+ \immediate\write\glswrite{%
+ \expandafter\the\csname glo@\@glo@type
+@filetok\endcsname}%
+ \immediate\closeout\glswrite
+ \fi
}%
}
\else
@@ -9419,8 +9495,9 @@ false,nolabel,autolabel}[nolabel]{%
%
%\begin{macro}{\acrfull}
% Full form of the acronym.
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\acrfull}{%
+\newrobustcmd*{\acrfull}{%
\@ifstar\s@acrfull\ns@acrfull
}
% \end{macrocode}
@@ -9455,17 +9532,19 @@ false,nolabel,autolabel}[nolabel]{%
%\end{macro}
%
%\begin{macro}{\acrfullformat}
-% Default full form is \meta{long}
-% (\cs{acronymfont}"{"\meta{short}"}").
+% Default full form is \meta{long} \parg{short}.
+%\changes{3.01}{2011/04/12}{removed \cs{acronymfont} as it should
+%already be set in the second argument.}
% \begin{macrocode}
-\newcommand{\acrfullformat}[2]{#1\space(\acronymfont{#2})}
+\newcommand{\acrfullformat}[2]{#1\space(#2)}
% \end{macrocode}
%\end{macro}
%
% Default format for full acronym
%\begin{macro}{\Acrfull}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Acrfull}{%
+\newrobustcmd*{\Acrfull}{%
\@ifstar\s@Acrfull\ns@Acrfull
}
% \end{macrocode}
@@ -9489,8 +9568,9 @@ false,nolabel,autolabel}[nolabel]{%
%\end{macro}
%
%\begin{macro}{\ACRfull}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\ACRfull}{%
+\newrobustcmd*{\ACRfull}{%
\@ifstar\s@ACRfull\ns@ACRfull
}
% \end{macrocode}
@@ -9516,8 +9596,9 @@ false,nolabel,autolabel}[nolabel]{%
% Plural:
%\begin{macro}{\acrfullpl}
%\changes{1.13}{2008 May 10}{new}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\acrfullpl}{%
+\newrobustcmd*{\acrfullpl}{%
\@ifstar\s@acrfullpl\ns@acrfullpl
}
% \end{macrocode}
@@ -9542,8 +9623,9 @@ false,nolabel,autolabel}[nolabel]{%
%
%\begin{macro}{\Acrfullpl}
%\changes{1.13}{2008 May 10}{new}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\Acrfullpl}{%
+\newrobustcmd*{\Acrfullpl}{%
\@ifstar\s@Acrfullpl\ns@Acrfullpl
}
% \end{macrocode}
@@ -9561,15 +9643,16 @@ false,nolabel,autolabel}[nolabel]{%
% Low-level macro:
% \begin{macrocode}
\def\@Acrfullpl#1#2[#3]{%
- \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}%
+ \acrlinkfullformat{\@Acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\ACRfullpl}
%\changes{1.13}{2008 May 10}{new}
+%\changes{3.01}{2011/04/12}{made robust}
% \begin{macrocode}
-\newcommand*{\ACRfullpl}{%
+\newrobustcmd*{\ACRfullpl}{%
\@ifstar\s@ACRfullpl\ns@ACRfullpl
}
% \end{macrocode}
@@ -16388,7 +16471,7 @@ see=[see also]{pear}}
\newglossaryentry{banana}{name=banana,
description={a yellow fruit with an even odder shape than
-a \protect\gls{pear}}}
+a \gls{pear}}}
\newglossaryentry{fruit}{name=fruit,
description={sweet, fleshy product of plant containing seed}}
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 13f67b0f5c4..1fff61cf90b 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 0.94b 2011/4/3 22:26
+% glossaries.ins generated using makedtx version 0.94b 2011/4/13 19:39
\input docstrip
\preamble