From e155df94bcae899bce238a8b1bc2d6b7e7303cbb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Apr 2016 21:52:18 +0000 Subject: glossaries (20apr16) git-svn-id: svn://tug.org/texlive/trunk@40635 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 | 35 +++++++-- .../latex/glossaries/expl/glossaries-accsupp.sty | 2 +- .../latex/glossaries/styles/glossary-hypernav.sty | 36 ++++----- .../latex/glossaries/styles/glossary-inline.sty | 2 +- .../tex/latex/glossaries/styles/glossary-list.sty | 22 ++++-- .../tex/latex/glossaries/styles/glossary-long.sty | 4 +- .../glossaries/styles/glossary-longbooktabs.sty | 2 +- .../glossaries/styles/glossary-longragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-mcols.sty | 89 ++++++++++++++++++---- .../tex/latex/glossaries/styles/glossary-super.sty | 4 +- .../glossaries/styles/glossary-superragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-tree.sty | 57 ++++++++++---- 17 files changed, 195 insertions(+), 72 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 7a8175cd327..5ff987e185e 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries-babel}[2016/04/19 v4.22 (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 d208ed1b5d5..3ef619ffc19 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2016/04/19 v4.22 (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 fb494303622..84ef1cd01ce 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2016/04/19 v4.22 (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 3f6cd46282c..013326deeb0 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2016/04/19 v4.22 (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 2bd58032f6e..cb047a2e309 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2016/04/19 v4.22 (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 71e5ff4bd5d..d50b0c384bc 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries}[2016/04/19 v4.22 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -4297,6 +4297,21 @@ false,nolabel,autolabel,nameref}[nolabel]{% \newrobustcmd*{\Glsentryfirstplural}[1]{% \@Gls@entry@field{#1}{firstpl}% } +\newrobustcmd*{\@glsentrytitlecase}[2]{% + \glsfieldfetch{#1}{#2}{\@gls@value}% + \xcapitalisewords{\@gls@value}% +} +\ifdef\texorpdfstring +{ + \newcommand*{\glsentrytitlecase}[2]{% + \texorpdfstring + {\@glsentrytitlecase{#1}{#2}}% + {\@gls@entry@field{#1}{#2}}% + } +} +{ + \newcommand*{\glsentrytitlecase}[2]{\@glsentrytitlecase{#1}{#2}} +} \newcommand*{\glsentrytype}[1]{\@gls@entry@field{#1}{type}} \newcommand*{\glsentrysort}[1]{% \@gls@entry@field{#1}{sort}% @@ -5031,7 +5046,7 @@ you \fi } \newcommand{\gls@protected@pagefmts}{% - \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage,\gls@Romanpage% + \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage,\gls@Romanpage,\gls@arabicpage% } \newcommand*{\gls@disablepagerefexpansion}{% \@for\@gls@this:=\gls@protected@pagefmts\do @@ -5042,6 +5057,7 @@ you \newcommand*{\gls@alphpage}{\@alph\c@page} \newcommand*{\gls@Alphpage}{\@Alph\c@page} \newcommand*{\gls@numberpage}{\number\c@page} +\newcommand*{\gls@arabicpage}{\@arabic\c@page} \newcommand*{\gls@romanpage}{\romannumeral\c@page} \newcommand*{\gls@Romanpage}{\@Roman\c@page} \newcommand*{\glsaddprotectedpagefmt}[1]{% @@ -5061,18 +5077,25 @@ you \newcommand{\@wrglossary@pageformat}[3]{% \ifx#3\c@page #1\else #2#3\fi } +\newif\ifglswrallowprimitivemods +\glswrallowprimitivemodstrue \newcommand*{\@@do@wrglossary}[1]{% \begingroup \let\orgthe\the \let\orgnumber\number + \let\orgarabic\@arabic \let\orgromannumeral\romannumeral \let\orgalph\@alph \let\orgAlph\@Alph \let\orgRoman\@Roman - \def\the##1{% - \ifx##1\c@page \gls@numberpage\else\orgthe##1\fi}% - \def\number##1{% - \ifx##1\c@page \gls@numberpage\else\orgnumber##1\fi}% + \ifglswrallowprimitivemods + \def\the##1{% + \ifx##1\c@page \gls@numberpage\else\orgthe##1\fi}% + \def\number##1{% + \ifx##1\c@page \gls@numberpage\else\orgnumber##1\fi}% + \fi + \def\@arabic##1{% + \ifx##1\c@page \gls@arabicpage\else\orgarabic##1\fi}% \def\romannumeral##1{% \ifx##1\c@page \gls@romanpage\else\orgromannumeral##1\fi}% \def\@Roman##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 82acf36324e..134335cc464 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/01/24 v4.21 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2016/04/19 v4.22 (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 2eeac6ba3f0..def2eed716c 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2016/04/19 v4.22 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{glsn:#1@#2}{#3}} @@ -71,26 +71,28 @@ }% } \newcommand*{\glsnavigation}{% -\def\@gls@between{}% -\@ifundefined{@gls@hypergrouplist@\@glo@type}{% - \def\@gls@list{}% -}{% - \expandafter\let\expandafter\@gls@list + \def\@gls@between{}% + \ifcsundef{@gls@hypergrouplist@\@glo@type}% + {% + \def\@gls@list{}% + }% + {% + \expandafter\let\expandafter\@gls@list \csname @gls@hypergrouplist@\@glo@type\endcsname -}% -\@for\@gls@tmp:=\@gls@list\do{% - \@gls@between - \@gls@getgrouptitle{\@gls@tmp}{\@gls@grptitle}% - \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% - \let\@gls@between\glshypernavsep% -}% + }% + \@for\@gls@tmp:=\@gls@list\do{% + \@gls@between + \@gls@getgrouptitle{\@gls@tmp}{\@gls@grptitle}% + \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% + \let\@gls@between\glshypernavsep + }% } \newcommand*{\glshypernavsep}{\space\textbar\space} \newcommand*{\glssymbolnav}{% -\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}}% -\glshypernavsep -\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}}% -\glshypernavsep + \glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}}% + \glshypernavsep + \glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}}% + \glshypernavsep } \endinput %% 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 434729eceb7..f497879f2d8 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-inline}[2016/04/19 v4.22 (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 c5a6e5d5ab0..8660f843aa4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -38,10 +38,12 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2016/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-list}[2016/04/19 v4.22 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } +\newcommand*{\glslistgroupheaderfmt}[1]{#1} +\newcommand*{\glslistnavigationitem}[1]{\item[#1]} \newglossarystyle{list}{% \renewenvironment{theglossary}% {\begin{description}}{\end{description}}% @@ -53,19 +55,21 @@ \glossentrydesc{##1}\glspostdescription\space ##2}% \renewcommand*{\subglossentry}[3]{% \glssubentryitem{##2}% - \glstarget{##2}{\strut}% + \glstarget{##2}{\strut}\space \glossentrydesc{##2}\glspostdescription\space ##3.}% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{listgroup}{% \setglossarystyle{list}% - \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} + \renewcommand*{\glsgroupheading}[1]{% + \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}} \newglossarystyle{listhypergroup}{% \setglossarystyle{list}% \renewcommand*{\glossaryheader}{% - \item[\glsnavigation]}% + \glslistnavigationitem{\glsnavigation}}% \renewcommand*{\glsgroupheading}[1]{% - \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} + \item[\glslistgroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}} \newglossarystyle{altlist}{% \setglossarystyle{list}% \renewcommand*{\glossentry}[2]{% @@ -80,13 +84,15 @@ } \newglossarystyle{altlistgroup}{% \setglossarystyle{altlist}% - \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} + \renewcommand*{\glsgroupheading}[1]{% + \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}} \newglossarystyle{altlisthypergroup}{% \setglossarystyle{altlist}% \renewcommand*{\glossaryheader}{% - \item[\glsnavigation]}% + \glslistnavigationitem{\glsnavigation}}% \renewcommand*{\glsgroupheading}[1]{% - \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} + \item[\glslistgroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}} \newglossarystyle{listdotted}{% \setglossarystyle{list}% \renewcommand*{\glossentry}[2]{% 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 019f68139fb..1c7578b3faf 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-long}[2016/04/19 v4.22 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -61,7 +61,7 @@ \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3\tabularnewline }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & 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 d2cd1bd6f3a..0118eeac47a 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2016/04/19 v4.22 (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 4d69054ad35..e5c3cca1f92 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-longragged}[2016/04/19 v4.22 (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 5940e498694..c547152a044 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-mcols}[2016/04/19 v4.22 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \providecommand{\indexspace}{% @@ -58,14 +58,29 @@ \newglossarystyle{mcolindexgroup}{% \setglossarystyle{mcolindex}% \renewcommand*{\glsgroupheading}[1]{% - \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% + \item\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}\indexspace}% } \newglossarystyle{mcolindexhypergroup}{% \setglossarystyle{mcolindex}% \renewcommand*{\glossaryheader}{% - \item\textbf{\glsnavigation}\indexspace}% + \item\glstreenavigationfmt{\glsnavigation}\indexspace}% \renewcommand*{\glsgroupheading}[1]{% - \item\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% + \item\glstreegroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% + \indexspace}% +} +\newglossarystyle{mcolindexspannav}{% + \setglossarystyle{index}% + \renewenvironment{theglossary}% + {% + \begin{multicols}{\glsmcols}[\noindent\glstreenavigationfmt{\glsnavigation}] + \setlength{\parindent}{0pt}% + \setlength{\parskip}{0pt plus 0.3pt}% + \let\item\@idxitem}% + {\end{multicols}}% + \renewcommand*{\glsgroupheading}[1]{% + \item\glstreegroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% \indexspace}% } \newglossarystyle{mcoltree}{% @@ -81,15 +96,29 @@ \newglossarystyle{mcoltreegroup}{% \setglossarystyle{mcoltree}% \renewcommand{\glsgroupheading}[1]{\par - \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% + \noindent\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcoltreehypergroup}{% \setglossarystyle{mcoltree}% \renewcommand*{\glossaryheader}{% - \par\noindent\textbf{\glsnavigation}\par\indexspace}% + \par\noindent\glstreenavigationfmt{\glsnavigation}\par\indexspace}% + \renewcommand*{\glsgroupheading}[1]{% + \par\noindent + \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \indexspace}% +} +\newglossarystyle{mcoltreespannav}{% + \setglossarystyle{tree}% + \renewenvironment{theglossary}% + {% + \begin{multicols}{\glsmcols}[\noindent\glstreenavigationfmt{\glsnavigation}] + \setlength{\parindent}{0pt}% + \setlength{\parskip}{0pt plus 0.3pt}% + }% + {\end{multicols}}% \renewcommand*{\glsgroupheading}[1]{% \par\noindent - \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par \indexspace}% } \newglossarystyle{mcoltreenoname}{% @@ -105,15 +134,29 @@ \newglossarystyle{mcoltreenonamegroup}{% \setglossarystyle{mcoltreenoname}% \renewcommand{\glsgroupheading}[1]{\par - \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% + \noindent\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcoltreenonamehypergroup}{% \setglossarystyle{mcoltreenoname}% \renewcommand*{\glossaryheader}{% - \par\noindent\textbf{\glsnavigation}\par\indexspace}% + \par\noindent\glstreenavigationfmt{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% \par\noindent - \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \indexspace}% +} +\newglossarystyle{mcoltreenonamespannav}{% + \setglossarystyle{treenoname}% + \renewenvironment{theglossary}% + {% + \begin{multicols}{\glsmcols}[\noindent\glstreenavigationfmt{\glsnavigation}] + \setlength{\parindent}{0pt}% + \setlength{\parskip}{0pt plus 0.3pt}% + }% + {\end{multicols}}% + \renewcommand*{\glsgroupheading}[1]{% + \par\noindent + \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par \indexspace}% } \newglossarystyle{mcolalttree}{% @@ -132,7 +175,7 @@ \def\@gls@prevlevel{-1}% \hangindent0pt\relax \parindent0pt\relax - \textbf{\glsgetgrouptitle{##1}}\par\indexspace}% + \glstreegroupheaderfmt{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcolalttreehypergroup}{% \setglossarystyle{mcolalttree}% @@ -141,14 +184,32 @@ \def\@gls@prevlevel{-1}% \hangindent0pt\relax \parindent0pt\relax - \textbf{\glsnavigation}\par\indexspace}% + \glstreenavigationfmt{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% \par \def\@gls@prevlevel{-1}% \hangindent0pt\relax \parindent0pt\relax - \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par - \indexspace}} + \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \indexspace}% +} +\newglossarystyle{mcolalttreespannav}{% + \setglossarystyle{alttree}% + \renewenvironment{theglossary}% + {% + \begin{multicols}{\glsmcols}[\noindent\glstreenavigationfmt{\glsnavigation}] + \def\@gls@prevlevel{-1}% + \mbox{}\par + }% + {\par\end{multicols}}% + \renewcommand*{\glsgroupheading}[1]{% + \par + \def\@gls@prevlevel{-1}% + \hangindent0pt\relax + \parindent0pt\relax + \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \indexspace} +} \endinput %% 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 323de27aa5f..64894fb0de5 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-super}[2016/04/19 v4.22 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -148,7 +148,7 @@ \renewcommand{\glossentry}[2]{% \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & \glossentrydesc{##1} & - \glossentrysymbol{##1} & ##3\tabularnewline + \glossentrysymbol{##1} & ##2\tabularnewline }% \renewcommand{\subglossentry}[3]{% & 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 945aa1e7cc7..cbd3527b7a6 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/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-superragged}[2016/04/19 v4.22 (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 e16d4130568..1f8a4bd7f58 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -38,11 +38,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2016/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossary-tree}[2016/04/19 v4.22 (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}} \newglossarystyle{index}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% @@ -76,14 +78,17 @@ \newglossarystyle{indexgroup}{% \setglossarystyle{index}% \renewcommand*{\glsgroupheading}[1]{% - \item\glstreenamefmt{\glsgetgrouptitle{##1}}\indexspace}% + \item\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}% + \indexspace + }% } \newglossarystyle{indexhypergroup}{% \setglossarystyle{index}% \renewcommand*{\glossaryheader}{% - \item\glstreenamefmt{\glsnavigation}\indexspace}% + \item\glstreenavigationfmt{\glsnavigation}\indexspace}% \renewcommand*{\glsgroupheading}[1]{% - \item\glstreenamefmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% + \item\glstreegroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% \indexspace}% } \newglossarystyle{tree}{% @@ -114,15 +119,17 @@ \newglossarystyle{treegroup}{% \setglossarystyle{tree}% \renewcommand{\glsgroupheading}[1]{\par - \noindent\glstreenamefmt{\glsgetgrouptitle{##1}}\par\indexspace}% + \noindent\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}\par + \indexspace}% } \newglossarystyle{treehypergroup}{% \setglossarystyle{tree}% \renewcommand*{\glossaryheader}{% - \par\noindent\glstreenamefmt{\glsnavigation}\par\indexspace}% + \par\noindent\glstreenavigationfmt{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% \par\noindent - \glstreenamefmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \glstreegroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par \indexspace}% } \newlength\glstreeindent @@ -155,17 +162,39 @@ \newglossarystyle{treenonamegroup}{% \setglossarystyle{treenoname}% \renewcommand{\glsgroupheading}[1]{\par - \noindent\glstreenamefmt{\glsgetgrouptitle{##1}}\par\indexspace}% + \noindent\glstreegroupheaderfmt + {\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{treenonamehypergroup}{% \setglossarystyle{treenoname}% \renewcommand*{\glossaryheader}{% - \par\noindent\glstreenamefmt{\glsnavigation}\par\indexspace}% + \par\noindent\glstreenavigationfmt{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% \par\noindent - \glstreenamefmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \glstreegroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par \indexspace}% } +\newrobustcmd*{\glsfindwidesttoplevelname}[1][\@glo@types]{% + \dimen@=0pt\relax + \gls@tmplen=0pt\relax + \forallglossaries[#1]{\@gls@type}% + {% + \forglsentries[\@gls@type]{\@glo@label}% + {% + \ifglshasparent{\@glo@label}% + {}% + {% + \settowidth{\dimen@}% + {\glstreenamefmt{\glsentryname{\@glo@label}}}% + \ifdim\dimen@>\gls@tmplen + \gls@tmplen=\dimen@ + \letcs{\@glswidestname}{glo@\glsdetoklabel{\@glo@label}@name}% + \fi + }% + }% + }% +} \newcommand*{\glssetwidest}[2][0]{% \expandafter\def\csname @glswidestname\romannumeral#1\endcsname{% #2}% @@ -234,7 +263,8 @@ \def\@gls@prevlevel{-1}% \hangindent0pt\relax \parindent0pt\relax - \glstreenamefmt{\glsgetgrouptitle{##1}}\par\indexspace}% + \glstreegroupheaderfmt{\glsgetgrouptitle{##1}}% + \par\indexspace}% } \newglossarystyle{alttreehypergroup}{% \setglossarystyle{alttree}% @@ -243,13 +273,14 @@ \def\@gls@prevlevel{-1}% \hangindent0pt\relax \parindent0pt\relax - \glstreenamefmt{\glsnavigation}\par\indexspace}% + \glstreenavigationfmt{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% \par \def\@gls@prevlevel{-1}% \hangindent0pt\relax \parindent0pt\relax - \glstreenamefmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \glstreegroupheaderfmt + {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par \indexspace}} \endinput %% -- cgit v1.2.3