2 files changed, 60 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
index 2bf1059077f..75959b49edb 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,14 +1,14 @@
 %\iffalse
 % glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot
 % Command line args:
-%   -author "Nicola Talbot"
+%   -doc "glossaries-extra-codedoc.tex"
 %   -section "chapter"
-%   -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
 %   -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
 %   -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
-%   -doc "glossaries-extra-codedoc.tex"
+%   -author "Nicola Talbot"
+%   -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
 %   glossaries-extra
-% Created on 2017/4/18 11:44
+% Created on 2017/5/10 9:00
 %\fi
 %\iffalse
 %<*package>
@@ -118,7 +118,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{11746}
+\CheckSum{11749}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -154,13 +154,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
  \raggedright
 }
 
-\title{glossaries-extra.sty v1.14:
+\title{glossaries-extra.sty v1.15:
  documented code}
 \author{Nicola L.C. Talbot\\[10pt]
 Dickimaw Books\\
 \url{http://www.dickimaw-books.com/}}
 
-\date{2017-04-18}
+\date{2017-05-10}
 
 \begin{document}
 \DocInput{glossaries-extra.dtx}
@@ -205,7 +205,7 @@ Dickimaw Books\\
 %\section{Package Initialisation and Options}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2017/04/18 v1.14 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/05/10 v1.15 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{xkeyval} to define package options.
 %    \begin{macrocode}
@@ -437,9 +437,10 @@ Dickimaw Books\\
 %
 %\begin{macro}{\@glsxtr@dorecord}
 %\changes{1.08}{2016-12-13}{new}
+%\changes{1.15}{2017-05-10}{corrected premature expansion of \cs{@glslocref}}
 %    \begin{macrocode}
 \newcommand*\@glsxtr@dorecord{%
-   \protected@write\@auxout{}{\string\glsxtr@record
+   \protected@write\@auxout{\let\@glslocref\relax}{\string\glsxtr@record
       {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}%
       {\@glslocref}}%
    \@glsxtr@counterrecordhook
@@ -11434,7 +11435,10 @@ Dickimaw Books\\
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\the\glslongtok}}%
 %    \end{macrocode}
 %\changes{0.5.1}{2015-12-07}{switch off regular attribute if set}
@@ -11557,7 +11561,10 @@ Dickimaw Books\\
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstlongfont{\the\glslongpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
 %    \end{macrocode}
 %\changes{0.5.1}{2015-12-07}{switch off regular attribute if set}
 % Unset the \catattr{regular} attribute if it has been set.
@@ -11703,7 +11710,10 @@ Dickimaw Books\\
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
        {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
 %    \end{macrocode}
 % Switch off hyperlinks on first use to prevent nested hyperlinks,
 % and unset the \catattr{regular} attribute if it has been set.
@@ -11806,7 +11816,10 @@ Dickimaw Books\\
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}},%
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
 %    \end{macrocode}
 % Make this category insert a footnote after the link if this was
 % the first use, and
@@ -12826,7 +12839,10 @@ Dickimaw Books\\
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslongemfont{\the\glslongtok}}}%
 %    \end{macrocode}
 % Unset the \catattr{regular} attribute if it has been set.
@@ -12934,7 +12950,10 @@ Dickimaw Books\\
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstlongfont{\the\glslongpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
 %    \end{macrocode}
 % Unset the \catattr{regular} attribute if it has been set.
 %    \begin{macrocode}
@@ -13275,7 +13294,10 @@ Dickimaw Books\\
      \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}{\the\glslabeltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
 %    \end{macrocode}
 % Unset the \catattr{regular} attribute if it has been set.
@@ -13338,7 +13360,10 @@ Dickimaw Books\\
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
@@ -13427,7 +13452,10 @@ Dickimaw Books\\
     sort={\the\glslongtok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
@@ -13463,7 +13491,10 @@ Dickimaw Books\\
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
@@ -13553,7 +13584,10 @@ Dickimaw Books\\
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
@@ -13607,7 +13641,10 @@ Dickimaw Books\\
      \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongtok}}{\the\glslabeltok}},%
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongpltok}}{\the\glslabeltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+%    \end{macrocode}
+%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
+%    \begin{macrocode}
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
 %    \end{macrocode}
 % Unset the \catattr{regular} attribute if it has been set.
 %    \begin{macrocode}
@@ -14949,7 +14986,7 @@ Dickimaw Books\\
 % First identify package:
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/04/18 v1.14 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/05/10 v1.15 (NLCT)]
 %    \end{macrocode}
 % Provide package options to automatically load required predefined
 % styles. The simplest method is to just test for the existence of
diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
index 5cc3435e316..4635f120b1b 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
@@ -1,4 +1,4 @@
-% glossaries-extra.ins generated using makedtx version 1.1 2017/4/18 11:44
+% glossaries-extra.ins generated using makedtx version 1.1 2017/5/10 9:00
 \input docstrip
 
 \preamble