diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty | 77 |
1 files changed, 40 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty index 7d67e17cfd5..4fe9f4b3143 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-stylemods.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2019/04/09 v1.41 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2020/02/13 v1.42 (NLCT)] \newcommand*{\@glsxtr@loadstyles}{} \DeclareOption{all}{% \appto\@glsxtr@loadstyles{% @@ -546,7 +546,8 @@ { \newcommand*{\glstreeprelocation}{\glsxtrprelocation} \newcommand*{\glstreechildprelocation}{\glstreeprelocation} - \newcommand{\glstreegroupskip}{\nopagebreak\indexspace\nobreak} + \newcommand{\glstreegroupskip}{\indexspace} + \newcommand{\glstreegroupheaderskip}{\nopagebreak\glstreegroupskip\nobreak} \renewglossarystyle{index}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% @@ -589,7 +590,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \item\glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } } @@ -600,13 +601,13 @@ \setglossarystyle{index}% \renewcommand*{\glossaryheader}{% \item\glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \item\glstreegroupheaderfmt {\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% }% } {} @@ -618,9 +619,10 @@ \newcommand{\glstreeDescLoc}[2]{% \ifglshasdesc{#1}% {\glstreedesc{#1}\glstreeprelocation}% - {\ifglshassymbol{#1}{\glstreeprelocation}{}}% + {\ifglshassymbol{#1}{\glstreeprelocation}{\glstreeNoDescSymbolPreLocation}}% #2% } + \newcommand{\glstreeNoDescSymbolPreLocation}{\space} \newcommand{\glstreesymbol}[1]{% \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}% }% @@ -630,7 +632,9 @@ \newcommand{\glstreeChildDescLoc}[2]{% \ifglshasdesc{#1}% {\glstreechilddesc{#1}\glstreechildprelocation}% - {\ifglshassymbol{#1}{\glstreechildprelocation}{}}% + {\ifglshassymbol{#1}{\glstreechildprelocation}% + {\glstreeNoDescSymbolPreLocation}% + }% #2% }% \newcommand{\glstreechildsymbol}[1]{% @@ -672,7 +676,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% } } {} @@ -682,14 +686,14 @@ \setglossarystyle{tree}% \renewcommand*{\glossaryheader}{% \par\noindent\glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent \glstreegroupheaderfmt {\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% } } {} @@ -717,7 +721,7 @@ \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \glstreenonamesymbol{##1}% \glstreenonamedesc{##1}% - \glstreeprelocation##2\par + \glstreeDescLoc{##1}{##2}\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax @@ -741,7 +745,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } } @@ -752,13 +756,13 @@ \setglossarystyle{treenoname}% \renewcommand*{\glossaryheader}{% \par\noindent\glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% } } {} @@ -768,9 +772,8 @@ {% \let\par\glsxtrAltTreePar \ifglshassymbol{#1}{(\glossentrysymbol{#1})\space}{}% - \ifglshasdesc{#1}% - {\glossentrydesc{#1}\glspostdescription\glstreeprelocation}{}% - #2\par + \ifglshasdesc{#1}{\glossentrydesc{#1}\glspostdescription}{}% + \glstreeDescLoc{#1}{#2}\par }% } \newlength\glsxtrAltTreeIndent @@ -1242,7 +1245,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip + \glstreegroupheaderskip }% }% }% @@ -1258,7 +1261,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip + \glstreegroupheaderskip }% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% @@ -1268,7 +1271,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip + \glstreegroupheaderskip }% } }% @@ -1282,7 +1285,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \item\glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1294,14 +1297,14 @@ \setglossarystyle{mcolindex}% \renewcommand*{\glossaryheader}{% \item\glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip + \glstreegroupheaderskip\@afterheading }% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \item\glstreegroupheaderfmt {\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1323,7 +1326,7 @@ \glstreePreHeader{##1}{\glsxtr@grptitle}% \item\glstreegroupheaderfmt {\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1337,7 +1340,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1349,14 +1352,14 @@ \setglossarystyle{mcoltree}% \renewcommand*{\glossaryheader}{% \par\noindent\glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip + \glstreegroupheaderskip }% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1379,7 +1382,7 @@ \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1393,7 +1396,7 @@ \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip\@afterheading + \glstreegroupheaderskip\@afterheading }% } }% @@ -1405,14 +1408,14 @@ \setglossarystyle{mcoltreenoname}% \renewcommand*{\glossaryheader}{% \par\noindent\glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip + \glstreegroupheaderskip }% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% } }% {% @@ -1434,7 +1437,7 @@ \glstreePreHeader{##1}{\glsxtr@grptitle}% \par\noindent \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip\@afterheading}% + \glstreegroupheaderskip\@afterheading}% } }% {% @@ -1466,7 +1469,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreegroupheaderfmt{\glsxtr@grptitle}% - \glstreegroupskip + \glstreegroupheaderskip }% } }% @@ -1482,7 +1485,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreenavigationfmt{\glsnavigation}% - \glstreegroupskip + \glstreegroupheaderskip }% \renewcommand*{\glsgroupheading}[1]{% \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}% @@ -1492,7 +1495,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip + \glstreegroupheaderskip }% } }% @@ -1518,7 +1521,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}% - \glstreegroupskip + \glstreegroupheaderskip }% } }% |