glossaries (19jan17)

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

17 files changed, 34 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
index 68ab1fed2b0..1952f1025ba 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{tracklang}
 \let\glsifusetranslator\@secondoftwo
   \AnyTrackedLanguages
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
index 67d78b63482..afdb556515f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2017/01/19 v4.29 (NLCT)]
 \ifglsxindy
   \renewcommand*\GlsAddXdyAttribute[1]{%
   \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
index dcb8c5eb645..4448b35dc0c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2017/01/19 v4.29 (NLCT)]
 \newcommand{\compatglossarystyle}[2]{%
   \ifcsundef{@glscompstyle@#1}%
   {%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
index 3724c2f517b..58ce97d844d 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{tracklang}
 \let\glsifusetranslator\@secondoftwo
   \AnyTrackedLanguages
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
index 2a496501bd7..15495829a73 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2017/01/19 v4.29 (NLCT)]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
 \ProcessOptions
 \RequirePackage{glossaries}
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 6f543a2c090..131e29688a9 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossaries}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -3607,7 +3607,9 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \settoheight{\gls@tmplen}{#2}%
   \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2%
 }
-\newcommand*{\glsdohyperlink}[2]{\hyperlink{#1}{#2}}
+\newcommand*{\glsdohyperlink}[2]{%
+ \hyperlink{#1}{#2}%
+}
 \newcommand*{\glsdonohyperlink}[2]{#2}
 \ifcsundef{hyperlink}%
 {%
@@ -5804,10 +5806,10 @@ you
     }%
     \glossarysection[\glossarytoctitle]{\glossarytitle}%
     \glossarypreamble
+    \def\@gls@currentlettergroup{}%
     \begin{theglossary}%
     \glossaryheader
     \glsresetentrylist
-    \def\@gls@currentlettergroup{}%
    \forlistcsloop{\@gls@noidx@do}{@glsref@\@glo@type}%
     \end{theglossary}%
     \glossarypostamble
@@ -5872,7 +5874,7 @@ you
       \ifdefempty{\@gls@currentlettergroup}{}{\glsgroupskip}%
       \glsgroupheading{\@glo@thislettergrp}%
     }%
-    \let\@gls@currentlettergroup\@glo@thislettergrp
+    \global\let\@gls@currentlettergroup\@glo@thislettergrp
     \ifdefvoid{\@gls@loclist}
     {%
       \glossentry{#1}{}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
index 5f67c25239c..cc155484910 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
@@ -39,18 +39,21 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-accsupp}[2017/01/07 v4.28 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2017/01/19 v4.29 (NLCT)
   Experimental glossaries accessibility]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
 \ProcessOptions
 \@ifpackageloaded{glossaries-extra}
 {%
-  \PackageWarning{glossaries-accsupp}{The `glossaries-accsupp'
-  package has been loaded after the `glossaries-extra'
-  package. This can cause a failure to integrate both
-  packages. Either use the `accsupp' option when you
-  load `glossaries-extra' or load `glossaries-accsupp'
-  before loading `glossaries-extra'}%
+  \ifx\@glsxtr@doaccsupp\empty
+   \GlossariesWarning{The `glossaries-accsupp'
+   package has been loaded\MessageBreak
+   after the `glossaries-extra' package. This\MessageBreak
+   can cause a failure to integrate both packages. \MessageBreak
+   Either use the `accsupp' option when you load\MessageBreak
+   `glossaries-extra' or load `glossaries-accsupp'\MessageBreak
+   before loading `glossaries-extra'}%
+  \fi
 }
 {}
 \def\compatibleglossentry#1#2{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
index 72a15f4cd87..4238cd7aec2 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -38,13 +38,14 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-hypernav}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2017/01/19 v4.29 (NLCT)]
 \newcommand*{\glsnavhyperlink}[3][\@glo@type]{%
   \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
-  \@glslink{glsn:#1@#2}{#3}}
+  \@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}}
+\newcommand*{\glsnavhyperlinkname}[2]{glsn:#1@#2}
 \newcommand*{\glsnavhypertarget}[3][\@glo@type]{%
   \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}%
-  \@glstarget{glsn:#1@#2}{#3}%
+  \@glstarget{\glsnavhyperlinkname{#1}{#2}}{#3}%
   \expandafter\let
      \expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname
   \@for\@gls@elem:=\@gls@list\do{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
index 57e109748a4..4ecb033e293 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-inline}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-inline}[2017/01/19 v4.29 (NLCT)]
 \newglossarystyle{inline}{%
   \renewenvironment{theglossary}%
     {%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
index 66508a0b495..652cd6aca49 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-list}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-list}[2017/01/19 v4.29 (NLCT)]
 \providecommand{\indexspace}{%
   \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
 }
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
index 3931c5b6e6b..acde092a7c8 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-long}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-long}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{longtable}
 \@ifundefined{glsdescwidth}{%
   \newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
index b7dc33c91a8..55a6cf8039e 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-longbooktabs}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{booktabs}
 \RequirePackage{glossary-long}
 \RequirePackage{glossary-longragged}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
index 6472877a0c1..8ab28fcc9b8 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-longragged}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{array}
 \RequirePackage{longtable}
 \@ifundefined{glsdescwidth}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
index 7c5f3b545c9..32d42829566 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-mcols}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{multicol}
 \RequirePackage{glossary-tree}
 \providecommand{\indexspace}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
index 21b8b90fccf..942df9e3de3 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-super}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-super}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{supertabular}
 \@ifundefined{glsdescwidth}{%
   \newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
index 00b11c270b6..0b8299712d9 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-superragged}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2017/01/19 v4.29 (NLCT)]
 \RequirePackage{array}
 \RequirePackage{supertabular}
 \@ifundefined{glsdescwidth}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
index 4ace6d4495c..47eaaa60cdb 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-tree}[2017/01/07 v4.28 (NLCT)]
+\ProvidesPackage{glossary-tree}[2017/01/19 v4.29 (NLCT)]
 \providecommand{\indexspace}{%
   \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
 }