glossaries 1.18

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

19 files changed, 517 insertions, 426 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 774682e3742..413fa26bdd6 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-babel.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2008/12/11 v1.01 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2009/01/14 v1.02 (NLCT)]
 \@ifundefined{captionsenglish}{}{%
   \addto\captionsenglish{%
     \renewcommand*{\glossaryname}{Glossary}%
@@ -86,7 +86,7 @@
     \renewcommand*{\pagelistname}{Page List}%
     \renewcommand*{\glssymbolsgroupname}{Symbols}%
     \renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
+}}%
 \@ifundefined{captionscanadian}{}{%
   \addto\captionscanadian{%
     \renewcommand*{\glossaryname}{Glossary}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 9c488642eef..41f8f836944 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2008/12/26 v1.17 (NLCT)]
+\ProvidesPackage{glossaries}[2009/01/14 v1.18 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -75,6 +75,23 @@ false,nolabel,autolabel}[nolabel]{%
 \newcommand*{\glossaryentrynumbers}[1]{#1}
 \DeclareOptionX{nonumberlist}{%
 \renewcommand*{\glossaryentrynumbers}[1]{}}
+\newcommand*{\@gls@loadlong}{\RequirePackage{glossary-long}}
+\DeclareOptionX{nolong}{\renewcommand*{\@gls@loadlong}{}}
+\IfFileExists{supertabular.sty}{%
+  \newcommand*{\@gls@loadsuper}{\RequirePackage{glossary-super}}}{%
+  \newcommand*{\@gls@loadsuper}{}}
+\DeclareOptionX{nosuper}{\renewcommand*{\@gls@loadsuper}{}}
+\newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}}
+\DeclareOptionX{nolist}{\renewcommand*{\@gls@loadlist}{}}
+\newcommand*{\@gls@loadtree}{\RequirePackage{glossary-tree}}
+\DeclareOptionX{notree}{\renewcommand*{\@gls@loadtree}{}}
+\DeclareOptionX{nostyles}{%
+  \renewcommand*{\@gls@loadlong}{}%
+  \renewcommand*{\@gls@loadsuper}{}%
+  \renewcommand*{\@gls@loadlist}{}%
+  \renewcommand*{\@gls@loadtree}{}%
+  \let\@glossary@default@style\relax
+}
 \newcommand{\glsdefaulttype}{main}
 \newcommand{\acronymtype}{\glsdefaulttype}
 \define@boolkey{glossaries.sty}[gls]{acronym}[true]{}
@@ -555,8 +572,7 @@ exists}%
 \def\@glo@descplural{#1}%
 }
 \define@key{glossentry}{sort}{%
-\def\@glo@sort{#1}%
-\@onelevel@sanitize\@glo@sort}
+\def\@glo@sort{#1}}
 \define@key{glossentry}{text}{%
 \def\@glo@text{#1}%
 }
@@ -593,6 +609,7 @@ counter as its value}}{%
   \string\newglossaryentry\space for entry `\@glo@label'}{You
   haven't specified the entry name}}
 \newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix}
+\newcommand*{\@glsdefaultsort}{\@glo@name}
 \newcount\gls@level
 \DeclareRobustCommand{\newglossaryentry}[2]{%
 \glsdoifnoexists{#1}{%
@@ -608,7 +625,7 @@ counter as its value}}{%
 \let\@glo@plural\@glsdefaultplural
 \let\@glo@first\relax
 \let\@glo@firstplural\relax
-\def\@glo@sort{\@glo@name}%
+\let\@glo@sort\@glsdefaultsort
 \def\@glo@counter{\@gls@getcounter{\@glo@type}}%
 \def\@glo@see{}%
 \def\@glo@parent{}%
@@ -679,6 +696,10 @@ in it}}{%
 \@gls@sanitizedesc
 \expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}%
 \expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}%
+\ifx\@glo@sort\@glsdefaultsort
+  \let\@glo@sort\@glo@name
+\fi
+\@onelevel@sanitize\@glo@sort
 \expandafter\protected@xdef\csname glo@#1@sort\endcsname{\@glo@sort}%
 \def\@glo@@symbol{\@glo@text}%
 \ifx\@glo@symbol\@glo@@symbol
@@ -2073,10 +2094,11 @@ false,nolabel,autolabel}[nolabel]{%
 \PackageWarning{glossaries}{overriding `theglossary' environment}%
 \renewenvironment{theglossary}{}{}}
 \newcommand*{\glossaryheader}{}
+\newcommand*{\glstarget}[2]{\@glstarget{glo:#1}{#2}}
 \newcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:#1}{#2} #4 #3. #5\par}
+\noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par}
 \newcommand*{\glossarysubentryfield}[6]{%
-\@glstarget{glo:#2}{}#4. #6\par}
+\glstarget{#2}{\strut}#4. #6\par}
 \newcommand*{\glsgroupskip}{}
 \newcommand*{\glsgroupheading}[1]{}
 \newcommand*{\glsgetgrouptitle}[1]{%
@@ -2169,6 +2191,18 @@ descriptionplural={#4\acrpluralsuffix},%
 first={#4 (#3)},plural={#3\acrpluralsuffix},%
 firstplural={\@glo@descplural\space (\@glo@plural)},%
 #1}}
+\newcommand{\oldacronym}[4][\gls@label]{%
+  \def\gls@label{#2}%
+  \newacronym[#4]{#1}{#2}{#3}%
+  \@ifundefined{xspace}{%
+    \expandafter\edef\csname#1\endcsname{%
+      \noexpand\@ifstar{\noexpand\Gls{#1}}{\noexpand\gls{#1}}}%
+  }{%
+    \expandafter\edef\csname#1\endcsname{%
+      \noexpand\@ifstar{\noexpand\Gls{#1}\noexpand\xspace}{%
+      \noexpand\gls{#1}\noexpand\xspace}}%
+  }%
+}
 \newcommand*{\acrpluralsuffix}{\glspluralsuffix}
 \newcommand*{\glsshortkey}{text}
 \newcommand*{\glsshortpluralkey}{plural}
@@ -2576,11 +2610,14 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
   \let\Acp\Glspl
 \fi
 \RequirePackage{glossary-hypernav}
-\RequirePackage{glossary-list}
-\RequirePackage{glossary-long}
-\RequirePackage{glossary-super}
-\RequirePackage{glossary-tree}
-\glossarystyle{\@glossary@default@style}
+\@gls@loadlist
+\@gls@loadlong
+\@gls@loadsuper
+\@gls@loadtree
+\ifx\@glossary@default@style\relax
+\else
+  \glossarystyle{\@glossary@default@style}
+\fi
 \endinput
 %%
 %% End of file `glossaries.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index 38e43ddcee3..3cbe71fa130 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `mfirstuc.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict
index fe9008f5f05..6e0d609df44 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Brazil.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
index af538e6577f..6bdffa81dcb 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Danish.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
index 4c3abfce2bc..d4ee1d20bb3 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Dutch.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
index c593919b6c0..27c6c9cb87f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-English.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
index a80e35203b1..7850ff0abb1 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-French.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
index 96219d71ce3..71434eecb77 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-German.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
index a470d25c4c2..7997961d921 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Irish.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
index bfe5ad78d9e..e2ece51f80b 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Italian.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
index 6790d186312..928348eb24f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Magyar.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
index b7fe8cca758..7f77cb16860 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Polish.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
index f529892e63d..ef896af8f21 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries-dictionary-Spanish.dict,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
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 19b3363a804..7d9d7ce3bf6 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-hypernav.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
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 91669b43672..c6c9764ccc9 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-list.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -38,52 +38,60 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-list}[2008/12/11 v1.04 (NLCT)]
+\ProvidesPackage{glossary-list}[2009/01/14 v1.05 (NLCT)]
 \newglossarystyle{list}{%
-\renewenvironment{theglossary}{\begin{description}}{\end{description}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5}%
-\renewcommand*{\glossarysubentryfield}[6]{%
-\@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6.}%
-\renewcommand*{\glsgroupskip}{\indexspace}}
+  \renewenvironment{theglossary}%
+    {\begin{description}}{\end{description}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[\glstarget{##1}{##2}] ##3\glspostdescription\space ##5}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+    \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}%
+  \renewcommand*{\glsgroupskip}{\indexspace}%
+}
 \newglossarystyle{listgroup}{%
-\glossarystyle{list}%
-\renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
+  \glossarystyle{list}%
+  \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
 \newglossarystyle{listhypergroup}{%
-\glossarystyle{list}%
-\renewcommand*{\glossaryheader}{%
-\item[\glsnavigation]}%
-\renewcommand*{\glsgroupheading}[1]{%
-\item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
+  \glossarystyle{list}%
+  \renewcommand*{\glossaryheader}{%
+    \item[\glsnavigation]}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
 \newglossarystyle{altlist}{%
-\glossarystyle{list}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\item[\@glstarget{glo:##1}{##2}]\mbox{}\newline ##3\glspostdescription\space ##5}%
-\renewcommand{\glossarysubentryfield}[6]{%
-\par\@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6}%
+  \glossarystyle{list}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[\glstarget{##1}{##2}]\mbox{}\newline
+      ##3\glspostdescription\space ##5}%
+  \renewcommand{\glossarysubentryfield}[6]{%
+    \par\glstarget{##2}{\strut}##4\glspostdescription\space ##6}%
 }
 \newglossarystyle{altlistgroup}{%
-\glossarystyle{altlist}%
-\renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
+  \glossarystyle{altlist}%
+  \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
 \newglossarystyle{altlisthypergroup}{%
-\glossarystyle{altlist}%
-\renewcommand*{\glossaryheader}{%
-\item[\glsnavigation]}%
-\renewcommand*{\glsgroupheading}[1]{%
-\item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
+  \glossarystyle{altlist}%
+  \renewcommand*{\glossaryheader}{%
+    \item[\glsnavigation]}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
 \newglossarystyle{listdotted}{%
-\glossarystyle{list}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##1}{##2}%
-\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}%
-\renewcommand*{\glossarysubentryfield}[6]{%
-\item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##2}{##3}%
-\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}%
+  \glossarystyle{list}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[]\makebox[\glslistdottedwidth][l]{\glstarget{##1}{##2}%
+    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+    \item[]\makebox[\glslistdottedwidth][l]{\glstarget{##2}{##3}%
+    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}%
 }
 \newlength\glslistdottedwidth
 \setlength{\glslistdottedwidth}{.5\linewidth}
+\newglossarystyle{sublistdotted}{%
+  \glossarystyle{listdotted}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[\glstarget{##1}{##2}]}%
+}
 \endinput
 %%
 %% End of file `glossary-list.sty'.
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 9cf3a012605..0adfcefdc38 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-long.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -38,128 +38,138 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-long}[2008/12/11 v1.02 (NLCT)]
+\ProvidesPackage{glossary-long}[2009/01/14 v1.03 (NLCT)]
 \RequirePackage{longtable}
-\newlength\glsdescwidth
-\newlength\glspagelistwidth
-\setlength{\glsdescwidth}{0.6\linewidth}
-\setlength{\glspagelistwidth}{0.1\linewidth}
+\@ifundefined{glsdescwidth}{%
+  \newlength\glsdescwidth
+  \setlength{\glsdescwidth}{0.6\linewidth}
+}{}
+\@ifundefined{glspagelistwidth}{%
+  \newlength\glspagelistwidth
+  \setlength{\glspagelistwidth}{0.1\linewidth}
+}{}
 \newglossarystyle{long}{%
-\renewenvironment{theglossary}{\begin{longtable}{lp{\glsdescwidth}}}{%
-\end{longtable}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}%
-\renewcommand*{\glossarysubentryfield}[6]{%
- & \@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6\\}%
-\renewcommand*{\glsgroupskip}{ & \\}}
+  \renewenvironment{theglossary}%
+     {\begin{longtable}{lp{\glsdescwidth}}}%
+     {\end{longtable}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     & \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
+  \renewcommand*{\glsgroupskip}{ & \\}%
+}
 \newglossarystyle{longborder}{%
-\glossarystyle{long}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{|l|p{\glsdescwidth}|}}{\end{longtable}}%
-\renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
+  \glossarystyle{long}%
+  \renewenvironment{theglossary}{%
+    \begin{longtable}{|l|p{\glsdescwidth}|}}{\end{longtable}}%
+  \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{longheader}{%
-\glossarystyle{long}%
-\renewcommand*{\glossaryheader}{%
-\bfseries \entryname & \bfseries \descriptionname\\
-\endhead}}
+  \glossarystyle{long}%
+  \renewcommand*{\glossaryheader}{%
+    \bfseries \entryname & \bfseries \descriptionname\\\endhead}%
+}
 \newglossarystyle{longheaderborder}{%
-\glossarystyle{longborder}%
-\renewcommand*{\glossaryheader}{%
-\hline\bfseries \entryname & \bfseries \descriptionname\\\hline
-\endhead
-\hline\endfoot}}
+  \glossarystyle{longborder}%
+  \renewcommand*{\glossaryheader}{%
+    \hline\bfseries \entryname & \bfseries \descriptionname\\\hline
+    \endhead
+    \hline\endfoot}%
+}
 \newglossarystyle{long3col}{%
-\renewenvironment{theglossary}{\begin{longtable}{lp{\glsdescwidth}p{\glspagelistwidth}}}{%
-\end{longtable}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:##1}{##2} & ##3 & ##5\\}%
-\renewcommand*{\glossarysubentryfield}[6]{%
- & \@glstarget{glo:##2}{\strut}##4 & ##6\\}%
-\renewcommand*{\glsgroupskip}{ & &\\}}
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{lp{\glsdescwidth}p{\glspagelistwidth}}}%
+    {\end{longtable}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glstarget{##1}{##2} & ##3 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     & \glstarget{##2}{\strut}##4 & ##6\\}%
+  \renewcommand*{\glsgroupskip}{ & &\\}%
+}
 \newglossarystyle{long3colborder}{%
-\glossarystyle{long3col}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}{%
-\end{longtable}}%
-\renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
+  \glossarystyle{long3col}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}%
+    {\end{longtable}}%
+  \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{long3colheader}{%
-\glossarystyle{long3col}%
-\renewcommand*{\glossaryheader}{%
-\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\pagelistname\\\endhead}%
+  \glossarystyle{long3col}%
+  \renewcommand*{\glossaryheader}{%
+    \bfseries\entryname&\bfseries\descriptionname&
+    \bfseries\pagelistname\\\endhead}%
 }
 \newglossarystyle{long3colheaderborder}{%
-\glossarystyle{long3colborder}%
-\renewcommand*{\glossaryheader}{%
-\hline
-\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\pagelistname\\\hline\endhead
-\hline\endfoot}%
+  \glossarystyle{long3colborder}%
+  \renewcommand*{\glossaryheader}{%
+    \hline
+    \bfseries\entryname&\bfseries\descriptionname&
+    \bfseries\pagelistname\\\hline\endhead
+    \hline\endfoot}%
 }
 \newglossarystyle{long4col}{%
-\renewenvironment{theglossary}{%
-\begin{longtable}{llll}}{%
-\end{longtable}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:##1}{##2} & ##3 & ##4 & ##5\\}%
-\renewcommand*{\glossarysubentryfield}[6]{%
- & \@glstarget{glo:##2}{\strut}##4 & ##5 & ##6\\}%
-\renewcommand*{\glsgroupskip}{ & & &\\}}
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{llll}}%
+    {\end{longtable}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     & \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
+  \renewcommand*{\glsgroupskip}{ & & &\\}%
+}
 \newglossarystyle{long4colheader}{%
-\glossarystyle{long4col}%
-\renewcommand*{\glossaryheader}{%
-\bfseries\entryname&\bfseries\descriptionname&
-\bfseries \symbolname&
-\bfseries\pagelistname\\\endhead}%
+  \glossarystyle{long4col}%
+  \renewcommand*{\glossaryheader}{%
+    \bfseries\entryname&\bfseries\descriptionname&
+    \bfseries \symbolname&
+    \bfseries\pagelistname\\\endhead}%
 }
 \newglossarystyle{long4colborder}{%
-\glossarystyle{long4col}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{|l|l|l|l|}}{%
-\end{longtable}}%
-\renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
+  \glossarystyle{long4col}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{|l|l|l|l|}}%
+    {\end{longtable}}%
+  \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{long4colheaderborder}{%
-\glossarystyle{long4col}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{|l|l|l|l|}}{%
-\end{longtable}}%
-\renewcommand*{\glossaryheader}{%
-\hline\bfseries\entryname&\bfseries\descriptionname&
-\bfseries \symbolname&
-\bfseries\pagelistname\\\hline\endhead\hline\endfoot}%
+  \glossarystyle{long4col}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{|l|l|l|l|}}%
+    {\end{longtable}}%
+  \renewcommand*{\glossaryheader}{%
+    \hline\bfseries\entryname&\bfseries\descriptionname&
+    \bfseries \symbolname&
+    \bfseries\pagelistname\\\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{altlong4col}{%
-\glossarystyle{long4col}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{%
-\end{longtable}}%
+   \glossarystyle{long4col}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
+    {\end{longtable}}%
 }
 \newglossarystyle{altlong4colheader}{%
-\glossarystyle{long4colheader}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{%
-\end{longtable}}%
+  \glossarystyle{long4colheader}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
+    {\end{longtable}}%
 }
 \newglossarystyle{altlong4colborder}{%
-\glossarystyle{long4colborder}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagewidthlist}|}}{%
-\end{longtable}}%
+   \glossarystyle{long4colborder}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
+    {\end{longtable}}%
 }
 \newglossarystyle{altlong4colheaderborder}{%
-\glossarystyle{long4colheaderborder}%
-\renewenvironment{theglossary}{%
-\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagewidthlist}|}}{%
-\end{longtable}}%
+  \glossarystyle{long4colheaderborder}%
+  \renewenvironment{theglossary}%
+    {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
+    {\end{longtable}}%
 }
 \endinput
 %%
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 cf7e19ccdd9..45c35e0d4c6 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-super.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -38,145 +38,166 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-super}[2008/12/11 v1.02 (NLCT)]
+\ProvidesPackage{glossary-super}[2009/01/14 v1.03 (NLCT)]
 \RequirePackage{supertabular}
+\@ifundefined{glsdescwidth}{%
+  \newlength\glsdescwidth
+  \setlength{\glsdescwidth}{0.6\linewidth}
+}{}
+\@ifundefined{glspagelistwidth}{%
+  \newlength\glspagelistwidth
+  \setlength{\glspagelistwidth}{0.1\linewidth}
+}{}
 \newglossarystyle{super}{%
-\renewenvironment{theglossary}{%
-\tablehead{}\tabletail{}%
-\begin{supertabular}{lp{\glsdescwidth}}}{%
-\end{supertabular}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}%
-\renewcommand*{\glossarysubentryfield}[6]{%
- & \@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6\\}%
-\renewcommand*{\glsgroupskip}{ & \\}}
+  \renewenvironment{theglossary}%
+    {\tablehead{}\tabletail{}%
+     \begin{supertabular}{lp{\glsdescwidth}}}%
+    {\end{supertabular}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     & \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
+  \renewcommand*{\glsgroupskip}{ & \\}%
+}
 \newglossarystyle{superborder}{%
-\glossarystyle{super}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline}\tabletail{\hline}%
-\begin{supertabular}{|l|p{\glsdescwidth}|}}{\end{supertabular}}%
+  \glossarystyle{super}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline}\tabletail{\hline}%
+     \begin{supertabular}{|l|p{\glsdescwidth}|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{superheader}{%
-\glossarystyle{super}%
-\renewenvironment{theglossary}{%
-\tablehead{\bfseries \entryname & \bfseries \descriptionname\\}%
-\tabletail{}%
-\begin{supertabular}{lp{\glsdescwidth}}}{\end{supertabular}}%
+  \glossarystyle{super}%
+\renewenvironment{theglossary}%
+  {\tablehead{\bfseries \entryname & \bfseries \descriptionname\\}%
+   \tabletail{}%
+   \begin{supertabular}{lp{\glsdescwidth}}}%
+  {\end{supertabular}}%
 }
 \newglossarystyle{superheaderborder}{%
-\glossarystyle{super}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline\bfseries \entryname & \bfseries \descriptionname\\\hline}%
-\tabletail{\hline}
-\begin{supertabular}{|l|p{\glsdescwidth}|}}{\end{supertabular}}%
+  \glossarystyle{super}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline\bfseries \entryname &
+       \bfseries \descriptionname\\\hline}%
+     \tabletail{\hline}
+     \begin{supertabular}{|l|p{\glsdescwidth}|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{super3col}{%
-\renewenvironment{theglossary}{%
-\tablehead{}\tabletail{}%
-\begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}{%
-\end{supertabular}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:##1}{##2} & ##3 & ##5\\}%
-\renewcommand*{\glossarysubentryfield}[6]{%
- & \@glstarget{glo:##2}{\strut}##4 & ##6\\}%
-\renewcommand*{\glsgroupskip}{ & &\\}}
+  \renewenvironment{theglossary}%
+    {\tablehead{}\tabletail{}%
+     \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}%
+    {\end{supertabular}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glstarget{##1}{##2} & ##3 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     & \glstarget{##2}{\strut}##4 & ##6\\}%
+  \renewcommand*{\glsgroupskip}{ & &\\}%
+}
 \newglossarystyle{super3colborder}{%
-\glossarystyle{super3col}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline}\tabletail{\hline}%
-\begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}{%
-\end{supertabular}}%
+  \glossarystyle{super3col}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline}\tabletail{\hline}%
+     \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{super3colheader}{%
-\glossarystyle{super3col}%
-\renewenvironment{theglossary}{%
-\tablehead{\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\pagelistname\\}\tabletail{}%
-\begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}{%
-\end{supertabular}}%
+  \glossarystyle{super3col}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
+       \bfseries\pagelistname\\}\tabletail{}%
+     \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{super3colheaderborder}{%
-\glossarystyle{super3colborder}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline
-\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\pagelistname\\\hline}%
-\tabletail{\hline}%
-\begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}{%
-\end{supertabular}}%
+  \glossarystyle{super3colborder}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline
+        \bfseries\entryname&\bfseries\descriptionname&
+        \bfseries\pagelistname\\\hline}%
+     \tabletail{\hline}%
+     \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{super4col}{%
-\renewenvironment{theglossary}{%
-\tablehead{}\tabletail{}%
-\begin{supertabular}{llll}}{%
-\end{supertabular}}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\@glstarget{glo:##1}{##2} & ##3 & ##4 & ##5\\}%
-\renewcommand*{\glossarysubentryfield}[6]{%
- & \@glstarget{glo:##2}{\strut}##4 & ##5 & ##6\\}%
-\renewcommand*{\glsgroupskip}{ & & &\\}}
+  \renewenvironment{theglossary}%
+    {\tablehead{}\tabletail{}%
+     \begin{supertabular}{llll}}{%
+     \end{supertabular}}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     & \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
+  \renewcommand*{\glsgroupskip}{ & & &\\}%
+}
 \newglossarystyle{super4colheader}{%
-\glossarystyle{super4col}%
-\renewenvironment{theglossary}{%
-\tablehead{\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\symbolname &
-\bfseries\pagelistname\\}\tabletail{}%
-\begin{supertabular}{llll}}{%
-\end{supertabular}}%
+  \glossarystyle{super4col}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
+        \bfseries\symbolname &
+        \bfseries\pagelistname\\}%
+     \tabletail{}%
+     \begin{supertabular}{llll}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{super4colborder}{%
-\glossarystyle{super4col}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline}\tabletail{\hline}%
-\begin{supertabular}{|l|l|l|l|}}{%
-\end{supertabular}}%
+  \glossarystyle{super4col}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline}\tabletail{\hline}%
+     \begin{supertabular}{|l|l|l|l|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{super4colheaderborder}{%
-\glossarystyle{super4col}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\symbolname &
-\bfseries\pagelistname\\}\tabletail{\hline}%
-\begin{supertabular}{|l|l|l|l|}}{%
-\end{supertabular}}%
+  \glossarystyle{super4col}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname&
+        \bfseries\symbolname &
+        \bfseries\pagelistname\\\hline}\tabletail{\hline}%
+     \begin{supertabular}{|l|l|l|l|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4col}{%
-\glossarystyle{super4col}%
-\renewenvironment{theglossary}{%
-\tablehead{}\tabletail{}%
-\begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{%
-\end{supertabular}}%
+  \glossarystyle{super4col}%
+  \renewenvironment{theglossary}%
+    {\tablehead{}\tabletail{}%
+     \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4colheader}{%
-\glossarystyle{super4colheader}%
-\renewenvironment{theglossary}{%
-\tablehead{\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\symbolname &
-\bfseries\pagelistname\\}\tabletail{}%
-\begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{%
-\end{supertabular}}%
+  \glossarystyle{super4colheader}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
+      \bfseries\symbolname &
+      \bfseries\pagelistname\\}\tabletail{}%
+     \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4colborder}{%
-\glossarystyle{super4colborder}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline}\tabletail{\hline}%
-\begin{supertabular}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}{%
-\end{supertabular}}%
+  \glossarystyle{super4colborder}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline}\tabletail{\hline}%
+     \begin{supertabular}%
+       {|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
+    {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4colheaderborder}{%
-\glossarystyle{super4colheaderborder}%
-\renewenvironment{theglossary}{%
-\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname&
-\bfseries\symbolname &
-\bfseries\pagelistname\\}\tabletail{\hline}%
-\begin{supertabular}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}{%
-\end{supertabular}}%
+  \glossarystyle{super4colheaderborder}%
+  \renewenvironment{theglossary}%
+    {\tablehead{\hline
+       \bfseries\entryname &
+       \bfseries\descriptionname &
+       \bfseries\symbolname &
+       \bfseries\pagelistname\\\hline}%
+     \tabletail{\hline}%
+     \begin{supertabular}%
+       {|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
+    {\end{supertabular}}%
 }
 \endinput
 %%
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 e36055dce24..1bdf157b0c5 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-tree.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -38,189 +38,204 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-tree}[2008/12/11 v1.0 (NLCT)]
+\ProvidesPackage{glossary-tree}[2009/01/14 v1.01 (NLCT)]
 \newglossarystyle{index}{%
-\renewenvironment{theglossary}{%
-\setlength{\parindent}{0pt}%
-\setlength{\parskip}{0pt plus 0.3pt}%
-\let\item\@idxitem}{}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
+  \renewenvironment{theglossary}%
+    {\setlength{\parindent}{0pt}%
+     \setlength{\parskip}{0pt plus 0.3pt}%
+     \let\item\@idxitem}%
+    {}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
 \renewcommand*{\glossaryentryfield}[5]{%
-\item\textbf{\@glstarget{glo:##1}{##2}}%
+\item\textbf{\glstarget{##1}{##2}}%
   \ifx\relax##4\relax
   \else
     \space(##4)%
   \fi
   \space ##3\glspostdescription \space ##5}%
-\renewcommand*{\glossarysubentryfield}[6]{%
-  \ifcase##1\relax
-    \item
-  \or
-    \subitem
-  \else
-    \subsubitem
-  \fi
-  \textbf{\@glstarget{glo:##2}{##3}}%
-  \ifx\relax##5\relax
-  \else
-    \space(##5)%
-  \fi
-  \space##4\glspostdescription\space ##6}%
-\renewcommand*{\glsgroupskip}{\indexspace}}
+  \renewcommand*{\glossarysubentryfield}[6]{%
+    \ifcase##1\relax
+      % level 0
+      \item
+    \or
+      % level 1
+      \subitem
+    \else
+      % all other levels
+      \subsubitem
+    \fi
+    \textbf{\glstarget{##2}{##3}}%
+    \ifx\relax##5\relax
+    \else
+      \space(##5)%
+    \fi
+    \space##4\glspostdescription\space ##6}%
+  \renewcommand*{\glsgroupskip}{\indexspace}}
 \newglossarystyle{indexgroup}{%
-\glossarystyle{index}%
-\renewcommand*{\glsgroupheading}[1]{%
-  \item\textbf{\glsgetgrouptitle{##1}}\indexspace}}
+  \glossarystyle{index}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item\textbf{\glsgetgrouptitle{##1}}\indexspace}%
+}
 \newglossarystyle{indexhypergroup}{%
-\glossarystyle{index}%
-\renewcommand*{\glossaryheader}{%
-\item\textbf{\glsnavigation}\indexspace}%
-\renewcommand*{\glsgroupheading}[1]{%
-\item\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
-\indexspace}}
+  \glossarystyle{index}%
+  \renewcommand*{\glossaryheader}{%
+    \item\textbf{\glsnavigation}\indexspace}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \item\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}%
+    \indexspace}%
+}
 \newglossarystyle{tree}{%
-\renewenvironment{theglossary}{%
-\setlength{\parindent}{0pt}%
-\setlength{\parskip}{0pt plus 0.3pt}%
-}{}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand{\glossaryentryfield}[5]{%
-  \hangindent0pt\relax
-  \parindent0pt\relax
-  \textbf{\@glstarget{glo:##1}{##2}}%
-  \ifx\relax##4\relax
-  \else
-    \space(##4)%
-  \fi
-  \space ##3\glspostdescription \space ##5\par}%
-\renewcommand{\glossarysubentryfield}[6]{%
-  \hangindent##1\glstreeindent\relax
-  \parindent##1\glstreeindent\relax
-  \textbf{\@glstarget{glo:##2}{##3}}%
-  \ifx\relax##5\relax
-  \else
-    \space(##5)%
-  \fi
-  \space##4\glspostdescription\space ##6\par}%
-\renewcommand*{\glsgroupskip}{\indexspace}}
+  \renewenvironment{theglossary}%
+    {\setlength{\parindent}{0pt}%
+     \setlength{\parskip}{0pt plus 0.3pt}}%
+    {}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand{\glossaryentryfield}[5]{%
+    \hangindent0pt\relax
+    \parindent0pt\relax
+    \textbf{\glstarget{##1}{##2}}%
+    \ifx\relax##4\relax
+    \else
+      \space(##4)%
+    \fi
+    \space ##3\glspostdescription \space ##5\par}%
+  \renewcommand{\glossarysubentryfield}[6]{%
+    \hangindent##1\glstreeindent\relax
+    \parindent##1\glstreeindent\relax
+    \textbf{\glstarget{##2}{##3}}%
+    \ifx\relax##5\relax
+    \else
+      \space(##5)%
+    \fi
+    \space##4\glspostdescription\space ##6\par}%
+  \renewcommand*{\glsgroupskip}{\indexspace}}
 \newglossarystyle{treegroup}{%
-\glossarystyle{tree}%
-\renewcommand{\glsgroupheading}[1]{\par
-\noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}}
+  \glossarystyle{tree}%
+  \renewcommand{\glsgroupheading}[1]{\par
+    \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
+}
 \newglossarystyle{treehypergroup}{%
-\glossarystyle{tree}%
-\renewcommand*{\glossaryheader}{%
-\par\noindent\textbf{\glsnavigation}\par\indexspace}%
-\renewcommand*{\glsgroupheading}[1]{%
-\par\noindent
-\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
-\indexspace}}
+  \glossarystyle{tree}%
+  \renewcommand*{\glossaryheader}{%
+    \par\noindent\textbf{\glsnavigation}\par\indexspace}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \par\noindent
+    \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
+    \indexspace}%
+}
 \newlength\glstreeindent
 \setlength{\glstreeindent}{10pt}
 \newglossarystyle{treenoname}{%
-\renewenvironment{theglossary}{%
-\setlength{\parindent}{0pt}%
-\setlength{\parskip}{0pt plus 0.3pt}%
-}{}%
-\renewcommand*{\glossaryheader}{}%
+  \renewenvironment{theglossary}%
+    {\setlength{\parindent}{0pt}%
+     \setlength{\parskip}{0pt plus 0.3pt}}%
+    {}%
+  \renewcommand*{\glossaryheader}{}%
 \renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand{\glossaryentryfield}[5]{%
-  \hangindent0pt\relax
-  \parindent0pt\relax
-  \textbf{\@glstarget{glo:##1}{##2}}%
-  \ifx\relax##4\relax
-  \else
-    \space(##4)%
-  \fi
-  \space ##3\glspostdescription \space ##5\par}%
-\renewcommand{\glossarysubentryfield}[6]{%
-  \hangindent##1\glstreeindent\relax
-  \parindent##1\glstreeindent\relax
-  \textbf{\@glstarget{glo:##2}{\strut}}%
-  ##4\glspostdescription\space ##6\par}%
-\renewcommand*{\glsgroupskip}{\indexspace}}
+  \renewcommand{\glossaryentryfield}[5]{%
+    \hangindent0pt\relax
+    \parindent0pt\relax
+    \textbf{\glstarget{##1}{##2}}%
+    \ifx\relax##4\relax
+    \else
+      \space(##4)%
+    \fi
+    \space ##3\glspostdescription \space ##5\par}%
+  \renewcommand{\glossarysubentryfield}[6]{%
+    \hangindent##1\glstreeindent\relax
+    \parindent##1\glstreeindent\relax
+    \glstarget{##2}{\strut}%
+    ##4\glspostdescription\space ##6\par}%
+  \renewcommand*{\glsgroupskip}{\indexspace}%
+}
 \newglossarystyle{treenonamegroup}{%
-\glossarystyle{treenoname}%
-\renewcommand{\glsgroupheading}[1]{\par
-\noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}}
+  \glossarystyle{treenoname}%
+  \renewcommand{\glsgroupheading}[1]{\par
+    \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
+}
 \newglossarystyle{treenonamehypergroup}{%
-\glossarystyle{treenoname}%
-\renewcommand*{\glossaryheader}{%
-\par\noindent\textbf{\glsnavigation}\par\indexspace}%
-\renewcommand*{\glsgroupheading}[1]{%
-\par\noindent
-\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
-\indexspace}}
+  \glossarystyle{treenoname}%
+  \renewcommand*{\glossaryheader}{%
+    \par\noindent\textbf{\glsnavigation}\par\indexspace}%
+  \renewcommand*{\glsgroupheading}[1]{%
+    \par\noindent
+    \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
+    \indexspace}%
+}
 \newcommand*{\glssetwidest}[2][0]{%
   \expandafter\def\csname @glswidestname\romannumeral#1\endcsname{%
     #2}%
 }
 \newcommand*{\@glswidestname}{}
 \newglossarystyle{alttree}{%
-\renewenvironment{theglossary}{%
-\def\@gls@prevlevel{-1}%
-\mbox{}\par}{\par}%
-\renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand{\glossaryentryfield}[5]{%
-  \ifnum\@gls@prevlevel=0\relax
-  \else
-     \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}%
+  \renewenvironment{theglossary}%
+    {\def\@gls@prevlevel{-1}%
+     \mbox{}\par}%
+    {\par}%
+  \renewcommand*{\glossaryheader}{}%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand{\glossaryentryfield}[5]{%
+    \ifnum\@gls@prevlevel=0\relax
+    \else
+       \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}%
+      \hangindent\glstreeindent
+      \parindent\glstreeindent
+    \fi
+    \makebox[0pt][r]{\makebox[\glstreeindent][l]{%
+       \textbf{\glstarget{##1}{##2}}}}%
+    \ifx\relax##4\relax
+    \else
+      (##4)\space
+    \fi
+    ##3\glspostdescription \space ##5\par
+    \def\@gls@prevlevel{0}%
+  }%
+  \renewcommand{\glossarysubentryfield}[6]{%
+    \ifnum\@gls@prevlevel=##1\relax
+    \else
+      \@ifundefined{@glswidestname\romannumeral##1}{%
+        \settowidth{\gls@tmplen}{\textbf{\@glswidestname\space}}}{%
+        \settowidth{\gls@tmplen}{\textbf{%
+           \csname @glswidestname\romannumeral##1\endcsname\space}}}%
+      \ifnum\@gls@prevlevel<##1\relax
+         \setlength\glstreeindent\gls@tmplen
+         \addtolength\glstreeindent\parindent
+         \parindent\glstreeindent
+      \else
+         \@ifundefined{@glswidestname\romannumeral\@gls@prevlevel}{%
+           \settowidth{\glstreeindent}{\textbf{%
+              \@glswidestname\space}}}{%
+           \settowidth{\glstreeindent}{\textbf{%
+              \csname @glswidestname\romannumeral\@gls@prevlevel
+                 \endcsname\space}}}%
+         \addtolength\parindent{-\glstreeindent}%
+         \setlength\glstreeindent\parindent
+      \fi
+    \fi
     \hangindent\glstreeindent
-    \parindent\glstreeindent
-  \fi
-  \makebox[0pt][r]{\makebox[\glstreeindent][l]{%
-     \textbf{\@glstarget{glo:##1}{##2}}}}%
-  \ifx\relax##4\relax
-  \else
-    (##4)\space
-  \fi
-  ##3\glspostdescription \space ##5\par
-  \def\@gls@prevlevel{0}%
-}%
-\renewcommand{\glossarysubentryfield}[6]{%
-  \ifnum\@gls@prevlevel=##1\relax
-  \else
-    \@ifundefined{@glswidestname\romannumeral##1}{%
-      \settowidth{\gls@tmplen}{\textbf{\@glswidestname\space}}}{%
-      \settowidth{\gls@tmplen}{\textbf{%
-         \csname @glswidestname\romannumeral##1\endcsname\space}}}%
-    \ifnum\@gls@prevlevel<##1\relax
-       \setlength\glstreeindent\gls@tmplen
-       \addtolength\glstreeindent\parindent
-       \parindent\glstreeindent
+    \makebox[0pt][r]{\makebox[\gls@tmplen][l]{%
+      \textbf{\glstarget{##2}{##3}}}}%
+    \ifx##5\relax\relax
     \else
-       \@ifundefined{@glswidestname\romannumeral\@gls@prevlevel}{%
-         \settowidth{\glstreeindent}{\textbf{%
-            \@glswidestname\space}}}{%
-         \settowidth{\glstreeindent}{\textbf{%
-            \csname @glswidestname\romannumeral\@gls@prevlevel
-               \endcsname\space}}}%
-       \addtolength\parindent{-\glstreeindent}%
-       \setlength\glstreeindent\parindent
+      (##5)\space
     \fi
-  \fi
-  \hangindent\glstreeindent
-  \makebox[0pt][r]{\makebox[\gls@tmplen][l]{%
-    \textbf{\@glstarget{glo:##2}{##3}}}}%
-  \ifx##5\relax\relax
-  \else
-    (##5)\space
-  \fi
-  ##4\glspostdescription\space ##6\par
-  \def\@gls@prevlevel{##1}}%
-\renewcommand*{\glsgroupskip}{\indexspace}}
+    ##4\glspostdescription\space ##6\par
+    \def\@gls@prevlevel{##1}%
+  }%
+  \renewcommand*{\glsgroupskip}{\indexspace}%
+}
 \newglossarystyle{alttreegroup}{%
-\glossarystyle{alttree}%
-\renewcommand{\glsgroupheading}[1]{\par
-\def\@gls@prevlevel{-1}%
-\hangindent0pt\relax
-\parindent0pt\relax
-\textbf{\glsgetgrouptitle{##1}}\par\indexspace}}
+  \glossarystyle{alttree}%
+  \renewcommand{\glsgroupheading}[1]{\par
+    \def\@gls@prevlevel{-1}%
+    \hangindent0pt\relax
+    \parindent0pt\relax
+    \textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
+}
 \newglossarystyle{alttreehypergroup}{%
-\glossarystyle{alttree}%
+  \glossarystyle{alttree}%
   \renewcommand*{\glossaryheader}{%
     \par
     \def\@gls@prevlevel{-1}%