diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty | 91 |
1 files changed, 55 insertions, 36 deletions
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}}% |