diff options
author | Karl Berry <karl@freefriends.org> | 2013-11-14 22:52:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-11-14 22:52:09 +0000 |
commit | 033271bfdf58e2563bd3fbdbeb0f1facfb0c02e5 (patch) | |
tree | 1ca0cddf673e09a878c83db761e4dc52c65ba48b /Master/texmf-dist/tex/latex/glossaries/styles | |
parent | e537bba01fd3f3a532b7fc1f6186c24065208638 (diff) |
glossaries (14nov13)
git-svn-id: svn://tug.org/texlive/trunk@32147 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/styles')
9 files changed, 316 insertions, 249 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index af113655e2d..ac0b7612d9c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-hypernav}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2013/11/14 v4.0 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{glsn:#1@#2}{#3}} @@ -80,7 +80,8 @@ }% \@for\@gls@tmp:=\@gls@list\do{% \@gls@between - \glsnavhyperlink{\@gls@tmp}{\glsgetgrouptitle{\@gls@tmp}}% + \@gls@getgrouptitle{\@gls@tmp}{\@gls@grptitle}% + \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% \let\@gls@between\glshypernavsep% }% } diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index d5891c47288..776345d8bb0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-inline}[2013/11/14 v4.0 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% @@ -49,19 +49,28 @@ {\glspostinline}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \glsinlinedopostchild \gls@inlinesep - \def\glo@desc{##3}% - \def\@no@post@desc{\nopostdesc}% - \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% - \ifx\glo@desc\@no@post@desc - \glsinlineemptydescformat{##4}{##5}% - \else - \ifstrempty{##3}% - {\glsinlineemptydescformat{##4}{##5}}% - {\glsinlinedescformat{##3}{##4}{##5}}% - \fi + \glsentryitem{##1}% + \glsinlinenameformat{##1}{% + \glossentryname{##1}% + }% + \ifglsdescsuppressed{##1}% + {% + \glsinlineemptydescformat + {% + \glossentrysymbol{##1}% + }% + {% + ##2% + }% + }% + {% + \ifglshasdesc{##1}% + {\glsinlinedescformat{\glossentrydesc{##1}}{\glossentrysymbol{##1}}{##2}}% + {\glsinlineemptydescformat{\glossentrysymbol{##1}}{##2}}% + }% \ifglshaschildren{##1}% {% \glsresetsubentrycounter @@ -72,10 +81,12 @@ {}% \def\gls@inlinesep{\glsinlineseparator}% }% - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \gls@inlinesubsep% - \glsinlinesubnameformat{##2}{##3}% - \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% + \glsinlinesubnameformat{##2}{% + \glossentryname{##2}}% + \glssubentryitem{##2}% + \glsinlinesubdescformat{\glossentrydesc{##2}}{\glossentrysymbol{##2}}{##3}% \def\gls@inlinesubsep{\glsinlinesubseparator}% }% \renewcommand*{\glsgroupskip}{}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index d5f0030baa6..9fbe8f418ff 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,67 +38,71 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2012/11/11 v3.04 (NLCT)] +\ProvidesPackage{glossary-list}[2013/11/14 v4.0 (NLCT)] \newglossarystyle{list}{% \renewenvironment{theglossary}% {\begin{description}}{\end{description}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}] - ##3\glspostdescription\space ##5}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2}% + \renewcommand*{\subglossentry}[3]{% \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% + \glstarget{##2}{\strut}% + \glossentrydesc{##2}\glspostdescription\space ##3.}% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{listgroup}{% - \glossarystyle{list}% + \setglossarystyle{list}% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} \newglossarystyle{listhypergroup}{% - \glossarystyle{list}% + \setglossarystyle{list}% \renewcommand*{\glossaryheader}{% \item[\glsnavigation]}% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} \newglossarystyle{altlist}{% - \glossarystyle{list}% - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}]% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}]% \mbox{}\par\nobreak\@afterheading - ##3\glspostdescription\space ##5}% - \renewcommand{\glossarysubentryfield}[6]{% + \glossentrydesc{##1}\glspostdescription\space ##2}% + \renewcommand{\subglossentry}[3]{% \par \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}% } \newglossarystyle{altlistgroup}{% - \glossarystyle{altlist}% + \setglossarystyle{altlist}% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} \newglossarystyle{altlisthypergroup}{% - \glossarystyle{altlist}% + \setglossarystyle{altlist}% \renewcommand*{\glossaryheader}{% \item[\glsnavigation]}% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} \newglossarystyle{listdotted}{% - \glossarystyle{list}% - \renewcommand*{\glossaryentryfield}[5]{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% \item[]\makebox[\glslistdottedwidth][l]{% - \glsentryitem{##1}\glstarget{##1}{##2}% - \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}% - \renewcommand*{\glossarysubentryfield}[6]{% + \glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}% + \renewcommand*{\subglossentry}[3]{% \item[]\makebox[\glslistdottedwidth][l]{% \glssubentryitem{##2}% - \glstarget{##2}{##3}% - \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% + \glstarget{##2}{\glossentryname{##2}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}% } \newlength\glslistdottedwidth \setlength{\glslistdottedwidth}{.5\hsize} \newglossarystyle{sublistdotted}{% - \glossarystyle{listdotted}% - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}]}% + \setglossarystyle{listdotted}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index 1c9442650b6..84e43034e24 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-long}[2013/11/14 v4.0 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -54,29 +54,35 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% + \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & +\tabularnewline\fi}% } \newglossarystyle{longborder}{% - \glossarystyle{long}% + \setglossarystyle{long}% \renewenvironment{theglossary}{% \begin{longtable}{|l|p{\glsdescwidth}|}}{\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{longheader}{% - \glossarystyle{long}% + \setglossarystyle{long}% \renewcommand*{\glossaryheader}{% - \bfseries \entryname & \bfseries \descriptionname\\\endhead}% + \bfseries \entryname & \bfseries \descriptionname\tabularnewline\endhead}% } \newglossarystyle{longheaderborder}{% - \glossarystyle{longborder}% + \setglossarystyle{longborder}% \renewcommand*{\glossaryheader}{% - \hline\bfseries \entryname & \bfseries \descriptionname\\\hline + \hline\bfseries \entryname & \bfseries + \descriptionname\tabularnewline\hline \endhead \hline\endfoot}% } @@ -86,33 +92,38 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{long3colborder}{% - \glossarystyle{long3col}% + \setglossarystyle{long3col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{long3colheader}{% - \glossarystyle{long3col}% + \setglossarystyle{long3col}% \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\endhead}% + \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{long3colheaderborder}{% - \glossarystyle{long3colborder}% + \setglossarystyle{long3colborder}% \renewcommand*{\glossaryheader}{% \hline \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\hline\endhead + \bfseries\pagelistname\tabularnewline\hline\endhead \hline\endfoot}% } \newglossarystyle{long4col}{% @@ -121,58 +132,66 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{long4colheader}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& \bfseries \symbolname& - \bfseries\pagelistname\\\endhead}% + \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{long4colborder}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|l|l|l|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{long4colheaderborder}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|l|l|l|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{% \hline\bfseries\entryname&\bfseries\descriptionname& \bfseries \symbolname& - \bfseries\pagelistname\\\hline\endhead\hline\endfoot}% + \bfseries\pagelistname\tabularnewline\hline\endhead + \hline\endfoot}% } \newglossarystyle{altlong4col}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewenvironment{theglossary}% {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{longtable}}% } \newglossarystyle{altlong4colheader}{% - \glossarystyle{long4colheader}% + \setglossarystyle{long4colheader}% \renewenvironment{theglossary}% {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{longtable}}% } \newglossarystyle{altlong4colborder}{% - \glossarystyle{long4colborder}% + \setglossarystyle{long4colborder}% \renewenvironment{theglossary}% {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% {\end{longtable}}% } \newglossarystyle{altlong4colheaderborder}{% - \glossarystyle{long4colheaderborder}% + \setglossarystyle{long4colheaderborder}% \renewenvironment{theglossary}% {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% {\end{longtable}}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty index b910fe34ce8..e156963e5e3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longragged}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-longragged}[2013/11/14 v4.0 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% @@ -55,31 +55,35 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% - \tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2% + \tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6% - \tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2}% + \glspostdescription\space ##3% + \tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{longraggedborder}{% - \glossarystyle{longragged}% + \setglossarystyle{longragged}% \renewenvironment{theglossary}{% \begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{longraggedheader}{% - \glossarystyle{longragged}% + \setglossarystyle{longragged}% \renewcommand*{\glossaryheader}{% \bfseries \entryname & \bfseries \descriptionname \tabularnewline\endhead}% } \newglossarystyle{longraggedheaderborder}{% - \glossarystyle{longraggedborder}% + \setglossarystyle{longraggedborder}% \renewcommand*{\glossaryheader}{% \hline\bfseries \entryname & \bfseries \descriptionname \tabularnewline\hline @@ -93,16 +97,21 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{longragged3colborder}{% - \glossarystyle{longragged3col}% + \setglossarystyle{longragged3col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|% >{\raggedright}p{\glspagelistwidth}|}}% @@ -110,13 +119,13 @@ \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{longragged3colheader}{% - \glossarystyle{longragged3col}% + \setglossarystyle{longragged3col}% \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{longragged3colheaderborder}{% - \glossarystyle{longragged3colborder}% + \setglossarystyle{longragged3colborder}% \renewcommand*{\glossaryheader}{% \hline \bfseries\entryname&\bfseries\descriptionname& @@ -130,16 +139,22 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & \glossentrydesc{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{altlongragged4colheader}{% - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% \renewenvironment{theglossary}% {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}l% >{\raggedright}p{\glspagelistwidth}}}% @@ -150,7 +165,7 @@ \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{altlongragged4colborder}{% - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|l|% >{\raggedright}p{\glspagelistwidth}|}}% @@ -158,7 +173,7 @@ \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{altlongragged4colheaderborder}{% - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|l|% >{\raggedright}p{\glspagelistwidth}|}}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index 745374ad9b9..53c5e6fb2bd 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,12 +38,12 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2013/04/21 v3.05 (NLCT)] +\ProvidesPackage{glossary-mcols}[2013/11/14 v4.0 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \newcommand*{\glsmcols}{2} \newglossarystyle{mcolindex}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -53,12 +53,12 @@ {\end{multicols}}% } \newglossarystyle{mcolindexgroup}{% - \glossarystyle{mcolindex}% + \setglossarystyle{mcolindex}% \renewcommand*{\glsgroupheading}[1]{% \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% } \newglossarystyle{mcolindexhypergroup}{% - \glossarystyle{mcolindex}% + \setglossarystyle{mcolindex}% \renewcommand*{\glossaryheader}{% \item\textbf{\glsnavigation}\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -66,7 +66,7 @@ \indexspace}% } \newglossarystyle{mcoltree}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -76,12 +76,12 @@ {\end{multicols}}% } \newglossarystyle{mcoltreegroup}{% - \glossarystyle{mcoltree}% + \setglossarystyle{mcoltree}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcoltreehypergroup}{% - \glossarystyle{mcoltree}% + \setglossarystyle{mcoltree}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -90,7 +90,7 @@ \indexspace}% } \newglossarystyle{mcoltreenoname}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -100,12 +100,12 @@ {\end{multicols}}% } \newglossarystyle{mcoltreenonamegroup}{% - \glossarystyle{mcoltreenoname}% + \setglossarystyle{mcoltreenoname}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcoltreenonamehypergroup}{% - \glossarystyle{mcoltreenoname}% + \setglossarystyle{mcoltreenoname}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -114,7 +114,7 @@ \indexspace}% } \newglossarystyle{mcolalttree}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -124,7 +124,7 @@ {\par\end{multicols}}% } \newglossarystyle{mcolalttreegroup}{% - \glossarystyle{mcolalttree}% + \setglossarystyle{mcolalttree}% \renewcommand{\glsgroupheading}[1]{\par \def\@gls@prevlevel{-1}% \hangindent0pt\relax @@ -132,7 +132,7 @@ \textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcolalttreehypergroup}{% - \glossarystyle{mcolalttree}% + \setglossarystyle{mcolalttree}% \renewcommand*{\glossaryheader}{% \par \def\@gls@prevlevel{-1}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index bca74c30ce7..8b193f3c457 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-super}[2013/11/14 v4.0 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -55,34 +55,40 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% + \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{superborder}{% - \glossarystyle{super}% + \setglossarystyle{super}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|}}% {\end{supertabular}}% } \newglossarystyle{superheader}{% - \glossarystyle{super}% + \setglossarystyle{super}% \renewenvironment{theglossary}% - {\tablehead{\bfseries \entryname & \bfseries \descriptionname\\}% + {\tablehead{\bfseries \entryname & + \bfseries\descriptionname\tabularnewline}% \tabletail{}% \begin{supertabular}{lp{\glsdescwidth}}}% {\end{supertabular}}% } \newglossarystyle{superheaderborder}{% - \glossarystyle{super}% + \setglossarystyle{super}% \renewenvironment{theglossary}% {\tablehead{\hline\bfseries \entryname & - \bfseries \descriptionname\\\hline}% + \bfseries \descriptionname\tabularnewline\hline}% \tabletail{\hline} \begin{supertabular}{|l|p{\glsdescwidth}|}}% {\end{supertabular}}% @@ -94,35 +100,40 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{super3colborder}{% - \glossarystyle{super3col}% + \setglossarystyle{super3col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{supertabular}}% } \newglossarystyle{super3colheader}{% - \glossarystyle{super3col}% + \setglossarystyle{super3col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\}\tabletail{}% + \bfseries\pagelistname\tabularnewline}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}% {\end{supertabular}}% } \newglossarystyle{super3colheaderborder}{% - \glossarystyle{super3colborder}% + \setglossarystyle{super3colborder}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\hline}% + \bfseries\pagelistname\tabularnewline\hline}% \tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{supertabular}}% @@ -134,58 +145,65 @@ \end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & ##3\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{super4colheader}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\}% + \bfseries\pagelistname\tabularnewline}% \tabletail{}% \begin{supertabular}{llll}}% {\end{supertabular}}% } \newglossarystyle{super4colborder}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|l|l|l|}}% {\end{supertabular}}% } \newglossarystyle{super4colheaderborder}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\\hline}\tabletail{\hline}% + \bfseries\pagelistname\tabularnewline\hline}% + \tabletail{\hline}% \begin{supertabular}{|l|l|l|l|}}% {\end{supertabular}}% } \newglossarystyle{altsuper4col}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{supertabular}}% } \newglossarystyle{altsuper4colheader}{% - \glossarystyle{super4colheader}% + \setglossarystyle{super4colheader}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\}\tabletail{}% + \bfseries\pagelistname\tabularnewline}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{supertabular}}% } \newglossarystyle{altsuper4colborder}{% - \glossarystyle{super4colborder}% + \setglossarystyle{super4colborder}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}% @@ -193,13 +211,13 @@ {\end{supertabular}}% } \newglossarystyle{altsuper4colheaderborder}{% - \glossarystyle{super4colheaderborder}% + \setglossarystyle{super4colheaderborder}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname & \bfseries\descriptionname & \bfseries\symbolname & - \bfseries\pagelistname\\\hline}% + \bfseries\pagelistname\tabularnewline\hline}% \tabletail{\hline}% \begin{supertabular}% {|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty index 3d522a6b620..b9c4943dc77 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-superragged}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-superragged}[2013/11/14 v4.0 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% @@ -56,25 +56,29 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% - \tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2% + \tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6% - \tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space + ##3% + \tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{superraggedborder}{% - \glossarystyle{superragged}% + \setglossarystyle{superragged}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|>{\raggedright}p{\glsdescwidth}|}}% {\end{supertabular}}% } \newglossarystyle{superraggedheader}{% - \glossarystyle{superragged}% + \setglossarystyle{superragged}% \renewenvironment{theglossary}% {\tablehead{\bfseries \entryname & \bfseries \descriptionname \tabularnewline}% @@ -83,7 +87,7 @@ {\end{supertabular}}% } \newglossarystyle{superraggedheaderborder}{% - \glossarystyle{superragged}% + \setglossarystyle{superragged}% \renewenvironment{theglossary}% {\tablehead{\hline\bfseries \entryname & \bfseries \descriptionname\tabularnewline\hline}% @@ -99,16 +103,21 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{superragged3colborder}{% - \glossarystyle{superragged3col}% + \setglossarystyle{superragged3col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|>{\raggedright}p{\glsdescwidth}|% @@ -116,7 +125,7 @@ {\end{supertabular}}% } \newglossarystyle{superragged3colheader}{% - \glossarystyle{superragged3col}% + \setglossarystyle{superragged3col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\pagelistname\tabularnewline}\tabletail{}% @@ -125,7 +134,7 @@ {\end{supertabular}}% } \newglossarystyle{superragged3colheaderborder}{% - \glossarystyle{superragged3colborder}% + \setglossarystyle{superragged3colborder}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname&\bfseries\descriptionname& @@ -143,16 +152,21 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{altsuperragged4colheader}{% - \glossarystyle{altsuperragged4col}% + \setglossarystyle{altsuperragged4col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & @@ -162,7 +176,7 @@ {\end{supertabular}}% } \newglossarystyle{altsuperragged4colborder}{% - \glossarystyle{altsuper4col}% + \setglossarystyle{altsuper4col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}% @@ -171,7 +185,7 @@ {\end{supertabular}}% } \newglossarystyle{altsuperragged4colheaderborder}{% - \glossarystyle{altsuperragged4col}% + \setglossarystyle{altsuperragged4col}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname & diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty index 166e8fe74de..35a971b8936 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.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-compatible-307.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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.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 @@ -38,23 +38,21 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-tree}[2013/11/14 v4.0 (NLCT)] \newglossarystyle{index}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% \setlength{\parskip}{0pt plus 0.3pt}% \let\item\@idxitem}% - {}% + {\par}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% -\renewcommand*{\glossaryentryfield}[5]{% -\item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\glossentry}[2]{% + \item\glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space \glossentrydesc{##1}\glspostdescription\space ##2% + }% + \renewcommand{\subglossentry}[3]{% \ifcase##1\relax % level 0 \item @@ -66,20 +64,18 @@ % all other levels \subsubitem \fi - \textbf{\glstarget{##2}{##3}}% - \ifx\relax##5\relax - \else - \space(##5)% - \fi - \space##4\glspostdescription\space ##6}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \space\glossentrydesc{##2}\glspostdescription\space ##3% + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{indexgroup}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewcommand*{\glsgroupheading}[1]{% \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% } \newglossarystyle{indexhypergroup}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewcommand*{\glossaryheader}{% \item\textbf{\glsnavigation}\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -93,35 +89,31 @@ {}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \hangindent0pt\relax \parindent0pt\relax - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5\par}% - \renewcommand{\glossarysubentryfield}[6]{% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space\glossentrydesc{##1}\glspostdescription\space##2\par + }% + \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax \parindent##1\glstreeindent\relax \ifnum##1=1\relax \glssubentryitem{##2}% \fi - \textbf{\glstarget{##2}{##3}}% - \ifx\relax##5\relax - \else - \space(##5)% - \fi - \space##4\glspostdescription\space ##6\par}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \space\glossentrydesc{##2}\glspostdescription\space ##3\par + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{treegroup}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{treehypergroup}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -137,33 +129,32 @@ \setlength{\parskip}{0pt plus 0.3pt}}% {}% \renewcommand*{\glossaryheader}{}% -\renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% \hangindent0pt\relax \parindent0pt\relax - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5\par}% - \renewcommand{\glossarysubentryfield}[6]{% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space\glossentrydesc{##1}\glspostdescription\space##2\par + }% + \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax \parindent##1\glstreeindent\relax \ifnum##1=1\relax \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - ##4\glspostdescription\space ##6\par}% + \glossentrydesc{##2}\glspostdescription\space##3\par + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{treenonamegroup}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{treenonamehypergroup}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -183,7 +174,7 @@ {\par}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \ifnum\@gls@prevlevel=0\relax \else \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}% @@ -191,15 +182,12 @@ \parindent\glstreeindent \fi \makebox[0pt][r]{\makebox[\glstreeindent][l]{% - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}% - \ifx\relax##4\relax - \else - (##4)\space - \fi - ##3\glspostdescription \space ##5\par + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \glossentrydesc{##1}\glspostdescription \space ##2\par \def\@gls@prevlevel{0}% }% - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \ifnum##1=1\relax \glssubentryitem{##2}% \fi @@ -226,18 +214,15 @@ \fi \hangindent\glstreeindent \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% - \textbf{\glstarget{##2}{##3}}}}% - \ifx##5\relax\relax - \else - (##5)\space - \fi - ##4\glspostdescription\space ##6\par + \textbf{\glstarget{##2}{\glossentryname{##2}}}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \glossentrydesc{##2}\glspostdescription\space ##3\par \def\@gls@prevlevel{##1}% }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{alttreegroup}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewcommand{\glsgroupheading}[1]{\par \def\@gls@prevlevel{-1}% \hangindent0pt\relax @@ -245,7 +230,7 @@ \textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{alttreehypergroup}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewcommand*{\glossaryheader}{% \par \def\@gls@prevlevel{-1}% |