summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-01-17 01:07:22 +0000
committerKarl Berry <karl@freefriends.org>2009-01-17 01:07:22 +0000
commit4619c8309b673808e4d13a3202d2c8d9f6374f5e (patch)
tree5140a9eeec6a7f7c5523e90208f6c908998fffc2 /Master/texmf-dist/tex/latex/glossaries/base
parente55e7bf0fee958f96ac89ec9c2cdfd3b1a91f99a (diff)
glossaries 1.18
git-svn-id: svn://tug.org/texlive/trunk@11899 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty6
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty61
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty2
3 files changed, 53 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
index 774682e3742..413fa26bdd6 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-babel.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2008 Nicola Talbot
+%% Copyright 2009 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2008/12/11 v1.01 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2009/01/14 v1.02 (NLCT)]
\@ifundefined{captionsenglish}{}{%
\addto\captionsenglish{%
\renewcommand*{\glossaryname}{Glossary}%
@@ -86,7 +86,7 @@
\renewcommand*{\pagelistname}{Page List}%
\renewcommand*{\glssymbolsgroupname}{Symbols}%
\renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
+}}%
\@ifundefined{captionscanadian}{}{%
\addto\captionscanadian{%
\renewcommand*{\glossaryname}{Glossary}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 9c488642eef..41f8f836944 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2008 Nicola Talbot
+%% Copyright 2009 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2008/12/26 v1.17 (NLCT)]
+\ProvidesPackage{glossaries}[2009/01/14 v1.18 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -75,6 +75,23 @@ false,nolabel,autolabel}[nolabel]{%
\newcommand*{\glossaryentrynumbers}[1]{#1}
\DeclareOptionX{nonumberlist}{%
\renewcommand*{\glossaryentrynumbers}[1]{}}
+\newcommand*{\@gls@loadlong}{\RequirePackage{glossary-long}}
+\DeclareOptionX{nolong}{\renewcommand*{\@gls@loadlong}{}}
+\IfFileExists{supertabular.sty}{%
+ \newcommand*{\@gls@loadsuper}{\RequirePackage{glossary-super}}}{%
+ \newcommand*{\@gls@loadsuper}{}}
+\DeclareOptionX{nosuper}{\renewcommand*{\@gls@loadsuper}{}}
+\newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}}
+\DeclareOptionX{nolist}{\renewcommand*{\@gls@loadlist}{}}
+\newcommand*{\@gls@loadtree}{\RequirePackage{glossary-tree}}
+\DeclareOptionX{notree}{\renewcommand*{\@gls@loadtree}{}}
+\DeclareOptionX{nostyles}{%
+ \renewcommand*{\@gls@loadlong}{}%
+ \renewcommand*{\@gls@loadsuper}{}%
+ \renewcommand*{\@gls@loadlist}{}%
+ \renewcommand*{\@gls@loadtree}{}%
+ \let\@glossary@default@style\relax
+}
\newcommand{\glsdefaulttype}{main}
\newcommand{\acronymtype}{\glsdefaulttype}
\define@boolkey{glossaries.sty}[gls]{acronym}[true]{}
@@ -555,8 +572,7 @@ exists}%
\def\@glo@descplural{#1}%
}
\define@key{glossentry}{sort}{%
-\def\@glo@sort{#1}%
-\@onelevel@sanitize\@glo@sort}
+\def\@glo@sort{#1}}
\define@key{glossentry}{text}{%
\def\@glo@text{#1}%
}
@@ -593,6 +609,7 @@ counter as its value}}{%
\string\newglossaryentry\space for entry `\@glo@label'}{You
haven't specified the entry name}}
\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix}
+\newcommand*{\@glsdefaultsort}{\@glo@name}
\newcount\gls@level
\DeclareRobustCommand{\newglossaryentry}[2]{%
\glsdoifnoexists{#1}{%
@@ -608,7 +625,7 @@ counter as its value}}{%
\let\@glo@plural\@glsdefaultplural
\let\@glo@first\relax
\let\@glo@firstplural\relax
-\def\@glo@sort{\@glo@name}%
+\let\@glo@sort\@glsdefaultsort
\def\@glo@counter{\@gls@getcounter{\@glo@type}}%
\def\@glo@see{}%
\def\@glo@parent{}%
@@ -679,6 +696,10 @@ in it}}{%
\@gls@sanitizedesc
\expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}%
\expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}%
+\ifx\@glo@sort\@glsdefaultsort
+ \let\@glo@sort\@glo@name
+\fi
+\@onelevel@sanitize\@glo@sort
\expandafter\protected@xdef\csname glo@#1@sort\endcsname{\@glo@sort}%
\def\@glo@@symbol{\@glo@text}%
\ifx\@glo@symbol\@glo@@symbol
@@ -2073,10 +2094,11 @@ false,nolabel,autolabel}[nolabel]{%
\PackageWarning{glossaries}{overriding `theglossary' environment}%
\renewenvironment{theglossary}{}{}}
\newcommand*{\glossaryheader}{}
+\newcommand*{\glstarget}[2]{\@glstarget{glo:#1}{#2}}
\newcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:#1}{#2} #4 #3. #5\par}
+\noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par}
\newcommand*{\glossarysubentryfield}[6]{%
-\@glstarget{glo:#2}{}#4. #6\par}
+\glstarget{#2}{\strut}#4. #6\par}
\newcommand*{\glsgroupskip}{}
\newcommand*{\glsgroupheading}[1]{}
\newcommand*{\glsgetgrouptitle}[1]{%
@@ -2169,6 +2191,18 @@ descriptionplural={#4\acrpluralsuffix},%
first={#4 (#3)},plural={#3\acrpluralsuffix},%
firstplural={\@glo@descplural\space (\@glo@plural)},%
#1}}
+\newcommand{\oldacronym}[4][\gls@label]{%
+ \def\gls@label{#2}%
+ \newacronym[#4]{#1}{#2}{#3}%
+ \@ifundefined{xspace}{%
+ \expandafter\edef\csname#1\endcsname{%
+ \noexpand\@ifstar{\noexpand\Gls{#1}}{\noexpand\gls{#1}}}%
+ }{%
+ \expandafter\edef\csname#1\endcsname{%
+ \noexpand\@ifstar{\noexpand\Gls{#1}\noexpand\xspace}{%
+ \noexpand\gls{#1}\noexpand\xspace}}%
+ }%
+}
\newcommand*{\acrpluralsuffix}{\glspluralsuffix}
\newcommand*{\glsshortkey}{text}
\newcommand*{\glsshortpluralkey}{plural}
@@ -2576,11 +2610,14 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\let\Acp\Glspl
\fi
\RequirePackage{glossary-hypernav}
-\RequirePackage{glossary-list}
-\RequirePackage{glossary-long}
-\RequirePackage{glossary-super}
-\RequirePackage{glossary-tree}
-\glossarystyle{\@glossary@default@style}
+\@gls@loadlist
+\@gls@loadlong
+\@gls@loadsuper
+\@gls@loadtree
+\ifx\@glossary@default@style\relax
+\else
+ \glossarystyle{\@glossary@default@style}
+\fi
\endinput
%%
%% End of file `glossaries.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index 38e43ddcee3..3cbe71fa130 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `mfirstuc.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2008 Nicola Talbot
+%% Copyright 2009 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3