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.sty100
1 files changed, 69 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 41f8f836944..85a1f05d410 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-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.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, 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-super.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.
%%
%% \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}[2009/01/14 v1.18 (NLCT)]
+\ProvidesPackage{glossaries}[2009/03/02 v1.19 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -295,7 +295,7 @@ name=true]{%
\fi
\@@glossaryseclabel}
\newcommand*{\@p@glossarysection}[2]{%
-\gls@doclearpage
+\glsclearpage
\phantomsection
\ifx\@@glossarysecstar\@empty
\csname\@@glossarysec\endcsname{#2}%
@@ -304,10 +304,11 @@ name=true]{%
\csname\@@glossarysec\endcsname*{#2}%
\fi
\@@glossaryseclabel}
-\newcommand{\gls@doclearpage}{%
+\newcommand*{\gls@doclearpage}{%
\ifthenelse{\equal{\@@glossarysec}{chapter}}{%
\@ifundefined{cleardoublepage}{\clearpage}{\cleardoublepage}}{}%
}
+\newcommand*{\glsclearpage}{\gls@doclearpage}
\newcommand*{\@gls@toc}[2]{%
\ifglstoc
\ifglsnumberline
@@ -825,21 +826,23 @@ counter as its value}}{%
\@ifstar\@sgls@link\@gls@link}
\newcommand*{\@sgls@link}[1][]{\@gls@link[hyper=false,#1]}
\newcommand*{\@gls@link}[3][]{%
-\glsdoifexists{#2}{%
-\def\glslabel{#2}%
-\def\@glsnumberformat{glsnumberformat}%
-\edef\@gls@counter{\csname glo@#2@counter\endcsname}%
-\KV@glslink@hypertrue
-\setkeys{glslink}{#1}%
-\edef\theglsentrycounter{\expandafter\noexpand
- \csname the\@gls@counter\endcsname}%
-\ifKV@glslink@hyper
-\@glslink{glo:#2}{\glstextformat{#3}}%
-\else
-\glstextformat{#3}\relax
-\fi
-\@do@wrglossary{#2}%
-}}
+ \glsdoifexists{#2}%
+ {%
+ \def\glslabel{#2}%
+ \def\@glsnumberformat{glsnumberformat}%
+ \edef\@gls@counter{\csname glo@#2@counter\endcsname}%
+ \KV@glslink@hypertrue
+ \setkeys{glslink}{#1}%
+ \edef\theglsentrycounter{\expandafter\noexpand
+ \csname the\@gls@counter\endcsname}%
+ \ifKV@glslink@hyper
+ \@glslink{glo:#2}{\glstextformat{#3}}%
+ \else
+ \glstextformat{#3}\relax
+ \fi
+ \@do@wrglossary{#2}%
+ }%
+}
\def\@set@glo@numformat#1#2#3{%
\expandafter\@glo@check@mkidxrangechar#3\@nil
\protected@edef#1{\@glo@prefix setentrycounter{#2}%
@@ -1336,6 +1339,39 @@ counter as its value}}{%
}%
\glsunset{#2}}%
}
+\newcommand*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
+\newcommand*{\@sglsdisp}[1][]{\@glsdisp[hyper=false,#1]}
+\newcommand*{\@glsdisp}[3][]{%
+ \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}%
+ }%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}%
+ }%
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+ \glsunset{#2}}%
+}
\newcommand*{\glstext}{\@ifstar\@sglstext\@glstext}
\newcommand*{\@sglstext}[1][]{\@glstext[hyper=false,#1]}
\newcommand*{\@glstext}[2][]{%
@@ -1910,6 +1946,10 @@ counter as its value}}{%
}{\PackageError{glossaries}{%
Glossary type `#1' not defined}{New glossaries must be defined before
using \string\makeglossary}}}
+\newcommand*{\warn@nomakeglossaries}{%
+ \PackageWarningNoLine{glossaries}{\string\makeglossaries\space
+ hasn't been used,^^Jthe glossaries will not be updated}%
+}
\newcommand*{\makeglossaries}{%
\protected@write\@auxout{}{\string\@istfilename{\istfilename}}%
\protected@write\@auxout{}{\string\@glsorder{\glsorder}}
@@ -1926,14 +1966,12 @@ using \string\makeglossary}}}
\let\makeglossary\relax
\let\makeglossaries\relax
\@disable@onlypremakeg
+ \let\warn@nomakeglossaries\relax
}
\let\makeglossary\makeglossaries
-\AtEndDocument{\ifx\makeglossaries\relax
-\else
- \PackageWarningNoLine{glossaries}{\string\makeglossaries\space
- hasn't been used,^^Jthe glossaries will not be updated}%
-\fi
-\warn@noprintglossary
+\AtEndDocument{%
+ \warn@nomakeglossaries
+ \warn@noprintglossary
}
\renewcommand*{\glossary}[1][\glsdefaulttype]{%
\@glossary[#1]}
@@ -2017,8 +2055,8 @@ using \string\makeglossary}}}
\newcommand*{\glsseesep}{, }
\newcommand*{\glsseeitem}[1]{\glshyperlink{#1}}
\def\warn@noprintglossary{\PackageWarningNoLine{glossaries}{No
-\string\printglossary\space or \string\printglossaries\space
-found.^^JThis document will not have a glossary.}}
+ \string\printglossary\space or \string\printglossaries\space
+ found.^^JThis document will not have a glossary.}}
\@ifundefined{printglossary}{}{%
\PackageWarning{glossaries}{Overriding \string\printglossary}%
\let\printglossary\undefined}
@@ -2315,7 +2353,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\textup{\glspluralsuffix}}%
\else
\ifglsacrsmaller
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}%
\fi
\fi
\ifglsacrdua
@@ -2423,7 +2461,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\textup{\glspluralsuffix}}%
\else
\ifglsacrsmaller
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}%
\fi
\fi
\fi
@@ -2478,7 +2516,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\textup{\glspluralsuffix}}%
\else
\ifglsacrsmaller
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}%
\fi
\fi
\ifglsacrdua
@@ -2511,7 +2549,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\renewcommand*{\acrpluralsuffix}{%
\textup{\glspluralsuffix}}%
\else
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}
\fi
\def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}}
\def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}}