glossaries 2.0.2 (14jul09)

git-svn-id: svn://tug.org/texlive/trunk@14290 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 49 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 1adf4db3d9d..be88ef3a3d0 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -26,7 +26,7 @@
 %   -doc "glossaries-manual.tex"
 %   -codetitle "Glossaries Documented Code"
 %   glossaries
-% Created on 2009/6/1 14:17
+% Created on 2009/7/13 14:13
 %\fi
 %\iffalse
 %<*package>
@@ -81,7 +81,7 @@
 \makeatother
 \RecordChanges
 \PageIndex
-\CheckSum{8706}
+\CheckSum{8711}
 \CodelineNumbered
 \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}}
 \newcommand*{\term}[1]{#1\iterm{#1}}
@@ -144,7 +144,7 @@
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{glossaries.sty v 2.01: \LaTeXe\ Package to Assist Generating Glossaries}
+% \title{glossaries.sty v 2.02: \LaTeXe\ Package to Assist Generating Glossaries}
 % \author{Nicola L.C. Talbot\\[10pt]
 %School of Computing Sciences\\
 %University of East Anglia\\
@@ -152,7 +152,7 @@
 %NR4 7TJ. United Kingdom.\\
 %\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
 %
-% \date{30th May 2009}
+% \date{13th July 2009}
 % \maketitle
 %\tableofcontents
 %
@@ -1201,7 +1201,18 @@
 %\end{verbatim}
 %You can change this value later in the document using\\[10pt]
 %\DescribeMacro{\setglossarysection}\cs{setglossarysection}\marg{name}\\[10pt]
-%where \meta{name} is the sectional unit.
+%where \meta{name} is the sectional unit. The start of each glossary
+%adds information to the page header via
+%\DescribeMacro{glossarymark}\cs{glossarymark}\marg{glossary title}.
+%This defaults to \cs{@mkboth}, but you may need to redefine it.
+%For example, to only change the right header:
+%\begin{verbatim}
+%\renewcommand{\glossarymark}[1]{\markright{#1}}
+%\end{verbatim}
+%or to prevent it from changing the headers:
+%\begin{verbatim}
+%\renewcommand{\glossarymark}[1]{}
+%\end{verbatim}
 %
 %Note that if you are using the \isty{hyperref} package and the
 %glossaries are put in chapters, you may need to redefine
@@ -3369,7 +3380,7 @@
 %since there are both advantages and disadvantages to using
 %\ics{xspace} in \cs{}\meta{label}. If you don't use the 
 %\isty{xspace} package you need to explicitly force a space using
-%\verb*"\ " (backslash space) however you can follow \cs{}\meta{label}
+%\verb*|\ | (backslash space) however you can follow \cs{}\meta{label}
 %with additional text in square brackets (the final optional
 %argument to \ics{gls}). If you use the \isty{xspace} package
 %you don't need to escape the spaces but you can't use
@@ -4396,7 +4407,7 @@
 % This package requires \LaTeXe.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2009/05/30 v2.01 (NLCT)]
+\ProvidesPackage{glossaries}[2009/07/13 v2.02 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -4405,11 +4416,6 @@
 \RequirePackage{mfirstuc}
 \RequirePackage{xfor}
 %    \end{macrocode}
-% If \isty{babel} package is loaded, check to see if \isty{translator} is installed.
-%    \begin{macrocode}
-\@ifpackageloaded{babel}{\IfFileExists{translator.sty}{%
-  \RequirePackage{translator}}{}}{}
-%    \end{macrocode}
 %\changes{1.1}{2008 Feb 22}{amsgen now loaded (\cs{new@ifnextchar} needed)}
 % Need to use \cs{new@ifnextchar} instead of \cs{@ifnextchar} in 
 % commands that have a final optional argument (such as \ics{gls})
@@ -4998,6 +5004,17 @@ name=true]{%
 %    \begin{macrocode}
 \ProcessOptionsX
 %    \end{macrocode}
+% If \isty{babel} package is loaded, check to see if 
+% \isty{translator} is installed, but only if translation is
+% required.
+%\changes{2.02}{2009 July 13}{translate=false will prevent 
+% automatic loading of translator package}
+%    \begin{macrocode}
+\ifglstranslate
+  \@ifpackageloaded{babel}{\IfFileExists{translator.sty}{%
+    \RequirePackage{translator}}{}}{}
+\fi
+%    \end{macrocode}
 %
 % If chapters are defined and the user has requested the
 % section counter as a package option, \cs{@chapter} will
@@ -5433,16 +5450,25 @@ name=true]{%
 % is defined, it uses \cs{\@p@glossarysection}, otherwise it
 % uses \cs{@glossarysection}.
 %\changes{1.05}{2007 Aug 10}{added '@mkboth to 'glossarysection}
+%\changes{2.02}{2009 July 13}{changed '@mkboth to 'glossarymark}
 %\begin{macro}{\glossarysection}
 %    \begin{macrocode}
 \newcommand*{\glossarysection}[2][\@gls@title]{%
 \def\@gls@title{#2}%
 \@ifundefined{phantomsection}{%
 \@glossarysection{#1}{#2}}{\@p@glossarysection{#1}{#2}}%
-\@mkboth{\glossarytoctitle}{\glossarytoctitle}%
+\glossarymark{\glossarytoctitle}%
 }
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\glossarymark}
+%\changes{2.02}{2007 July 13}{New}
+% Sets the header mark for the glossary. Takes the glossary short
+% (TOC) title as the argument.
+%    \begin{macrocode}
+\newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}}
+%    \end{macrocode}
+%\end{macro}
 %
 % The required sectional unit is given by \cs{@@glossarysec}
 % which was defined by the \pkgopt{section} package option. The
@@ -10141,8 +10167,9 @@ using \string\makeglossary}}}
   \global\let\glossaryentrynumbers\@org@glossaryentrynumbers
 %    \end{macrocode}
 % Suppress warning about no \ics{printglossary}
+%\changes{2.02}{2007 July 13}{suppressed warning globally rather than locally}
 %    \begin{macrocode}
-\let\warn@noprintglossary\relax
+  \global\let\warn@noprintglossary\relax
 }
 %    \end{macrocode}
 %\end{macro}
@@ -15076,15 +15103,16 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
 %\fi
 %\iffalse
 %    \begin{macrocode}
-%<*glossaries-dictionary-Brazil.dict>
+%<*glossaries-dictionary-Brazilian.dict>
 %    \end{macrocode}
 %\fi
 %\subsection{Brazilian Dictionary}
 % This is a dictionary file provided by Thiago de~Melo for
 % use with the \isty{translator} package.
 %\changes{1.17}{2008 November 17}{added Brazilian dictionary}
+%\changes{2.02}{2009 July 13}{Changed Brazil to Brazilian}
 %    \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Brazil}
+\ProvidesDictionary{glossaries-dictionary}{Brazilian}
 %    \end{macrocode}
 % Provide Brazilian translations:
 %    \begin{macrocode}
@@ -15099,7 +15127,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
 %    \end{macrocode}
 %\iffalse
 %    \begin{macrocode}
-%</glossaries-dictionary-Brazil.dict>
+%</glossaries-dictionary-Brazilian.dict>
 %    \end{macrocode}
 %\fi
 %\iffalse
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index ad517e63cc4..c02ce0f12ea 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 2009/6/1 14:17
+% glossaries.ins generated using makedtx version 0.94b 2009/7/13 14:13
 \input docstrip
 
 \preamble
@@ -18,7 +18,7 @@
 
  The Current Maintainer of this work is Nicola Talbot.
 
- This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+ This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
 
 \endpreamble
 
@@ -46,8 +46,8 @@
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-accsupp.sty,package}}
 \file{glossaries-babel.sty}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-babel.sty,package}}
-\file{glossaries-dictionary-Brazil.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Brazil.dict,package}}
+\file{glossaries-dictionary-Brazilian.dict}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Brazilian.dict,package}}
 \file{glossaries-dictionary-Danish.dict}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Danish.dict,package}}
 \file{glossaries-dictionary-Dutch.dict}{\usepreamble\defaultpreamble