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