From 3aed69f900ce6a1011d17c3886e1d65c66822612 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Aug 2007 00:36:59 +0000 Subject: glossaries 1.04 (15aug07) git-svn-id: svn://tug.org/texlive/trunk@4740 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/glossaries/glossaries.sty | 16 +++++++++------- .../tex/latex/glossaries/glossary-hypernav.sty | 2 +- Master/texmf-dist/tex/latex/glossaries/glossary-list.sty | 6 +++--- Master/texmf-dist/tex/latex/glossaries/glossary-long.sty | 4 ++-- .../texmf-dist/tex/latex/glossaries/glossary-super.sty | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex') 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} diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty index eb4f96f7edc..f41364cb2d7 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty @@ -28,7 +28,7 @@ %% Right brace \} Tilde \~} %% lots of text omitted %% lots of text omitted -\ProvidesPackage{glossary-hypernav}[2007/05/16 v1.0 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2007/07/04 v1.01 (NLCT)] \@ifundefined{hyperlink}{% \newcommand*{\glsnavhyperlink}[3][]{#3}}{% \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty index 35839fb3237..eabec031330 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty @@ -28,13 +28,13 @@ %% Right brace \} Tilde \~} %% lots of text omitted %% lots of text omitted -\ProvidesPackage{glossary-list}[2007/05/16 v1.0 (NLCT)] +\ProvidesPackage{glossary-list}[2007/07/04 v1.01 (NLCT)] \newglossarystyle{list}{% \renewenvironment{theglossary}{\begin{description}}{\end{description}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% -\item[\@glstarget{glo:##1}{##2}] ##3. ##5}% +\item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5}% \renewcommand*{\glsgroupskip}{\indexspace}} \newglossarystyle{listgroup}{% \glossarystyle{list}% @@ -48,7 +48,7 @@ \newglossarystyle{altlist}{% \glossarystyle{list}% \renewcommand*{\glossaryentryfield}[5]{% -\item[\@glstarget{glo:##1}{##2}]\mbox{}\newline ##3. ##5}% +\item[\@glstarget{glo:##1}{##2}]\mbox{}\newline ##3\glspostdescription\space ##5}% } \newglossarystyle{altlistgroup}{% \glossarystyle{altlist}% diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty index ba96cc2c677..9aca83bba07 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty @@ -28,7 +28,7 @@ %% Right brace \} Tilde \~} %% lots of text omitted %% lots of text omitted -\ProvidesPackage{glossary-long}[2007/05/16 v1.0 (NLCT)] +\ProvidesPackage{glossary-long}[2007/07/04 v1.01 (NLCT)] \RequirePackage{longtable} \newlength\glsdescwidth \newlength\glspagelistwidth @@ -40,7 +40,7 @@ \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% -\@glstarget{glo:##1}{##2} & ##3. ##5\\}% +\@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}% \renewcommand*{\glsgroupskip}{ & \\}} \newglossarystyle{longborder}{% \glossarystyle{long}% diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty index 2feb98d910d..382502d0dec 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty @@ -28,7 +28,7 @@ %% Right brace \} Tilde \~} %% lots of text omitted %% lots of text omitted -\ProvidesPackage{glossary-super}[2007/05/16 v1.0 (NLCT)] +\ProvidesPackage{glossary-super}[2007/07/04 v1.01 (NLCT)] \RequirePackage{supertabular} \newglossarystyle{super}{% \renewenvironment{theglossary}{% @@ -38,7 +38,7 @@ \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% -\@glstarget{glo:##1}{##2} & ##3. ##5\\}% +\@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}% \renewcommand*{\glsgroupskip}{ & \\}} \newglossarystyle{superborder}{% \glossarystyle{super}% -- cgit v1.2.3