glossaries-extra (1apr20)

git-svn-id: svn://tug.org/texlive/trunk@54688 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 14 insertions, 10 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 eb6fcda06d5..9098bed7dc0 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}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (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 586470575fe..f9fff6d26d3 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}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)]
 \newcommand*{\@glsxtr@loadstyles}{}
 \DeclareOption{all}{%
   \appto\@glsxtr@loadstyles{%
@@ -705,9 +705,15 @@
   \newcommand{\glstreenonamesymbol}[1]{%
     \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}%
   }%
+  \newcommand{\glstreenonameDescLoc}[2]{%
+    \glstreenonamedesc{#1}\glstreeprelocation#2%
+  }
   \newcommand{\glstreenonamechilddesc}[1]{%
     \glossentrydesc{#1}\glspostdescription
   }%
+  \newcommand{\glstreenonameChildDescLoc}[2]{%
+    \glstreenonamechilddesc{#1}\glstreechildprelocation#2%
+  }
   \renewglossarystyle{treenoname}{%
     \renewenvironment{theglossary}%
       {\setlength{\parindent}{0pt}%
@@ -720,8 +726,7 @@
       \parindent0pt\relax
       \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
       \glstreenonamesymbol{##1}%
-      \glstreenonamedesc{##1}%
-      \glstreeDescLoc{##1}{##2}\par
+      \glstreenonameDescLoc{##1}{##2}\par
     }%
     \renewcommand{\subglossentry}[3]{%
       \hangindent##1\glstreeindent\relax
@@ -730,8 +735,7 @@
         \glssubentryitem{##2}%
       \fi
       \glstarget{##2}{\strut}%
-      \glstreenonamechilddesc{##2}%
-      \glstreechildprelocation##3\par
+      \glstreenonameChildDescLoc{##2}{##3}\par
     }%
     \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}%
   }
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 1b905fc93a8..cb1b1cded9a 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}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (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 0349f32c57b..db0c97bc566 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}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)]
 \RequirePackage{multicol}
 \RequirePackage{glossary-tree}
 \newcommand{\glsxtrbookindexcols}{2}
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 637a2b69ed7..9c3e6fbad5c 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}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (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 aa6c9ecc012..041e54d8d06 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-topic}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)]
 \RequirePackage{multicol}
 \newglossarystyle{topic}{%
   \renewenvironment{theglossary}%