diff options
author | Karl Berry <karl@freefriends.org> | 2007-08-16 00:36:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-08-16 00:36:59 +0000 |
commit | 3aed69f900ce6a1011d17c3886e1d65c66822612 (patch) | |
tree | 71347232fcd706c8e5b7e3b6b8a4dcc443104bf9 /Master/texmf-dist/tex/latex/glossaries/glossaries.sty | |
parent | e8a50aed5d15bb07b077c572f74b697de13dd259 (diff) |
glossaries 1.04 (15aug07)
git-svn-id: svn://tug.org/texlive/trunk@4740 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/glossaries.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/glossaries/glossaries.sty | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty index 2f89ef952ba..60c8a8cee5c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty @@ -29,7 +29,7 @@ %% lots of text omitted %% lots of text omitted \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2007/05/25 v1.02 (NLCT)] +\ProvidesPackage{glossaries}[2007/08/03 v1.04 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{xspace} @@ -96,6 +96,7 @@ name=true]{% \providecommand*{\pagelistname}{Page List} \providecommand*{\glssymbolsgroupname}{Symbols} \providecommand*{\glsnumbersgroupname}{Numbers} +\newcommand*{\glspostdescription}{.} \providecommand*{\istfilename}{\jobname.ist} \newcommand*{\@istfilename}[1]{} \newcommand{\glscompositor}{.} @@ -239,10 +240,10 @@ in it}}{% \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% \expandafter\gdef\csname glo@#1@flagfalse\endcsname{% \expandafter\global\expandafter -\let\csname ifglo@#1@flag\endcsname\iffalse} +\let\csname ifglo@#1@flag\endcsname\iffalse}% \expandafter\gdef\csname glo@#1@flagtrue\endcsname{% \expandafter\global\expandafter -\let\csname ifglo@#1@flag\endcsname\iftrue} +\let\csname ifglo@#1@flag\endcsname\iftrue}% \csname glo@#1@flagfalse\endcsname }} \@onlypreamble{\newglossaryentry} @@ -275,6 +276,7 @@ in it}}{% \def\glsdefaulttype{#1}\input{#2}% \let\glsdefaulttype\@gls@default} \@onlypreamble{\loadglsentries} +\newcommand*{\glstextformat}[1]{#1} \newcommand*{\glsdisplayfirst}[4]{#1#4} \newcommand*{\glsdisplay}[4]{#1#4} \newcommand*{\defglsdisplay}[2][\glsdefaulttype]{% @@ -300,9 +302,9 @@ counter as its value}}{% \setkeys{glslink}{#1}% \edef\theglsentrycounter{\csname the\@gls@counter\endcsname}% \ifKV@glslink@hyper -\@glslink{glo:#2}{#3}% +\@glslink{glo:#2}{\glstextformat{#3}}% \else -#3\relax +\glstextformat{#3}\relax \fi \protected@edef\@glo@sort{\csname glo@#2@sort\endcsname}% \@gls@checkmkidxchars\@glo@sort @@ -874,8 +876,8 @@ style `#1' undefined}{}}{% \defglsdisplay[acronym]{#1#4}\defglsdisplayfirst[acronym]{#1#4} \fi \newcommand{\newacronym}[4][]{% -\newglossaryentry{#2}{type=\acronymtype, -name={#3},description={#4},text={#3}, +\newglossaryentry{#2}{type=\acronymtype,% +name={#3},description={#4},text={#3},% first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} \@onlypreamble{\newacronym} \RequirePackage{glossary-hypernav} |