6 files changed, 171 insertions, 89 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
index 757345860f0..218686c492a 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2019/03/31 v1.40 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2019/04/09 v1.41 (NLCT)]
 \ifglsacronym
   \providecommand*{\printunsrtacronyms}[1][]{%
    \printunsrtglossary[type=\acronymtype,#1]}%
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 b158e4a66cc..7d67e17cfd5 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}[2019/03/31 v1.40 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2019/04/09 v1.41 (NLCT)]
 \newcommand*{\@glsxtr@loadstyles}{}
 \DeclareOption{all}{%
   \appto\@glsxtr@loadstyles{%
@@ -105,6 +105,7 @@
   \newcommand{\glslistchildprelocation}{\glslistprelocation}
   \newcommand{\glslistchildpostlocation}{.}
   \newcommand{\glslistdesc}[1]{\glossentrydesc{#1}\glspostdescription}
+  \newcommand{\glslistgroupskip}{\nobreak\indexspace\nobreak}
   \renewglossarystyle{list}{%
     \renewenvironment{theglossary}%
       {\begin{description}}{\end{description}}%
@@ -119,7 +120,7 @@
       \glstarget{##2}{\strut}\space
       \glslistdesc{##2}%
       \glslistchildprelocation ##3\glslistchildpostlocation}%
-    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glslistgroupskip\fi}%
   }
 }
 {}
@@ -538,12 +539,14 @@
   \renewcommand{\glstreenamefmt}[1]{\glstreedefaultnamefmt{#1}}
   \def\glstreegroupheaderfmt#1{\glstreedefaultnamefmt{#1}}
   \def\glstreenavigationfmt#1{\glstreedefaultnamefmt{#1}}
+  \newcommand{\glstreePreHeader}[2]{}
 }
 {}
 \ifdef{\@glsstyle@index}
 {
   \newcommand*{\glstreeprelocation}{\glsxtrprelocation}
   \newcommand*{\glstreechildprelocation}{\glstreeprelocation}
+  \newcommand{\glstreegroupskip}{\nopagebreak\indexspace\nobreak}
   \renewglossarystyle{index}{%
     \renewenvironment{theglossary}%
       {\setlength{\parindent}{0pt}%
@@ -559,8 +562,7 @@
        \item\glsentryitem{##1}%
        \glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
        \glstreesymbol{##1}%
-       \glstreedesc{##1}%
-       \glstreeprelocation ##2%
+       \glstreeDescLoc{##1}{##2}%
     }%
     \renewcommand{\subglossentry}[3]{%
       \ifcase##1\relax
@@ -573,10 +575,9 @@
       \fi
       \glstreenamefmt{\glstarget{##2}{\glossentryname{##2}}}%
       \glstreechildsymbol{##2}%
-      \glstreechilddesc{##2}%
-      \glstreechildprelocation ##3%
+      \glstreeChildDescLoc{##2}{##3}%
     }%
-    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}%
   }
 }
 {}
@@ -585,9 +586,10 @@
   \renewglossarystyle{indexgroup}{%
     \setglossarystyle{index}%
     \renewcommand*{\glsgroupheading}[1]{%
-      \item\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace
-      \nobreak\@afterheading
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \item\glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }
@@ -598,12 +600,13 @@
     \setglossarystyle{index}%
     \renewcommand*{\glossaryheader}{%
       \item\glstreenavigationfmt{\glsnavigation}%
-       \nobreak\@afterheading\indexspace}%
+       \glstreegroupskip\@afterheading}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \item\glstreegroupheaderfmt
-        {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace
-      \nobreak\@afterheading}%
+        {\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading}%
   }%
 }
 {}
@@ -612,12 +615,24 @@
   \newcommand{\glstreedesc}[1]{%
     \glstreepredesc\glossentrydesc{#1}\glspostdescription
   }
+  \newcommand{\glstreeDescLoc}[2]{%
+    \ifglshasdesc{#1}%
+    {\glstreedesc{#1}\glstreeprelocation}%
+    {\ifglshassymbol{#1}{\glstreeprelocation}{}}%
+    #2%
+  }
   \newcommand{\glstreesymbol}[1]{%
     \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}%
   }%
   \newcommand{\glstreechilddesc}[1]{%
     \glstreechildpredesc\glossentrydesc{#1}\glspostdescription
   }%
+  \newcommand{\glstreeChildDescLoc}[2]{%
+    \ifglshasdesc{#1}%
+    {\glstreechilddesc{#1}\glstreechildprelocation}%
+    {\ifglshassymbol{#1}{\glstreechildprelocation}{}}%
+    #2%
+  }%
   \newcommand{\glstreechildsymbol}[1]{%
     \glstreesymbol{#1}%
   }%
@@ -633,8 +648,7 @@
       \parindent0pt\relax
       \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
       \glstreesymbol{##1}%
-      \glstreedesc{##1}%
-      \glstreeprelocation##2\par
+      \glstreeDescLoc{##1}{##2}\par
     }%
     \renewcommand{\subglossentry}[3]{%
       \hangindent##1\glstreeindent\relax
@@ -644,10 +658,9 @@
       \fi
       \glstreenamefmt{\glstarget{##2}{\glossentryname{##2}}}%
       \glstreechildsymbol{##2}%
-      \glstreechilddesc{##2}%
-      \glstreechildprelocation ##3\par
+      \glstreeChildDescLoc{##2}{##3}\par
     }%
-    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}%
   }%
 }
 {}
@@ -655,9 +668,11 @@
 {%
   \renewglossarystyle{treegroup}{%
     \setglossarystyle{tree}%
-    \renewcommand{\glsgroupheading}[1]{\par
-      \noindent\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}\par
-      \nopagebreak\indexspace\nobreak\@afterheading}%
+    \renewcommand{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip\@afterheading}%
   }
 }
 {}
@@ -666,13 +681,15 @@
   \renewglossarystyle{treehypergroup}{%
     \setglossarystyle{tree}%
     \renewcommand*{\glossaryheader}{%
-      \par\noindent\glstreenavigationfmt{\glsnavigation}\par
-      \nobreak\@afterheading\indexspace}%
+      \par\noindent\glstreenavigationfmt{\glsnavigation}%
+      \glstreegroupskip\@afterheading}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par\noindent
       \glstreegroupheaderfmt
-        {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
-      \nopagebreak\indexspace\nobreak\@afterheading}%
+        {\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading}%
   }
 }
 {}
@@ -712,7 +729,7 @@
       \glstreenonamechilddesc{##2}%
       \glstreechildprelocation##3\par
     }%
-    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}%
   }
 }
 {}
@@ -720,10 +737,11 @@
 {%
   \renewglossarystyle{treenonamegroup}{%
     \setglossarystyle{treenoname}%
-    \renewcommand{\glsgroupheading}[1]{\par
-      \noindent\glstreegroupheaderfmt
-        {\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+    \renewcommand{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }
@@ -733,13 +751,14 @@
   \renewglossarystyle{treenonamehypergroup}{%
     \setglossarystyle{treenoname}%
     \renewcommand*{\glossaryheader}{%
-      \par\noindent\glstreenavigationfmt{\glsnavigation}\par
-      \nobreak\@afterheading\indexspace}%
+      \par\noindent\glstreenavigationfmt{\glsnavigation}%
+      \glstreegroupskip\@afterheading}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par\noindent
-      \glstreegroupheaderfmt
-        {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading}%
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading}%
   }
 }
 {}
@@ -749,7 +768,9 @@
     {%
       \let\par\glsxtrAltTreePar
       \ifglshassymbol{#1}{(\glossentrysymbol{#1})\space}{}%
-      \glossentrydesc{#1}\glspostdescription\glstreeprelocation #2\par
+      \ifglshasdesc{#1}%
+        {\glossentrydesc{#1}\glspostdescription\glstreeprelocation}{}%
+      #2\par
     }%
   }
   \newlength\glsxtrAltTreeIndent
@@ -1205,7 +1226,7 @@
       \glsxtralttreeSubSymbolDescLocation{##1}{##2}{##3}%
       \def\@gls@prevlevel{##1}%
     }%
-    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+    \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}%
   }
 }%
 {%
@@ -1218,8 +1239,10 @@
       \def\@gls@prevlevel{-1}%
       \hangindent0pt\relax
       \parindent0pt\relax
-      \glstreegroupheaderfmt{\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace\nopagebreak
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip
     }%
   }%
 }%
@@ -1234,16 +1257,18 @@
       \def\@gls@prevlevel{-1}%
       \hangindent0pt\relax
       \parindent0pt\relax
-      \glstreenavigationfmt{\glsnavigation}\par\indexspace
+      \glstreenavigationfmt{\glsnavigation}%
+      \glstreegroupskip
     }%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par
       \def\@gls@prevlevel{-1}%
       \hangindent0pt\relax
       \parindent0pt\relax
-      \glstreegroupheaderfmt
-       {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
-      \nopagebreak\indexspace\nopagebreak
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip
     }%
   }
 }%
@@ -1254,8 +1279,10 @@
   \renewglossarystyle{mcolindexgroup}{%
     \setglossarystyle{mcolindex}%
     \renewcommand*{\glsgroupheading}[1]{%
-      \item\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \item\glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1267,12 +1294,14 @@
     \setglossarystyle{mcolindex}%
     \renewcommand*{\glossaryheader}{%
       \item\glstreenavigationfmt{\glsnavigation}%
-      \indexspace
+      \glstreegroupskip
     }%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \item\glstreegroupheaderfmt
-        {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+        {\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1290,9 +1319,11 @@
      \let\item\glstreeitem}%
     {\end{multicols}}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \item\glstreegroupheaderfmt
-        {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+        {\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1302,9 +1333,11 @@
 {%
   \renewglossarystyle{mcoltreegroup}{%
     \setglossarystyle{mcoltree}%
-    \renewcommand{\glsgroupheading}[1]{\par
-      \noindent\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+    \renewcommand{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1315,12 +1348,15 @@
   \renewglossarystyle{mcoltreehypergroup}{%
     \setglossarystyle{mcoltree}%
     \renewcommand*{\glossaryheader}{%
-      \par\noindent\glstreenavigationfmt{\glsnavigation}\par\indexspace
+      \par\noindent\glstreenavigationfmt{\glsnavigation}%
+      \glstreegroupskip
     }%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par\noindent
-      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1339,9 +1375,11 @@
     }%
     {\end{multicols}}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par\noindent
-      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1351,9 +1389,11 @@
 {%
   \renewglossarystyle{mcoltreenonamegroup}{%
     \setglossarystyle{mcoltreenoname}%
-    \renewcommand{\glsgroupheading}[1]{\par
-      \noindent\glstreegroupheaderfmt{\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace\nobreak\@afterheading
+    \renewcommand{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \par\noindent\glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip\@afterheading
     }%
   }
 }%
@@ -1364,11 +1404,15 @@
   \renewglossarystyle{mcoltreenonamehypergroup}{%
     \setglossarystyle{mcoltreenoname}%
     \renewcommand*{\glossaryheader}{%
-      \par\noindent\glstreenavigationfmt{\glsnavigation}\par\indexspace}%
+      \par\noindent\glstreenavigationfmt{\glsnavigation}%
+      \glstreegroupskip
+    }%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par\noindent
-      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading}%
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading}%
   }
 }%
 {%
@@ -1386,9 +1430,11 @@
     }%
     {\end{multicols}}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par\noindent
-      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nobreak\@afterheading}%
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip\@afterheading}%
   }
 }%
 {%
@@ -1412,12 +1458,15 @@
 {%
   \renewglossarystyle{mcolalttreegroup}{%
     \setglossarystyle{mcolalttree}%
-    \renewcommand{\glsgroupheading}[1]{\par
+    \renewcommand{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
+      \par
       \def\@gls@prevlevel{-1}%
       \hangindent0pt\relax
       \parindent0pt\relax
-      \glstreegroupheaderfmt{\glsgetgrouptitle{##1}}%
-      \nopagebreak\indexspace\nopagebreak
+      \glstreegroupheaderfmt{\glsxtr@grptitle}%
+      \glstreegroupskip
     }%
   }
 }%
@@ -1433,15 +1482,17 @@
       \hangindent0pt\relax
       \parindent0pt\relax
       \glstreenavigationfmt{\glsnavigation}%
-      \par\indexspace
+      \glstreegroupskip
     }%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par
       \def\@gls@prevlevel{-1}%
       \hangindent0pt\relax
       \parindent0pt\relax
-      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nopagebreak
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip
     }%
   }
 }%
@@ -1460,12 +1511,14 @@
     }%
     {\par\end{multicols}}%
     \renewcommand*{\glsgroupheading}[1]{%
+      \glsxtrgetgrouptitle{##1}{\glsxtr@grptitle}%
+      \glstreePreHeader{##1}{\glsxtr@grptitle}%
       \par
       \def\@gls@prevlevel{-1}%
       \hangindent0pt\relax
       \parindent0pt\relax
-      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-      \nopagebreak\indexspace\nopagebreak
+      \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsxtr@grptitle}}%
+      \glstreegroupskip
     }%
   }
 }%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
index 94e66a2f9f5..9246f55b5d7 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2019/03/31 v1.40 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2019/04/09 v1.41 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{etoolbox}
 \@ifpackageloaded{glossaries}
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
index 83858af8f5d..8b4851257aa 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2019/03/31 v1.40 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2019/04/09 v1.41 (NLCT)]
 \RequirePackage{multicol}
 \RequirePackage{glossary-tree}
 \newcommand{\glsxtrbookindexcols}{2}
@@ -194,9 +194,9 @@
     \let\@glsxtr@bookindex@atendgroup\relax
     \let\@glsxtr@bookindex@subatendgroup\relax
     \let\@glsxtr@bookindex@subsubatendgroup\relax
-    \glsxtrgetgrouptitle{##1}{\thisgrptitle}%
-    \glsxtrbookindexbookmark{\thisgrptitle}{index.##1}%
-    \glsxtrbookindexformatheader{\thisgrptitle}%
+    \glsxtrgetgrouptitle{##1}{\glsxtrcurrentgrptitle}%
+    \glsxtrbookindexbookmark{\glsxtrcurrentgrptitle}{index.##1}%
+    \glsxtrbookindexformatheader{\glsxtrcurrentgrptitle}%
     \nopagebreak\indexspace\nopagebreak\@afterheading
   }%
 }
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty
index cc7b6fa44e6..5724ca61515 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-longextra}[2019/03/31 v1.40 (NLCT)]
+\ProvidesPackage{glossary-longextra}[2019/04/09 v1.41 (NLCT)]
 \RequirePackage{glossary-longbooktabs}
 \newcommand{\glslongextraNameFmt}[1]{%
  \glsentryitem{#1}\glstarget{#1}{\glossentryname{#1}}%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
index 76b6b62ef76..b73fe6dc74d 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
@@ -39,18 +39,36 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-topic}[2019/03/31 v1.40 (NLCT)]
+\ProvidesPackage{glossary-topic}[2019/04/09 v1.41 (NLCT)]
 \RequirePackage{multicol}
 \newglossarystyle{topic}{%
-  \renewenvironment{theglossary}{\glstopicInit}{\par}%
+  \renewenvironment{theglossary}%
+  {%
+    \glstopicInit
+    \def\glstopic@prechildren{}%
+    \def\glstopic@prevlevel{-1}%
+  }%
+  {\par}%
   \renewcommand*{\glossaryheader}{}%
-  \renewcommand*{\glsgroupheading}[1]{\glstopicGroupHeading{##1}}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \def\glstopic@prevlevel{-1}%
+    \glstopicGroupHeading{##1}%
+  }%
   \renewcommand{\glossentry}[2]{%
     \hangindent0pt\relax
     \parindent\glstopicParIndent\relax
     \glstopicItem{##1}{##2}%
+     \ifglshasdesc{##1}%
+     {%
+       \def\glstopic@prechildren{}%
+     }%
+     {%
+       \def\glstopic@prechildren{\nopagebreak}%
+     }%
   }%
   \renewcommand{\subglossentry}[3]{%
+    \ifnum\glstopic@prevlevel=0\relax\glstopic@prechildren\fi
+    \def\glstopic@prevlevel{##1}%
     \glstopicAssignSubIndent{##1}%
     \glstopicSubItem{##1}{##2}{##3}%
   }%
@@ -83,6 +101,7 @@
 \setlength\glstopicSubIndent{20pt}
 \newcommand{\glstopicInit}{}
 \newcommand*{\glstopicAssignSubIndent}[1]{%
+  \par
   \parindent\dimexpr#1\glstopicSubIndent-\glstopicSubIndent\relax
   \glstopicAssignWidest{#1}%
   \hangindent\dimexpr\parindent+\glstopicwidest\relax
@@ -107,13 +126,13 @@
 \newcommand*{\glstopicMidSkip}{\smallskip}
 \newcommand*{\glstopicPostSkip}{\smallskip}
 \newcommand*{\glstopicSubItem}[3]{%
-  \par
   \glstopicSubItemBox{#1}{\glstopicSubNameFont{\glsentryitem{#2}%
     \glstarget{#2}{\glossentryname{#2}}}%
     \glstopicSubItemSep
   }%
   \ifglshassymbol{#2}{(\glossentrysymbol{#2})\space}{}%
-  \glossentrydesc{#2}\glspostdescription
+  \ifglshasdesc{#2}%
+   {\glossentrydesc{#2}\glspostdescription\glstopicSubPreLocSep}{}%
   \glstopicSubLoc{#2}{#3}%
 }
 \newcommand*{\glstopicSubItemSep}{\quad}
@@ -121,7 +140,8 @@
   \ifdim\glstopicwidest>0pt\relax\makebox[\glstopicwidest][l]{#2}\else#2\fi
 }
 \newcommand*{\glstopicSubNameFont}[1]{\textbf{#1}}
-\newcommand*{\glstopicSubLoc}[2]{\space#2}
+\newcommand*{\glstopicSubPreLocSep}{\space}
+\newcommand*{\glstopicSubLoc}[2]{#2}
 \newcommand*{\glstopicCols}{2}
 \newcommand*{\glstopicColsEnv}{multicols}
 \newglossarystyle{topicmcols}{%
@@ -149,7 +169,16 @@
     \parindent\glstopicParIndent\relax
     \glstopicItem{##1}{##2}%
     \ifnum\glstopicCols>1\relax
-      \edef\glstopic@prechildren{\noexpand\begin{\glstopicColsEnv}{\glstopicCols}}%
+      \ifglshasdesc{##1}%
+      {%
+        \edef\glstopic@prechildren{%
+          \noexpand\begin{\glstopicColsEnv}{\glstopicCols}}%
+      }%
+      {%
+        \edef\glstopic@prechildren{%
+          \noexpand\nopagebreak
+          \noexpand\begin{\glstopicColsEnv}{\glstopicCols}}%
+      }%
       \edef\glstopic@postchildren{\noexpand\end{\glstopicColsEnv}}%
     \fi
   }%