1 files changed, 47 insertions, 16 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 b2833673969..195583b6bac 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
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2018/04/25 v1.30 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2018/05/09 v1.31 (NLCT)]
 \newcommand*{\@glsxtr@loadstyles}{}
 \DeclareOption{all}{%
   \appto\@glsxtr@loadstyles{%
@@ -102,6 +102,7 @@
   \newcommand{\glslistprelocation}{\glsxtrprelocation}
   \newcommand{\glslistchildprelocation}{\glslistprelocation}
   \newcommand{\glslistchildpostlocation}{.}
+  \newcommand{\glslistdesc}[1]{\glossentrydesc{#1}\glspostdescription}
   \renewglossarystyle{list}{%
     \renewenvironment{theglossary}%
       {\begin{description}}{\end{description}}%
@@ -110,11 +111,11 @@
     \renewcommand*{\glossentry}[2]{%
       \item[\glsentryitem{##1}%
             \glstarget{##1}{\glossentryname{##1}}]
-         \glossentrydesc{##1}\glspostdescription\glslistprelocation ##2}%
+        \glslistdesc{##1}\glslistprelocation ##2}%
     \renewcommand*{\subglossentry}[3]{%
       \glssubentryitem{##2}%
       \glstarget{##2}{\strut}\space
-      \glossentrydesc{##2}\glspostdescription
+      \glslistdesc{##2}%
       \glslistchildprelocation ##3\glslistchildpostlocation}%
     \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
   }
@@ -128,11 +129,11 @@
       \item[\glsentryitem{##1}%
         \glstarget{##1}{\glossentryname{##1}}]%
       \mbox{}\par\nobreak\@afterheading
-      \glossentrydesc{##1}\glspostdescription\glslistprelocation ##2}%
+      \glslistdesc{##1}\glslistprelocation ##2}%
     \renewcommand{\subglossentry}[3]{%
       \par
       \glssubentryitem{##2}%
-      \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription
+      \glstarget{##2}{\strut}\glslistdesc{##2}%
       \glslistchildprelocation ##3}%
   }
 }
@@ -529,6 +530,14 @@
      #1\glsxtrpostdescription}
 }
 {}
+\ifdef\glstreenamefmt
+{
+  \newcommand{\glstreedefaultnamefmt}[1]{\textbf{#1}}
+  \renewcommand{\glstreenamefmt}[1]{\glstreedefaultnamefmt{#1}}
+  \def\glstreegroupheaderfmt#1{\glstreedefaultnamefmt{#1}}
+  \def\glstreenavigationfmt#1{\glstreedefaultnamefmt{#1}}
+}
+{}
 \ifdef{\@glsstyle@index}
 {
   \newcommand*{\glstreeprelocation}{\glsxtrprelocation}
@@ -547,8 +556,8 @@
     \renewcommand*{\glossentry}[2]{%
        \item\glsentryitem{##1}%
        \glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
-       \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
-       \glstreepredesc \glossentrydesc{##1}\glspostdescription
+       \glstreesymbol{##1}%
+       \glstreedesc{##1}%
        \glstreeprelocation ##2%
     }%
     \renewcommand{\subglossentry}[3]{%
@@ -561,8 +570,8 @@
         \subsubitem
       \fi
       \glstreenamefmt{\glstarget{##2}{\glossentryname{##2}}}%
-      \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}%
-      \glstreechildpredesc\glossentrydesc{##2}\glspostdescription
+      \glstreechildsymbol{##2}%
+      \glstreechilddesc{##2}%
       \glstreechildprelocation ##3%
     }%
     \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
@@ -598,6 +607,18 @@
 {}
 \ifdef{\@glsstyle@tree}
 {%
+  \newcommand{\glstreedesc}[1]{%
+    \glstreepredesc\glossentrydesc{#1}\glspostdescription
+  }
+  \newcommand{\glstreesymbol}[1]{%
+    \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}%
+  }%
+  \newcommand{\glstreechilddesc}[1]{%
+    \glstreechildpredesc\glossentrydesc{#1}\glspostdescription
+  }%
+  \newcommand{\glstreechildsymbol}[1]{%
+    \glstreesymbol{#1}%
+  }%
   \renewglossarystyle{tree}{%
     \renewenvironment{theglossary}%
       {\setlength{\parindent}{0pt}%
@@ -609,8 +630,8 @@
       \hangindent0pt\relax
       \parindent0pt\relax
       \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
-      \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
-      \glstreepredesc\glossentrydesc{##1}\glspostdescription
+      \glstreesymbol{##1}%
+      \glstreedesc{##1}%
       \glstreeprelocation##2\par
     }%
     \renewcommand{\subglossentry}[3]{%
@@ -620,8 +641,8 @@
         \glssubentryitem{##2}%
       \fi
       \glstreenamefmt{\glstarget{##2}{\glossentryname{##2}}}%
-      \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}%
-      \glstreechildpredesc\glossentrydesc{##2}\glspostdescription
+      \glstreechildsymbol{##2}%
+      \glstreechilddesc{##2}%
       \glstreechildprelocation ##3\par
     }%
     \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
@@ -655,6 +676,15 @@
 {}
 \ifdef{\@glsstyle@treenoname}
 {%
+  \newcommand{\glstreenonamedesc}[1]{%
+    \glstreepredesc\glossentrydesc{#1}\glspostdescription
+  }%
+  \newcommand{\glstreenonamesymbol}[1]{%
+    \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}%
+  }%
+  \newcommand{\glstreenonamechilddesc}[1]{%
+    \glossentrydesc{#1}\glspostdescription
+  }%
   \renewglossarystyle{treenoname}{%
     \renewenvironment{theglossary}%
       {\setlength{\parindent}{0pt}%
@@ -666,8 +696,8 @@
       \hangindent0pt\relax
       \parindent0pt\relax
       \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
-      \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
-      \glstreepredesc\glossentrydesc{##1}\glspostdescription
+      \glstreenonamesymbol{##1}%
+      \glstreenonamedesc{##1}%
       \glstreeprelocation##2\par
     }%
     \renewcommand{\subglossentry}[3]{%
@@ -677,7 +707,8 @@
         \glssubentryitem{##2}%
       \fi
       \glstarget{##2}{\strut}%
-      \glossentrydesc{##2}\glspostdescription\glstreechildprelocation##3\par
+      \glstreenonamechilddesc{##2}%
+      \glstreechildprelocation##3\par
     }%
     \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
   }