summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty44
1 files changed, 32 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 6656ebafc85..fc83c81924c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -21,7 +21,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-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-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, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.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-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-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, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2012/05/21 v3.02 (NLCT)]
+\ProvidesPackage{glossaries}[2012/09/21 v3.03 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -103,6 +103,11 @@ false,nolabel,autolabel}[nolabel]{%
\renewcommand*{\@gls@loadtree}{}%
\let\@glossary@default@style\relax
}
+\newcommand*{\glspostdescription}{\ifglsnopostdot\else.\fi}
+\define@boolkey{glossaries.sty}[gls]{nopostdot}[true]{}
+\glsnopostdotfalse
+\define@boolkey{glossaries.sty}[gls]{nogroupskip}[true]{}
+\glsnogroupskipfalse
\define@boolkey{glossaries.sty}[gls]{ucmark}[true]{}
\glsucmarkfalse
\define@boolkey{glossaries.sty}[gls]{entrycounter}[true]{}
@@ -124,7 +129,7 @@ false,nolabel,autolabel}[nolabel]{%
\ifx\@glo@sort\@glsdefaultsort
\let\@glo@sort\@glo@name
\fi
- \@onelevel@sanitize\@glo@sort
+ \@gls@sanitizesort
\expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}%
}%
\def\@gls@setsort##1{}%
@@ -236,6 +241,7 @@ false,nolabel,autolabel}[nolabel]{%
\newcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}
\newcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name}
\newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol}
+\newcommand*{\@gls@sanitizesort}{\@onelevel@sanitize\@glo@sort}
\define@boolkey[gls]{sanitize}{description}[true]{%
\ifgls@sanitize@description
\renewcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}%
@@ -256,13 +262,23 @@ false,nolabel,autolabel}[nolabel]{%
\else
\renewcommand*{\@gls@sanitizesymbol}{}%
\fi}
+\define@boolkey[gls]{sanitize}{sort}[true]{%
+\ifgls@sanitize@sort
+ \renewcommand*{\@gls@sanitizesort}{%
+\@onelevel@sanitize\@glo@sort}%
+\else
+ \renewcommand*{\@gls@sanitizesort}{}%
+\fi}
\define@key{glossaries.sty}{sanitize}[description=true,symbol=true,
name=true]{%
-\ifthenelse{\equal{#1}{none}}{%
-\renewcommand*{\@gls@sanitizedesc}{}%
-\renewcommand*{\@gls@sanitizename}{}%
-\renewcommand*{\@gls@sanitizesymbol}{}%
-}{\setkeys[gls]{sanitize}{#1}}%
+\ifthenelse{\equal{#1}{none}}%
+{%
+ \renewcommand*{\@gls@sanitizedesc}{}%
+ \renewcommand*{\@gls@sanitizename}{}%
+ \renewcommand*{\@gls@sanitizesymbol}{}%
+}%
+{%
+ \setkeys[gls]{sanitize}{#1}}%
}
\define@boolkey{glossaries.sty}[gls]{translate}[true]{}
\glstranslatefalse
@@ -457,7 +473,6 @@ name=true]{%
\RequirePackage{glossaries-babel}}{}%
}}
\fi
-\newcommand*{\glspostdescription}{.}
\newcommand*{\nopostdesc}{}
\newcommand*{\@nopostdesc}{%
\let\org@glspostdescription\glspostdescription
@@ -3395,6 +3410,7 @@ you
\ifglsxindy\findrootlanguage\fi
\def\@glo@type{\glsdefaulttype}%
\def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}%
+ \def\glossarytoctitle{\glossarytitle}%
\let\org@glossarytitle\glossarytitle
\def\@glossarystyle{}%
\def\gls@dotoctitle{\glssettoctitle{\@glo@type}}%
@@ -3450,9 +3466,13 @@ you
\forallglossaries{\@@glo@type}{\printglossary[type=\@@glo@type]}%
}
\define@key{printgloss}{type}{\def\@glo@type{#1}}
-\define@key{printgloss}{title}{\def\glossarytitle{#1}}
-\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}%
-\let\gls@dotoctitle\relax
+\define@key{printgloss}{title}{%
+ \def\glossarytitle{#1}%
+ \let\gls@dotoctitle\relax
+}
+\define@key{printgloss}{toctitle}{%
+ \def\glossarytoctitle{#1}%
+ \let\gls@dotoctitle\relax
}
\define@key{printgloss}{style}{%
\ifcsundef{@glsstyle@#1}%