glossaries (20oct21)

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

2 files changed, 285 insertions, 34 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 5c9124cc635..110cdf53618 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,9 +1,7 @@
 %\iffalse
 % glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
-%   -comment ".*\.perl"
-%   -comment ".*\.tex"
-%   -author "Nicola Talbot"
+%   -section "chapter"
 %   -src "glossaries\.sty\Z=>glossaries.sty"
 %   -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
 %   -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -13,17 +11,19 @@
 %   -src "(glossaries-babel)\.(sty)\Z=>\1.\2"
 %   -src "(glossaries-polyglossia)\.(sty)\Z=>\1.\2"
 %   -src "(example-glossaries-.*\.tex)\Z=>\1"
-%   -src "(glossaries-2020-03-19\.sty)\Z=>\1"
+%   -src "(glossar.*-2020-03-19\.sty)\Z=>\1"
 %   -src "(.*\.perl)\Z=>\1"
 %   -setambles ".*\.perl=>\nopreamble\nopostamble"
 %   -setambles ".*\.tex=>\nopreamble\nopostamble"
 %   -doc "glossaries-manual.tex"
-%   -section "chapter"
-%   -codetitle "Main Package Code"
+%   -comment ".*\.perl"
+%   -comment ".*\.tex"
+%   -author "Nicola Talbot"
 %   -macrocode ".*\.perl"
 %   -macrocode ".*\.tex"
+%   -codetitle "Main Package Code"
 %   glossaries
-% Created on 2021/9/23 17:22
+% Created on 2021/10/20 10:44
 %\fi
 %\iffalse
 %<*package>
@@ -137,7 +137,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{34113}
+\CheckSum{34471}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -164,12 +164,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %\fi
 %\MakeShortVerb{"}
 %
-% \title{Documented Code For glossaries v4.47}
+% \title{Documented Code For glossaries v4.48}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2021-09-20}
+% \date{2021-10-19}
 % \maketitle
 %
 %This is the documented code for the \styfmt{glossaries} package.
@@ -185,7 +185,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %glossaries package}.
 %
 %\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.47:
+%For the main user guide, read \qt{glossaries.sty v4.48:
 %\LaTeX2e\ Package to Assist Generating Glossaries}.
 %
 %\item[\url{mfirstuc-manual.pdf}]
@@ -244,11 +244,11 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 % Rollback releases:
 %    \begin{macrocode}
 \DeclareRelease{v4.46}{2020-03-19}{glossaries-2020-03-19.sty}
-\DeclareCurrentRelease{v4.47}{2021-09-20}
+\DeclareCurrentRelease{v4.48}{2021-10-19}
 %    \end{macrocode}
 % Declare package:
 %    \begin{macrocode}
-\ProvidesPackage{glossaries}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossaries}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
 % Required packages:
@@ -6360,6 +6360,23 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{macro}{\glsunexpandedfieldvalue}
+%\changes{4.48}{2021-10-19}{new}
+%\begin{definition}
+%\cs{glsunexpandedfieldvalue}\marg{label}\marg{field}
+%\end{definition}
+%For use in expandable contexts where the field value is required,
+%but the contents should not be expanded. The \meta{field} argument
+%must be the internal field name.
+%    \begin{macrocode}
+\newcommand*{\glsunexpandedfieldvalue}[2]{%
+  \ifcsname glo@\glsdetoklabel{#1}@#2\endcsname
+   \expandafter\expandonce\csname glo@\glsdetoklabel{#1}@#2\expandafter\endcsname
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\ifglsfieldeq}
 %\begin{definition}
 %\cs{ifglsfieldeq}\marg{label}\marg{field}\marg{string}\marg{true}\marg{false}
@@ -12094,6 +12111,17 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{macro}{\glscapitalisewords}
+%\changes{4.48}{2021-10-19}{new}
+% Make it easier to switch from \cs{capitalisewords} to
+% \cs{capitalisefmtwords}.
+%    \begin{macrocode}
+\newcommand{\glscapitalisewords}[1]{%
+  \capitalisewords{#1}%
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\glsentrytitlecase}
 %\changes{4.22}{2016-04-19}{new}
 %\changes{4.45}{2020-02-13}{added existence check}
@@ -12102,7 +12130,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \glsdoifexists{#1}%
   {%
     \glsfieldfetch{#1}{#2}{\@gls@value}%
-    \xcapitalisewords{\@gls@value}%
+    \expandafter\glscapitalisewords\expandafter{\@gls@value}%
   }%
 }
 \ifdef\texorpdfstring
@@ -19865,7 +19893,7 @@ you
 % \cs{gls}\marg{label}} on subsequent use.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
 %    \begin{macrocode}
@@ -20330,7 +20358,7 @@ you
 %\label{sec:code:hypernav}
 % Package Definition:
 %    \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %
 % The commands defined in this package are provided to 
@@ -20529,7 +20557,7 @@ you
 % This defines an in-line style where the entries are
 % comma-separated with just the name and description displayed.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-inline}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{style}{inline}
@@ -20710,6 +20738,95 @@ you
 %\fi
 %\iffalse
 %    \begin{macrocode}
+%<*glossary-list-2020-03-19.sty>
+%    \end{macrocode}
+%\fi
+% \section{Rollback v4.46 (glossary-list-2020-03-19.sty)}
+% Version 4.46 preserved for rollback.
+%    \begin{macrocode}
+\ProvidesPackage{glossary-list}[2020/03/19 v4.46 (NLCT)]
+\providecommand{\indexspace}{%
+  \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
+}
+\newcommand*{\glslistgroupheaderfmt}[1]{#1}
+\newcommand*{\glslistnavigationitem}[1]{\item[#1]}
+\newglossarystyle{list}{%
+  \renewenvironment{theglossary}%
+    {\begin{description}}{\end{description}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+          \glstarget{##1}{\glossentryname{##1}}]
+       \glossentrydesc{##1}\glspostdescription\space ##2}%
+  \renewcommand*{\subglossentry}[3]{%
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\strut}\space
+    \glossentrydesc{##2}\glspostdescription\space ##3.}%
+  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+}
+\newglossarystyle{listgroup}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}}
+\newglossarystyle{listhypergroup}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossaryheader}{%
+    \glslistnavigationitem{\glsnavigation}}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt
+          {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}}
+\newglossarystyle{altlist}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+      \glstarget{##1}{\glossentryname{##1}}]%
+      \mbox{}\par\nobreak\@afterheading
+      \glossentrydesc{##1}\glspostdescription\space ##2}%
+  \renewcommand{\subglossentry}[3]{%
+    \par
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}%
+}
+\newglossarystyle{altlistgroup}{%
+  \setglossarystyle{altlist}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}}
+\newglossarystyle{altlisthypergroup}{%
+  \setglossarystyle{altlist}%
+  \renewcommand*{\glossaryheader}{%
+    \glslistnavigationitem{\glsnavigation}}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt
+      {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}}
+\newglossarystyle{listdotted}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[]\makebox[\glslistdottedwidth][l]{%
+      \glsentryitem{##1}%
+      \glstarget{##1}{\glossentryname{##1}}%
+      \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}%
+  \renewcommand*{\subglossentry}[3]{%
+    \item[]\makebox[\glslistdottedwidth][l]{%
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\glossentryname{##2}}%
+    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}%
+}
+\newlength\glslistdottedwidth
+\setlength{\glslistdottedwidth}{.5\hsize}
+\newglossarystyle{sublistdotted}{%
+  \setglossarystyle{listdotted}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}%
+}
+%    \end{macrocode}
+%\iffalse
+%    \begin{macrocode}
+%</glossary-list-2020-03-19.sty>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
 %<*glossary-list.sty>
 %    \end{macrocode}
 %\fi
@@ -20720,7 +20837,16 @@ you
 % \ics{item} command, it will appear in a bold font by
 % default.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-list}[2021/09/20 v4.47 (NLCT)]
+\NeedsTeXFormat{LaTeX2e}
+%    \end{macrocode}
+% Rollback releases:
+%    \begin{macrocode}
+\DeclareRelease{v4.46}{2020-03-19}{glossary-list-2020-03-19.sty}
+\DeclareCurrentRelease{v4.48}{2021-10-19}
+%    \end{macrocode}
+%Declare package:
+%    \begin{macrocode}
+\ProvidesPackage{glossary-list}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\indexspace}
 %\changes{4.13}{2015-02-03}{new}
@@ -20755,6 +20881,38 @@ you
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{macro}{\glslistinit}
+%\changes{4.48}{2021-10-19}{new}
+%Provide a way to ensure appropriate expansion of the name if
+%\pkgopt{entrycounter} is used with \sty{gettitlestring}:
+%    \begin{macrocode}
+\newcommand{\glslistinit}{%
+  \ifdef\GetTitleStringDisableCommands
+  {%
+    \GetTitleStringSetup{expand}%
+    \GetTitleStringDisableCommands{%
+      \let\glsentryitem\@gobble
+      \let\glstarget\@secondoftwo
+      \let\glossentryname\glslistexpandedname
+      \let\glslistgroupheaderfmt\@firstofone
+      \let\glsgetgrouptitle\@firstofone
+      \let\glsnavhypertarget\@secondoftwo
+    }%
+  }%
+  {}%
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glslistexpandedname}
+%\changes{4.48}{2021-10-19}{new}
+%    \begin{macrocode}
+\newcommand{\glslistexpandedname}[1]{%
+ \glsunexpandedfieldvalue{#1}{name}%
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{style}{list}
 % The \glostyle{list} glossary style 
 % uses the \env{description} environment. The group separator
@@ -20770,7 +20928,7 @@ you
 % Use \env{description} environment:
 %    \begin{macrocode}
   \renewenvironment{theglossary}%
-    {\begin{description}}{\end{description}}%
+    {\glslistinit\begin{description}}{\end{description}}%
 %    \end{macrocode}
 % No header at the start of the environment:
 %    \begin{macrocode}
@@ -21002,7 +21160,7 @@ you
 % The glossary styles defined in the \isty{glossary-long} package
 % used the \env{longtable} environment in the glossary.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-long}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-long}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{longtable} package:
 %    \begin{macrocode}
@@ -21499,7 +21657,7 @@ you
 % \url{http://tex.stackexchange.com/a/56890}
 %
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{booktabs} package:
 %    \begin{macrocode}
@@ -21840,7 +21998,7 @@ you
 % used the \env{longtable} environment in the glossary and use
 % ragged right formatting for the multiline columns.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -22273,7 +22431,7 @@ you
 %use the \sty{multicol} package. These use the tree-like glossary
 %styles in a multicol environment.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -22710,7 +22868,7 @@ you
 % The glossary styles defined in the \isty{glossary-super} package
 % use the \env{supertabular} environment.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-super}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-super}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{supertabular} package:
 %    \begin{macrocode}
@@ -23242,7 +23400,7 @@ you
 % are like those provided by the \isty{glossary-super} package, 
 % except that the multiline columns have ragged right justification.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -23682,7 +23840,7 @@ you
 % that have a tree-like structure. These are designed for
 % hierarchical glossaries.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossary-tree}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{macro}{\indexspace}
@@ -24403,7 +24561,7 @@ you
 % hyperlinks may not work properly.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\GlsAddXdyAttribute}
 % Adds an attribute in old format.
@@ -24764,7 +24922,7 @@ you
 %\section{glossaries-compatible-307}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 %
 % Compatibility macros for predefined glossary styles:
@@ -25572,7 +25730,7 @@ you
 %    \end{macrocode}
 % Package version number now in line with main glossaries package number.
 %    \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2021/09/20 v4.47 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2021/10/19 v4.48 (NLCT)
   Experimental glossaries accessibility]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
@@ -28880,7 +29038,7 @@ you
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -28924,7 +29082,7 @@ you
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2021/09/20 v4.47 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2021/10/19 v4.48 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -30847,7 +31005,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \newcommand*{\@gls@loadsuper}{\RequirePackage{glossary-super}}}{%
   \newcommand*{\@gls@loadsuper}{}}
 \@gls@declareoption{nosuper}{\renewcommand*{\@gls@loadsuper}{}}
-\newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}}
+\newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}[=v4.46]}
 \@gls@declareoption{nolist}{%
  \renewcommand*{\@gls@loadlist}{%
   \ifdefstring{\@glossary@default@style}{list}%
@@ -38816,6 +38974,95 @@ you
 %\fi
 %\iffalse
 %    \begin{macrocode}
+%<*glossary-list-2020-03-19.sty>
+%    \end{macrocode}
+%\fi
+% \section{Rollback v4.46 (glossary-list-2020-03-19.sty)}
+% Version 4.46 preserved for rollback.
+%    \begin{macrocode}
+\ProvidesPackage{glossary-list}[2020/03/19 v4.46 (NLCT)]
+\providecommand{\indexspace}{%
+  \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
+}
+\newcommand*{\glslistgroupheaderfmt}[1]{#1}
+\newcommand*{\glslistnavigationitem}[1]{\item[#1]}
+\newglossarystyle{list}{%
+  \renewenvironment{theglossary}%
+    {\begin{description}}{\end{description}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+          \glstarget{##1}{\glossentryname{##1}}]
+       \glossentrydesc{##1}\glspostdescription\space ##2}%
+  \renewcommand*{\subglossentry}[3]{%
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\strut}\space
+    \glossentrydesc{##2}\glspostdescription\space ##3.}%
+  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
+}
+\newglossarystyle{listgroup}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}}
+\newglossarystyle{listhypergroup}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossaryheader}{%
+    \glslistnavigationitem{\glsnavigation}}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt
+          {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}}
+\newglossarystyle{altlist}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+      \glstarget{##1}{\glossentryname{##1}}]%
+      \mbox{}\par\nobreak\@afterheading
+      \glossentrydesc{##1}\glspostdescription\space ##2}%
+  \renewcommand{\subglossentry}[3]{%
+    \par
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}%
+}
+\newglossarystyle{altlistgroup}{%
+  \setglossarystyle{altlist}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}}
+\newglossarystyle{altlisthypergroup}{%
+  \setglossarystyle{altlist}%
+  \renewcommand*{\glossaryheader}{%
+    \glslistnavigationitem{\glsnavigation}}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glslistgroupheaderfmt
+      {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}}
+\newglossarystyle{listdotted}{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[]\makebox[\glslistdottedwidth][l]{%
+      \glsentryitem{##1}%
+      \glstarget{##1}{\glossentryname{##1}}%
+      \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}%
+  \renewcommand*{\subglossentry}[3]{%
+    \item[]\makebox[\glslistdottedwidth][l]{%
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\glossentryname{##2}}%
+    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}%
+}
+\newlength\glslistdottedwidth
+\setlength{\glslistdottedwidth}{.5\hsize}
+\newglossarystyle{sublistdotted}{%
+  \setglossarystyle{listdotted}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}%
+}
+%    \end{macrocode}
+%\iffalse
+%    \begin{macrocode}
+%</glossary-list-2020-03-19.sty>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
 %<*glossaries.perl>
 %    \end{macrocode}
 %\fi
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 0c8f90881bf..7c92550963f 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.2 2021/9/23 17:22
+% glossaries.ins generated using makedtx version 1.2 2021/10/20 10:44
 \input docstrip
 
 \preamble
@@ -18,7 +18,7 @@
 
  The Current Maintainer of this work is Nicola Talbot.
 
- This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childmultipar.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-longchild.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbolnames.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, glossaries-2020-03-19.sty, glossaries.perl.
+ This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list-2020-03-19.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childmultipar.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-longchild.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbolnames.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, glossaries-2020-03-19.sty, glossary-list-2020-03-19.sty, glossaries.perl.
 
 \endpreamble
 
@@ -32,6 +32,8 @@
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-hypernav.sty,package}}
 \file{glossary-inline.sty}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-inline.sty,package}}
+\file{glossary-list-2020-03-19.sty}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-list-2020-03-19.sty,package}}
 \file{glossary-list.sty}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-list.sty,package}}
 \file{glossary-long.sty}{\usepreamble\defaultpreamble
@@ -75,6 +77,8 @@
 \file{example-glossaries-url.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-url.tex}}
 \file{glossaries-2020-03-19.sty}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-2020-03-19.sty,package}}
+\file{glossary-list-2020-03-19.sty}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-list-2020-03-19.sty,package}}
 \file{glossaries.perl}{\nopreamble\nopostamble\from{glossaries.dtx}{glossaries.perl}}
 }