From 27aa5722eb36fa15f05d471c338e2ced0e22d02c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 15 Oct 2016 22:56:50 +0000 Subject: glossaries (12oct16) git-svn-id: svn://tug.org/texlive/trunk@42274 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/glossaries/base/glossaries-babel.sty | 2 +- .../glossaries/base/glossaries-compatible-207.sty | 2 +- .../glossaries/base/glossaries-compatible-307.sty | 2 +- .../glossaries/base/glossaries-polyglossia.sty | 2 +- .../latex/glossaries/base/glossaries-prefix.sty | 2 +- .../tex/latex/glossaries/base/glossaries.sty | 6 +++-- .../latex/glossaries/expl/glossaries-accsupp.sty | 2 +- .../latex/glossaries/styles/glossary-hypernav.sty | 2 +- .../latex/glossaries/styles/glossary-inline.sty | 2 +- .../tex/latex/glossaries/styles/glossary-list.sty | 2 +- .../tex/latex/glossaries/styles/glossary-long.sty | 2 +- .../glossaries/styles/glossary-longbooktabs.sty | 2 +- .../glossaries/styles/glossary-longragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-mcols.sty | 9 ++++--- .../tex/latex/glossaries/styles/glossary-super.sty | 2 +- .../glossaries/styles/glossary-superragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-tree.sty | 28 ++++++++++++++++------ 17 files changed, 45 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex/glossaries') diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty index d4a01021221..eec5ad721c4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossaries-babel}[2016/10/12 v4.26 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index ca4ba320600..632c070bb80 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2016/10/12 v4.26 (NLCT)] \ifglsxindy \renewcommand*\GlsAddXdyAttribute[1]{% \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty index c2834467712..7950422c761 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2016/10/12 v4.26 (NLCT)] \newcommand{\compatglossarystyle}[2]{% \ifcsundef{@glscompstyle@#1}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty index 591f02e547a..ee5cef26bd0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2016/10/12 v4.26 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty index c09b18a080e..e2658a969ca 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2016/10/12 v4.26 (NLCT)] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions \RequirePackage{glossaries} diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index b1587fd9413..b38ceff2d77 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2016/06/09 v4.25 (NLCT)] +\ProvidesPackage{glossaries}[2016/10/12 v4.26 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -138,7 +138,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% \label{\glsautoprefix\@glo@type}}% \fi } -\newcommand*{\@glossary@default@style}{list} +\@ifpackageloaded{classicthesis} +{\newcommand*{\@glossary@default@style}{index}} +{\newcommand*{\@glossary@default@style}{list}} \define@key{glossaries.sty}{style}{% \renewcommand*{\@glossary@default@style}{#1}% } diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty index 8a7d16e0e32..08e246fdcf2 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-accsupp}[2016/06/09 v4.25 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2016/10/12 v4.26 (NLCT) Experimental glossaries accessibility] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions 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 -- cgit v1.2.3