glossaries (17jun13)

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

2 files changed, 24 insertions, 93 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 705b752adc4..9959f8a4172 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 2013/4/21 19:12
+% Created on 2013/6/17 17:30
 %\fi
 %\iffalse
 %<*package>
@@ -136,7 +136,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{14021}
+\CheckSum{13967}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -164,12 +164,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{Documented Code For glossaries v3.05}
+% \title{Documented Code For glossaries v3.06}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2013-04-21}
+% \date{2013-06-17}
 % \maketitle
 %
 %This is the documented code for the \styfmt{glossaries} package.
@@ -185,7 +185,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 v3.05:
+%For the main user guide, read \qt{glossaries.sty v3.06:
 %\LaTeX2e\ Package to Assist Generating Glossaries}.
 %
 %\item[\url{mfirstuc-manual.pdf}]
@@ -229,7 +229,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 % This package requires \LaTeXe.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2013/04/21 v3.05 (NLCT)]
+\ProvidesPackage{glossaries}[2013/06/17 v3.06 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -1311,11 +1311,12 @@ name=true]{%
 %    \end{macrocode}
 %
 %\begin{macro}{\@xdy@main@language}
+%\changes{3.06}{2013/06/17}{Changed back to using \cs{languagename}}
 % Define what language to use for each glossary type (if a
 % language is not defined for a particular glossary type
 % the language specified for the main glossary is used.)
 %    \begin{macrocode}
-\def\@xdy@main@language{\rootlanguagename}%
+\def\@xdy@main@language{\languagename}%
 %    \end{macrocode}
 %\end{macro}
 % Define key to set the language
@@ -2582,87 +2583,14 @@ name=true]{%
 %\end{macro}
 %
 %\begin{macro}{\findrootlanguage}
-% The root language name is required by \app{xindy}. This
-% information is for \app{makeglossaries} to pass to
-% \app{xindy}. Since \ics{languagename} only stores the
-% regional dialect rather than the root language name, some
-% trickery is required to determine the root language.
+%\changes{3.06}{2013/06/17}{Obsoleted}
+% This used to determine the root language, using a~bit of trickery
+% since \sty{babel} doesn't supply the information, but now that
+% \sty{babel} is once again actively maintained, we can't do this
+% any more, so \cs{findrootlanguage} no longer available. Now
+% provide a command that does nothing (in case it's been patched).
 %    \begin{macrocode}
-\ifglsxindy
-  \@ifpackageloaded{babel}{%
-%    \end{macrocode}
-% Need to parse \texttt{babel.sty} to determine the root language.
-% This code was provided by Enrico~Gregorio.
-%    \begin{macrocode}
-  \def\findrootlanguage{\begingroup
-    \escapechar=-1\relax
-%    \end{macrocode}
-% normalize \cs{languagename} to category 12 chars
-%    \begin{macrocode}
-    \edef\languagename{%
-      \expandafter\string\csname\languagename\endcsname}%
-%    \end{macrocode}
-% disable \texttt{babel.sty} useless commands
-%    \begin{macrocode}
-    \def\NeedsTeXFormat##1[##2]{}%
-    \def\ProvidesPackage##1[##2]{}%
-    \let\LdfInit\relax
-    \def\languageattribute##1##2{}%
-%    \end{macrocode}
-% change the meaning of \cs{DeclareOption}
-%    \begin{macrocode}
-    \def\DeclareOption##1##2{%
-%    \end{macrocode}
-% at \cs{DeclareOption*} we end
-%    \begin{macrocode}
-      \ifx##1*\expandafter\endinput\else
-%    \end{macrocode}
-% else we build a string with the first argument
-%    \begin{macrocode}
-      \edef\testlanguage{\expandafter\string\csname##1\endcsname}%
-%    \end{macrocode}
-% if \cs{testlanguage} and \cs{languagename} are the same
-% we execute the second argument
-%    \begin{macrocode}
-      \ifx\testlanguage\languagename##2\fi
-    \fi}
-%    \end{macrocode}
-% almost all options of babel are \cs{input}"{"\meta{name}".ldf}"
-%    \begin{macrocode}
-  \def\input##1{\stripldf##1}%
-%    \end{macrocode}
-% we put the root language name in \ics{rootlanguagename}
-%    \begin{macrocode}
-  \def\stripldf##1.ldf{\gdef\rootlanguagename{##1}}%
-%    \end{macrocode}
-% now input babel.sty, using the primitive \cs{input}
-%    \begin{macrocode}
-  \@@input babel.sty
-  \endgroup}%
-  }{%
-%    \end{macrocode}
-% \isty{babel} hasn't been loaded, so check if \isty{ngerman} has
-% been loaded
-%    \begin{macrocode}
-    \@ifpackageloaded{ngerman}{%
-       \def\findrootlanguage{%
-         \def\rootlanguagename{german}}%
-    }{%
-%    \end{macrocode}
-% Neither \sty{babel} nor \sty{ngerman} have been loaded, so
-% assume the root language is English
-%    \begin{macrocode}
-       \def\findrootlanguage{%
-         \def\rootlanguagename{english}}%
-    }%
-  }%
-\fi
-%    \end{macrocode}
-%\end{macro}
-%\begin{macro}{\rootlanguagename}
-% Set default root language to English.
-%    \begin{macrocode}
-\def\rootlanguagename{english}
+\newcommand*{\findrootlanguage}{}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2715,6 +2643,14 @@ name=true]{%
   \newcommand*{\GlsSetXdyCodePage}[1]{%
     \renewcommand*{\gls@codepage}{#1}%
   }
+%    \end{macrocode}
+%\changes{}{}{}
+% Suggested by egreg:
+%    \begin{macrocode}
+\AtBeginDocument{
+  \ifx\gls@codepage\@empty
+  \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{}
+\fi}
 \else
   \newcommand*{\GlsSetXdyCodePage}[1]{%
     \glsnoxindywarning\GlsSetXdyCodePage}
@@ -9385,11 +9321,6 @@ you
 %    \begin{macrocode}
 \newcommand*{\printglossary}[1][type=\glsdefaulttype]{%
 %    \end{macrocode}
-% If \app{xindy} is being used, need to find the root language
-% for \app{makeglossaries} to pass to \app{xindy}.
-%    \begin{macrocode}
-  \ifglsxindy\findrootlanguage\fi
-%    \end{macrocode}
 % Set up defaults.
 %    \begin{macrocode}
   \def\@glo@type{\glsdefaulttype}%
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 35eb819eb3b..bda1dba15f7 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 2013/4/21 19:12
+% glossaries.ins generated using makedtx version 0.94b 2013/6/17 17:30
 \input docstrip
 
 \preamble