glossaries-extra (10may17)

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

55 files changed, 87 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
index df5dbec12b0..8e803f76d47 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
@@ -1,3 +1,9 @@
+1.15 (2017-05-10):
+
+ * Fixed typo in command name (\glsabbvfont -> \glsabbrvfont)
+
+ * Deferred location expansion in \@glsxtr@dorecord
+
 1.14 (2017-04-18):
 
  * New keys for \glsadd: thevalue and theHvalue
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README
index 4de1f396fcc..3ef56ff3cda 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/README
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/README
@@ -1,6 +1,6 @@
-LaTeX Package : glossaries-extra v1.14
+LaTeX Package : glossaries-extra v1.15
 
-Last Modified : 2017-04-18
+Last Modified : 2017-05-10
 
 Author        : Nicola Talbot
 
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf
index 6dd68c9338c..51b025afa54 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html
index 86d32ef2be4..9aa301401df 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html
@@ -217,7 +217,7 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;}
 >
 <!--l. 177--><p class="noindent" >
 </p><!--l. 177--><p class="noindent" ><span 
-class="cmr-17">glossaries-extra.sty v1.14: an extension to the</span>
+class="cmr-17">glossaries-extra.sty v1.15: an extension to the</span>
 <span 
 class="cmr-17">glossaries package</span>
 </p>
@@ -241,7 +241,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span
 class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table>
 </div>
 <!--l. 177--><p class="noindent" ><span 
-class="cmr-12">2017-04-18</span></p></div>
+class="cmr-12">2017-05-10</span></p></div>
    <div 
 class="abstract" 
 >
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf
index 70fffbc9f46..867e36e11c4 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex
index 014415d45a9..02ebd06489b 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex
@@ -167,13 +167,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
 \DeleteShortVerb{\|}
 \MakeShortVerb{"}
 
- \title{glossaries-extra.sty v1.14:
+ \title{glossaries-extra.sty v1.15:
  an extension to the glossaries package}
  \author{Nicola L.C. Talbot\\[10pt]
 Dickimaw Books\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2017-04-18}
+ \date{2017-05-10}
  \maketitle
 
 \begin{abstract}
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf
index d494667edc2..7321e83ea46 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf
index fd396472bbd..f72a05591c7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf
index c8a6b8ece28..d71ed9bb4db 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf
index 6893d548878..b9a9386e6cc 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf
index baa5c4bb487..d47b53dffd1 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf
index 3c0bdb399a6..9579992ca18 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf
index 68fc849251e..2522d6095d0 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf
index 7c9e4a37767..33c4050b266 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf
index 200d3e68c7a..a48a5da6945 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf
index d6e7ef776f1..d65f54d1e42 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf
index 83e90c43ae4..26a0c34c444 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf
index f70be962d28..b1712cf74e7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf
index cd735277214..68b6a849092 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf
index fde21b1f63b..17ac4891838 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf
index aa550263d73..f7ebb3a939b 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf
index 18067bd3c2d..66a49ed8725 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf
index f5917e37b38..44361707b79 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf
index f73e67317bf..aeb2b1614be 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf
index 13688c2434b..8df2b1bc4ee 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf
index 019eb661ebf..e9ab96577f2 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf
index 52e0f44ecca..80a9e94992f 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf
index 15824e4824b..14009848d23 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf
index c877d1caa0b..dc0aa546cd1 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf
index d5150a59082..468aae4ac44 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
index 0ba3393e3de..ea2b2c74c48 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
index 581ed6af93a..b5246a6caff 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf
index e471146fdd9..1141a99fdaa 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf
index fa76a89e41b..44c3053dc17 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf
index b920238d014..6bd73b10c74 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf
index b93d0321862..31365552498 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf
index a9823de9136..66d0d15a694 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf
index 54b138dcfa9..fada0ab0bed 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
index a356b9c6b22..18114cf5264 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf
index fa2e6f72e91..2c79df3df5a 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf
index 1aab7d2e221..035a8b80e6c 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf
index 9e34654efc6..af5605a6c6b 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf
index 01665654c6b..3002dfafd75 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf
index ff8bcbafc3e..76ed0b56ebc 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf
index adfa1e06a5b..fb0b73766f7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf
index c328076cb42..7e2a1a98167 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf
index 182ca047315..b9e23407ca7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf
index 28e7f2ce24f..50411956331 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
index ab3873601ba..81a06310628 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf
index 15276795b10..d5e4bb51e5e 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf
index f01a67f5c88..d6606ac1a1c 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf
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
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 43d7ac64cc9..3496cf21c37 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}[2017/04/18 v1.14 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/05/10 v1.15 (NLCT)]
 \newcommand*{\@glsxtr@loadstyles}{}
 \DeclareOption*{%
   \IfFileExists{glossary-\CurrentOption.sty}
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 df30651a874..55a3a3b5af5 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}[2017/04/18 v1.14 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/05/10 v1.15 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{etoolbox}
 \@ifpackageloaded{glossaries}
@@ -148,7 +148,7 @@
  \endgroup
 }
 \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
@@ -5632,7 +5632,7 @@
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\the\glslongtok}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -5709,7 +5709,7 @@
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstlongfont{\the\glslongpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
     {%
@@ -5787,7 +5787,7 @@
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
        {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -5857,7 +5857,7 @@
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}},%
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
@@ -6364,7 +6364,7 @@
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslongemfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -6424,7 +6424,7 @@
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
      (\protect\glsfirstlongfont{\the\glslongpltok})},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
     {%
@@ -6571,7 +6571,7 @@
      \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}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -6615,7 +6615,7 @@
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
@@ -6686,7 +6686,7 @@
     sort={\the\glslongtok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
@@ -6714,7 +6714,7 @@
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
@@ -6786,7 +6786,7 @@
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
@@ -6824,7 +6824,7 @@
      \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}}}%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
     {%