diff options
author | Karl Berry <karl@freefriends.org> | 2016-10-15 22:56:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-10-15 22:56:50 +0000 |
commit | 27aa5722eb36fa15f05d471c338e2ced0e22d02c (patch) | |
tree | 0bcef0050898ddb76863876beaaca6beb9fd6527 /Master/texmf-dist/tex/latex/glossaries/styles | |
parent | c212ffd23a839e583d2db964165d5fb058c77a2d (diff) |
glossaries (12oct16)
git-svn-id: svn://tug.org/texlive/trunk@42274 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/styles')
10 files changed, 35 insertions, 18 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 b6417524b70..48a38c58de4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-hypernav}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2016/10/12 v4.26 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{glsn:#1@#2}{#3}} 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 d6992550d9f..aa66c22cf25 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-inline}[2016/10/12 v4.26 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% 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 3d374db1a99..5ad33ca40ff 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-list}[2016/10/12 v4.26 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } 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 7630a3bc8ee..29e211d9e53 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-long}[2016/10/12 v4.26 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty index 13cc858d83a..5d3f0df31b4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longbooktabs}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2016/10/12 v4.26 (NLCT)] \RequirePackage{booktabs} \RequirePackage{glossary-long} \RequirePackage{glossary-longragged} 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 7b60de92aca..0b393bd194c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longragged}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-longragged}[2016/10/12 v4.26 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% 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 122063e85c5..38ee6b694de 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-mcols}[2016/10/12 v4.26 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \providecommand{\indexspace}{% @@ -52,7 +52,10 @@ \begin{multicols}{\glsmcols} \setlength{\parindent}{0pt}% \setlength{\parskip}{0pt plus 0.3pt}% - \let\item\@idxitem}% + \let\item\glstreeitem + \let\subitem\glstreesubitem + \let\subsubitem\glstreesubsubitem + }% {\end{multicols}}% } \newglossarystyle{mcolindexgroup}{% @@ -76,7 +79,7 @@ \begin{multicols}{\glsmcols}[\noindent\glstreenavigationfmt{\glsnavigation}] \setlength{\parindent}{0pt}% \setlength{\parskip}{0pt plus 0.3pt}% - \let\item\@idxitem}% + \let\item\glstreeitem}% {\end{multicols}}% \renewcommand*{\glsgroupheading}[1]{% \item\glstreegroupheaderfmt 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 1f7f4b7827a..050288fc728 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-super}[2016/10/12 v4.26 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth 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 837f9cb47dc..3bfc55c1199 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-superragged}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-superragged}[2016/10/12 v4.26 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% 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 79aeabc8e95..9f81377bab9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -38,25 +38,39 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossary-tree}[2016/10/12 v4.26 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } \newcommand*{\glstreenamefmt}[1]{\textbf{#1}} \newcommand*{\glstreegroupheaderfmt}[1]{\glstreenamefmt{#1}} \newcommand*{\glstreenavigationfmt}[1]{\glstreenamefmt{#1}} +\ifdef\@idxitem +{\newcommand{\glstreeitem}{\@idxitem}} +{\newcommand{\glstreeitem}{\par\hangindent40\p@}} +\ifdef\subitem +{\let\glstreesubitem\subitem} +{\newcommand\glstreesubitem{\glstreeitem\hspace*{20\p@}}} +\ifdef\subsubitem +{\let\glstreesubsubitem\subsubitem} +{\newcommand\glstreesubsubitem{\glstreeitem\hspace*{30\p@}}} +\newcommand{\glstreepredesc}{\space} +\newcommand{\glstreechildpredesc}{\space} \newglossarystyle{index}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% \setlength{\parskip}{0pt plus 0.3pt}% - \let\item\@idxitem}% + \let\item\glstreeitem + \let\subitem\glstreesubitem + \let\subsubitem\glstreesubsubitem + }% {\par}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossentry}[2]{% \item\glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% - \space \glossentrydesc{##1}\glspostdescription\space ##2% + \glstreepredesc \glossentrydesc{##1}\glspostdescription\space ##2% }% \renewcommand{\subglossentry}[3]{% \ifcase##1\relax @@ -72,7 +86,7 @@ \fi \glstreenamefmt{\glstarget{##2}{\glossentryname{##2}}}% \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% - \space\glossentrydesc{##2}\glspostdescription\space ##3% + \glstreechildpredesc\glossentrydesc{##2}\glspostdescription\space ##3% }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{indexgroup}{% @@ -103,7 +117,7 @@ \parindent0pt\relax \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% - \space\glossentrydesc{##1}\glspostdescription\space##2\par + \glstreepredesc\glossentrydesc{##1}\glspostdescription\space##2\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax @@ -113,7 +127,7 @@ \fi \glstreenamefmt{\glstarget{##2}{\glossentryname{##2}}}% \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% - \space\glossentrydesc{##2}\glspostdescription\space ##3\par + \glstreechildpredesc\glossentrydesc{##2}\glspostdescription\space ##3\par }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{treegroup}{% @@ -146,7 +160,7 @@ \parindent0pt\relax \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% - \space\glossentrydesc{##1}\glspostdescription\space##2\par + \glstreepredesc\glossentrydesc{##1}\glspostdescription\space##2\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax |