glossaries (10may18)

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

2 files changed, 206 insertions, 178 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index cc9a7cd8385..03e1821f46d 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -2,14 +2,15 @@
 % glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
 %   -author "Nicola Talbot"
+%   -comment ".*\.perl"
+%   -comment ".*\.tex"
+%   -comment ".*\.xdy"
+%   -section "chapter"
+%   -codetitle "Main Package Code"
+%   -doc "glossaries-manual.tex"
 %   -setambles ".*\.perl=>\nopreamble\nopostamble"
 %   -setambles ".*\.tex=>\nopreamble\nopostamble"
 %   -setambles ".*\.xdy=>\nopreamble\nopostamble"
-%   -codetitle "Main Package Code"
-%   -section "chapter"
-%   -macrocode ".*\.perl"
-%   -macrocode ".*\.tex"
-%   -macrocode ".*\.xdy"
 %   -src "glossaries\.sty\Z=>glossaries.sty"
 %   -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
 %   -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -26,12 +27,11 @@
 %   -src "(samplexdy-mc.*\.xdy)\Z=>\1"
 %   -src "(database.*\.tex)\Z=>\1"
 %   -src "(.*\.perl)\Z=>\1"
-%   -doc "glossaries-manual.tex"
-%   -comment ".*\.perl"
-%   -comment ".*\.tex"
-%   -comment ".*\.xdy"
+%   -macrocode ".*\.perl"
+%   -macrocode ".*\.tex"
+%   -macrocode ".*\.xdy"
 %   glossaries
-% Created on 2018/4/7 16:28
+% Created on 2018/5/10 14:33
 %\fi
 %\iffalse
 %<*package>
@@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{19495}
+\CheckSum{19427}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %\fi
 %\MakeShortVerb{"}
 %
-% \title{Documented Code For glossaries v4.37}
+% \title{Documented Code For glossaries v4.38}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2018-04-07}
+% \date{2018-05-10}
 % \maketitle
 %
 %This is the documented code for the \styfmt{glossaries} package.
@@ -193,7 +193,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.37:
+%For the main user guide, read \qt{glossaries.sty v4.38:
 %\LaTeX2e\ Package to Assist Generating Glossaries}.
 %
 %\item[\url{mfirstuc-manual.pdf}]
@@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 % This package requires \LaTeXe.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossaries}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
 % Required packages:
@@ -807,6 +807,37 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 %\end{option}
 %
+%\begin{counter}{glossaryentry}
+%\changes{3.0}{2011-04-02}{new}
+% If the \pkgopt{entrycounter} package option has been used, define
+% a counter to number each level~0 entry.
+% This is now defined by an internal command for consistency.
+%\end{counter}
+%
+%\begin{macro}{\@gls@define@glossaryentrycounter}
+%\changes{4.38}{2018-05-10}{new}
+%    \begin{macrocode}
+\newcommand*{\@gls@define@glossaryentrycounter}{%
+  \ifglsentrycounter
+%    \end{macrocode}
+%\changes{4.38}{2018-05-10}{added check for existence of glossaryentry counter}
+%Define the \ctr{glossaryentry} counter if it doesn't already exist.
+%    \begin{macrocode}
+    \ifundef\c@glossaryentry
+    {%
+      \ifx\@gls@counterwithin\@empty
+        \newcounter{glossaryentry}%
+      \else
+        \newcounter{glossaryentry}[\@gls@counterwithin]%
+      \fi
+      \def\theHglossaryentry{\currentglossary.\theglossaryentry}%
+    }%
+    {}%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{option}{entrycounter}
 % Defines a counter that can be used in the standard glossary styles
 % to number each (main) entry. If true, this will define a counter called
@@ -827,6 +858,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 \define@key{glossaries.sty}{counterwithin}{%
   \renewcommand*{\@gls@counterwithin}{#1}%
   \glsentrycountertrue
+  \@gls@define@glossaryentrycounter
 }
 %    \end{macrocode}
 %\end{option}
@@ -838,6 +870,41 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{counter}{glossarysubentry}
+%\changes{3.0}{2011-04-02}{new}
+% If the \pkgopt{subentrycounter} package option has been used, define
+% a counter to number each level~1 entry. This is now defined by an
+% internal command for consistency.
+%\end{counter}
+%\begin{macro}{\@gls@define@glossarysubentrycounter}
+%\changes{4.38}{2018-05-10}{new}
+%    \begin{macrocode}
+\newcommand{\@gls@define@glossarysubentrycounter}{%
+%    \end{macrocode}
+%Check if counter already defined.
+%    \begin{macrocode}
+  \ifundef\c@glossarysubentry
+  {%
+    \ifglssubentrycounter
+      \ifglsentrycounter
+        \newcounter{glossarysubentry}[glossaryentry]%
+      \else
+        \newcounter{glossarysubentry}%
+      \fi
+%    \end{macrocode}
+%\changes{4.38}{2018-05-10}{prepended \cs{currentglossary}\texttt{.} to
+%\cs{theHglossarysubentry} and removed spurious eol space}
+%As with \cs{theHglossaryentry}, this starts with
+%\cs{currentglossary}\texttt{.} to help avoid duplicate hyper targets.
+%    \begin{macrocode}
+      \def\theHglossarysubentry{\currentglossary.\currentglssubentry.\theglossarysubentry}%
+    \fi
+  }%
+  {}%
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{option}{subentrycounter}
 % Define a counter that can be used in the standard glossary styles
 % to number each level~1 entry. If true, this will define a counter called
@@ -2377,6 +2444,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \let\@gls@do@symbolssdef\relax
   \let\@gls@do@indexdef\relax
   \let\@gls@do@acronymsdef\relax
+  \ifglsentrycounter
+    \let\@gls@doentrycounterdef\relax
+  \else
+    \let\@gls@doentrycounterdef\@gls@define@glossaryentrycounter
+  \fi
+  \ifglssubentrycounter
+    \let\@gls@dosubentrycounterdef\relax
+  \else
+    \let\@gls@dosubentrycounterdef\@gls@define@glossarysubentrycounter
+  \fi
   \setkeys{glossaries.sty}{#1}%
   \@gls@setacrstyle
   \@gls@setupshortcuts
@@ -2384,6 +2461,8 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \@gls@do@numbersdef
   \@gls@do@symbolssdef
   \@gls@do@indexdef
+  \@gls@doentrycounterdef
+  \@gls@dosubentrycounterdef
 }
 %    \end{macrocode}
 %\end{macro}
@@ -15014,6 +15093,20 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 }
 %    \end{macrocode}
 %
+%\begin{macro}{\GlsEntryCounterLabelPrefix}
+%\changes{4.38}{2018-05-10}{new}
+%Make it easier to redefine the label prefix.
+%    \begin{macrocode}
+\newcommand*{\GlsEntryCounterLabelPrefix}{glsentry-}
+%    \end{macrocode}
+%\end{macro}
+%
+%The conditionals have been moved inside the appropriate commands to
+%make it easier for the user to redefine them in the preamble
+%and selectively switch the counter display on and off. Previously
+%the helper commands were redefined by the \gloskey{entrycounter}
+%option, which would counteract any earlier customisation.
+%
 %\changes{4.08}{2014-07-30}{added entrycounter option to
 %\texttt{printgloss} family}
 % The \gloskey[printglossary]{entrycounter} key is the same as the
@@ -15021,30 +15114,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \begin{macrocode}
 \define@choicekey{printgloss}{entrycounter}{true,false}[true]{%
   \csuse{glsentrycounter#1}%
-  \ifglsentrycounter
-    \ifx\@gls@counterwithin\@empty
-      \newcounter{glossaryentry}%
-    \else
-      \newcounter{glossaryentry}[\@gls@counterwithin]%
-    \fi
-    \def\theHglossaryentry{\currentglossary.\theglossaryentry}%
-    \renewcommand*{\glsresetentrycounter}{%
-      \setcounter{glossaryentry}{0}%
-    }%
-    \renewcommand*{\glsstepentry}[1]{%
-      \refstepcounter{glossaryentry}%
-      \label{glsentry-\glsdetoklabel{##1}}%
-    }%
-    \renewcommand*{\glsentrycounterlabel}{\theglossaryentry.\space}%
-    \renewcommand*{\glsentryitem}[1]{%
-      \glsstepentry{##1}\glsentrycounterlabel
-    }%
-  \else
-    \renewcommand*{\glsresetentrycounter}{}%
-    \renewcommand*{\glsstepentry}[1]{}%
-    \renewcommand*{\glsentrycounterlabel}{}%
-    \renewcommand*{\glsentryitem}[1]{\glsresetsubentrycounter}
-  \fi
+  \@gls@define@glossaryentrycounter
 }
 %    \end{macrocode}
 %
@@ -15058,34 +15128,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \begin{macrocode}
 \define@choicekey{printgloss}{subentrycounter}{true,false}[true]{%
   \csuse{glssubentrycounter#1}%
-  \ifglssubentrycounter
-    \ifundef\c@glossarysubentry
-    {%
-      \ifglsentrycounter
-        \newcounter{glossarysubentry}[glossaryentry]%
-      \else
-        \newcounter{glossarysubentry}
-      \fi
-    }{}%
-    \renewcommand*{\glsstepsubentry}[1]{%
-      \edef\currentglssubentry{\glsdetoklabel{##1}}%
-      \refstepcounter{glossarysubentry}%
-      \label{glsentry-\currentglssubentry}%
-    }%
-    \renewcommand*{\glsresetsubentrycounter}{%
-      \setcounter{glossarysubentry}{0}%
-    }%
-    \renewcommand*{\glssubentryitem}[1]{%
-      \glsstepsubentry{##1}\glssubentrycounterlabel
-    }%
-    \renewcommand*{\glssubentrycounterlabel}{\theglossarysubentry)\space}%
-    \def\theHglossarysubentry{\currentglssubentry.\theglossarysubentry}
-  \else
-    \renewcommand*{\glssubentryitem}[1]{}%
-    \renewcommand*{\glsstepsubentry}[1]{}%
-    \renewcommand*{\glsresetsubentrycounter}{}%
-    \renewcommand*{\glssubentrycounterlabel}{}%
-  \fi
+  \@gls@define@glossarysubentrycounter
 }
 %    \end{macrocode}
 %
@@ -15185,63 +15228,36 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 %\end{macro}
 %
-%\begin{counter}{glossaryentry}
-%\changes{3.0}{2011-04-02}{new}
-% If the \pkgopt{entrycounter} package option has been used, define
-% a counter to number each level~0 entry.
+%Process \pkgopt{entrycounter} and then \pkgopt{subentrycounter}
+%options (this ensures the sub-counter can pick up the main counter
+%as the master if required):
 %    \begin{macrocode}
-\ifglsentrycounter
-  \ifx\@gls@counterwithin\@empty
-    \newcounter{glossaryentry}
-  \else
-    \newcounter{glossaryentry}[\@gls@counterwithin]
-  \fi
-  \def\theHglossaryentry{\currentglossary.\theglossaryentry}
-\fi
-%    \end{macrocode}
-%\end{counter}
-%
-%\begin{counter}{glossarysubentry}
-%\changes{3.0}{2011-04-02}{new}
-% If the \pkgopt{subentrycounter} package option has been used, define
-% a counter to number each level~1 entry.
-%    \begin{macrocode}
-\ifglssubentrycounter
-  \ifglsentrycounter
-    \newcounter{glossarysubentry}[glossaryentry]
-  \else
-    \newcounter{glossarysubentry}
-  \fi
-  \def\theHglossarysubentry{\currentglssubentry.\theglossarysubentry}
-\fi
+\@gls@define@glossaryentrycounter
+\@gls@define@glossarysubentrycounter
 %    \end{macrocode}
-%\end{counter}
-%
 %\begin{macro}{\glsresetsubentrycounter}
 %\changes{3.0}{2011-04-02}{new}
 % Resets the \ctr{glossarysubentry} counter.
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 %    \begin{macrocode}
-\ifglssubentrycounter
-  \newcommand*{\glsresetsubentrycounter}{%
+\newcommand*{\glsresetsubentrycounter}{%
+  \ifglssubentrycounter
     \setcounter{glossarysubentry}{0}%
-  }
-\else
-  \newcommand*{\glsresetsubentrycounter}{}
-\fi
+  \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
 %\begin{macro}{\glsresetsubentrycounter}
 %\changes{3.02}{2012-05-21}{new}
-% Resets the \ctr{glossarentry} counter.
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
+% Resets the \ctr{glossaryentry} counter.
 %    \begin{macrocode}
-\ifglsentrycounter
-  \newcommand*{\glsresetentrycounter}{%
+\newcommand*{\glsresetentrycounter}{%
+  \ifglsentrycounter
     \setcounter{glossaryentry}{0}%
-  }
-\else
-  \newcommand*{\glsresetentrycounter}{}
-\fi
+  \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -15250,15 +15266,14 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % Advance the \ctr{glossaryentry} counter if in use. The argument is
 % the label associated with the entry.
 %\changes{4.03}{2014-01-20}{added \cs{glsdetoklabel}}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 %    \begin{macrocode}
-\ifglsentrycounter
-  \newcommand*{\glsstepentry}[1]{%
+\newcommand*{\glsstepentry}[1]{%
+  \ifglsentrycounter
     \refstepcounter{glossaryentry}%
-    \label{glsentry-\glsdetoklabel{#1}}%
-  }
-\else
-  \newcommand*{\glsstepentry}[1]{}
-\fi
+    \label{\GlsEntryCounterLabelPrefix\glsdetoklabel{#1}}%
+  \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -15267,16 +15282,15 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % Advance the \ctr{glossarysubentry} counter if in use. The argument is
 % the label associated with the subentry.
 %\changes{4.03}{2014-01-20}{added \cs{glsdetoklabel}}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 %    \begin{macrocode}
-\ifglssubentrycounter
-  \newcommand*{\glsstepsubentry}[1]{%
+\newcommand*{\glsstepsubentry}[1]{%
+  \ifglssubentrycounter
     \edef\currentglssubentry{\glsdetoklabel{#1}}%
     \refstepcounter{glossarysubentry}%
-    \label{glsentry-\currentglssubentry}%
-  }
-\else
-  \newcommand*{\glsstepsubentry}[1]{}
-\fi
+    \label{\GlsEntryCounterLabelPrefix\currentglssubentry}%
+  \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -15285,68 +15299,73 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % Reference the entry or sub-entry counter if in use, otherwise just do
 % \ics{gls}.
 %\changes{4.03}{2014-01-20}{added \cs{glsdetoklabel}}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 %    \begin{macrocode}
-\ifglsentrycounter
-  \newcommand*{\glsrefentry}[1]{\ref{glsentry-\glsdetoklabel{#1}}}
-\else
-  \ifglssubentrycounter
-    \newcommand*{\glsrefentry}[1]{\ref{glsentry-\glsdetoklabel{#1}}}
-  \else
-    \newcommand*{\glsrefentry}[1]{\gls{#1}}
-  \fi
-\fi
+\newcommand*{\glsrefentry}[1]{%
+ \ifglsentrycounter
+   \ref{\GlsEntryCounterLabelPrefix\glsdetoklabel{#1}}%
+ \else
+   \ifglssubentrycounter
+     \ref{\GlsEntryCounterLabelPrefix\glsdetoklabel{#1}}%
+   \else
+     \gls{#1}%
+   \fi
+ \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
 %\begin{macro}{\glsentrycounterlabel}
 %\changes{3.0}{2011-04-02}{new}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 % Defines how to display the \ctr{glossaryentry} counter.
 %    \begin{macrocode}
-\ifglsentrycounter
-  \newcommand*{\glsentrycounterlabel}{\theglossaryentry.\space}
-\else
-  \newcommand*{\glsentrycounterlabel}{}
-\fi
+\newcommand*{\glsentrycounterlabel}{%
+ \ifglsentrycounter
+   \theglossaryentry.\space
+ \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
 %\begin{macro}{\glssubentrycounterlabel}
 %\changes{3.0}{2011-04-02}{new}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 % Defines how to display the \ctr{glossarysubentry} counter.
 %    \begin{macrocode}
-\ifglssubentrycounter
-  \newcommand*{\glssubentrycounterlabel}{\theglossarysubentry)\space}
-\else
-  \newcommand*{\glssubentrycounterlabel}{}
-\fi
+\newcommand*{\glssubentrycounterlabel}{%
+ \ifglssubentrycounter
+   \theglossarysubentry)\space
+ \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
 %\begin{macro}{\glsentryitem}
 % Step and display \ctr{glossaryentry} counter, if appropriate.
 %\changes{3.0}{2011-04-02}{new}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 %    \begin{macrocode}
-\ifglsentrycounter
-  \newcommand*{\glsentryitem}[1]{%
+\newcommand*{\glsentryitem}[1]{%
+  \ifglsentrycounter
     \glsstepentry{#1}\glsentrycounterlabel
-  }
-\else
-  \newcommand*{\glsentryitem}[1]{\glsresetsubentrycounter}
-\fi
+  \else
+    \glsresetsubentrycounter
+  \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
 %\begin{macro}{\glssubentryitem}
 % Step and display \ctr{glossarysubentry} counter, if appropriate.
 %\changes{3.0}{2011-04-02}{new}
+%\changes{4.38}{2018-05-10}{bug fix: move conditional inside command}
 %    \begin{macrocode}
-\ifglssubentrycounter
-  \newcommand*{\glssubentryitem}[1]{%
+\newcommand*{\glssubentryitem}[1]{%
+  \ifglssubentrycounter
     \glsstepsubentry{#1}\glssubentrycounterlabel
-  }
-\else
-  \newcommand*{\glssubentryitem}[1]{}
-\fi
+  \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -18908,7 +18927,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % \cs{gls}\marg{label}} on subsequent use.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
 %    \begin{macrocode}
@@ -19323,7 +19342,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %\label{sec:code:hypernav}
 % Package Definition:
 %    \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %
 % The commands defined in this package are provided to 
@@ -19516,7 +19535,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % This defines an in-line style where the entries are
 % comma-separated with just the name and description displayed.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-inline}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{style}{inline}
@@ -19707,7 +19726,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % \ics{item} command, it will appear in a bold font by
 % default.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-list}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-list}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\indexspace}
 %\changes{4.13}{2015-02-03}{new}
@@ -19989,7 +20008,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % The glossary styles defined in the \isty{glossary-long} package
 % used the \env{longtable} environment in the glossary.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-long}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-long}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{longtable} package:
 %    \begin{macrocode}
@@ -20486,7 +20505,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % \url{http://tex.stackexchange.com/a/56890}
 %
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{booktabs} package:
 %    \begin{macrocode}
@@ -20827,7 +20846,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % used the \env{longtable} environment in the glossary and use
 % ragged right formatting for the multiline columns.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -21260,7 +21279,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %use the \sty{multicol} package. These use the tree-like glossary
 %styles in a multicol environment.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -21697,7 +21716,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % The glossary styles defined in the \isty{glossary-super} package
 % use the \env{supertabular} environment.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-super}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-super}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{supertabular} package:
 %    \begin{macrocode}
@@ -22229,7 +22248,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % are like those provided by the \isty{glossary-super} package, 
 % except that the multiline columns have ragged right justification.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -22669,7 +22688,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % that have a tree-like structure. These are designed for
 % hierarchical glossaries.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossary-tree}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{macro}{\indexspace}
@@ -23390,7 +23409,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % hyperlinks may not work properly.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\GlsAddXdyAttribute}
 % Adds an attribute in old format.
@@ -23751,7 +23770,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %\section{glossaries-compatible-307}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 %
 % Compatibility macros for predefined glossary styles:
@@ -24559,7 +24578,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 % Package version number now in line with main glossaries package number.
 %    \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2018/04/07 v4.37 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2018/05/10 v4.38 (NLCT)
   Experimental glossaries accessibility]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
@@ -24990,13 +25009,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %\end{macro}
 %
 %\begin{macro}{\glsaccsupp}
-%\cs{glsaccsupp}\marg{replacement text}\marg{text}\\[10pt]
+%\changes{4.38}{2018-05-10}{added braces around actual text argument}
+%\begin{definition}
+%\cs{glsaccsupp}\marg{replacement text}\marg{text}
+%\end{definition}
 % This can be redefined to use "E" or "Alt" instead of
 % "ActualText". (I don't have the software to test the "E" or
 % "Alt" options.)
 %    \begin{macrocode}
 \newcommand*{\glsaccsupp}[2]{%
-  \BeginAccSupp{ActualText=#1}#2\EndAccSupp{}%
+  \BeginAccSupp{ActualText={#1}}#2\EndAccSupp{}%
 }
 %    \end{macrocode}
 %\end{macro}
@@ -26879,9 +26901,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %
 %\begin{macro}{\showglonameaccess}
 %\changes{4.03}{2014-01-20}{added \cs{glsdetoklabel}}
+%\changes{4.38}{2018-05-10}{bug fix: corrected field (was showing text access field)}
 %    \begin{macrocode}
 \newcommand*{\showglonameaccess}[1]{%
-  \expandafter\show\csname glo@\glsdetoklabel{#1}@textaccess\endcsname
+  \expandafter\show\csname glo@\glsdetoklabel{#1}@access\endcsname
 }
 %    \end{macrocode}
 %\end{macro}
@@ -26998,7 +27021,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -27042,7 +27065,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2018/04/07 v4.37 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2018/05/10 v4.38 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -34988,9 +35011,14 @@ description={the hash symbol}}
 # 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, glossary-hypernav.sty, 
-# glossary-list.sty, glossary-long.sty, glossary-super.sty, 
-# glossaries.perl, mfrstuc.perl. Also makeglossaries and makeglossaries.bat
+# 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, glossaries.perl.
+# Also makeglossaries and makeglossaries-lite.lua.
 
 
 package main;
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 8bb5f4b9224..7cffd8f0f5d 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 2018/4/7 16:28
+% glossaries.ins generated using makedtx version 1.2 2018/5/10 14:33
 \input docstrip
 
 \preamble