summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-24 23:04:03 +0000
committerKarl Berry <karl@freefriends.org>2014-11-24 23:04:03 +0000
commitf8afa087413b6c1c7901b309057f715e8f6dc12a (patch)
tree7774fcf0fe11e151874b45bcc01ab171dad4b44f /Master/texmf-dist/source
parent226ee7542cb7aebf33c102943c20102bca7e9db3 (diff)
glossaries (24nov14)
git-svn-id: svn://tug.org/texlive/trunk@35657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx1262
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins28
2 files changed, 325 insertions, 965 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 14ab4e75bbc..edc6423bc5a 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -19,7 +19,6 @@
% -src "(glossaries-accsupp)\.(sty)\Z=>\1.\2"
% -src "(glossaries-babel)\.(sty)\Z=>\1.\2"
% -src "(glossaries-polyglossia)\.(sty)\Z=>\1.\2"
-% -src "(glossaries-dictionary-.+)\.(dict)\Z=>\1.\2"
% -src "(minimalgls\.tex)\Z=>\1"
% -src "(glossary-lipsum-examples\.tex)\Z=>\1"
% -src "(example-glossaries-.*\.tex)\Z=>\1"
@@ -31,7 +30,7 @@
% -author "Nicola Talbot"
% -codetitle "Main Package Code"
% glossaries
-% Created on 2014/9/1 21:18
+% Created on 2014/11/24 16:50
%\fi
%\iffalse
%<*package>
@@ -141,7 +140,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{18645}
+\CheckSum{17735}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -169,12 +168,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{Documented Code For glossaries v4.11}
+% \title{Documented Code For glossaries v4.12}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2014-09-01}
+% \date{2014-11-22}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -190,7 +189,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.11:
+%For the main user guide, read \qt{glossaries.sty v4.12:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -249,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2014/09/01 v4.11 (NLCT)]
+\ProvidesPackage{glossaries}[2014/11/22 v4.12 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -1564,8 +1563,45 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\end{macro}
%\begin{macro}{\@gls@notranslatorhook}
%\changes{3.13a}{2013-11-05}{new}
+%\changes{4.12}{2014-11-22}{removed}
+%\cs{@gls@notranslatorhook} has been removed.
+%\end{macro}
+%\begin{macro}{\@gls@usetranslator}
+%\changes{4.12}{2014-11-22}{new}
% \begin{macrocode}
-\newcommand*\@gls@notranslatorhook{}
+\newcommand*\@gls@usetranslator{%
+% \end{macrocode}
+% \sty{polyglossia} tricks \cs{@ifpackageloaded} into thinking that
+% \sty{babel} has been loaded, so check for \sty{polyglossia} as well.
+% \begin{macrocode}
+ \@ifpackageloaded{polyglossia}%
+ {%
+ \let\glsifusetranslator\@secondoftwo
+ }%
+ {%
+ \@ifpackageloaded{babel}%
+ {%
+ \IfFileExists{translator.sty}%
+ {%
+ \RequirePackage{translator}%
+ \let\glsifusetranslator\@firstoftwo
+ }%
+ {}%
+ }%
+ {}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsifusedtranslatordict}
+%\changes{4.12}{2014-11-22}{new}
+% Checks if given \sty{translator} dictionary has been loaded.
+% \begin{macrocode}
+\newcommand{\glsifusedtranslatordict}[3]{%
+ \glsifusetranslator
+ {\ifcsdef{ver@glossaries-dictionary-#1.dict}{#2}{#3}}%
+ {#3}%
+}
% \end{macrocode}
%\end{macro}
%
@@ -1575,8 +1611,9 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% via the document class.
% \begin{macrocode}
\@gls@declareoption{notranslate}{%
- \glstranslatefalse
- \let\@gls@notranslatorhook\relax
+ \glstranslatefalse
+ \let\@gls@usetranslator\relax
+ \let\glsifusetranslator\@secondoftwo
}
% \end{macrocode}
%\end{option}
@@ -1591,12 +1628,32 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\ifcase\nr\relax
\glstranslatetrue
+ \renewcommand*\@gls@usetranslator{%
+ \@ifpackageloaded{polyglossia}%
+ {%
+ \let\glsifusetranslator\@secondoftwo
+ }%
+ {%
+ \@ifpackageloaded{babel}%
+ {%
+ \IfFileExists{translator.sty}%
+ {%
+ \RequirePackage{translator}%
+ \let\glsifusetranslator\@firstoftwo
+ }%
+ {}%
+ }%
+ {}%
+ }%
+ }%
\or
\glstranslatefalse
- \let\@gls@notranslatorhook\relax
+ \let\@gls@usetranslator\relax
+ \let\glsifusetranslator\@secondoftwo
\or
- \glstranslatefalse
- \def\@gls@notranslatorhook{\RequirePackage{glossaries-babel}}%
+ \glstranslatetrue
+ \let\@gls@usetranslator\relax
+ \let\glsifusetranslator\@secondoftwo
\fi
}
% \end{macrocode}
@@ -1604,14 +1661,22 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Set the default value:
% \begin{macrocode}
\glstranslatefalse
- \@ifpackageloaded{translator}%
- {\glstranslatetrue}%
+\let\glsifusetranslator\@secondoftwo
+\@ifpackageloaded{translator}%
+{%
+ \glstranslatetrue
+ \let\glsifusetranslator\@firstoftwo
+}%
+{%
+ \@for\gls@thissty:=tracklang,babel,ngerman,polyglossia\do
+ {
+ \@ifpackageloaded{\gls@thissty}%
{%
- \@ifpackageloaded{polyglossia}%
- {\glstranslatetrue}%
- {%
- \@ifpackageloaded{babel}{\glstranslatetrue}{}%
- }%
+ \glstranslatetrue
+ \@endfortrue
+ }%
+ {}%
+ }
}
% \end{macrocode}
%
@@ -2056,34 +2121,6 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
%\end{macro}
%
-% 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{polyglossia}%
- {%
-% \end{macrocode}
-%\changes{3.02}{2012/05/21}{added check for polyglossia}%
-% \sty{polyglossia} fakes \sty{babel} so need to check for
-% \sty{polyglossia} first.
-% \begin{macrocode}
- }%
- {%
- \@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
% be modified so
@@ -2154,8 +2191,8 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
%\end{macro}
%
-%\subsection{Default values}\label{sec:predefinednames}
-% This section sets up default values that are used by this
+%\subsection{Predefined Text}\label{sec:predefinednames}
+% Set up default textual tags that are used by this
% package. Some of the names may already be defined (e.g.\ by
% \isty{babel}) so \cs{providecommand} is used.
%
@@ -2225,6 +2262,19 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\newcommand*{\glspluralsuffix}{s}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsacrpluralsuffix}
+% Default plural suffix for acronyms
+%\changes{4.12}{2014-11-22}{new}
+% \begin{macrocode}
+\newcommand*{\glsacrpluralsuffix}{\glspluralsuffix}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsupacrpluralsuffix}
+%\changes{4.12}{2014-11-22}{new}
+% \begin{macrocode}
+\newcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\seename}
% \begin{macrocode}
\providecommand*{\seename}{see}
@@ -2238,7 +2288,44 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Add multi-lingual support\changes{1.08}{2007 Oct 13}{Added
% babel support}. Thanks to everyone who contributed to the
% translations from both comp.text.tex and via email.
+%\begin{macro}{\RequireGlossariesLang}
+%\changes{4.12}{2014-11-22}{new}
+% \begin{macrocode}
+\newcommand*{\RequireGlossariesLang}[1]{%
+ \@ifundefined{ver@glossaries-#1.ldf}{\input{glossaries-#1.ldf}}{}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\ProvidesGlossariesLang}
+%\changes{4.12}{2014-11-22}{new}
+% \begin{macrocode}
+\newcommand*{\ProvidesGlossariesLang}[1]{%
+ \ProvidesFile{glossaries-#1.ldf}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\addglossarytocaptions}
+% Does nothing if \sty{translator} hasn't been loaded.
+% \begin{macrocode}
+\newcommand*{\addglossarytocaptions}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
+% As from v4.12, multlingual support has been split off into
+% independently-maintained language modules.
+% \begin{macrocode}
+\ifglstranslate
+% \end{macrocode}
+% Load \sty{tracklang}
+% \begin{macrocode}
+ \RequirePackage{tracklang}
+% \end{macrocode}
+% Load \sty{translator} if required.
+% \begin{macrocode}
+ \@gls@usetranslator
+% \end{macrocode}
% If using \isty{translator}, \ics{glossaryname} should be defined
% in terms of \ics{translate}, but if babel is also loaded, it will
% redefine \cs{glossaryname} whenever the language is set, so
@@ -2247,60 +2334,68 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with
%\cs{ifcsundef}}
% \begin{macrocode}
-\newcommand*{\addglossarytocaptions}[1]{%
- \ifcsundef{captions#1}{}%
+ \@ifpackageloaded{translator}
{%
- \expandafter\let\expandafter\@gls@tmp\csname captions#1\endcsname
- \expandafter\toks@\expandafter{\@gls@tmp
- \renewcommand*{\glossaryname}{\translate{Glossary}}%
+% \end{macrocode}
+% If the language options have been specified through the
+% document class, then \sty{translator} can pick them up. If not,
+% \sty{translator} will default to English and any language
+% option passed to \sty{babel} won't be detected, so if
+% \cs{trans@languages} is just \texttt{English} and \cs{bbl@loaded}
+% isn't simply \texttt{english}, then don't use the \sty{translator}
+% dictionaries.
+% \begin{macrocode}
+ \ifboolexpr
+ {
+ test {\ifdefstring{\trans@languages}{English}}
+ and not
+ test {\ifdefstring{bbl@loaded}{english}}
+ }
+ {%
+ \let\glsifusetranslator\@secondoftwo
+ }%
+ {%
+ \usedictionary{glossaries-dictionary}%
+ \renewcommand*{\addglossarytocaptions}[1]{%
+ \ifcsundef{captions#1}{}%
+ {%
+ \expandafter\let\expandafter\@gls@tmp\csname captions#1\endcsname
+ \expandafter\toks@\expandafter{\@gls@tmp
+ \renewcommand*{\glossaryname}{\translate{Glossary}}%
+ }%
+ \expandafter\edef\csname captions#1\endcsname{\the\toks@}%
+ }%
+ }%
}%
- \expandafter\edef\csname captions#1\endcsname{\the\toks@}%
}%
-}
+ {}%
% \end{macrocode}
-%\end{macro}
+% Check for tracked languages
% \begin{macrocode}
-\ifglstranslate
+ \AnyTrackedLanguages
+ {%
+ \ForEachTrackedDialect{\this@dialect}{%
+ \IfTrackedLanguageFileExists{\this@dialect}%
+ {glossaries-}% prefix
+ {.ldf}%
+ {%
+ \RequireGlossariesLang{\CurrentTrackedTag}%
+ }%
+ {%
+ \PackageWarningNoLine{glossaries}%
+ {No language module detected for `\this@dialect'.\MessageBreak
+ Language modules need to be installed separately.\MessageBreak
+ Please check on CTAN for a bundle called\MessageBreak
+ `glossaries-\CurrentTrackedLanguage' or similar}%
+ }%
+ }%
+ }%
+ {}%
% \end{macrocode}
-% If \isty{translator} is not install, used standard
-% \isty{babel} captions, otherwise load \isty{translator}
-% dictionary.
-%\changes{1.1}{2008 Feb 22}{Added support for translator package}
-%\changes{1.15}{2008 August 15}{Added \cs{glssettoctitle}}
-% \begin{macrocode}
- \@ifpackageloaded{translator}{%
- \usedictionary{glossaries-dictionary}%
- \addglossarytocaptions{portuges}%
- \addglossarytocaptions{portuguese}%
- \addglossarytocaptions{brazil}%
- \addglossarytocaptions{brazilian}%
- \addglossarytocaptions{danish}%
- \addglossarytocaptions{dutch}%
- \addglossarytocaptions{afrikaans}%
- \addglossarytocaptions{english}%
- \addglossarytocaptions{UKenglish}%
- \addglossarytocaptions{USenglish}%
- \addglossarytocaptions{american}%
- \addglossarytocaptions{australian}%
- \addglossarytocaptions{british}%
- \addglossarytocaptions{canadian}%
- \addglossarytocaptions{newzealand}%
- \addglossarytocaptions{french}%
- \addglossarytocaptions{frenchb}%
- \addglossarytocaptions{francais}%
- \addglossarytocaptions{acadian}%
- \addglossarytocaptions{canadien}%
- \addglossarytocaptions{german}%
- \addglossarytocaptions{germanb}%
- \addglossarytocaptions{austrian}%
- \addglossarytocaptions{naustrian}%
- \addglossarytocaptions{ngerman}%
- \addglossarytocaptions{irish}%
- \addglossarytocaptions{italian}%
- \addglossarytocaptions{magyar}%
- \addglossarytocaptions{hungarian}%
- \addglossarytocaptions{polish}%
- \addglossarytocaptions{spanish}%
+% if using \sty{translator} use translator interface.
+% \begin{macrocode}
+ \glsifusetranslator
+ {%
\renewcommand*{\glssettoctitle}[1]{%
\ifcsdef{gls@tr@set@#1@toctitle}%
{%
@@ -2322,23 +2417,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\translate{Symbols (glossaries)}}%
\renewcommand*{\glsnumbersgroupname}{%
\translate{Numbers (glossaries)}}%
- }{%
-% \end{macrocode}
-%\changes{3.02}{2012/05/21}{reversed order of package check}
-% \begin{macrocode}
- \@ifpackageloaded{polyglossia}%
- {\RequirePackage{glossaries-polyglossia}}%
- {%
- \@ifpackageloaded{babel}{%
- \RequirePackage{glossaries-babel}}{}%
- }}
-\else
-% \end{macrocode}
-%\changes{3.13a}{2013-11-05}{added cs{@gls@nottranslatorhook} to else clause}
-% \begin{macrocode}
- \@gls@notranslatorhook
+ }{}%
\fi
% \end{macrocode}
+%
%\begin{macro}{\nopostdesc}
% Provide a means to suppress description terminator for a given
% entry. (Useful for entries with no description.) Has no
@@ -2824,11 +2906,12 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% table of contents, the second argument is the sectioning type.)
%\begin{macro}{\@gls@toc}
%\changes{1.1}{2008 Feb 22}{numberline added}
+%\changes{4.12}{2014-11-22}{added \cs{protect} to \cs{numberline}}
% \begin{macrocode}
\newcommand*{\@gls@toc}[2]{%
\ifglstoc
\ifglsnumberline
- \addcontentsline{toc}{#2}{\numberline{}#1}%
+ \addcontentsline{toc}{#2}{\protect\numberline{}#1}%
\else
\addcontentsline{toc}{#2}{#1}%
\fi
@@ -3040,6 +3123,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\GlsAddXdyAttribute{hypersl}
\GlsAddXdyAttribute{hypersc}
\GlsAddXdyAttribute{hyperemph}
+% \end{macrocode}
+%\changes{4.12}{2014-11-22}{Added glsignore attribute}
+% \begin{macrocode}
+ \GlsAddXdyAttribute{glsignore}
}
\else
\let\@gls@addpredefinedattributes\relax
@@ -10257,8 +10344,14 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\changes{2.04}{2009 November 10}{fixed bug that ignored counter}
%\changes{3.01}{2011/04/12}{made robust}
%\changes{4.03}{2014-01-20}{added \cs{glsdetoklabel}}
+%\changes{4.12}{2014-11-22}{added check for vertical mode}
% \begin{macrocode}
\newrobustcmd*{\glsadd}[2][]{%
+% \end{macrocode}
+% Need to move to horizontal mode if not already in it, but only if
+% not in preamble.
+% \begin{macrocode}
+ \@gls@adjustmode
\glsdoifexists{#2}%
{%
\def\@glsnumberformat{glsnumberformat}%
@@ -10275,6 +10368,14 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\@gls@adjustmode}
+%\changes{4.12}{2014-11-22}{new}
+% \begin{macrocode}
+\newcommand*{\@gls@adjustmode}{}
+\AtBeginDocument{\renewcommand*{\@gls@adjustmode}{\ifvmode\mbox{}\fi}}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{definition}
%\cs{glsaddall}\oarg{option list}
%\end{definition}
@@ -10303,16 +10404,24 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% document.
%\changes{3.08a}{2013-09-28}{new}
%\changes{3.13a}{2013-11-05}{set default to \cs{@glo@types}}
+%\changes{4.12}{2014-11-22}{replaced @gobble with glsignore}
% \begin{macrocode}
\newrobustcmd*{\glsaddallunused}[1][\@glo@types]{%
\forallglsentries[#1]{\@glo@entry}%
{%
- \ifglsused{\@glo@entry}{}{\glsadd[format=@gobble]{\@glo@entry}}%
+ \ifglsused{\@glo@entry}{}{\glsadd[format=glsignore]{\@glo@entry}}%
}%
}
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsignore}
+%\changes{4.12}{2014-11-22}{new}
+% \begin{macrocode}
+\newcommand*{\glsignore}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
%\subsection{Creating associated files}
% The \cs{writeist} command creates the associated
% customized \filetype{.ist} \app{makeindex} style file.
@@ -13986,7 +14095,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% the entire text \texttt{abcs} is set in \cs{textsc}, \cs{textup}
% is need to cancel it out.
% \begin{macrocode}
-\newcommand*{\acrpluralsuffix}{\glspluralsuffix}
+\newcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}
% \end{macrocode}
%\end{macro}
% If \sty{garamondx} has been loaded, need to use \cs{textulc}
@@ -14595,7 +14704,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\GlsUseAcrStyleDefs{long-short}%
\renewcommand{\acronymfont}[1]{\textsc{##1}}%
- \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
}
% \end{macrocode}
%\end{acrstyle}
@@ -14611,7 +14720,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\GlsUseAcrStyleDefs{long-short}%
\renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
- \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}%
}
% \end{macrocode}
%\end{acrstyle}
@@ -14627,7 +14736,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\GlsUseAcrStyleDefs{short-long}%
\renewcommand{\acronymfont}[1]{\textsc{##1}}%
- \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
}
% \end{macrocode}
%\end{acrstyle}
@@ -14643,7 +14752,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{%
\GlsUseAcrStyleDefs{short-long}%
\renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
- \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}%
}
% \end{macrocode}
%\end{acrstyle}
@@ -14882,7 +14991,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}%
\renewcommand*{\acronymsort}[2]{##1}%
\renewcommand*{\acronymfont}[1]{##1}%
- \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}%
}
% \end{macrocode}
%\end{acrstyle}
@@ -14943,7 +15052,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}%
\renewcommand*{\acronymsort}[2]{##1}%
\renewcommand*{\acronymfont}[1]{##1}%
- \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}%
% \end{macrocode}
% Don't use footnotes for \ics{acrfull}:
% \begin{macrocode}
@@ -14994,7 +15103,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\GlsUseAcrStyleDefs{footnote}%
\renewcommand{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
\renewcommand{\acronymfont}[1]{\textsc{##1}}%
- \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
}%
% \end{macrocode}
%\end{acrstyle}
@@ -15011,7 +15120,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\GlsUseAcrStyleDefs{footnote}%
\renewcommand{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
\renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
- \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}%
}%
% \end{macrocode}
%\end{acrstyle}
@@ -15281,7 +15390,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\newacronymhook
\DefaultNewAcronymDef
}%
- \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\acrpluralsuffix}{\glsacrpluralsuffix}%
}
% \end{macrocode}
%\end{macro}
@@ -15434,8 +15543,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\renewcommand*{\acronymfont}[1]{\textsc{##1}}%
% \end{macrocode}
% \begin{macrocode}
- \renewcommand*{\acrpluralsuffix}{%
- \glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
\else
\ifglsacrsmaller
\renewcommand*{\acronymfont}[1]{\textsmaller{##1}}%
@@ -15674,8 +15782,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand{\acronymfont}[1]{\textsc{##1}}
- \renewcommand*{\acrpluralsuffix}{%
- \glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
\else
\ifglsacrsmaller
\renewcommand*{\acronymfont}[1]{\textsmaller{##1}}%
@@ -15811,8 +15918,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{##1}}%
- \renewcommand*{\acrpluralsuffix}{%
- \glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
\else
\ifglsacrsmaller
\renewcommand*{\acronymfont}[1]{\textsmaller{##1}}%
@@ -15992,8 +16098,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{##1}}
- \renewcommand*{\acrpluralsuffix}{%
- \glstextup{\glspluralsuffix}}%
+ \renewcommand*{\acrpluralsuffix}{\glsupacrpluralsuffix}%
\else
\renewcommand*{\acronymfont}[1]{\textsmaller{##1}}
\fi
@@ -24261,312 +24366,38 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\section{Multi-Lingual Support}
% Many thanks to everyone who contributed to the translations both
% via email and on comp.text.tex.
-%\subsection{Babel Captions}
-% Define \isty{babel} captions if multi-lingual
-% support is required, but the \isty{translator} package is not loaded.
+% Language support has now been split off into independent language
+% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2013/11/14 v4.0 (NLCT)]
-% \end{macrocode}
-% English:
-% \begin{macrocode}
-\@ifundefined{captionsenglish}{}{%
- \addto\captionsenglish{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
-\@ifundefined{captionsamerican}{}{%
- \addto\captionsamerican{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
-\@ifundefined{captionsaustralian}{}{%
- \addto\captionsaustralian{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
-\@ifundefined{captionsbritish}{}{%
- \addto\captionsbritish{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}}%
-\@ifundefined{captionscanadian}{}{%
- \addto\captionscanadian{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
-\@ifundefined{captionsnewzealand}{}{%
- \addto\captionsnewzealand{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
-\@ifundefined{captionsUKenglish}{}{%
- \addto\captionsUKenglish{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
-\@ifundefined{captionsUSenglish}{}{%
- \addto\captionsUSenglish{%
- \renewcommand*{\glossaryname}{Glossary}%
- \renewcommand*{\acronymname}{Acronyms}%
- \renewcommand*{\entryname}{Notation}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Page List}%
- \renewcommand*{\glssymbolsgroupname}{Symbols}%
- \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-}
+\ProvidesPackage{glossaries-babel}[2014/11/22 v4.12 (NLCT)]
% \end{macrocode}
-% German (quite a few variations were suggested for German;
-% I settled on the following):
-% \begin{macrocode}
-\@ifundefined{captionsgerman}{}{%
- \addto\captionsgerman{%
- \renewcommand*{\glossaryname}{Glossar}%
- \renewcommand*{\acronymname}{Akronyme}%
- \renewcommand*{\entryname}{Bezeichnung}%
- \renewcommand*{\descriptionname}{Beschreibung}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Seiten}%
- \renewcommand*{\glssymbolsgroupname}{Symbole}%
- \renewcommand*{\glsnumbersgroupname}{Zahlen}}
-}
-% \end{macrocode}
-% ngerman is identical to German:
-%\changes{1.2}{2009 April 16}{fixed bug in ngerman captions}
-% \begin{macrocode}
-\@ifundefined{captionsngerman}{}{%
- \addto\captionsngerman{%
- \renewcommand*{\glossaryname}{Glossar}%
- \renewcommand*{\acronymname}{Akronyme}%
- \renewcommand*{\entryname}{Bezeichnung}%
- \renewcommand*{\descriptionname}{Beschreibung}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Seiten}%
- \renewcommand*{\glssymbolsgroupname}{Symbole}%
- \renewcommand*{\glsnumbersgroupname}{Zahlen}}
-}
-% \end{macrocode}
-% Italian:
-% \begin{macrocode}
-\@ifundefined{captionsitalian}{}{%
- \addto\captionsitalian{%
- \renewcommand*{\glossaryname}{Glossario}%
- \renewcommand*{\acronymname}{Acronimi}%
- \renewcommand*{\entryname}{Nomenclatura}%
- \renewcommand*{\descriptionname}{Descrizione}%
- \renewcommand*{\symbolname}{Simbolo}%
- \renewcommand*{\pagelistname}{Elenco delle pagine}%
- \renewcommand*{\glssymbolsgroupname}{Simboli}%
- \renewcommand*{\glsnumbersgroupname}{Numeri}}
-}
-% \end{macrocode}
-% Dutch:
-% \begin{macrocode}
-\@ifundefined{captionsdutch}{}{%
- \addto\captionsdutch{%
- \renewcommand*{\glossaryname}{Woordenlijst}%
- \renewcommand*{\acronymname}{Acroniemen}%
- \renewcommand*{\entryname}{Benaming}%
- \renewcommand*{\descriptionname}{Beschrijving}%
- \renewcommand*{\symbolname}{Symbool}%
- \renewcommand*{\pagelistname}{Pagina's}%
- \renewcommand*{\glssymbolsgroupname}{Symbolen}%
- \renewcommand*{\glsnumbersgroupname}{Cijfers}}
-}
-% \end{macrocode}
-% Spanish:
-% \begin{macrocode}
-\@ifundefined{captionsspanish}{}{%
- \addto\captionsspanish{%
- \renewcommand*{\glossaryname}{Glosario}%
- \renewcommand*{\acronymname}{Siglas}%
- \renewcommand*{\entryname}{Entrada}%
- \renewcommand*{\descriptionname}{Descripci\'on}%
- \renewcommand*{\symbolname}{S\'{\i}mbolo}%
- \renewcommand*{\pagelistname}{Lista de p\'aginas}%
- \renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}%
- \renewcommand*{\glsnumbersgroupname}{N\'umeros}}
-}
-% \end{macrocode}
-% French:
-% \begin{macrocode}
-\@ifundefined{captionsfrench}{}{%
- \addto\captionsfrench{%
- \renewcommand*{\glossaryname}{Glossaire}%
- \renewcommand*{\acronymname}{Acronymes}%
- \renewcommand*{\entryname}{Terme}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbole}%
- \renewcommand*{\pagelistname}{Pages}%
- \renewcommand*{\glssymbolsgroupname}{Symboles}%
- \renewcommand*{\glsnumbersgroupname}{Nombres}}
-}
-\@ifundefined{captionsfrenchb}{}{%
- \addto\captionsfrenchb{%
- \renewcommand*{\glossaryname}{Glossaire}%
- \renewcommand*{\acronymname}{Acronymes}%
- \renewcommand*{\entryname}{Terme}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbole}%
- \renewcommand*{\pagelistname}{Pages}%
- \renewcommand*{\glssymbolsgroupname}{Symboles}%
- \renewcommand*{\glsnumbersgroupname}{Nombres}}
-}
-\@ifundefined{captionsfrancais}{}{%
- \addto\captionsfrancais{%
- \renewcommand*{\glossaryname}{Glossaire}%
- \renewcommand*{\acronymname}{Acronymes}%
- \renewcommand*{\entryname}{Terme}%
- \renewcommand*{\descriptionname}{Description}%
- \renewcommand*{\symbolname}{Symbole}%
- \renewcommand*{\pagelistname}{Pages}%
- \renewcommand*{\glssymbolsgroupname}{Symboles}%
- \renewcommand*{\glsnumbersgroupname}{Nombres}}
-}
-% \end{macrocode}
-% Danish:
-% \begin{macrocode}
-\@ifundefined{captionsdanish}{}{%
- \addto\captionsdanish{%
- \renewcommand*{\glossaryname}{Ordliste}%
- \renewcommand*{\acronymname}{Akronymer}%
- \renewcommand*{\entryname}{Symbolforklaring}%
- \renewcommand*{\descriptionname}{Beskrivelse}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Side}%
- \renewcommand*{\glssymbolsgroupname}{Symboler}%
- \renewcommand*{\glsnumbersgroupname}{Tal}}
-}
-% \end{macrocode}
-% Irish:
-% \begin{macrocode}
-\@ifundefined{captionsirish}{}{%
- \addto\captionsirish{%
- \renewcommand*{\glossaryname}{Gluais}%
- \renewcommand*{\acronymname}{Acrainmneacha}%
-% \end{macrocode}
-% wasn't sure whether to go for N\'ota (Note), Ciall (`Meaning',
-% `sense') or Br\'{\i} (`Meaning'). In the end I chose Ciall.
-% \begin{macrocode}
- \renewcommand*{\entryname}{Ciall}%
- \renewcommand*{\descriptionname}{Tuairisc}%
-% \end{macrocode}
-% Again, not sure whether to use Comhartha/Comhartha\'{\i} or
-% Siombail/Siombaile, so have chosen the former.
-% \begin{macrocode}
- \renewcommand*{\symbolname}{Comhartha}%
- \renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}%
- \renewcommand*{\pagelistname}{Leathanaigh}%
- \renewcommand*{\glsnumbersgroupname}{Uimhreacha}}
-}
-% \end{macrocode}
-% Hungarian:
-% \begin{macrocode}
-\@ifundefined{captionsmagyar}{}{%
- \addto\captionsmagyar{%
- \renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}%
- \renewcommand*{\acronymname}{Bet\H uszavak}%
- \renewcommand*{\entryname}{Kifejez\'es}%
- \renewcommand*{\descriptionname}{Magyar\'azat}%
- \renewcommand*{\symbolname}{Jel\"ol\'es}%
- \renewcommand*{\pagelistname}{Oldalsz\'am}%
- \renewcommand*{\glssymbolsgroupname}{Jelek}%
- \renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}%
- }
-}
-\@ifundefined{captionshungarian}{}{%
- \addto\captionshungarian{%
- \renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}%
- \renewcommand*{\acronymname}{Bet\H uszavak}%
- \renewcommand*{\entryname}{Kifejez\'es}%
- \renewcommand*{\descriptionname}{Magyar\'azat}%
- \renewcommand*{\symbolname}{Jel\"ol\'es}%
- \renewcommand*{\pagelistname}{Oldalsz\'am}%
- \renewcommand*{\glssymbolsgroupname}{Jelek}%
- \renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}%
- }
-}
-% \end{macrocode}
-% Polish
-% \changes{1.13}{2008 May 10}{Add Polish support}
+% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
-\@ifundefined{captionspolish}{}{%
- \addto\captionspolish{%
- \renewcommand*{\glossaryname}{S{\l}ownik termin\'ow}%
- \renewcommand*{\acronymname}{Skr\'ot}%
- \renewcommand*{\entryname}{Termin}%
- \renewcommand*{\descriptionname}{Opis}%
- \renewcommand*{\symbolname}{Symbol}%
- \renewcommand*{\pagelistname}{Strony}%
- \renewcommand*{\glssymbolsgroupname}{Symbole}%
- \renewcommand*{\glsnumbersgroupname}{Liczby}}
-}
+\RequirePackage{tracklang}
+\let\glsifusetranslator\@secondoftwo
% \end{macrocode}
-% Brazilian
-%\changes{1.17}{2008 December 11}{Added Brazilian support}
+% Check for tracked languages:
% \begin{macrocode}
-\@ifundefined{captionsbrazil}{}{%
- \addto\captionsbrazil{%
- \renewcommand*{\glossaryname}{Gloss\'ario}%
- \renewcommand*{\acronymname}{Siglas}%
- \renewcommand*{\entryname}{Nota\c c\~ao}%
- \renewcommand*{\descriptionname}{Descri\c c\~ao}%
- \renewcommand*{\symbolname}{S\'imbolo}%
- \renewcommand*{\pagelistname}{Lista de P\'aginas}%
- \renewcommand*{\glssymbolsgroupname}{S\'imbolos}%
- \renewcommand*{\glsnumbersgroupname}{N\'umeros}%
+ \AnyTrackedLanguages
+ {%
+ \ForEachTrackedDialect{\this@dialect}{%
+ \IfTrackedLanguageFileExists{\this@dialect}%
+ {glossaries-}% prefix
+ {.ldf}%
+ {%
+ \RequireGlossariesLang{\CurrentTrackedTag}%
+ }%
+ {%
+ \PackageWarningNoLine{glossaries}%
+ {No language module detected for `\this@dialect'.\MessageBreak
+ Language modules need to be installed separately.\MessageBreak
+ Please check on CTAN for a bundle called\MessageBreak
+ `glossaries-\CurrentTrackedLanguage' or similar}%
+ }%
+ }%
}%
-}
+ {}%
% \end{macrocode}
%\iffalse
% \begin{macrocode}
@@ -24579,186 +24410,38 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
%\fi
%\subsection{Polyglossia Captions}
+% Language support has now been split off into independent language
+% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2013/11/14 v4.0 (NLCT)]
-% \end{macrocode}
-% English:
-% \begin{macrocode}
-\@ifundefined{captionsenglish}{}{%
- \expandafter\toks@\expandafter{\captionsenglish
- \renewcommand*{\glossaryname}{\textenglish{Glossary}}%
- \renewcommand*{\acronymname}{\textenglish{Acronyms}}%
- \renewcommand*{\entryname}{\textenglish{Notation}}%
- \renewcommand*{\descriptionname}{\textenglish{Description}}%
- \renewcommand*{\symbolname}{\textenglish{Symbol}}%
- \renewcommand*{\pagelistname}{\textenglish{Page List}}%
- \renewcommand*{\glssymbolsgroupname}{\textenglish{Symbols}}%
- \renewcommand*{\glsnumbersgroupname}{\textenglish{Numbers}}%
- }%
- \edef\captionsenglish{\the\toks@}%
-}
-% \end{macrocode}
-% German:
-% \begin{macrocode}
-\@ifundefined{captionsgerman}{}{%
- \expandafter\toks@\expandafter{\captionsgerman
- \renewcommand*{\glossaryname}{\textgerman{Glossar}}%
- \renewcommand*{\acronymname}{\textgerman{Akronyme}}%
- \renewcommand*{\entryname}{\textgerman{Bezeichnung}}%
- \renewcommand*{\descriptionname}{\textgerman{Beschreibung}}%
- \renewcommand*{\symbolname}{\textgerman{Symbol}}%
- \renewcommand*{\pagelistname}{\textgerman{Seiten}}%
- \renewcommand*{\glssymbolsgroupname}{\textgerman{Symbole}}%
- \renewcommand*{\glsnumbersgroupname}{\textgerman{Zahlen}}%
- }%
- \edef\captionsgerman{\the\toks@}%
-}
-% \end{macrocode}
-% Italian:
-% \begin{macrocode}
-\@ifundefined{captionsitalian}{}{%
- \expandafter\toks@\expandafter{\captionsitalian
- \renewcommand*{\glossaryname}{\textitalian{Glossario}}%
- \renewcommand*{\acronymname}{\textitalian{Acronimi}}%
- \renewcommand*{\entryname}{\textitalian{Nomenclatura}}%
- \renewcommand*{\descriptionname}{\textitalian{Descrizione}}%
- \renewcommand*{\symbolname}{\textitalian{Simbolo}}%
- \renewcommand*{\pagelistname}{\textitalian{Elenco delle pagine}}%
- \renewcommand*{\glssymbolsgroupname}{\textitalian{Simboli}}%
- \renewcommand*{\glsnumbersgroupname}{\textitalian{Numeri}}%
- }%
- \edef\captionsitalian{\the\toks@}%
-}
-% \end{macrocode}
-% Dutch:
-% \begin{macrocode}
-\@ifundefined{captionsdutch}{}{%
- \expandafter\toks@\expandafter{\captionsdutch
- \renewcommand*{\glossaryname}{\textdutch{Woordenlijst}}%
- \renewcommand*{\acronymname}{\textdutch{Acroniemen}}%
- \renewcommand*{\entryname}{\textdutch{Benaming}}%
- \renewcommand*{\descriptionname}{\textdutch{Beschrijving}}%
- \renewcommand*{\symbolname}{\textdutch{Symbool}}%
- \renewcommand*{\pagelistname}{\textdutch{Pagina's}}%
- \renewcommand*{\glssymbolsgroupname}{\textdutch{Symbolen}}%
- \renewcommand*{\glsnumbersgroupname}{\textdutch{Cijfers}}%
- }%
- \edef\captionsdutch{\the\toks@}%
-}
-% \end{macrocode}
-% Spanish:
-% \begin{macrocode}
-\@ifundefined{captionsspanish}{}{%
- \expandafter\toks@\expandafter{\captionsspanish
- \renewcommand*{\glossaryname}{\textspanish{Glosario}}%
- \renewcommand*{\acronymname}{\textspanish{Siglas}}%
- \renewcommand*{\entryname}{\textspanish{Entrada}}%
- \renewcommand*{\descriptionname}{\textspanish{Descripci\'on}}%
- \renewcommand*{\symbolname}{\textspanish{S\'{\i}mbolo}}%
- \renewcommand*{\pagelistname}{\textspanish{Lista de p\'aginas}}%
- \renewcommand*{\glssymbolsgroupname}{\textspanish{S\'{\i}mbolos}}%
- \renewcommand*{\glsnumbersgroupname}{\textspanish{N\'umeros}}%
- }%
- \edef\captionsspanish{\the\toks@}%
-}
+\ProvidesPackage{glossaries-polyglossia}[2014/11/22 v4.12 (NLCT)]
% \end{macrocode}
-% French:
+% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
-\@ifundefined{captionsfrench}{}{%
- \expandafter\toks@\expandafter{\captionsfrench
- \renewcommand*{\glossaryname}{\textfrench{Glossaire}}%
- \renewcommand*{\acronymname}{\textfrench{Acronymes}}%
- \renewcommand*{\entryname}{\textfrench{Terme}}%
- \renewcommand*{\descriptionname}{\textfrench{Description}}%
- \renewcommand*{\symbolname}{\textfrench{Symbole}}%
- \renewcommand*{\pagelistname}{\textfrench{Pages}}%
- \renewcommand*{\glssymbolsgroupname}{\textfrench{Symboles}}%
- \renewcommand*{\glsnumbersgroupname}{\textfrench{Nombres}}%
- }%
- \edef\captionsfrench{\the\toks@}%
-}
-% \end{macrocode}
-% Danish:
-% \begin{macrocode}
-\@ifundefined{captionsdanish}{}{%
- \expandafter\toks@\expandafter{\captionsdanish
- \renewcommand*{\glossaryname}{\textdanish{Ordliste}}%
- \renewcommand*{\acronymname}{\textdanish{Akronymer}}%
- \renewcommand*{\entryname}{\textdanish{Symbolforklaring}}%
- \renewcommand*{\descriptionname}{\textdanish{Beskrivelse}}%
- \renewcommand*{\symbolname}{\textdanish{Symbol}}%
- \renewcommand*{\pagelistname}{\textdanish{Side}}%
- \renewcommand*{\glssymbolsgroupname}{\textdanish{Symboler}}%
- \renewcommand*{\glsnumbersgroupname}{\textdanish{Tal}}%
- }%
- \edef\captionsdanish{\the\toks@}%
-}
+\RequirePackage{tracklang}
+\let\glsifusetranslator\@secondoftwo
% \end{macrocode}
-% Irish:
+% Check for tracked languages:
% \begin{macrocode}
-\@ifundefined{captionsirish}{}{%
- \expandafter\toks@\expandafter{\captionsirish
- \renewcommand*{\glossaryname}{\textirish{Gluais}}%
- \renewcommand*{\acronymname}{\textirish{Acrainmneacha}}%
- \renewcommand*{\entryname}{\textirish{Ciall}}%
- \renewcommand*{\descriptionname}{\textirish{Tuairisc}}%
- \renewcommand*{\symbolname}{\textirish{Comhartha}}%
- \renewcommand*{\glssymbolsgroupname}{\textirish{Comhartha\'{\i}}}%
- \renewcommand*{\pagelistname}{\textirish{Leathanaigh}}%
- \renewcommand*{\glsnumbersgroupname}{\textirish{Uimhreacha}}%
- }%
- \edef\captionsirish{\the\toks@}%
-}
-% \end{macrocode}
-% Hungarian:
-% \begin{macrocode}
-\@ifundefined{captionsmagyar}{}{%
- \expandafter\toks@\expandafter{\captionsmagyar
- \renewcommand*{\glossaryname}{\textmagyar{Sz\'ojegyz\'ek}}%
- \renewcommand*{\acronymname}{\textmagyar{Bet\H uszavak}}%
- \renewcommand*{\entryname}{\textmagyar{Kifejez\'es}}%
- \renewcommand*{\descriptionname}{\textmagyar{Magyar\'azat}}%
- \renewcommand*{\symbolname}{\textmagyar{Jel\"ol\'es}}%
- \renewcommand*{\pagelistname}{\textmagyar{Oldalsz\'am}}%
- \renewcommand*{\glssymbolsgroupname}{\textmagyar{Jelek}}%
- \renewcommand*{\glsnumbersgroupname}{\textmagyar{Sz\'amjegyek}}%
- }%
- \edef\captionsmagyar{\the\toks@}%
-}
-% \end{macrocode}
-% Polish
-% \changes{1.13}{2008 May 10}{Add Polish support}
-% \begin{macrocode}
-\@ifundefined{captionspolish}{}{%
- \expandafter\toks@\expandafter{\captionspolish
- \renewcommand*{\glossaryname}{\textpolish{S{\l}ownik termin\'ow}}%
- \renewcommand*{\acronymname}{\textpolish{Skr\'ot}}%
- \renewcommand*{\entryname}{\textpolish{Termin}}%
- \renewcommand*{\descriptionname}{\textpolish{Opis}}%
- \renewcommand*{\symbolname}{\textpolish{Symbol}}%
- \renewcommand*{\pagelistname}{\textpolish{Strony}}%
- \renewcommand*{\glssymbolsgroupname}{\textpolish{Symbole}}%
- \renewcommand*{\glsnumbersgroupname}{\textpolish{Liczby}}%
- }%
- \edef\captionspolish{\the\toks@}%
-}
-% \end{macrocode}
-% Portugues
-% \begin{macrocode}
-\@ifundefined{captionsportuges}{}{%
- \expandafter\toks@\expandafter{\captionsportuges
- \renewcommand*{\glossaryname}{\textportuges{Gloss\'ario}}%
- \renewcommand*{\acronymname}{\textportuges{Siglas}}%
- \renewcommand*{\entryname}{\textportuges{Nota\c c\~ao}}%
- \renewcommand*{\descriptionname}{\textportuges{Descri\c c\~ao}}%
- \renewcommand*{\symbolname}{\textportuges{S\'imbolo}}%
- \renewcommand*{\pagelistname}{\textportuges{Lista de P\'aginas}}%
- \renewcommand*{\glssymbolsgroupname}{\textportuges{S\'imbolos}}%
- \renewcommand*{\glsnumbersgroupname}{\textportuges{N\'umeros}}%
+ \AnyTrackedLanguages
+ {%
+ \ForEachTrackedDialect{\this@dialect}{%
+ \IfTrackedLanguageFileExists{\this@dialect}%
+ {glossaries-}% prefix
+ {.ldf}%
+ {%
+ \RequireGlossariesLang{\CurrentTrackedTag}%
+ }%
+ {%
+ \PackageWarningNoLine{glossaries}%
+ {No language module detected for `\this@dialect'.\MessageBreak
+ Language modules need to be installed separately.\MessageBreak
+ Please check on CTAN for a bundle called\MessageBreak
+ `glossaries-\CurrentTrackedLanguage' or similar}%
+ }%
+ }%
}%
- \edef\captionsportuges{\the\toks@}%
-}
+ {}%
% \end{macrocode}
%\iffalse
% \begin{macrocode}
@@ -24767,329 +24450,6 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\fi
%\iffalse
% \begin{macrocode}
-%<*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}{Brazilian}
-% \end{macrocode}
-% Provide Brazilian translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Gloss\'ario}
-\providetranslation{Acronyms}{Siglas}
-\providetranslation{Notation (glossaries)}{Nota\c c\~ao}
-\providetranslation{Description (glossaries)}{Descri\c c\~ao}
-\providetranslation{Symbol (glossaries)}{S\'imbolo}
-\providetranslation{Page List (glossaries)}{Lista de P\'aginas}
-\providetranslation{Symbols (glossaries)}{S\'imbolos}
-\providetranslation{Numbers (glossaries)}{N\'umeros}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Brazilian.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Danish.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Danish Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Danish}
-% \end{macrocode}
-% Provide Danish translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Ordliste}
-\providetranslation{Acronyms}{Akronymer}
-\providetranslation{Notation (glossaries)}{Symbolforklaring}
-\providetranslation{Description (glossaries)}{Beskrivelse}
-\providetranslation{Symbol (glossaries)}{Symbol}
-\providetranslation{Page List (glossaries)}{Side}
-\providetranslation{Symbols (glossaries)}{Symboler}
-\providetranslation{Numbers (glossaries)}{Tal}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Danish.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Dutch.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Dutch Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Dutch}
-% \end{macrocode}
-% Provide Dutch translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Woordenlijst}
-\providetranslation{Acronyms}{Acroniemen}
-\providetranslation{Notation (glossaries)}{Benaming}
-\providetranslation{Description (glossaries)}{Beschrijving}
-\providetranslation{Symbol (glossaries)}{Symbool}
-\providetranslation{Page List (glossaries)}{Pagina's}
-\providetranslation{Symbols (glossaries)}{Symbolen}
-\providetranslation{Numbers (glossaries)}{Cijfers}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Dutch.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-English.dict>
-% \end{macrocode}
-%\fi
-%\subsection{English Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{English}
-% \end{macrocode}
-% Provide English translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Glossary}
-\providetranslation{Acronyms}{Acronyms}
-\providetranslation{Notation (glossaries)}{Notation}
-\providetranslation{Description (glossaries)}{Description}
-\providetranslation{Symbol (glossaries)}{Symbol}
-\providetranslation{Page List (glossaries)}{Page List}
-\providetranslation{Symbols (glossaries)}{Symbols}
-\providetranslation{Numbers (glossaries)}{Numbers}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-English.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-French.dict>
-% \end{macrocode}
-%\fi
-%\subsection{French Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{French}
-% \end{macrocode}
-% Provide French translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Glossaire}
-\providetranslation{Acronyms}{Acronymes}
-\providetranslation{Notation (glossaries)}{Terme}
-\providetranslation{Description (glossaries)}{Description}
-\providetranslation{Symbol (glossaries)}{Symbole}
-\providetranslation{Page List (glossaries)}{Pages}
-\providetranslation{Symbols (glossaries)}{Symboles}
-\providetranslation{Numbers (glossaries)}{Nombres}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-French.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-German.dict>
-% \end{macrocode}
-%\fi
-%\subsection{German Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{German}
-% \end{macrocode}
-% Provide German translations (quite a few variations were suggested
-% for German; I settled on the following):
-% \begin{macrocode}
-\providetranslation{Glossary}{Glossar}
-\providetranslation{Acronyms}{Akronyme}
-\providetranslation{Notation (glossaries)}{Bezeichnung}
-\providetranslation{Description (glossaries)}{Beschreibung}
-\providetranslation{Symbol (glossaries)}{Symbol}
-\providetranslation{Page List (glossaries)}{Seiten}
-\providetranslation{Symbols (glossaries)}{Symbole}
-\providetranslation{Numbers (glossaries)}{Zahlen}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-German.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Irish.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Irish Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Irish}
-% \end{macrocode}
-% Provide Irish translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Gluais}
-\providetranslation{Acronyms}{Acrainmneacha}
-\providetranslation{Notation (glossaries)}{Ciall}
-\providetranslation{Description (glossaries)}{Tuairisc}
-\providetranslation{Symbol (glossaries)}{Comhartha}
-\providetranslation{Page List (glossaries)}{Leathanaigh}
-\providetranslation{Symbols (glossaries)}{Comhartha\'{\i}}
-\providetranslation{Numbers (glossaries)}{Uimhreacha}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Irish.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Italian.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Italian Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Italian}
-% \end{macrocode}
-% Provide Italian translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Glossario}
-\providetranslation{Acronyms}{Acronimi}
-\providetranslation{Notation (glossaries)}{Nomenclatura}
-\providetranslation{Description (glossaries)}{Descrizione}
-\providetranslation{Symbol (glossaries)}{Simbolo}
-\providetranslation{Page List (glossaries)}{Elenco delle pagine}
-\providetranslation{Symbols (glossaries)}{Simboli}
-\providetranslation{Numbers (glossaries)}{Numeri}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Italian.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Magyar.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Magyar Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Magyar}
-% \end{macrocode}
-% Provide translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Sz\'ojegyz\'ek}
-\providetranslation{Acronyms}{Bet\H uszavak}
-\providetranslation{Notation (glossaries)}{Kifejez\'es}
-\providetranslation{Description (glossaries)}{Magyar\'azat}
-\providetranslation{Symbol (glossaries)}{Jel\"ol\'es}
-\providetranslation{Page List (glossaries)}{Oldalsz\'am}
-\providetranslation{Symbols (glossaries)}{Jelek}
-\providetranslation{Numbers (glossaries)}{Sz\'amjegyek}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Magyar.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Polish.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Polish Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Polish}
-% \end{macrocode}
-% Provide Polish translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{S{\l}ownik termin\'ow}
-\providetranslation{Acronyms}{Skr\'ot}
-\providetranslation{Notation (glossaries)}{Termin}
-\providetranslation{Description (glossaries)}{Opis}
-\providetranslation{Symbol (glossaries)}{Symbol}
-\providetranslation{Page List (glossaries)}{Strony}
-\providetranslation{Symbols (glossaries)}{Symbole}
-\providetranslation{Numbers (glossaries)}{Liczby}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Polish.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Serbian.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Serbian Dictionary}
-% This dictionary was provided by Zoran Filipovic.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Serbian}
-\providetranslation{Glossary}{Mali re\v cnik}
-\providetranslation{Acronyms}{Skra\' cenice}
-\providetranslation{Notation (glossaries)}{Oznaka}
-\providetranslation{Description (glossaries)}{Opis}
-\providetranslation{Symbol (glossaries)}{Simbol}
-\providetranslation{Page List (glossaries)}{Stranica}
-\providetranslation{Symbols (glossaries)}{Simboli}
-\providetranslation{Numbers (glossaries)}{Brojevi}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Serbian.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*glossaries-dictionary-Spanish.dict>
-% \end{macrocode}
-%\fi
-%\subsection{Spanish Dictionary}
-% This is a dictionary file provided for use with the \isty{translator}
-% package.
-% \begin{macrocode}
-\ProvidesDictionary{glossaries-dictionary}{Spanish}
-% \end{macrocode}
-% Provide Spanish translations:
-% \begin{macrocode}
-\providetranslation{Glossary}{Glosario}
-\providetranslation{Acronyms}{Siglas}
-\providetranslation{Notation (glossaries)}{Entrada}
-\providetranslation{Description (glossaries)}{Descripci\'on}
-\providetranslation{Symbol (glossaries)}{S\'{\i}mbolo}
-\providetranslation{Page List (glossaries)}{Lista de p\'aginas}
-\providetranslation{Symbols (glossaries)}{S\'{\i}mbolos}
-\providetranslation{Numbers (glossaries)}{N\'umeros}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossaries-dictionary-Spanish.dict>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
%<*minimalgls.tex>
% \end{macrocode}
%\fi
@@ -25126,6 +24486,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+ % If you require multilingual support you must also install
+ % the appropriate glossaries language module. The language
+ % modules are distributed separately.
+
\documentclass{article}
\listfiles
@@ -26732,8 +26096,11 @@ description={sweet, fleshy product of plant containing seed}}
\documentclass{report}
\usepackage[colorlinks]{hyperref}
-\usepackage[acronym, % create list of acronyms
- nomain, % don't need main glossary for this example
+\usepackage[acronym,% create list of acronyms
+ % The package option "nomain" is used here to suppress the
+ % main glossary, since this example doesn't use it. If you
+ % want to use the main glossary, remove the "nomain" option.
+ nomain
]{glossaries}
\makeglossaries
@@ -27300,11 +26667,18 @@ There are two types of ordering: word ordering (which places
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+
+ % This file also requires the glossaries-english
+ % and glossaries-french language modules. These must
+ % be installed in addition to installing the glossaries package.
\documentclass[english,french]{article}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{babel}
+ % The package option "nomain" is used here to suppress the
+ % main glossary, since this example doesn't use it. If you
+ % want to use the main glossary, remove the "nomain" option.
\usepackage[nomain]{glossaries}
\newglossary[glg]{english}{gls}{glo}{English to French}
@@ -28402,7 +27776,10 @@ You don't need to worry about makeindex's special characters:
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[acronym,% create 'acronym' glossary type
- nomain,% 'main' glossary not needed as using 'acronym'
+ % The package option "nomain" is used here to suppress the
+ % main glossary, since this example doesn't use it. If you
+ % want to use the main glossary, remove the "nomain" option.
+ nomain,%
style=altlist, % use altlist style
toc, % add the glossary to the table of contents
]{glossaries}
@@ -28545,7 +27922,10 @@ one \gls[format=hyperbf]{svm}.
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[acronym,% create 'acronym' glossary type
- nomain,% 'main' glossary not needed as using 'acronym'
+ % The package option "nomain" is used here to suppress the
+ % main glossary, since this example doesn't use it. If you
+ % want to use the main glossary, remove the "nomain" option.
+ nomain,
style=altlist, % use altlist style
toc, % add the glossary to the table of contents
]{glossaries}
@@ -29356,7 +28736,10 @@ Bessel functions $Z_\nu(z)$ are solutions of
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[acronym,% create 'acronym' glossary type
- nomain,% 'main' glossary not needed as using 'acronym'
+ % The package option "nomain" is used here to suppress the
+ % main glossary, since this example doesn't use it. If you
+ % want to use the main glossary, remove the "nomain" option.
+ nomain,
style=altlist, % use altlist style
toc, % add the glossary to the table of contents
]{glossaries}
@@ -31879,8 +31262,8 @@ description={the hash symbol}}
# File : glossaries.perl
# Author : Nicola L.C. Talbot
# Date : 14th June 2007
-# Last Modified : 2012-09-21
-# Version : 1.05
+# Last Modified : 2014-09-24
+# Version : 1.06
# Description : LaTeX2HTML (limited!) implementation of glossaries
# package. Note that not all the glossaries.sty
# macros have been implemented.
@@ -32130,7 +31513,8 @@ sub gls_compare{
local($x0) = '';
local($y0) = '';
- if ($x=~s/^(&#(?:\d+|x[\da-f]+);)//)
+ #v1.06 added /i for case-insensitive match
+ if ($x=~s/^(&#(?:\d+|x[\da-f]+);)//i)
{
$x0 = $1;
}
@@ -32139,7 +31523,7 @@ sub gls_compare{
$x0 = $1;
}
- if ($y=~s/^(&#(?:\d+|x[\da-f]+);)//)
+ if ($y=~s/^(&#(?:\d+|x[\da-f]+);)//i)
{
$y0 = $1;
}
@@ -32150,7 +31534,7 @@ sub gls_compare{
local($numx);
- if ($x0=~/&#(\d+|x[\da-f]+);/)
+ if ($x0=~/&#(\d+|x[\da-f]+);/i)
{
$numx = $1;
@@ -32163,7 +31547,7 @@ sub gls_compare{
local($numy);
- if ($y0=~/&#(\d+|x[\da-f]+);/)
+ if ($y0=~/&#(\d+|x[\da-f]+);/i)
{
$numy = $1;
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index f7dc7332599..373740fcb47 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 2014/9/1 21:18
+% glossaries.ins generated using makedtx version 1.1 2014/11/24 16:50
\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, glossaries-prefix.sty, mfirstuc.sty, mfirstuc-english.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+ This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, mfirstuc-english.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, minimalgls.tex, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
\endpreamble
@@ -60,30 +60,6 @@
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-babel.sty,package}}
\file{glossaries-polyglossia.sty}{\usepreamble\defaultpreamble
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-polyglossia.sty,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
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Dutch.dict,package}}
-\file{glossaries-dictionary-English.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-English.dict,package}}
-\file{glossaries-dictionary-French.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-French.dict,package}}
-\file{glossaries-dictionary-German.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-German.dict,package}}
-\file{glossaries-dictionary-Irish.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Irish.dict,package}}
-\file{glossaries-dictionary-Italian.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Italian.dict,package}}
-\file{glossaries-dictionary-Magyar.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Magyar.dict,package}}
-\file{glossaries-dictionary-Polish.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Polish.dict,package}}
-\file{glossaries-dictionary-Serbian.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Serbian.dict,package}}
-\file{glossaries-dictionary-Spanish.dict}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Spanish.dict,package}}
\file{minimalgls.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{minimalgls.tex}}
\file{glossary-lipsum-examples.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{glossary-lipsum-examples.tex}}
\file{example-glossaries-acronym-desc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-acronym-desc.tex}}