1 files changed, 21 insertions, 36 deletions
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 9137a38056a..19b3363a804 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -21,7 +21,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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,42 +39,25 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \ProvidesPackage{glossary-hypernav}[2007/07/04 v1.01 (NLCT)]
-\@ifundefined{hyperlink}{%
-\newcommand*{\glsnavhyperlink}[3][]{#3}}{%
 \newcommand*{\glsnavhyperlink}[3][\@glo@type]{%
-\edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
-\hyperlink{glsn:#1@#2}{#3}}}
-\@ifundefined{hypertarget}{%
+  \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
+  \@glslink{glsn:#1@#2}{#3}}
 \newcommand*{\glsnavhypertarget}[3][\@glo@type]{%
-\protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}%
-#3%
-\expandafter
-\let\expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname
-\@for\@gls@elem:=\@gls@list\do{%
-\ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}%
-\if@endfor
-\else
-  \PackageWarningNoLine{glossaries}{Navigation panel
-    for glossary type `#1'^^Jmissing group `#2'}%
-  \gdef\gls@hypergrouprerun{%
+  \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}%
+  \@glstarget{glsn:#1@#2}{#3}%
+  \expandafter\let
+     \expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname
+  \@for\@gls@elem:=\@gls@list\do{%
+    \ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}%
+  \if@endfor
+  \else
     \PackageWarningNoLine{glossaries}{Navigation panel
-    has changed. Rerun LaTeX}}%
-\fi}}{%
-\newcommand*{\glsnavhypertarget}[3][\@glo@type]{%
-\protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}%
-\hypertarget{glsn:#1@#2}{#3}%
-\expandafter
-\let\expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname
-\@for\@gls@elem:=\@gls@list\do{%
-\ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}%
-\if@endfor
-\else
-  \PackageWarningNoLine{glossaries}{Navigation panel
-     for glossary type `#1'^^Jmissing group `#2'}%
-  \gdef\gls@hypergrouprerun{%
-    \PackageWarningNoLine{glossaries}{Navigation panel
-    has changed. Rerun LaTeX}}%
-\fi}}
+       for glossary type `#1'^^Jmissing group `#2'}%
+    \gdef\gls@hypergrouprerun{%
+      \PackageWarningNoLine{glossaries}{Navigation panel
+      has changed. Rerun LaTeX}}%
+  \fi
+}
 \let\gls@hypergrouprerun\relax
 \AtEndDocument{\gls@hypergrouprerun}
 \newcommand*{\@gls@hypergroup}[2]{%
@@ -103,8 +86,10 @@
 }
 \newcommand*{\glshypernavsep}{\space\textbar\space}
 \newcommand*{\glssymbolnav}{%
-\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}} \textbar\
-\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}} \textbar\
+\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}}%
+\glshypernavsep
+\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}}%
+\glshypernavsep
 }
 \endinput
 %%