summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-26 22:59:33 +0000
committerKarl Berry <karl@freefriends.org>2013-06-26 22:59:33 +0000
commit4cabe029e53d7b74996e026c1d70eb6200592c52 (patch)
treeaa9a83ca317344aced9e06f0c70c560e2075920d /Master/texmf-dist/tex/latex/glossaries
parentb236252d91485f591e2e4fa402e21b237e92e289 (diff)
glossaries (17jun13)
git-svn-id: svn://tug.org/texlive/trunk@30964 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.sty40
1 files changed, 7 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 18a1eb1c6b5..ae21a5218d7 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}[2013/04/21 v3.05 (NLCT)]
+\ProvidesPackage{glossaries}[2013/06/17 v3.06 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -377,7 +377,7 @@ name=true]{%
\DeclareOptionX{makeindex}{\glsxindyfalse}
\define@boolkey[gls]{xindy}{glsnumbers}[true]{}
\gls@xindy@glsnumberstrue
-\def\@xdy@main@language{\rootlanguagename}%
+\def\@xdy@main@language{\languagename}%
\define@key[gls]{xindy}{language}{\def\@xdy@main@language{#1}}
\ifcsundef{inputencodingname}{%
\def\gls@codepage{}}{%
@@ -916,36 +916,7 @@ name=true]{%
\newcommand*\GlsSetXdyStyles[1]{%
\glsnoxindywarning\GlsSetXdyStyles}
\fi
-\ifglsxindy
- \@ifpackageloaded{babel}{%
- \def\findrootlanguage{\begingroup
- \escapechar=-1\relax
- \edef\languagename{%
- \expandafter\string\csname\languagename\endcsname}%
- \def\NeedsTeXFormat##1[##2]{}%
- \def\ProvidesPackage##1[##2]{}%
- \let\LdfInit\relax
- \def\languageattribute##1##2{}%
- \def\DeclareOption##1##2{%
- \ifx##1*\expandafter\endinput\else
- \edef\testlanguage{\expandafter\string\csname##1\endcsname}%
- \ifx\testlanguage\languagename##2\fi
- \fi}
- \def\input##1{\stripldf##1}%
- \def\stripldf##1.ldf{\gdef\rootlanguagename{##1}}%
- \@@input babel.sty
- \endgroup}%
- }{%
- \@ifpackageloaded{ngerman}{%
- \def\findrootlanguage{%
- \def\rootlanguagename{german}}%
- }{%
- \def\findrootlanguage{%
- \def\rootlanguagename{english}}%
- }%
- }%
-\fi
-\def\rootlanguagename{english}
+\newcommand*{\findrootlanguage}{}
\def\@xdylanguage#1#2{}
\ifglsxindy
\newcommand*\GlsSetXdyLanguage[2][\glsdefaulttype]{%
@@ -964,6 +935,10 @@ name=true]{%
\newcommand*{\GlsSetXdyCodePage}[1]{%
\renewcommand*{\gls@codepage}{#1}%
}
+\AtBeginDocument{
+ \ifx\gls@codepage\@empty
+ \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{}
+\fi}
\else
\newcommand*{\GlsSetXdyCodePage}[1]{%
\glsnoxindywarning\GlsSetXdyCodePage}
@@ -3622,7 +3597,6 @@ you
\undef\printglossary
}
\newcommand*{\printglossary}[1][type=\glsdefaulttype]{%
- \ifglsxindy\findrootlanguage\fi
\def\@glo@type{\glsdefaulttype}%
\def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}%
\def\glossarytoctitle{\glossarytitle}%