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