glossaries (14nov13)

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

28 files changed, 3397 insertions, 1553 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 707e3480053..1daab6e2276 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2009/04/16 v1.2 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2013/11/14 v4.0 (NLCT)]
 \@ifundefined{captionsenglish}{}{%
   \addto\captionsenglish{%
     \renewcommand*{\glossaryname}{Glossary}%
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 8b55a688b2e..f98a7e05bb0 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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
new file mode 100644
index 00000000000..3d6ad8267d8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
@@ -0,0 +1,546 @@
+%%
+%% This is file `glossaries-compatible-307.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-compatible-307.sty,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2013 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  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, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{glossaries-compatible-307}[2013/11/14 v4.0 (NLCT)]
+\newcommand{\compatglossarystyle}[2]{%
+  \ifcsundef{@glscompstyle@#1}%
+  {%
+    \csdef{@glscompstyle@#1}{#2}%
+  }%
+  {%
+    \PackageError{glossaries}{Glossary compatibility style `#1' is already defined}{}%
+  }%
+}
+\compatglossarystyle{inline}{%
+  \renewcommand{\glossaryentryfield}[5]{%
+    \glsinlinedopostchild
+    \gls@inlinesep
+    \def\glo@desc{##3}%
+    \def\@no@post@desc{\nopostdesc}%
+    \glsentryitem{##1}\glsinlinenameformat{##1}{##2}%
+    \ifx\glo@desc\@no@post@desc
+      \glsinlineemptydescformat{##4}{##5}%
+    \else
+      \ifstrempty{##3}%
+      {\glsinlineemptydescformat{##4}{##5}}%
+      {\glsinlinedescformat{##3}{##4}{##5}}%
+    \fi
+    \ifglshaschildren{##1}%
+    {%
+       \glsresetsubentrycounter
+       \glsinlineparentchildseparator
+       \def\gls@inlinesubsep{}%
+       \def\gls@inlinepostchild{\glsinlinepostchild}%
+    }%
+    {}%
+    \def\gls@inlinesep{\glsinlineseparator}%
+  }%
+  \renewcommand{\glossarysubentryfield}[6]{%
+    \gls@inlinesubsep%
+    \glsinlinesubnameformat{##2}{##3}%
+    \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}%
+    \def\gls@inlinesubsep{\glsinlinesubseparator}%
+  }%
+}
+\compatglossarystyle{list}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[\glsentryitem{##1}\glstarget{##1}{##2}]
+       ##3\glspostdescription\space ##5}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}%
+}
+\compatglossarystyle{listgroup}{%
+ \csuse{@glscompstyle@list}%
+}%
+\compatglossarystyle{listhypergroup}{%
+ \csuse{@glscompstyle@list}%
+}%
+\compatglossarystyle{altlist}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[\glsentryitem{##1}\glstarget{##1}{##2}]%
+      \mbox{}\par\nobreak\@afterheading
+      ##3\glspostdescription\space ##5}%
+  \renewcommand{\glossarysubentryfield}[6]{%
+    \par
+    \glssubentryitem{##2}%
+    \glstarget{##2}{\strut}##4\glspostdescription\space ##6}%
+}%
+\compatglossarystyle{altlistgroup}{%
+ \csuse{@glscompstyle@altlist}%
+}%
+\compatglossarystyle{altlisthypergroup}{%
+ \csuse{@glscompstyle@altlist}%
+}%
+\compatglossarystyle{listdotted}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[]\makebox[\glslistdottedwidth][l]{%
+      \glsentryitem{##1}\glstarget{##1}{##2}%
+      \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+    \item[]\makebox[\glslistdottedwidth][l]{%
+    \glssubentryitem{##2}%
+    \glstarget{##2}{##3}%
+    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}%
+}%
+\compatglossarystyle{sublistdotted}{%
+  \csuse{@glscompstyle@listdotted}%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item[\glsentryitem{##1}\glstarget{##1}{##2}]}%
+}%
+\compatglossarystyle{long}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
+}%
+\compatglossarystyle{longborder}{%
+ \csuse{@glscompstyle@long}%
+}%
+\compatglossarystyle{longheader}{%
+ \csuse{@glscompstyle@long}%
+}%
+\compatglossarystyle{longheaderborder}{%
+ \csuse{@glscompstyle@long}%
+}%
+\compatglossarystyle{long3col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##6\\}%
+}%
+\compatglossarystyle{long3colborder}{%
+ \csuse{@glscompstyle@long3col}%
+}%
+\compatglossarystyle{long3colheader}{%
+ \csuse{@glscompstyle@long3col}%
+}%
+\compatglossarystyle{long3colheaderborder}{%
+ \csuse{@glscompstyle@long3col}%
+}%
+\compatglossarystyle{long4col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
+}%
+\compatglossarystyle{long4colheader}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{long4colborder}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{long4colheaderborder}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{altlong4col}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{altlong4colheader}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{altlong4colborder}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{altlong4colheaderborder}{%
+ \csuse{@glscompstyle@long4col}%
+}%
+\compatglossarystyle{longragged}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
+    \tabularnewline}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
+    \tabularnewline}%
+}%
+\compatglossarystyle{longraggedborder}{%
+ \csuse{@glscompstyle@longragged}%
+}%
+\compatglossarystyle{longraggedheader}{%
+ \csuse{@glscompstyle@longragged}%
+}%
+\compatglossarystyle{longraggedheaderborder}{%
+ \csuse{@glscompstyle@longragged}%
+}%
+\compatglossarystyle{longragged3col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
+}%
+\compatglossarystyle{longragged3colborder}{%
+ \csuse{@glscompstyle@longragged3col}%
+}%
+\compatglossarystyle{longragged3colheader}{%
+ \csuse{@glscompstyle@longragged3col}%
+}%
+\compatglossarystyle{longragged3colheaderborder}{%
+ \csuse{@glscompstyle@longragged3col}%
+}%
+\compatglossarystyle{altlongragged4col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
+}%
+\compatglossarystyle{altlongragged4colheader}{%
+ \csuse{@glscompstyle@altlong4col}%
+}%
+\compatglossarystyle{altlongragged4colborder}{%
+ \csuse{@glscompstyle@altlong4col}%
+}%
+\compatglossarystyle{altlongragged4colheaderborder}{%
+ \csuse{@glscompstyle@altlong4col}%
+}%
+\compatglossarystyle{index}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
+      \ifx\relax##4\relax
+      \else
+        \space(##4)%
+      \fi
+      \space ##3\glspostdescription \space ##5}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+    \ifcase##1\relax
+      % level 0
+      \item
+    \or
+      % level 1
+      \subitem
+      \glssubentryitem{##2}%
+    \else
+      % all other levels
+      \subsubitem
+    \fi
+    \textbf{\glstarget{##2}{##3}}%
+    \ifx\relax##5\relax
+    \else
+      \space(##5)%
+    \fi
+    \space##4\glspostdescription\space ##6}%
+}%
+\compatglossarystyle{indexgroup}{%
+ \csuse{@glscompstyle@index}%
+}%
+\compatglossarystyle{indexhypergroup}{%
+ \csuse{@glscompstyle@index}%
+}%
+\compatglossarystyle{tree}{%
+  \renewcommand{\glossaryentryfield}[5]{%
+    \hangindent0pt\relax
+    \parindent0pt\relax
+    \glsentryitem{##1}\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
+    \ifnum##1=1\relax
+      \glssubentryitem{##2}%
+    \fi
+    \textbf{\glstarget{##2}{##3}}%
+    \ifx\relax##5\relax
+    \else
+      \space(##5)%
+    \fi
+    \space##4\glspostdescription\space ##6\par}%
+}%
+\compatglossarystyle{treegroup}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{treehypergroup}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{treenoname}{%
+  \renewcommand{\glossaryentryfield}[5]{%
+    \hangindent0pt\relax
+    \parindent0pt\relax
+    \glsentryitem{##1}\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
+    \ifnum##1=1\relax
+      \glssubentryitem{##2}%
+    \fi
+    \glstarget{##2}{\strut}%
+    ##4\glspostdescription\space ##6\par}%
+}%
+\compatglossarystyle{treenonamegroup}{%
+ \csuse{@glscompstyle@treenoname}%
+}%
+\compatglossarystyle{treenonamehypergroup}{%
+ \csuse{@glscompstyle@treenoname}%
+}%
+\compatglossarystyle{alttree}{%
+  \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]{%
+       \glsentryitem{##1}\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##1=1\relax
+      \glssubentryitem{##2}%
+    \fi
+    \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
+    \makebox[0pt][r]{\makebox[\gls@tmplen][l]{%
+      \textbf{\glstarget{##2}{##3}}}}%
+    \ifx##5\relax\relax
+    \else
+      (##5)\space
+    \fi
+    ##4\glspostdescription\space ##6\par
+    \def\@gls@prevlevel{##1}%
+  }%
+}%
+\compatglossarystyle{alttreegroup}{%
+ \csuse{@glscompstyle@alttree}%
+}%
+\compatglossarystyle{alttreehypergroup}{%
+ \csuse{@glscompstyle@alttree}%
+}%
+\compatglossarystyle{mcolindex}{%
+ \csuse{@glscompstyle@index}%
+}%
+\compatglossarystyle{mcolindexgroup}{%
+ \csuse{@glscompstyle@index}%
+}%
+\compatglossarystyle{mcolindexhypergroup}{%
+ \csuse{@glscompstyle@index}%
+}%
+\compatglossarystyle{mcoltree}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{mcolindextreegroup}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{mcolindextreehypergroup}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{mcoltreenoname}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{mcoltreenonamegroup}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{mcoltreenonamehypergroup}{%
+ \csuse{@glscompstyle@tree}%
+}%
+\compatglossarystyle{mcolalttree}{%
+ \csuse{@glscompstyle@alttree}%
+}%
+\compatglossarystyle{mcolalttreegroup}{%
+ \csuse{@glscompstyle@alttree}%
+}%
+\compatglossarystyle{mcolalttreehypergroup}{%
+ \csuse{@glscompstyle@alttree}%
+}%
+
+\compatglossarystyle{superragged}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
+      \tabularnewline}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
+     \tabularnewline}%
+}%
+\compatglossarystyle{superraggedborder}{%
+ \csuse{@glscompstyle@superragged}%
+}%
+\compatglossarystyle{superraggedheader}{%
+ \csuse{@glscompstyle@superragged}%
+}%
+\compatglossarystyle{superraggedheaderborder}{%
+ \csuse{@glscompstyle@superragged}%
+}%
+\compatglossarystyle{superragged3col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
+}%
+\compatglossarystyle{superragged3colborder}{%
+ \csuse{@glscompstyle@superragged3col}%
+}%
+\compatglossarystyle{superragged3colheader}{%
+ \csuse{@glscompstyle@superragged3col}%
+}%
+\compatglossarystyle{superragged3colheaderborder}{%
+ \csuse{@glscompstyle@superragged3col}%
+}%
+\compatglossarystyle{altsuperragged4col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
+}%
+\compatglossarystyle{altsuperragged4colheader}{%
+ \csuse{@glscompstyle@altsuperragged4col}%
+}%
+\compatglossarystyle{altsuperragged4colborder}{%
+ \csuse{@glscompstyle@altsuperragged4col}%
+}%
+\compatglossarystyle{altsuperragged4colheaderborder}{%
+ \csuse{@glscompstyle@altsuperragged4col}%
+}%
+\compatglossarystyle{super}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
+}%
+\compatglossarystyle{superborder}{%
+ \csuse{@glscompstyle@super}%
+}%
+\compatglossarystyle{superheader}{%
+ \csuse{@glscompstyle@super}%
+}%
+\compatglossarystyle{superheaderborder}{%
+ \csuse{@glscompstyle@super}%
+}%
+\compatglossarystyle{super3col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##6\\}%
+}%
+\compatglossarystyle{super3colborder}{%
+ \csuse{@glscompstyle@super3col}%
+}%
+\compatglossarystyle{super3colheader}{%
+ \csuse{@glscompstyle@super3col}%
+}%
+\compatglossarystyle{super3colheaderborder}{%
+ \csuse{@glscompstyle@super3col}%
+}%
+\compatglossarystyle{super4col}{%
+  \renewcommand*{\glossaryentryfield}[5]{%
+    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
+  \renewcommand*{\glossarysubentryfield}[6]{%
+     &
+     \glssubentryitem{##2}%
+     \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
+}%
+\compatglossarystyle{super4colheader}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\compatglossarystyle{super4colborder}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\compatglossarystyle{super4colheaderborder}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\compatglossarystyle{altsuper4col}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\compatglossarystyle{altsuper4colheader}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\compatglossarystyle{altsuper4colborder}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\compatglossarystyle{altsuper4colheaderborder}{%
+ \csuse{@glscompstyle@super4col}%
+}%
+\endinput
+%%
+%% End of file `glossaries-compatible-307.sty'.
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 6668d69bdd8..3c4f4ba4b66 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2009/11/09 v1.0 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2013/11/14 v4.0 (NLCT)]
 \@ifundefined{captionsenglish}{}{%
   \expandafter\toks@\expandafter{\captionsenglish
     \renewcommand*{\glossaryname}{\textenglish{Glossary}}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index dc53b167230..2df06584c5d 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,10 +39,12 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2013/07/05 v3.07 (NLCT)]
+\ProvidesPackage{glossaries}[2013/11/14 v4.0 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
+\RequirePackage{textcase}
+\renewcommand*{\mfirstucMakeUppercase}{\MakeTextUppercase}%
 \RequirePackage{xfor}
 \RequirePackage{datatool-base}
 \RequirePackage{amsgen}
@@ -59,7 +61,7 @@
   \newcommand{\glsorg@glossary}{%
     \@bsphack
       \begingroup
-        \@sanitize \glsorg@wrglossary
+        \@sanitize \endgroup\@esphack
   }
   \newcommand{\glsorg@wrglossary}[1]{%
         \protected@write\@glossaryfile{}{%
@@ -67,6 +69,12 @@
       \endgroup
     \@esphack
   }
+  \renewcommand*{\RecordChanges}{%
+    \newwrite\@glossaryfile
+    \immediate\openout\@glossaryfile=\jobname.glo
+    \def\glsorg@glossary{\@bsphack\begingroup\@sanitize\glsorg@wrglossary}%
+    \typeout{Writing glossary file \jobname .glo}%
+  }
   \let\glsorg@changes\changes
   \renewcommand{\changes}[3]{%
     \begingroup
@@ -112,7 +120,8 @@ false,nolabel,autolabel}[nolabel]{%
 }
 \newcommand*{\@glossary@default@style}{list}
 \define@key{glossaries.sty}{style}{%
-\renewcommand*{\@glossary@default@style}{#1}}
+  \renewcommand*{\@glossary@default@style}{#1}%
+}
 \newcommand*{\glossaryentrynumbers}[1]{#1\gls@save@numberlist{#1}}
 \DeclareOptionX{nonumberlist}{%
   \renewcommand*{\glossaryentrynumbers}[1]{\gls@save@numberlist{#1}}%
@@ -150,7 +159,13 @@ false,nolabel,autolabel}[nolabel]{%
 \define@boolkey{glossaries.sty}[gls]{nogroupskip}[true]{}
 \glsnogroupskipfalse
 \define@boolkey{glossaries.sty}[gls]{ucmark}[true]{}
-\glsucmarkfalse
+\@ifclassloaded{memoir}
+{%
+  \glsucmarktrue
+}%
+{%
+  \glsucmarkfalse
+}
 \define@boolkey{glossaries.sty}[gls]{entrycounter}[true]{}
 \glsentrycounterfalse
 \define@key{glossaries.sty}{counterwithin}{%
@@ -163,6 +178,9 @@ false,nolabel,autolabel}[nolabel]{%
 \define@choicekey{glossaries.sty}{sort}{standard,def,use}{%
   \csname @gls@setupsort@#1\endcsname
 }
+\newcommand*{\glsprestandardsort}[3]{%
+  \glsdosanitizesort
+}
 \newcommand*{\@gls@setupsort@standard}{%
   \def\do@glo@storeentry{\@glo@storeentry}%
   \def\@gls@defsortcount##1{}%
@@ -170,7 +188,8 @@ false,nolabel,autolabel}[nolabel]{%
     \ifx\@glo@sort\@glsdefaultsort
       \let\@glo@sort\@glo@name
     \fi
-    \@gls@sanitizesort
+    \let\glsdosanitizesort\@gls@sanitizesort
+    \glsprestandardsort{\@glo@sort}{##1}{##2}%
     \expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}%
   }%
   \def\@gls@setsort##1{}%
@@ -240,6 +259,29 @@ false,nolabel,autolabel}[nolabel]{%
    \renewcommand*{\glsdefmain}{}%
 }
 \define@boolkey{glossaries.sty}[gls]{acronym}[true]{%
+  \ifglsacronym
+    \renewcommand{\@gls@do@acronymsdef}{%
+      \DeclareAcronymList{acronym}%
+      \newglossary[alg]{acronym}{acr}{acn}{\acronymname}%
+      \renewcommand*{\acronymtype}{acronym}%
+    }%
+  \else
+    \let\@gls@do@acronymsdef\relax
+  \fi
+}
+\AtBeginDocument{%
+  \ifglsacronym
+    \ifbool{glscompatible-3.07}%
+    {}%
+    {%
+      \providecommand*{\printacronyms}[1][]{%
+        \printglossary[type=\acronymtype,#1]}%
+    }%
+  \fi
+}
+\newcommand*{\@gls@do@acronymsdef}{}
+\DeclareOptionX{acronyms}{%
+  \glsacronymtrue
   \DeclareAcronymList{acronym}%
 }
 \newcommand*{\@glsacronymlists}{}
@@ -277,7 +319,7 @@ false,nolabel,autolabel}[nolabel]{%
   \renewcommand*{\@glsacronymlists}{#1}%
 }
 \define@key{glossaries.sty}{acronymlists}{%
-  \@addtoacronymlists{#1}%
+  \DeclareAcronymList{#1}%
 }
 \newcommand{\glscounter}{page}
 \define@key{glossaries.sty}{counter}{%
@@ -296,49 +338,120 @@ false,nolabel,autolabel}[nolabel]{%
 \define@key{glossaries.sty}{nohypertypes}{%
   \GlsDeclareNoHyperList{#1}%
 }
-\newcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}
-\newcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name}
-\newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol}
-\newcommand*{\@gls@sanitizesort}{\@onelevel@sanitize\@glo@sort}
+\newcommand*{\GlossariesWarning}[1]{%
+  \PackageWarning{glossaries}{#1}%
+}
+\newcommand*{\GlossariesWarningNoLine}[1]{%
+  \PackageWarningNoLine{glossaries}{#1}%
+}
+\DeclareOptionX{nowarn}{%
+  \renewcommand*{\GlossariesWarning}[1]{}%
+  \renewcommand*{\GlossariesWarningNoLine}[1]{}%
+}
+\newcommand*{\@gls@sanitizedesc}{%
+}
+\newcommand*{\glssetexpandfield}[1]{%
+  \csdef{gls@assign@#1@field}##1##2{%
+    \@@gls@expand@field{##1}{#1}{##2}%
+  }%
+}
+\newcommand*{\glssetnoexpandfield}[1]{%
+  \csdef{gls@assign@#1@field}##1##2{%
+    \@@gls@noexpand@field{##1}{#1}{##2}%
+  }%
+}
+\glssetexpandfield{type}
+\glssetnoexpandfield{desc}
+\glssetnoexpandfield{descplural}
+\newcommand*{\@gls@sanitizename}{}
+\glssetnoexpandfield{name}
+\newcommand*{\@gls@sanitizesymbol}{}
+\glssetnoexpandfield{symbol}
+\glssetnoexpandfield{symbolplural}
+\newcommand*{\@gls@sanitizesort}{%
+  \ifglssanitizesort
+    \@onelevel@sanitize\@glo@sort
+  \else
+  \fi
+}
 \define@boolkey[gls]{sanitize}{description}[true]{%
-\ifgls@sanitize@description
-  \renewcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}%
-\else
-  \renewcommand*{\@gls@sanitizedesc}{}%
-\fi
+  \GlossariesWarning{sanitize={description} package option deprecated}%
+  \ifgls@sanitize@description
+    \glssetnoexpandfield{desc}%
+    \glssetnoexpandfield{descplural}%
+  \else
+    \glssetexpandfield{desc}%
+    \glssetexpandfield{descplural}%
+  \fi
 }
 \define@boolkey[gls]{sanitize}{name}[true]{%
-\ifgls@sanitize@name
-  \renewcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name}%
-\else
-  \renewcommand*{\@gls@sanitizename}{}%
-\fi}
+  \GlossariesWarning{sanitize={name} package option
+deprecated}%
+  \ifgls@sanitize@name
+    \glssetnoexpandfield{name}%
+  \else
+    \glssetexpandfield{name}%
+  \fi
+}
 \define@boolkey[gls]{sanitize}{symbol}[true]{%
-\ifgls@sanitize@symbol
-  \renewcommand*{\@gls@sanitizesymbol}{%
-\@onelevel@sanitize\@glo@symbol}%
-\else
-  \renewcommand*{\@gls@sanitizesymbol}{}%
-\fi}
-\define@boolkey[gls]{sanitize}{sort}[true]{%
-\ifgls@sanitize@sort
-  \renewcommand*{\@gls@sanitizesort}{%
-\@onelevel@sanitize\@glo@sort}%
-\else
-  \renewcommand*{\@gls@sanitizesort}{}%
-\fi}
+  \GlossariesWarning{sanitize={symbol} package option
+deprecated}%
+  \ifgls@sanitize@symbol
+    \glssetnoexpandfield{symbol}%
+    \glssetnoexpandfield{symbolplural}%
+  \else
+    \glssetexpandfield{symbol}%
+    \glssetexpandfield{symbolplural}%
+  \fi
+}
+\define@boolkey{glossaries.sty}[gls]{sanitizesort}[true]{%
+  \ifglssanitizesort
+    \glssetnoexpandfield{sortvalue}%
+  \else
+    \glssetexpandfield{sortvalue}%
+  \fi
+}
+\glssanitizesorttrue
+\glssetnoexpandfield{sortvalue}%
+\define@choicekey{sanitize}{sort}{true,false}[true]{%
+  \setbool{glssanitizesort}{#1}%
+  \ifglssanitizesort
+    \glssetnoexpandfield{sortvalue}%
+  \else
+    \glssetexpandfield{sortvalue}%
+  \fi
+  \GlossariesWarning{sanitize={sort} package option
+    deprecated. Use sanitizesort instead}%
+}
 \define@key{glossaries.sty}{sanitize}[description=true,symbol=true,
 name=true]{%
-\ifthenelse{\equal{#1}{none}}%
-{%
-  \renewcommand*{\@gls@sanitizedesc}{}%
-  \renewcommand*{\@gls@sanitizename}{}%
-  \renewcommand*{\@gls@sanitizesymbol}{}%
-}%
-{%
-  \setkeys[gls]{sanitize}{#1}}%
+  \ifthenelse{\equal{#1}{none}}%
+  {%
+    \GlossariesWarning{sanitize package option deprecated}%
+  }%
+  {%
+    \setkeys[gls]{sanitize}{#1}%
+  }%
 }
-\define@boolkey{glossaries.sty}[gls]{translate}[true]{}
+\newif\ifglstranslate
+\newcommand*\@gls@notranslatorhook{}
+\DeclareOptionX{notranslate}{%
+   \glstranslatefalse
+   \let\@gls@notranslatorhook\relax
+}
+\define@choicekey{glossaries.sty}{translate}[\val\nr]%
+  {true,false,babel}[true]%
+  {%
+    \ifcase\nr\relax
+      \glstranslatetrue
+    \or
+      \glstranslatefalse
+      \let\@gls@notranslatorhook\relax
+    \or
+      \glstranslatefalse
+      \def\@gls@notranslatorhook{\RequirePackage{glossaries-babel}}%
+    \fi
+  }
 \glstranslatefalse
   \@ifpackageloaded{translator}%
     {\glstranslatetrue}%
@@ -353,21 +466,30 @@ name=true]{%
 \glsindexonlyfirstfalse
 \define@boolkey{glossaries.sty}[gls]{hyperfirst}[true]{}
 \glshyperfirsttrue
+\newcommand*{\@gls@setacrstyle}{}
 \define@boolkey{glossaries.sty}[glsacr]{footnote}[true]{%
-\ifthenelse{\boolean{glsacrdescription}}{}%
-{\renewcommand*{\@gls@sanitizedesc}{}}%
+  \ifbool{glsacrdescription}%
+  {}%
+  {%
+    \renewcommand*{\@gls@sanitizedesc}{}%
+  }%
+  \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}%
 }
 \define@boolkey{glossaries.sty}[glsacr]{description}[true]{%
   \renewcommand*{\@gls@sanitizesymbol}{}%
+  \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}%
 }
 \define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{%
   \renewcommand*{\@gls@sanitizesymbol}{}%
+  \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}%
 }
 \define@boolkey{glossaries.sty}[glsacr]{smaller}[true]{%
   \renewcommand*{\@gls@sanitizesymbol}{}%
+  \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}%
 }
 \define@boolkey{glossaries.sty}[glsacr]{dua}[true]{%
   \renewcommand*{\@gls@sanitizesymbol}{}%
+  \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}%
 }
 \define@boolkey{glossaries.sty}[glsacr]{shortcuts}[true]{}
 \newcommand*{\glsorder}{word}
@@ -390,21 +512,69 @@ name=true]{%
   \glsxindytrue
   \setkeys[gls]{xindy}{#1}%
 }
-\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{}
+\DeclareOptionX{xindygloss}{%
+  \glsxindytrue
+}
+\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{%
+  \ifglssavewrites
+    \renewcommand*{\glswritefiles}{\@glswritefiles}%
+  \else
+    \let\glswritefiles\relax
+  \fi
+}
 \glssavewritesfalse
-\newcommand*{\GlossariesWarning}[1]{%
-  \PackageWarning{glossaries}{#1}%
+\let\glswritefiles\relax
+\define@boolkey{glossaries.sty}[gls]{compatible-3.07}[true]{}
+\boolfalse{glscompatible-3.07}
+\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{%
+  \ifbool{glscompatible-2.07}%
+  {%
+    \booltrue{glscompatible-3.07}%
+  }%
+  {}%
 }
-\newcommand*{\GlossariesWarningNoLine}[1]{%
-  \PackageWarningNoLine{glossaries}{#1}%
+\boolfalse{glscompatible-2.07}
+\newcommand{\@gls@do@symbolsdef}{}
+\DeclareOptionX{symbols}{%
+  \renewcommand{\@gls@do@symbolsdef}{%
+    \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}%
+    \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,#1]}%
+  }%
 }
-\DeclareOptionX{nowarn}{%
-  \renewcommand*{\GlossariesWarning}[1]{}%
-  \renewcommand*{\GlossariesWarningNoLine}[1]{}%
+\newcommand{\@gls@do@numbersdef}{}
+\DeclareOptionX{numbers}{%
+  \renewcommand{\@gls@do@numbersdef}{%
+    \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}%
+    \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,#1]}%
+  }%
 }
-\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{}
-\csname glscompatible-2.07false\endcsname
 \ProcessOptionsX
+\RequirePackage{glossaries-compatible-307}
+\disable@keys{glossaries.sty}{compatible-2.07,%
+ xindy,xindygloss,makeindex,%
+ acronym,translate,notranslate,nolong,nosuper,notree,nostyles,nomain}
+\newcommand*{\setupglossaries}[1]{%
+  \renewcommand*{\@gls@setacrstyle}{}%
+  \ifglsacrshortcuts
+    \def\@gls@setupshortcuts{\glsacrshortcutstrue}%
+  \else
+    \def\@gls@setupshortcuts{%
+      \ifglsacrshortcuts
+        \DefineAcronymSynonyms
+      \fi
+    }%
+  \fi
+  \glsacrshortcutsfalse
+  \let\@gls@do@numbersdef\relax
+  \let\@gls@do@symbolssdef\relax
+  \let\@gls@do@acronymsdef\relax
+  \setkeys{glossaries.sty}{#1}%
+  \@gls@setacrstyle
+  \@gls@setupshortcuts
+  \@gls@do@acronymsdef
+  \@gls@do@numbersdef
+  \@gls@do@symbolssdef
+}
 \ifglstranslate
   \@ifpackageloaded{polyglossia}%
   {%
@@ -433,12 +603,13 @@ name=true]{%
 {}
 \newcommand*{\@gls@onlypremakeg}{}
 \newcommand*{\@onlypremakeg}[1]{%
-\ifx\@gls@onlypremakeg\@empty
-   \def\@gls@onlypremakeg{#1}%
-\else
-   \expandafter\toks@\expandafter{\@gls@onlypremakeg}%
-   \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}%
-\fi}
+  \ifx\@gls@onlypremakeg\@empty
+     \def\@gls@onlypremakeg{#1}%
+  \else
+     \expandafter\toks@\expandafter{\@gls@onlypremakeg}%
+     \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}%
+  \fi
+}
 \newcommand*{\@disable@onlypremakeg}{%
 \@for\@thiscs:=\@gls@onlypremakeg\do{%
    \expandafter\@disable@premakecs\@thiscs%
@@ -530,6 +701,8 @@ name=true]{%
       \@ifpackageloaded{babel}{%
         \RequirePackage{glossaries-babel}}{}%
     }}
+\else
+   \@gls@notranslatorhook
 \fi
 \DeclareRobustCommand*{\nopostdesc}{}
 \newcommand*{\@nopostdesc}{%
@@ -537,6 +710,7 @@ name=true]{%
   \def\glspostdescription{%
     \let\glspostdescription\org@glspostdescription}%
 }
+\newcommand*{\@no@post@desc}{\nopostdesc}
 \newcommand{\glspar}{\par}
 \ifglsxindy
   \newcommand{\setStyleFile}[1]{%
@@ -589,7 +763,7 @@ name=true]{%
   \ifglossaryexists{#1}{%
     \csgdef{@glossarypreamble@#1}{#2}%
   }{%
-    \PackageWarning{glossaries}{%
+    \GlossariesWarning{%
       Glossary `#1' is not defined%
     }%
   }%
@@ -604,62 +778,62 @@ name=true]{%
   {%
     \@p@glossarysection{#1}{#2}%
   }%
-  \glossarymark{\glossarytoctitle}%
+  \glsglossarymark{\glossarytoctitle}%
 }
 \ifcsundef{glossarymark}%
 {%
-  \ifglsucmark
-    \newcommand{\glossarymark}[1]{%
-       \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}%
-    }
-  \else
-    \newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}}
-  \fi
+  \newcommand{\glsglossarymark}[1]{\glossarymark{#1}}
 }%
 {%
-  \GlossariesWarning{overriding \string\glossarymark}%
-  \@ifclassloaded{memoir}%
-  {
-    \ifglsucmark
-      \renewcommand{\glossarymark}[1]{%
-         \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}%
-      }
-    \else
-      \renewcommand{\glossarymark}[1]{%
+  \@ifclassloaded{memoir}
+  {%
+    \newcommand{\glsglossarymark}[1]{%
+      \ifglsucmark
         \markboth{\memUChead{#1}}{\memUChead{#1}}%
-      }
-    \fi
-  }
-  {
-    \ifglsucmark
-      \renewcommand{\glossarymark}[1]{%
-         \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}%
-      }
-    \else
-      \renewcommand{\glossarymark}[1]{\@mkboth{#1}{#1}}
-    \fi
+      \else
+        \markboth{#1}{#1}%
+      \fi
+    }
+  }%
+  {%
+    \newcommand{\glsglossarymark}[1]{%
+      \ifglsucmark
+        \@mkboth{\mfirstucMakeUppercase{#1}}{\mfirstucMakeUppercase{#1}}%
+      \else
+        \@mkboth{#1}{#1}%
+      \fi
+    }
   }
 }
+\providecommand{\glossarymark}[1]{%
+  \ifglsucmark
+    \@mkboth{\mfirstucMakeUppercase{#1}}{\mfirstucMakeUppercase{#1}}%
+  \else
+    \@mkboth{#1}{#1}%
+  \fi
+}
 \newcommand*{\setglossarysection}[1]{%
 \setkeys{glossaries.sty}{section=#1}}
 \newcommand*{\@glossarysection}[2]{%
-\ifx\@@glossarysecstar\@empty
-  \csname\@@glossarysec\endcsname{#2}%
-\else
-  \csname\@@glossarysec\endcsname*{#2}%
-  \@gls@toc{#1}{\@@glossarysec}%
-\fi
-\@@glossaryseclabel}
+  \ifx\@@glossarysecstar\@empty
+    \csname\@@glossarysec\endcsname{#2}%
+  \else
+    \csname\@@glossarysec\endcsname*{#2}%
+    \@gls@toc{#1}{\@@glossarysec}%
+  \fi
+  \@@glossaryseclabel
+}
 \newcommand*{\@p@glossarysection}[2]{%
-\glsclearpage
-\phantomsection
-\ifx\@@glossarysecstar\@empty
-  \csname\@@glossarysec\endcsname{#2}%
-\else
-  \@gls@toc{#1}{\@@glossarysec}%
-  \csname\@@glossarysec\endcsname*{#2}%
-\fi
-\@@glossaryseclabel}
+  \glsclearpage
+  \phantomsection
+  \ifx\@@glossarysecstar\@empty
+    \csname\@@glossarysec\endcsname{#2}%
+  \else
+    \@gls@toc{#1}{\@@glossarysec}%
+      \csname\@@glossarysec\endcsname*{#2}%
+  \fi
+  \@@glossaryseclabel
+}
 \newcommand*{\gls@doclearpage}{%
   \ifthenelse{\equal{\@@glossarysec}{chapter}}%
   {%
@@ -685,13 +859,14 @@ name=true]{%
 }
 \newcommand*{\glsclearpage}{\gls@doclearpage}
 \newcommand*{\@gls@toc}[2]{%
-\ifglstoc
-  \ifglsnumberline
-    \addcontentsline{toc}{#2}{\numberline{}#1}%
-  \else
-    \addcontentsline{toc}{#2}{#1}%
+  \ifglstoc
+    \ifglsnumberline
+      \addcontentsline{toc}{#2}{\numberline{}#1}%
+    \else
+      \addcontentsline{toc}{#2}{#1}%
+    \fi
   \fi
-\fi}
+}
 \newcommand*{\glsnoxindywarning}[1]{%
   \GlossariesWarning{Not in xindy mode --- ignoring \string#1}%
 }
@@ -964,10 +1139,11 @@ name=true]{%
   \newcommand*{\GlsSetXdyCodePage}[1]{%
     \renewcommand*{\gls@codepage}{#1}%
   }
-\AtBeginDocument{
-  \ifx\gls@codepage\@empty
-  \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{}
-\fi}
+  \AtBeginDocument{%
+    \ifx\gls@codepage\@empty
+      \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{}%
+    \fi
+  }
 \else
   \newcommand*{\GlsSetXdyCodePage}[1]{%
     \glsnoxindywarning\GlsSetXdyCodePage}
@@ -995,18 +1171,24 @@ name=true]{%
 }
 \newcommand*{\forglsentries}[3][\glsdefaulttype]{%
   \edef\@@glo@list{\csname glolist@#1\endcsname}%
-  \@for#2:=\@@glo@list\do{\ifx#2\@empty\else#3\fi}%
+  \@for#2:=\@@glo@list\do
+  {%
+    \ifdefempty{#2}{}{#3}%
+  }%
 }
 \newcommand*{\forallglsentries}[3][\@glo@types]{%
-\expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}{%
-\forglsentries[\@@this@glo@]{#2}{#3}}}
+  \expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}%
+  {%
+    \forglsentries[\@@this@glo@]{#2}{#3}%
+  }%
+}
 \newcommand{\ifglossaryexists}[3]{%
   \ifcsundef{@glotype@#1@out}{#3}{#2}%
 }
 \newcommand{\ifglsentryexists}[3]{%
   \ifcsundef{glo@#1@name}{#3}{#2}%
 }
-\newcommand*{\ifglsused}[3]{\ifthenelse{\boolean{glo@#1@flag}}{#2}{#3}}
+\newcommand*{\ifglsused}[3]{\ifbool{glo@#1@flag}{#2}{#3}}
 \newcommand{\glsdoifexists}[2]{%
   \ifglsentryexists{#1}{#2}{%
     \PackageError{glossaries}{Glossary entry `#1' has not been
@@ -1042,32 +1224,80 @@ name=true]{%
     \ifcsempty{glo@#1@parent}{#3}{#2}%
   }%
 }
+\newcommand*{\ifglshasdesc}[3]{%
+  \ifcsempty{glo@#1@desc}%
+  {#3}%
+  {#2}%
+}
+\newcommand*{\ifglsdescsuppressed}[3]{%
+  \ifcsequal{glos@#1@desc}{@no@post@desc}%
+  {#2}%
+  {#3}%
+}
+\newcommand*{\ifglshassymbol}[3]{%
+  \ifcsempty{glo@#1@symbol}%
+  {#3}%
+  {%
+    \expandafter\ifx\csname glo@#1@symbol\endcsname\@gls@default@value
+      #3%
+    \else
+      #2%
+    \fi
+  }%
+}
+\newcommand*{\ifglshaslong}[3]{%
+  \ifcsempty{glo@#1@long}%
+  {#3}%
+  {%
+    \expandafter\ifx\csname glo@#1@long\endcsname\@gls@default@value
+      #3%
+    \else
+      #2%
+    \fi
+  }%
+}
+\newcommand*{\ifglshasshort}[3]{%
+  \ifcsempty{glo@#1@short}%
+  {#3}%
+  {%
+    \expandafter\ifx\csname glo@#1@short\endcsname\@gls@default@value
+      #3%
+    \else
+      #2%
+    \fi
+  }%
+}
 \newcommand*{\@glo@types}{,}
+\newcommand*\@gls@provide@newglossary{%
+  \protected@write\@auxout{}{\string\providecommand\string\@newglossary[4]{}}%
+  \let\@gls@provide@newglossary\relax
+}
+\newcommand*{\defglsentryfmt}[2][\glsdefaulttype]{%
+  \csgdef{gls@#1@entryfmt}{#2}%
+}
+\newcommand*{\gls@doentryfmt}[1]{\csuse{gls@#1@entryfmt}}
 \newcommand*{\newglossary}[5][glg]{%
-\ifglossaryexists{#2}{%
-  \PackageError{glossaries}{Glossary type `#2' already exists}{%
-  You can't define a new glossary called `#2' because it already
-  exists}%
-}{%
-  \ifx\glsdefaulttype\relax
+ \ifglossaryexists{#2}%
+ {%
+   \PackageError{glossaries}{Glossary type `#2' already exists}{%
+   You can't define a new glossary called `#2' because it already
+   exists}%
+ }%
+ {%
+  \ifundef\glsdefaulttype
+  {%
     \gdef\glsdefaulttype{#2}%
-  \fi
+  }{}%
   \toks@{#2}\edef\@glo@types{\@glo@types\the\toks@,}%
   \expandafter\gdef\csname glolist@#2\endcsname{,}%
   \expandafter\def\csname @glotype@#2@in\endcsname{#3}%
   \expandafter\def\csname @glotype@#2@out\endcsname{#4}%
   \expandafter\def\csname @glotype@#2@title\endcsname{#5}%
+  \@gls@provide@newglossary
   \protected@write\@auxout{}{\string\@newglossary{#2}{#1}{#3}{#4}}%
-  \ifcsundef{gls@#2@display}%
+  \ifcsundef{gls@#2@entryfmt}%
   {%
-    \expandafter\gdef\csname gls@#2@display\endcsname{\glsdisplay}%
-  }%
-  {}%
-  \ifcsundef{gls@#2@displayfirst}%
-  {%
-    \expandafter\gdef\csname gls@#2@displayfirst\endcsname{%
-      \glsdisplayfirst
-    }%
+    \defglsentryfmt[#2]{\glsentryfmt}%
   }%
   {}%
   \@gls@defsortcount{#2}%
@@ -1087,8 +1317,12 @@ name=true]{%
   \fi
 }
 \newcommand*{\@gls@getcounter}[1]{%
-\csname @glotype@#1@counter\endcsname}
+ \csname @glotype@#1@counter\endcsname
+}
 \glsdefmain
+\@gls@do@acronymsdef
+\@gls@do@symbolsdef
+\@gls@do@numbersdef
 \define@key{glossentry}{name}{%
 \def\@glo@name{#1}%
 }
@@ -1112,6 +1346,7 @@ name=true]{%
 \define@key{glossentry}{firstplural}{%
 \def\@glo@firstplural{#1}%
 }
+\newcommand*{\@gls@default@value}{\relax}
 \define@key{glossentry}{symbol}{%
 \def\@glo@symbol{#1}%
 }
@@ -1135,9 +1370,16 @@ name=true]{%
   }%
 }
 \define@key{glossentry}{see}{%
+  \gls@checkseeallowed
   \def\@glo@see{#1}%
   \@glo@seeautonumberlist
 }
+\newcommand*{\gls@checkseeallowed}{%
+  \PackageError{glossaries}%
+  {`see' key may only be used after \string\makeglossaries}%
+  {You must use \string\makeglossaries\space before defining
+   any entries that have a `see' key}%
+}
 \define@key{glossentry}{parent}{%
 \def\@glo@parent{#1}}
 \define@choicekey{glossentry}{nonumberlist}[\val\nr]{true,false}[true]{%
@@ -1181,7 +1423,17 @@ name=true]{%
   \PackageError{glossaries}{name key required in
   \string\newglossaryentry\space for entry `\@glo@label'}{You
   haven't specified the entry name}}
-\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix}
+\newcommand*\@glsnodesc{%
+  \PackageError{glossaries}
+  {%
+    description key required in \string\newglossaryentry\space
+    for entry `\@glo@label'%
+  }%
+  {%
+    You haven't specified the entry description%
+  }%
+}%
+\newcommand*{\@glsdefaultplural}{}
 \newcommand*{\@gls@missingnumberlist}[1]{%
   ??%
   \ifglssavenumberlist
@@ -1198,31 +1450,318 @@ name=true]{%
 }
 \newcommand*{\@glsdefaultsort}{\@glo@name}
 \newcount\gls@level
+\newcommand{\@@gls@noexpand@field}[3]{%
+ \expandafter\global\expandafter
+    \let\csname glo@#1@#2\endcsname#3%
+}
+\newcommand{\@gls@noexpand@fields}[4]{%
+  \ifcsdef{gls@assign@#3@field}
+  {%
+     \ifdefequal{#4}{\@gls@default@value}%
+     {%
+       \edef\@gls@value{\expandonce{#1}}%
+       \csuse{gls@assign@#3@field}{#2}{\@gls@value}%
+     }%
+     {%
+       \csuse{gls@assign@#3@field}{#2}{#4}%
+     }%
+  }%
+  {%
+    \ifdefequal{#4}{\@gls@default@value}%
+    {%
+       \edef\@gls@value{\expandonce{#1}}%
+       \@@gls@noexpand@field{#2}{#3}{\@gls@value}%
+    }%
+    {%
+      \@@gls@noexpand@field{#2}{#3}{#4}%
+    }%
+  }%
+}
+\newcommand{\@@gls@expand@field}[3]{%
+ \expandafter
+   \protected@xdef\csname glo@#1@#2\endcsname{#3}%
+}
+\newcommand{\@gls@expand@fields}[4]{%
+  \ifcsdef{gls@assign@#3@field}
+  {%
+     \ifdefequal{#4}{\@gls@default@value}%
+     {%
+       \edef\@gls@value{\expandonce{#1}}%
+       \csuse{gls@assign@#3@field}{#2}{\@gls@value}%
+     }%
+     {%
+       \expandafter\@gls@startswithexpandonce#4\relax\relax\gls@endcheck
+       {%
+         \@@gls@expand@field{#2}{#3}{#4}%
+       }%
+       {%
+         \csuse{gls@assign@#3@field}{#2}{#4}%
+       }%
+     }%
+  }%
+  {%
+    \ifdefequal{#4}{\@gls@default@value}%
+    {%
+      \@@gls@expand@field{#2}{#3}{#1}%
+    }%
+    {%
+      \@@gls@expand@field{#2}{#3}{#4}%
+    }%
+  }%
+}
+\def\@gls@expandonce{\expandonce}
+\def\@gls@startswithexpandonce#1#2\gls@endcheck#3#4{%
+  \def\@gls@tmp{#1}%
+  \ifdefequal{\@gls@expandonce}{\@gls@tmp}{#3}{#4}%
+}
+\let\gls@assign@field\@gls@expand@fields
+\newcommand*{\glsexpandfields}{%
+  \let\gls@assign@field\@gls@expand@fields
+}
+\newcommand*{\glsnoexpandfields}{%
+  \let\gls@assign@field\@gls@noexpand@fields
+}
 \newrobustcmd{\newglossaryentry}[2]{%
   \glsdoifnoexists{#1}%
   {%
-    \def\@glo@label{#1}%
-    \let\@glo@name\@glsnoname
-    \def\@glo@desc{%
-      \PackageError{glossaries}
-      {%
-        description key required in \string\newglossaryentry\space
-        for entry `\@glo@label'%
+     \gls@defglossaryentry{#1}{#2}%
+  }%
+}
+\newrobustcmd{\provideglossaryentry}[2]{%
+  \ifglsentryexists{#1}%
+  {}%
+  {%
+    \gls@defglossaryentry{#1}{#2}%
+  }%
+}
+\@onlypreamble{\provideglossaryentry}
+\newrobustcmd{\new@glossaryentry}[2]{%
+  \ifundef\@gls@deffile
+  {%
+     \global\newwrite\@gls@deffile
+     \immediate\openout\@gls@deffile=\jobname.glsdefs
+  }%
+  {}%
+  \ifglsentryexists{#1}{}%
+  {%
+     \gls@defglossaryentry{#1}{#2}%
+  }%
+  \@gls@writedef{#1}%
+}
+\AtBeginDocument
+{
+  \makeatletter
+  \InputIfFileExists{\jobname.glsdefs}{}{}%
+  \makeatother
+  \let\newglossaryentry\new@glossaryentry
+}
+\AtEndDocument{\ifdef\@gls@deffile{\closeout\@gls@deffile}{}}
+\newcommand*{\@gls@writedef}[1]{%
+  \immediate\write\@gls@deffile
+  {%
+    \string\ifglsentryexists{#1}{}\expandafter\@gobble\string\%^^J%
+    \expandafter\@gobble\string\{\expandafter\@gobble\string\%^^J%
+      \string\gls@defglossaryentry{#1}\expandafter\@gobble\string\%^^J%
+      \expandafter\@gobble\string\{\expandafter\@gobble\string\%%
+  }%
+  \@for\@gls@map:=\@gls@keymap\do
+  {%
+    \edef\glo@value{\expandafter\expandonce
+       \csname glo@#1@\expandafter\@secondoftwo\@gls@map\endcsname}%
+    \@onelevel@sanitize\glo@value
+    \immediate\write\@gls@deffile
+    {%
+      \expandafter\@firstoftwo\@gls@map
+        =\expandafter\@gobble\string\{\glo@value\expandafter\@gobble\string\},%
+        \expandafter\@gobble\string\%%
+    }%
+  }%
+  \glswritedefhook
+  \immediate\write\@gls@deffile
+  {%
+           \expandafter\@gobble\string\%^^J%
+      \expandafter\@gobble\string\}\expandafter\@gobble\string\%^^J%
+    \expandafter\@gobble\string\}\expandafter\@gobble\string\%%
+  }%
+}
+\newcommand*{\@gls@keymap}{%
+  {name}{name},%
+  {sort}{sortvalue},% unescaped sort value
+  {type}{type},%
+  {first}{first},%
+  {firstplural}{firstpl},%
+  {text}{text},%
+  {plural}{plural},%
+  {description}{desc},%
+  {descriptionplural}{descplural},%
+  {symbol}{symbol},%
+  {symbolplural}{symbolplural},%
+  {user1}{useri},%
+  {user2}{userii},%
+  {user3}{useriii},%
+  {user4}{useriv},%
+  {user5}{userv},%
+  {user6}{uservi},%
+  {long}{long},%
+  {longplural}{longpl},%
+  {short}{short},%
+  {shortplural}{shortpl},%
+  {counter}{counter},%
+  {parent}{parent}%
+}
+\newcommand*{\glsaddkey}{\@ifstar\@sglsaddkey\@glsaddkey}
+\newcommand*{\@sglsaddkey}[1]{%
+  \key@ifundefined{glossentry}{#1}%
+  {%
+    \expandafter\newcommand\expandafter*\expandafter
+     {\csname gls@assign@#1@field\endcsname}[2]{%
+       \@@gls@expand@field{##1}{#1}{##2}%
+     }%
+  }%
+  {}%
+  \@glsaddkey{#1}%
+}
+\newcommand*{\@glsaddkey}[7]{%
+  \key@ifundefined{glossentry}{#1}%
+  {%
+    \define@key{glossentry}{#1}{\csdef{@glo@#1}{##1}}%
+    \appto\@gls@keymap{,{#1}{#1}}%
+    \appto\@newglossaryentryprehook{\csdef{@glo@#1}{#2}}%
+    \appto\@newglossaryentryposthook{%
+      \letcs{\@glo@tmp}{@glo@#1}%
+      \gls@assign@field{#2}{\@glo@label}{#1}{\@glo@tmp}%
+    }%
+    \newcommand*{#3}[1]{\csuse{glo@##1@#1}}%
+    \newcommand*{#4}[1]{%
+      \letcs{\@glo@text}{glo@##1@#1}%
+      \xmakefirstuc\@glo@text
+    }%
+    \ifcsdef{@gls@user@#1@}%
+    {%
+       \PackageError{glossaries}%
+       {Can't define `\string#5' as helper command
+        `\expandafter\string\csname @gls@user@#1@\endcsname' already exists}%
+       {}%
+    }%
+    {%
+      \newrobustcmd*{#5}{\@ifstar{\csuse{@sgls@user@#1}}{\csuse{@gls@user@#1}}}%
+      \expandafter\newcommand\expandafter*\expandafter
+        {\csname @sgls@user@#1\endcsname}[1][]{%
+          \csuse{@gls@user@#1}[hyper=false,##1]%
+        }%
+      \expandafter\newcommand\expandafter*\expandafter
+        {\csname @gls@user@#1\endcsname}[2][]{%
+          \new@ifnextchar[%
+            {\csuse{@gls@user@#1@}{##1}{##2}}%
+            {\csuse{@gls@user@#1@}{##1}{##2}[]}}%
+      \csdef{@gls@user@#1@}##1##2[##3]{%
+        \glsdoifexists{##2}%
+        {%
+          \edef\@glo@type{\glsentrytype{##2}}%
+          \@gls@link[##1]{##2}{#3{##2}##3}%
+        }%
       }%
-      {%
-        You haven't specified the entry description%
+    }%
+    \ifcsdef{@Gls@user@#1@}%
+    {%
+       \PackageError{glossaries}%
+       {Can't define `\string#6' as helper command
+        `\expandafter\string\csname @Gls@user@#1@\endcsname' already exists}%
+       {}%
+    }%
+    {%
+      \newrobustcmd*{#6}{\@ifstar{\csuse{@sGls@user@#1}}{\csuse{@Gls@user@#1}}}%
+      \expandafter\newcommand\expandafter*\expandafter
+        {\csname @sGls@user@#1\endcsname}[1][]{%
+          \csuse{@Gls@user@#1}[hyper=false,##1]%
+        }%
+      \expandafter\newcommand\expandafter*\expandafter
+        {\csname @Gls@user@#1\endcsname}[2][]{%
+          \new@ifnextchar[%
+            {\csuse{@Gls@user@#1@}{##1}{##2}}%
+            {\csuse{@Gls@user@#1@}{##1}{##2}[]}}%
+      \csdef{@Gls@user@#1@}##1##2[##3]{%
+        \glsdoifexists{##2}%
+        {%
+          \edef\@glo@type{\glsentrytype{##2}}%
+          \@gls@link[##1]{##2}{#4{##2}##3}%
+        }%
       }%
     }%
-    \def\@glo@descplural{\@glo@desc}%
-    \def\@glo@type{\glsdefaulttype}%
-    \def\@glo@symbol{\relax}%
-    \def\@glo@symbolplural{\@glo@symbol}%
-    \def\@glo@text{\@glo@name}%
-    \let\@glo@plural\@glsdefaultplural
-    \let\@glo@first\relax
-    \let\@glo@firstplural\relax
-    \let\@glo@sort\@glsdefaultsort
-    \def\@glo@counter{\@gls@getcounter{\@glo@type}}%
+    \ifcsdef{@GLS@user@#1@}%
+    {%
+       \PackageError{glossaries}%
+       {Can't define `\string#7' as helper command
+        `\expandafter\string\csname @GLS@user@#1@\endcsname' already exists}%
+       {}%
+    }%
+    {%
+      \newrobustcmd*{#7}{\@ifstar{\csuse{@sGLS@user@#1}}{\csuse{@GLS@user@#1}}}%
+      \expandafter\newcommand\expandafter*\expandafter
+        {\csname @sGLS@user@#1\endcsname}[1][]{%
+          \csuse{@GLS@user@#1}[hyper=false,##1]%
+        }%
+      \expandafter\newcommand\expandafter*\expandafter
+        {\csname @GLS@user@#1\endcsname}[2][]{%
+          \new@ifnextchar[%
+            {\csuse{@GLS@user@#1@}{##1}{##2}}%
+            {\csuse{@GLS@user@#1@}{##1}{##2}[]}}%
+      \csdef{@GLS@user@#1@}##1##2[##3]{%
+        \glsdoifexists{##2}%
+        {%
+          \edef\@glo@type{\glsentrytype{##2}}%
+          \@gls@link[##1]{##2}{\mfirstucMakeUppercase{#3{##2}##3}}%
+        }%
+      }%
+    }%
+  }%
+  {%
+    \PackageError{glossaries}{Key `#1' already exists}{}%
+  }%
+}
+\newcommand*{\glswritedefhook}{}
+\newcommand*{\gls@assign@desc}[1]{%
+  \gls@assign@field{}{#1}{desc}{\@glo@desc}%
+  \gls@assign@field{\@glo@desc}{#1}{descplural}{\@glo@descplural}%
+}
+\newcommand{\longnewglossaryentry}[3]{%
+  \glsdoifnoexists{#1}%
+  {%
+     \bgroup
+       \let\@org@newglossaryentryprehook\@newglossaryentryprehook
+       \long\def\@newglossaryentryprehook{%
+         \long\def\@glo@desc{#3\leavevmode\unskip\nopostdesc}%
+         \@org@newglossaryentryprehook
+       }%
+       \renewcommand*{\gls@assign@desc}[1]{%
+          \global\cslet{glo@#1@desc}{\@glo@desc}%
+          \global\cslet{glo@#1@descplural}{\@glo@desc}%
+        }
+       \gls@defglossaryentry{#1}{#2}%
+     \egroup
+  }
+}
+\@onlypreamble{\longnewglossaryentry}
+\newcommand{\longprovideglossaryentry}[3]{%
+  \ifglsentryexists{#1}{}%
+  {\longnewglossaryentry{#1}{#2}{#3}}%
+}
+\@onlypreamble{\longprovideglossaryentry}
+\newcommand{\gls@defglossaryentry}[2]{%
+    \def\@glo@label{#1}%
+    \let\glslabel\@glo@label
+    \let\@glo@name\@glsnoname
+    \let\@glo@desc\@glsnodesc
+    \let\@glo@descplural\@gls@default@value
+    \let\@glo@type\@gls@default@value
+    \let\@glo@symbol\@gls@default@value
+    \let\@glo@symbolplural\@gls@default@value
+    \let\@glo@text\@gls@default@value
+    \let\@glo@plural\@gls@default@value
+    \let\@glo@first\@gls@default@value
+    \let\@glo@firstplural\@gls@default@value
+    \let\@glo@sort\@gls@default@value
+    \let\@glo@counter\@gls@default@value
     \def\@glo@see{}%
     \def\@glo@parent{}%
     \def\@glo@prefix{}%
@@ -1238,10 +1777,20 @@ name=true]{%
     \def\@glo@longpl{}%
     \@newglossaryentryprehook
     \setkeys{glossentry}{#2}%
+    \ifundef\glsdefaulttype
+    {%
+       \PackageError{glossaries}%
+       {No default glossary type (have you used `nomain'?)}%
+       {If you use package option `nomain' you must define
+        a new glossary before you can define entries}%
+    }%
+    {}%
+    \gls@assign@field{\glsdefaulttype}{#1}{type}{\@glo@type}%
+    \edef\@glo@type{\glsentrytype{#1}}%
     \ifcsundef{glolist@\@glo@type}%
     {%
       \PackageError{glossaries}%
-      {Glossary type '\@glo@type' has not been defined}%
+      {Glossary type `\@glo@type' has not been defined}%
       {You need to define a new glossary type, before making entries
        in it}%
     }%
@@ -1268,7 +1817,7 @@ name=true]{%
           \ifx\@glo@name\@glsnoname
             \expandafter\let\expandafter\@glo@name
                \csname glo@\@glo@parent @name\endcsname
-            \ifx\@glo@plural\@glsdefaultplural
+            \ifx\@glo@plural\@gls@default@value
               \expandafter\let\expandafter\@glo@plural
                  \csname glo@\@glo@parent @plural\endcsname
             \fi
@@ -1289,52 +1838,47 @@ name=true]{%
       }%
     \fi
     \expandafter\xdef\csname glo@#1@level\endcsname{\number\gls@level}%
-    \ifx\relax\@glo@firstplural
-       \ifx\relax\@glo@first
-          \def\@glo@firstplural{\@glo@plural}%
-          \def\@glo@first{\@glo@text}%
-       \else
-          \def\@glo@firstplural{\@glo@first\glspluralsuffix}%
-       \fi
+    \gls@assign@field{\@glo@name}{#1}{sortvalue}{\@glo@sort}%
+    \letcs\@glo@sort{glo@#1@sortvalue}%
+    \gls@assign@field{\@glo@name}{#1}{text}{\@glo@text}%
+    \expandafter\gls@assign@field\expandafter
+       {\csname glo@#1@text\endcsname\glspluralsuffix}%
+       {#1}{plural}{\@glo@plural}%
+    \expandafter\gls@assign@field\expandafter
+       {\csname glo@#1@text\endcsname}%
+       {#1}{first}{\@glo@first}%
+    \ifx\@glo@first\@gls@default@value
+      \expandafter\gls@assign@field\expandafter
+         {\csname glo@#1@plural\endcsname}%
+         {#1}{firstpl}{\@glo@firstplural}%
     \else
-       \ifx\relax\@glo@first
-          \def\@glo@first{\@glo@text}%
-       \fi
+      \expandafter\gls@assign@field\expandafter
+         {\csname glo@#1@first\endcsname\glspluralsuffix}%
+         {#1}{firstpl}{\@glo@firstplural}%
     \fi
-    \expandafter
-      \protected@xdef\csname glo@#1@text\endcsname{\@glo@text}%
-    \expandafter
-      \protected@xdef\csname glo@#1@plural\endcsname{\@glo@plural}%
-    \expandafter
-      \protected@xdef\csname glo@#1@first\endcsname{\@glo@first}%
-    \expandafter
-      \protected@xdef\csname glo@#1@firstpl\endcsname{\@glo@firstplural}%
-    \expandafter
-      \protected@xdef\csname glo@#1@type\endcsname{\@glo@type}%
-    \expandafter
-      \protected@xdef\csname glo@#1@counter\endcsname{\@glo@counter}%
-    \expandafter
-      \protected@xdef\csname glo@#1@useri\endcsname{\@glo@useri}%
-    \expandafter
-      \protected@xdef\csname glo@#1@userii\endcsname{\@glo@userii}%
-    \expandafter
-      \protected@xdef\csname glo@#1@useriii\endcsname{\@glo@useriii}%
-    \expandafter
-      \protected@xdef\csname glo@#1@useriv\endcsname{\@glo@useriv}%
-    \expandafter
-      \protected@xdef\csname glo@#1@userv\endcsname{\@glo@userv}%
-    \expandafter
-      \protected@xdef\csname glo@#1@uservi\endcsname{\@glo@uservi}%
-    \expandafter
-      \protected@xdef\csname glo@#1@short\endcsname{\@glo@short}%
-    \expandafter
-      \protected@xdef\csname glo@#1@shortpl\endcsname{\@glo@shortpl}%
-    \expandafter
-      \protected@xdef\csname glo@#1@long\endcsname{\@glo@long}%
-    \expandafter
-      \protected@xdef\csname glo@#1@longpl\endcsname{\@glo@longpl}%
-    \@gls@sanitizename
-    \expandafter\protected@xdef\csname glo@#1@name\endcsname{\@glo@name}%
+    \ifcsundef{@glotype@\@glo@type @counter}%
+    {%
+      \def\@glo@defaultcounter{\glscounter}%
+    }%
+    {%
+      \letcs\@glo@defaultcounter{@glotype@\@glo@type @counter}%
+    }%
+    \gls@assign@field{\@glo@defaultcounter}{#1}{counter}{\@glo@counter}%
+    \gls@assign@field{}{#1}{useri}{\@glo@useri}%
+    \gls@assign@field{}{#1}{userii}{\@glo@userii}%
+    \gls@assign@field{}{#1}{useriii}{\@glo@useriii}%
+    \gls@assign@field{}{#1}{useriv}{\@glo@useriv}%
+    \gls@assign@field{}{#1}{userv}{\@glo@userv}%
+    \gls@assign@field{}{#1}{uservi}{\@glo@uservi}%
+    \gls@assign@field{}{#1}{short}{\@glo@short}%
+    \gls@assign@field{}{#1}{shortpl}{\@glo@shortpl}%
+    \gls@assign@field{}{#1}{long}{\@glo@long}%
+    \gls@assign@field{}{#1}{longpl}{\@glo@longpl}%
+    \ifx\@glo@name\@glsnoname
+      \@glsnoname
+      \let\@gloname\@gls@default@value
+    \fi
+    \gls@assign@field{}{#1}{name}{\@glo@name}%
     \ifcsundef{glo@#1@numberlist}%
     {%
       \csxdef{glo@#1@numberlist}{\noexpand\@gls@missingnumberlist{\@glo@label}}%
@@ -1344,17 +1888,21 @@ name=true]{%
     \ifx\@glo@desc\@glo@@desc
       \let\@glo@desc\@glo@first
     \fi
-    \@gls@sanitizedesc
-    \expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}%
-    \expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}%
+    \ifx\@glo@desc\@glsnodesc
+      \@glsnodesc
+      \let\@glodesc\@gls@default@value
+    \fi
+    \gls@assign@desc{#1}%
     \@gls@defsort{\@glo@type}{#1}%
     \def\@glo@@symbol{\@glo@text}%
     \ifx\@glo@symbol\@glo@@symbol
       \let\@glo@symbol\@glo@text
     \fi
-    \@gls@sanitizesymbol
-    \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}%
-    \expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}%
+    \gls@assign@field{\relax}{#1}{symbol}{\@glo@symbol}%
+    \expandafter
+      \gls@assign@field\expandafter
+      {\csname glo@#1@symbol\endcsname}
+      {#1}{symbolplural}{\@glo@symbolplural}%
     \expandafter\gdef\csname glo@#1@flagfalse\endcsname{%
       \expandafter\global\expandafter
         \let\csname ifglo@#1@flag\endcsname\iffalse
@@ -1372,7 +1920,6 @@ name=true]{%
         \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{#1}}%
       \@do@glssee
     \fi
-  }%
   \do@glo@storeentry{#1}%
   \@newglossaryentryposthook
 }
@@ -1389,104 +1936,395 @@ name=true]{%
   \csdef{glo@#1@type}{#2}%
 }
 \ifglsxindy
-  \newcommand*{\@glossaryentryfield}{\string\\glossaryentryfield}
+  \newcommand*{\@glossaryentryfield}{\string\\glossentry}
 \else
-  \newcommand*{\@glossaryentryfield}{\string\glossaryentryfield}
+  \newcommand*{\@glossaryentryfield}{\string\glossentry}
 \fi
 \ifglsxindy
   \newcommand*{\@glossarysubentryfield}{%
-    \string\\glossarysubentryfield}
+    \string\\subglossentry}
 \else
   \newcommand*{\@glossarysubentryfield}{%
-    \string\glossarysubentryfield}
+    \string\subglossentry}
 \fi
 \newcommand{\@glo@storeentry}[1]{%
-\protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}%
-\@gls@checkmkidxchars\@glo@sort
-\protected@edef\@@glo@name{\csname glo@#1@name\endcsname}%
-\@gls@checkmkidxchars\@@glo@name
-\ifglsxindy
-  \protected@edef\@glo@name{\string\\glsnamefont{\@@glo@name}}%
-\else
-  \protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}%
-\fi
-\protected@edef\@glo@desc{\csname glo@#1@desc\endcsname}%
-\@gls@checkmkidxchars\@glo@desc
-\protected@edef\@glo@symbol{\csname glo@#1@symbol\endcsname}%
-\@gls@checkmkidxchars\@glo@symbol
-\@gls@checkmkidxchars\@glo@prefix
-\edef\@glo@parent{\csname glo@#1@parent\endcsname}%
-\ifglsxindy
-  \ifx\@glo@parent\@empty
-    \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
-     (\string"\@glo@sort\string" %
-     \string"\@glo@prefix\@glossaryentryfield{#1}{\@glo@name
-     }{\@glo@desc}{\@glo@symbol}\string") %
-    }%
+  \def\@glo@label{#1}%
+  \@gls@checkmkidxchars\@glo@label
+  \protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}%
+  \@gls@checkmkidxchars\@glo@sort
+  \@gls@checkmkidxchars\@glo@prefix
+  \edef\@glo@parent{\csname glo@#1@parent\endcsname}%
+  \ifglsxindy
+    \ifx\@glo@parent\@empty
+      \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
+       (\string"\@glo@sort\string" %
+       \string"\@glo@prefix\@glossaryentryfield{\@glo@label}\string") %
+      }%
+    \else
+      \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
+        \csname glo@\@glo@parent @index\endcsname
+        (\string"\@glo@sort\string" %
+        \string"\@glo@prefix\@glossarysubentryfield
+           {\csname glo@#1@level\endcsname}{\@glo@label}\string") %
+       }%
+    \fi
   \else
-    \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
-      \csname glo@\@glo@parent @index\endcsname
-      (\string"\@glo@sort\string" %
-      \string"\@glo@prefix\@glossarysubentryfield%
-         {\csname glo@#1@level\endcsname}{#1}{\@glo@name
-      }{\@glo@desc}{\@glo@symbol}\string") %
-   }%
+    \ifx\@glo@parent\@empty
+      \@onelevel@sanitize\@glo@prefix
+      \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
+        \@glo@sort\@gls@actualchar\@glo@prefix
+        \@glossaryentryfield{\@glo@label}%
+      }%
+    \else
+      \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
+        \csname glo@\@glo@parent @index\endcsname\@gls@levelchar
+        \@glo@sort\@gls@actualchar\@glo@prefix
+        \@glossarysubentryfield
+          {\csname glo@#1@level\endcsname}{\@glo@label}%
+      }%
+    \fi
   \fi
-\else
-  \ifx\@glo@parent\@empty
-    \@onelevel@sanitize\@glo@prefix
-    \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
-      \@glo@sort\@gls@actualchar\@glo@prefix
-      \@glossaryentryfield{#1}{\@glo@name}{\@glo@desc
-      }{\@glo@symbol}%
-    }%
+}
+\AtBeginDocument{%
+  \@ifpackageloaded{amsmath}%
+  {\let\gls@ifnotmeasuring\@gls@ifnotmeasuring}%
+  {}%
+}
+\newcommand*{\@gls@ifnotmeasuring}[1]{%
+  \ifmeasuring@
   \else
-    \expandafter\protected@xdef\csname glo@#1@index\endcsname{%
-      \csname glo@\@glo@parent @index\endcsname\@gls@levelchar
-      \@glo@sort\@gls@actualchar\@glo@prefix
-      \@glossarysubentryfield
-        {\csname glo@#1@level\endcsname}{#1}{\@glo@name}{\@glo@desc
-      }{\@glo@symbol}%
-    }%
+    #1%
   \fi
-\fi
 }
+\newcommand*\gls@ifnotmeasuring[1]{#1}
 \newcommand*{\glsreset}[1]{%
-\glsdoifexists{#1}{%
-\expandafter\global\csname glo@#1@flagfalse\endcsname}}
+  \gls@ifnotmeasuring
+  {%
+    \glsdoifexists{#1}%
+    {%
+       \expandafter\global\csname glo@#1@flagfalse\endcsname
+    }%
+  }%
+}
 \newcommand*{\glslocalreset}[1]{%
-\glsdoifexists{#1}{%
-\expandafter\let\csname ifglo@#1@flag\endcsname\iffalse}}
+  \gls@ifnotmeasuring
+  {%
+    \glsdoifexists{#1}%
+    {%
+       \expandafter\let\csname ifglo@#1@flag\endcsname\iffalse
+    }%
+  }%
+}
 \newcommand*{\glsunset}[1]{%
-\glsdoifexists{#1}{%
-\expandafter\global\csname glo@#1@flagtrue\endcsname}}
+  \gls@ifnotmeasuring
+  {%
+    \glsdoifexists{#1}%
+    {%
+      \expandafter\global\csname glo@#1@flagtrue\endcsname
+    }%
+  }%
+}
 \newcommand*{\glslocalunset}[1]{%
-\glsdoifexists{#1}{%
-\expandafter\let\csname ifglo@#1@flag\endcsname\iftrue}}
+  \gls@ifnotmeasuring
+  {%
+    \glsdoifexists{#1}%
+    {%
+      \expandafter\let\csname ifglo@#1@flag\endcsname\iftrue
+    }%
+  }%
+}
 \newcommand*{\glsresetall}[1][\@glo@types]{%
-\forallglsentries[#1]{\@glsentry}{%
-\glsreset{\@glsentry}}}
+  \forallglsentries[#1]{\@glsentry}%
+  {%
+     \glsreset{\@glsentry}%
+  }%
+}
 \newcommand*{\glslocalresetall}[1][\@glo@types]{%
-\forallglsentries[#1]{\@glsentry}{%
-\glslocalreset{\@glsentry}}}
+  \forallglsentries[#1]{\@glsentry}%
+  {%
+    \glslocalreset{\@glsentry}%
+  }%
+}
 \newcommand*{\glsunsetall}[1][\@glo@types]{%
-\forallglsentries[#1]{\@glsentry}{%
-\glsunset{\@glsentry}}}
+  \forallglsentries[#1]{\@glsentry}%
+  {%
+    \glsunset{\@glsentry}%
+  }%
+}
 \newcommand*{\glslocalunsetall}[1][\@glo@types]{%
-\forallglsentries[#1]{\@glsentry}{%
-\glslocalunset{\@glsentry}}}
+  \forallglsentries[#1]{\@glsentry}%
+  {%
+    \glslocalunset{\@glsentry}%
+  }%
+}
 \newcommand*{\loadglsentries}[2][\@gls@default]{%
-\let\@gls@default\glsdefaulttype
-\def\glsdefaulttype{#1}\input{#2}%
-\let\glsdefaulttype\@gls@default}
+  \let\@gls@default\glsdefaulttype
+  \def\glsdefaulttype{#1}\input{#2}%
+  \let\glsdefaulttype\@gls@default
+}
 \@onlypreamble{\loadglsentries}
 \newcommand*{\glstextformat}[1]{#1}
+\newcommand*{\glsentryfmt}{%
+  \@@gls@default@entryfmt\glsdisplayfirst\glsdisplay
+}
+\newcommand*{\@@gls@default@entryfmt}[2]{%
+  \ifdefempty\glscustomtext
+  {%
+    \glsifplural
+    {%
+      \glscapscase
+      {%
+        \ifglsused\glslabel
+        {%
+          #2{\glsentryplural{\glslabel}}%
+            {\glsentrydescplural{\glslabel}}%
+            {\glsentrysymbolplural{\glslabel}}{\glsinsert}%
+        }%
+        {%
+          #1{\glsentryfirstplural{\glslabel}}%
+            {\glsentrydescplural{\glslabel}}%
+            {\glsentrysymbolplural{\glslabel}}{\glsinsert}%
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+          \ifbool{glscompatible-3.07}%
+          {%
+            \protected@edef\@glo@etext{%
+              #2{\glsentryplural{\glslabel}}%
+                {\glsentrydescplural{\glslabel}}%
+                {\glsentrysymbolplural{\glslabel}}{\glsinsert}}%
+            \xmakefirstuc\@glo@etext
+          }%
+          {%
+            #2{\Glsentryplural{\glslabel}}%
+              {\glsentrydescplural{\glslabel}}%
+              {\glsentrysymbolplural{\glslabel}}{\glsinsert}%
+          }%
+        }%
+        {%
+          \ifbool{glscompatible-3.07}%
+          {%
+            \protected@edef\@glo@etext{%
+              #1{\glsentryfirstplural{\glslabel}}%
+                {\glsentrydescplural{\glslabel}}%
+                {\glsentrysymbolplural{\glslabel}}{\glsinsert}}%
+            \xmakefirstuc\@glo@etext
+          }%
+          {%
+            #1{\Glsentryfirstplural{\glslabel}}%
+              {\glsentrydescplural{\glslabel}}%
+              {\glsentrysymbolplural{\glslabel}}{\glsinsert}%
+          }%
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+          \mfirstucMakeUppercase{#2{\glsentryplural{\glslabel}}%
+            {\glsentrydescplural{\glslabel}}%
+            {\glsentrysymbolplural{\glslabel}}{\glsinsert}}%
+        }%
+        {%
+          \mfirstucMakeUppercase{#1{\glsentryfirstplural{\glslabel}}%
+            {\glsentrydescplural{\glslabel}}%
+            {\glsentrysymbolplural{\glslabel}}{\glsinsert}}%
+        }%
+      }%
+    }%
+    {%
+      \glscapscase
+      {%
+        \ifglsused\glslabel
+        {%
+          #2{\glsentrytext{\glslabel}}%
+            {\glsentrydesc{\glslabel}}%
+            {\glsentrysymbol{\glslabel}}{\glsinsert}%
+        }%
+        {%
+          #1{\glsentryfirst{\glslabel}}%
+            {\glsentrydesc{\glslabel}}%
+            {\glsentrysymbol{\glslabel}}{\glsinsert}%
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+          \ifbool{glscompatible-3.07}%
+          {%
+            \protected@edef\@glo@etext{%
+              #2{\glsentrytext{\glslabel}}%
+                {\glsentrydesc{\glslabel}}%
+                {\glsentrysymbol{\glslabel}}{\glsinsert}}%
+            \xmakefirstuc\@glo@etext
+          }%
+          {%
+            #2{\Glsentrytext{\glslabel}}%
+              {\glsentrydesc{\glslabel}}%
+              {\glsentrysymbol{\glslabel}}{\glsinsert}%
+          }%
+        }%
+        {%
+          \ifbool{glscompatible-3.07}%
+          {%
+            \protected@edef\@glo@etext{%
+              #1{\glsentryfirst{\glslabel}}%
+                {\glsentrydesc{\glslabel}}%
+                {\glsentrysymbol{\glslabel}}{\glsinsert}}%
+              \xmakefirstuc\@glo@etext
+          }%
+          {%
+            #1{\Glsentryfirst{\glslabel}}%
+              {\glsentrydesc{\glslabel}}%
+              {\glsentrysymbol{\glslabel}}{\glsinsert}%
+          }%
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+          \mfirstucMakeUppercase{#2{\glsentrytext{\glslabel}}%
+            {\glsentrydesc{\glslabel}}%
+            {\glsentrysymbol{\glslabel}}{\glsinsert}}%
+        }%
+        {%
+          \mfirstucMakeUppercase{#1{\glsentryfirst{\glslabel}}%
+            {\glsentrydesc{\glslabel}}%
+            {\glsentrysymbol{\glslabel}}{\glsinsert}}%
+        }%
+      }%
+    }%
+  }%
+  {%
+    \ifglsused{\glslabel}%
+    {%
+      #2{\glscustomtext}%
+        {\glsentrydesc{\glslabel}}%
+        {\glsentrysymbol{\glslabel}}{}%
+    }%
+    {%
+      #1{\glscustomtext}%
+        {\glsentrydesc{\glslabel}}%
+        {\glsentrysymbol{\glslabel}}{}%
+    }%
+  }%
+}
+\newcommand*{\glsgenentryfmt}{%
+  \ifdefempty\glscustomtext
+  {%
+    \glsifplural
+    {%
+      \glscapscase
+      {%
+        \ifglsused\glslabel
+        {%
+          \glsentryplural{\glslabel}\glsinsert
+        }%
+        {%
+          \glsentryfirstplural{\glslabel}\glsinsert
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+           \Glsentryplural{\glslabel}\glsinsert
+        }%
+        {%
+           \Glsentryfirstplural{\glslabel}\glsinsert
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+          \mfirstucMakeUppercase
+             {\glsentryplural{\glslabel}\glsinsert}%
+        }%
+        {%
+          \mfirstucMakeUppercase
+             {\glsentryfirstplural{\glslabel}\glsinsert}%
+        }%
+      }%
+    }%
+    {%
+      \glscapscase
+      {%
+        \ifglsused\glslabel
+        {%
+          \glsentrytext{\glslabel}\glsinsert
+        }%
+        {%
+          \glsentryfirst{\glslabel}\glsinsert
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+           \Glsentrytext{\glslabel}\glsinsert
+        }%
+        {%
+          \Glsentryfirst{\glslabel}\glsinsert
+        }%
+      }%
+      {%
+        \ifglsused\glslabel
+        {%
+          \mfirstucMakeUppercase{\glsentrytext{\glslabel}\glsinsert}%
+        }%
+        {%
+          \mfirstucMakeUppercase{\glsentryfirst{\glslabel}\glsinsert}%
+        }%
+      }%
+    }%
+  }%
+  {%
+    \glscustomtext\glsinsert
+  }%
+}
 \newcommand*{\glsdisplayfirst}[4]{#1#4}
 \newcommand*{\glsdisplay}[4]{#1#4}
 \newcommand*{\defglsdisplay}[2][\glsdefaulttype]{%
-\expandafter\def\csname gls@#1@display\endcsname##1##2##3##4{#2}}
+  \GlossariesWarning{\string\defglsdisplay\space is now obsolete.^^J
+  Use \string\defglsentryfmt\space instead}%
+  \expandafter\def\csname gls@#1@display\endcsname##1##2##3##4{#2}%
+  \edef\@gls@doentrydef{%
+    \noexpand\defglsentryfmt[#1]{%
+      \noexpand\ifcsdef{gls@#1@displayfirst}%
+      {%
+        \noexpand\@@gls@default@entryfmt
+          {\noexpand\csuse{gls@#1@displayfirst}}
+          {\noexpand\csuse{gls@#1@display}}%
+      }%
+      {%
+        \noexpand\@@gls@default@entryfmt
+          {\noexpand\glsdisplayfirst}
+          {\noexpand\csuse{gls@#1@display}}%
+      }%
+    }%
+  }%
+  \@gls@doentrydef
+}
 \newcommand*{\defglsdisplayfirst}[2][\glsdefaulttype]{%
-\expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}}
+  \GlossariesWarning{\string\defglsdisplayfirst\space is now obsolete.^^J
+  Use \string\defglsentryfmt\space instead}%
+  \expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}%
+  \edef\@gls@doentrydef{%
+    \noexpand\defglsentryfmt[#1]{%
+      \noexpand\ifcsdef{gls@#1@display}%
+      {%
+        \noexpand\@@gls@default@entryfmt
+          {\noexpand\csuse{gls@#1@displayfirst}}
+          {\noexpand\csuse{gls@#1@display}}%
+      }%
+      {%
+        \noexpand\@@gls@default@entryfmt
+          {\noexpand\csuse{gls@#1@displayfirst}}%
+          {\noexpand\glsdisplay}
+      }%
+    }%
+  }%
+  \@gls@doentrydef
+}
 \define@key{glslink}{counter}{%
   \ifcsundef{c@#1}%
   {%
@@ -1506,7 +2344,8 @@ name=true]{%
 \define@boolkey{glslink}{hyper}[true]{}
 \define@boolkey{glslink}{local}[true]{}
 \newrobustcmd*{\glslink}{%
-\@ifstar\@sgls@link\@gls@@link}
+ \@ifstar\@sgls@link\@gls@@link
+}
 \newcommand*{\@sgls@link}[1][]{\@gls@@link[hyper=false,#1]}
 \newcommand*{\@gls@@link}[3][]{%
   \ifglsentryexists{#2}%
@@ -1540,7 +2379,7 @@ name=true]{%
     \ifKV@glslink@hyper
       \@glslink{\glolinkprefix#2}{\glstextformat{#3}}%
     \else
-      \glstextformat{#3}\relax
+      \glstextformat{#3}%
     \fi
 }
 \newcommand*{\glolinkprefix}{glo:}
@@ -1642,236 +2481,244 @@ name=true]{%
   \let#1=\gls@xdystring
 }
 \newcommand{\@gls@checkmkidxchars}[1]{%
-\ifglsxindy
-  \@gls@escbsdq{#1}%
-\else
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checkquote#1\@nil""\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checkescquote#1\@nil\"\"\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checkescactual#1\@nil\?\?\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checkactual#1\@nil??\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checkbar#1\@nil||\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checkescbar#1\@nil\|\|\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-  \def\@gls@checkedmkidx{}%
-  \expandafter\@gls@checklevel#1\@nil!!\null
-  \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
-\fi
+  \ifglsxindy
+    \@gls@escbsdq{#1}%
+  \else
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checkquote#1\@nil""\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checkescquote#1\@nil\"\"\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checkescactual#1\@nil\?\?\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checkactual#1\@nil??\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checkbar#1\@nil||\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checkescbar#1\@nil\|\|\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+    \def\@gls@checkedmkidx{}%
+    \expandafter\@gls@checklevel#1\@nil!!\null
+    \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
+  \fi
 }
 \def\@gls@updatechecked#1\@nil#2{\def#2{#1}}
 \newtoks\@gls@tmpb
 \def\@gls@checkquote#1"#2"#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkquote{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\@gls@quotechar\@gls@quotechar\@gls@quotechar}%
-  \def\@@gls@checkquote{\@gls@checkquote#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\@gls@quotechar}%
- \ifx\null#3\null
-   \def\@@gls@checkquote{\@gls@checkquote#2""\null}%
- \else
-   \def\@@gls@checkquote{\@gls@checkquote#2"#3\null}%
- \fi
-\fi
-\@@gls@checkquote}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+   \ifx\null#3\null
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+    \def\@@gls@checkquote{\relax}%
+   \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+      \@gls@quotechar\@gls@quotechar\@gls@quotechar\@gls@quotechar}%
+    \def\@@gls@checkquote{\@gls@checkquote#3\null}%
+   \fi
+  \else
+   \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+     \@gls@quotechar\@gls@quotechar}%
+   \ifx\null#3\null
+     \def\@@gls@checkquote{\@gls@checkquote#2""\null}%
+   \else
+     \def\@@gls@checkquote{\@gls@checkquote#2"#3\null}%
+   \fi
+  \fi
+  \@@gls@checkquote
+}
 \def\@gls@checkescquote#1\"#2\"#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkescquote{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\string\"\@gls@quotechar
-    \@gls@quotechar\string\"\@gls@quotechar}%
-  \def\@@gls@checkescquote{\@gls@checkescquote#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\string\"\@gls@quotechar}%
- \ifx\null#3\null
-   \def\@@gls@checkescquote{\@gls@checkescquote#2\"\"\null}%
- \else
-   \def\@@gls@checkescquote{\@gls@checkescquote#2\"#3\null}%
- \fi
-\fi
-\@@gls@checkescquote}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+   \ifx\null#3\null
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+    \def\@@gls@checkescquote{\relax}%
+   \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+      \@gls@quotechar\string\"\@gls@quotechar
+      \@gls@quotechar\string\"\@gls@quotechar}%
+    \def\@@gls@checkescquote{\@gls@checkescquote#3\null}%
+   \fi
+  \else
+   \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+     \@gls@quotechar\string\"\@gls@quotechar}%
+   \ifx\null#3\null
+     \def\@@gls@checkescquote{\@gls@checkescquote#2\"\"\null}%
+   \else
+     \def\@@gls@checkescquote{\@gls@checkescquote#2\"#3\null}%
+   \fi
+  \fi
+\@@gls@checkescquote
+}
 \def\@gls@checkescactual#1\?#2\?#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkescactual{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\string\"\@gls@actualchar
+ \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+ \toks@={#1}%
+ \ifx\null#2\null
+   \ifx\null#3\null
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+    \def\@@gls@checkescactual{\relax}%
+   \else
+     \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+     \@gls@quotechar\string\"\@gls@actualchar
+     \@gls@quotechar\string\"\@gls@actualchar}%
+     \def\@@gls@checkescactual{\@gls@checkescactual#3\null}%
+   \fi
+  \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
     \@gls@quotechar\string\"\@gls@actualchar}%
-  \def\@@gls@checkescactual{\@gls@checkescactual#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\string\"\@gls@actualchar}%
- \ifx\null#3\null
-  \def\@@gls@checkescactual{\@gls@checkescactual#2\?\?\null}%
- \else
-  \def\@@gls@checkescactual{\@gls@checkescactual#2\?#3\null}%
- \fi
-\fi
-\@@gls@checkescactual}
+    \ifx\null#3\null
+      \def\@@gls@checkescactual{\@gls@checkescactual#2\?\?\null}%
+    \else
+      \def\@@gls@checkescactual{\@gls@checkescactual#2\?#3\null}%
+   \fi
+  \fi
+\@@gls@checkescactual
+}
 \def\@gls@checkescbar#1\|#2\|#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkescbar{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\string\"\@gls@encapchar
-    \@gls@quotechar\string\"\@gls@encapchar}%
-  \def\@@gls@checkescbar{\@gls@checkescbar#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\string\"\@gls@encapchar}%
- \ifx\null#3\null
-  \def\@@gls@checkescbar{\@gls@checkescbar#2\|\|\null}%
- \else
-  \def\@@gls@checkescbar{\@gls@checkescbar#2\|#3\null}%
- \fi
-\fi
-\@@gls@checkescbar}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+   \ifx\null#3\null
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+    \def\@@gls@checkescbar{\relax}%
+   \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+      \@gls@quotechar\string\"\@gls@encapchar
+      \@gls@quotechar\string\"\@gls@encapchar}%
+    \def\@@gls@checkescbar{\@gls@checkescbar#3\null}%
+   \fi
+  \else
+   \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+     \@gls@quotechar\string\"\@gls@encapchar}%
+   \ifx\null#3\null
+    \def\@@gls@checkescbar{\@gls@checkescbar#2\|\|\null}%
+   \else
+    \def\@@gls@checkescbar{\@gls@checkescbar#2\|#3\null}%
+   \fi
+  \fi
+\@@gls@checkescbar
+}
 \def\@gls@checkesclevel#1\!#2\!#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkesclevel{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\string\"\@gls@levelchar
-    \@gls@quotechar\string\"\@gls@levelchar}%
-  \def\@@gls@checkesclevel{\@gls@checkesclevel#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\string\"\@gls@levelchar}%
- \ifx\null#3\null
-  \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!\!\null}%
- \else
-  \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!#3\null}%
- \fi
-\fi
-\@@gls@checkesclevel}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+   \ifx\null#3\null
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+    \def\@@gls@checkesclevel{\relax}%
+   \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+      \@gls@quotechar\string\"\@gls@levelchar
+      \@gls@quotechar\string\"\@gls@levelchar}%
+    \def\@@gls@checkesclevel{\@gls@checkesclevel#3\null}%
+   \fi
+  \else
+   \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+     \@gls@quotechar\string\"\@gls@levelchar}%
+   \ifx\null#3\null
+    \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!\!\null}%
+   \else
+    \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!#3\null}%
+   \fi
+  \fi
+\@@gls@checkesclevel
+}
 \def\@gls@checkbar#1|#2|#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkbar{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\@gls@encapchar\@gls@quotechar\@gls@encapchar}%
-  \def\@@gls@checkbar{\@gls@checkbar#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\@gls@encapchar}%
- \ifx\null#3\null
-   \def\@@gls@checkbar{\@gls@checkbar#2||\null}%
- \else
-   \def\@@gls@checkbar{\@gls@checkbar#2|#3\null}%
- \fi
-\fi
-\@@gls@checkbar}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+   \ifx\null#3\null
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+    \def\@@gls@checkbar{\relax}%
+   \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+      \@gls@quotechar\@gls@encapchar\@gls@quotechar\@gls@encapchar}%
+    \def\@@gls@checkbar{\@gls@checkbar#3\null}%
+   \fi
+  \else
+   \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+     \@gls@quotechar\@gls@encapchar}%
+   \ifx\null#3\null
+     \def\@@gls@checkbar{\@gls@checkbar#2||\null}%
+   \else
+     \def\@@gls@checkbar{\@gls@checkbar#2|#3\null}%
+   \fi
+  \fi
+  \@@gls@checkbar
+}
 \def\@gls@checklevel#1!#2!#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checklevel{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\@gls@levelchar\@gls@quotechar\@gls@levelchar}%
-  \def\@@gls@checklevel{\@gls@checklevel#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\@gls@levelchar}%
- \ifx\null#3\null
-   \def\@@gls@checklevel{\@gls@checklevel#2!!\null}%
- \else
-   \def\@@gls@checklevel{\@gls@checklevel#2!#3\null}%
- \fi
-\fi
-\@@gls@checklevel}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+    \ifx\null#3\null
+      \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+      \def\@@gls@checklevel{\relax}%
+    \else
+      \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+      \@gls@quotechar\@gls@levelchar\@gls@quotechar\@gls@levelchar}%
+      \def\@@gls@checklevel{\@gls@checklevel#3\null}%
+    \fi
+  \else
+    \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+    \@gls@quotechar\@gls@levelchar}%
+    \ifx\null#3\null
+      \def\@@gls@checklevel{\@gls@checklevel#2!!\null}%
+    \else
+      \def\@@gls@checklevel{\@gls@checklevel#2!#3\null}%
+    \fi
+  \fi
+  \@@gls@checklevel
+}
 \def\@gls@checkactual#1?#2?#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@checkactual{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \@gls@quotechar\@gls@actualchar\@gls@quotechar\@gls@actualchar}%
-  \def\@@gls@checkactual{\@gls@checkactual#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \@gls@quotechar\@gls@actualchar}%
- \ifx\null#3\null
-   \def\@@gls@checkactual{\@gls@checkactual#2??\null}%
- \else
-   \def\@@gls@checkactual{\@gls@checkactual#2?#3\null}%
- \fi
-\fi
-\@@gls@checkactual}
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+    \ifx\null#3\null
+      \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+      \def\@@gls@checkactual{\relax}%
+     \else
+      \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+        \@gls@quotechar\@gls@actualchar\@gls@quotechar\@gls@actualchar}%
+      \def\@@gls@checkactual{\@gls@checkactual#3\null}%
+     \fi
+    \else
+     \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+       \@gls@quotechar\@gls@actualchar}%
+     \ifx\null#3\null
+       \def\@@gls@checkactual{\@gls@checkactual#2??\null}%
+     \else
+       \def\@@gls@checkactual{\@gls@checkactual#2?#3\null}%
+     \fi
+    \fi
+  \@@gls@checkactual
+}
 \def\@gls@xdycheckquote#1"#2"#3\null{%
-\@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
-\toks@={#1}%
-\ifx\null#2\null
- \ifx\null#3\null
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
-  \def\@@gls@xdycheckquote{\relax}%
- \else
-  \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-    \string\"\string\"}%
-  \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}%
- \fi
-\else
- \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
-   \string\"}%
- \ifx\null#3\null
-   \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}%
- \else
-   \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}%
- \fi
-\fi
-\@@gls@xdycheckquote
+  \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
+  \toks@={#1}%
+  \ifx\null#2\null
+    \ifx\null#3\null
+      \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}%
+      \def\@@gls@xdycheckquote{\relax}%
+     \else
+      \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+        \string\"\string\"}%
+      \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}%
+     \fi
+    \else
+     \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@
+       \string\"}%
+     \ifx\null#3\null
+       \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}%
+     \else
+       \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}%
+     \fi
+    \fi
+  \@@gls@xdycheckquote
 }
 \edef\def@gls@xdycheckbackslash{%
  \noexpand\def\noexpand\@gls@xdycheckbackslash##1\@backslashchar
@@ -1916,8 +2763,7 @@ name=true]{%
 {%
   \gdef\@glslink#1#2{\hyperlink{#1}{#2}}%
 }
-\newlength\gls@tmplen
-\ifcsundef{hypertarget}%
+\newlength\gls@tmplen \ifcsundef{hypertarget}%
 {%
   \gdef\@glstarget#1#2{#2}%
 }%
@@ -1928,13 +2774,17 @@ name=true]{%
   }%
 }
 \newcommand{\glsdisablehyper}{%
-\renewcommand*\@glslink[2]{##2}%
-\renewcommand*\@glstarget[2]{##2}}
+  \renewcommand*\@glslink[2]{##2}%
+  \renewcommand*\@glstarget[2]{##2}%
+}
 \newcommand{\glsenablehyper}{%
 \renewcommand*\@glslink[2]{\hyperlink{##1}{##2}}%
 \renewcommand*\@glstarget[2]{%
   \settoheight{\gls@tmplen}{##2}%
   \raisebox{\gls@tmplen}{\hypertarget{##1}{}}##2}}
+\providecommand{\@firstofthree}[3]{#1}
+\providecommand{\@secondofthree}[3]{#2}
+\providecommand{\@thirdofthree}[3]{#3}
 \newrobustcmd*{\gls}{\@ifstar\@sgls\@gls}
 \newcommand*{\@sgls}[1][]{\@gls[hyper=false,#1]}
 \newcommand*{\@gls}[2][]{%
@@ -1946,17 +2796,12 @@ name=true]{%
     \edef\@glo@type{\glsentrytype{#2}}%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-          {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
-    }%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-          {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
-    }%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glscustomtext\@empty
+    \def\glsinsert{#3}%
+      \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
       \@gls@link[#1]{#2}{\@glo@text}%
@@ -1993,23 +2838,14 @@ name=true]{%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
     \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@secondofthree
+    \let\glscustomtext\@empty
+    \def\glsinsert{#3}%
+      \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
-      \protected@edef\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-          {\glsentrytext{#2}}{\glsentrydesc{#2}}%
-          {\glsentrysymbol{#2}}{#3}}%
-    }%
-    {%
-      \protected@edef\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-          {\glsentryfirst{#2}}{\glsentrydesc{#2}}%
-          {\glsentrysymbol{#2}}{#3}}%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{%
-      \expandafter\makefirstuc\expandafter{\@glo@text}}%
+      \@gls@link[#1]{#2}{\@glo@text}%
     }%
     {%
       \gls@checkisacronymlist\@glo@type
@@ -2019,12 +2855,10 @@ name=true]{%
         \OR \NOT\boolean{glshyperfirst}%
       }%
       {%
-        \@gls@link[#1,hyper=false]{#2}{%
-          \expandafter\makefirstuc\expandafter{\@glo@text}}%
+        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
       }%
       {%
-        \@gls@link[#1]{#2}{%
-          \expandafter\makefirstuc\expandafter{\@glo@text}}%
+        \@gls@link[#1]{#2}{\@glo@text}%
       }%
     }%
     \ifKV@glslink@local
@@ -2045,22 +2879,15 @@ name=true]{%
     \edef\@glo@type{\glsentrytype{#2}}%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glscustomtext\@empty
+    \def\glsinsert{#3}%
+    \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-        {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}%
-      }%
-    }%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-        {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}%
-      }%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+      \@gls@link[#1]{#2}{\@glo@text}%
     }%
     {%
       \gls@checkisacronymlist\@glo@type
@@ -2068,10 +2895,10 @@ name=true]{%
       {%
         \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\)
         \OR \NOT\boolean{glshyperfirst}}{%
-        \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
       }%
       {%
-        \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+        \@gls@link[#1]{#2}{\@glo@text}%
       }%
     }%
     \ifKV@glslink@local
@@ -2092,19 +2919,12 @@ name=true]{%
     \edef\@glo@type{\glsentrytype{#2}}%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-          {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
-          {\glsentrysymbolplural{#2}}{#3}}%
-    }%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-          {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
-          {\glsentrysymbolplural{#2}}{#3}}%
-    }%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@firstofthree
+    \let\glscustomtext\@empty
+    \def\glsinsert{#3}%
+    \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
       \@gls@link[#1]{#2}{\@glo@text}%
@@ -2142,23 +2962,14 @@ name=true]{%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
     \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@secondofthree
+    \let\glscustomtext\@empty
+    \def\glsinsert{#3}%
+    \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
-      \protected@edef\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-          {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
-          {\glsentrysymbolplural{#2}}{#3}}%
-    }%
-    {%
-      \protected@edef\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-          {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
-          {\glsentrysymbolplural{#2}}{#3}}%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{%
-        \expandafter\makefirstuc\expandafter{\@glo@text}}%
+      \@gls@link[#1]{#2}{\@glo@text}%
     }%
     {%
       \gls@checkisacronymlist\@glo@type
@@ -2168,12 +2979,10 @@ name=true]{%
         \OR \NOT\boolean{glshyperfirst}%
       }%
       {%
-        \@gls@link[#1,hyper=false]{#2}{%
-          \expandafter\makefirstuc\expandafter{\@glo@text}}%
+        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
       }%
       {%
-        \@gls@link[#1]{#2}{%
-          \expandafter\makefirstuc\expandafter{\@glo@text}}%
+        \@gls@link[#1]{#2}{\@glo@text}%
       }%
     }%
     \ifKV@glslink@local
@@ -2194,24 +3003,15 @@ name=true]{%
     \edef\@glo@type{\glsentrytype{#2}}%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glscustomtext\@empty
+    \def\glsinsert{#3}%
+    \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-        {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
-        {\glsentrysymbolplural{#2}}{#3}%
-      }%
-    }%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-        {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
-        {\glsentrysymbolplural{#2}}{#3}%
-      }%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+      \@gls@link[#1]{#2}{\@glo@text}%
     }%
     {%
       \gls@checkisacronymlist\@glo@type
@@ -2221,10 +3021,10 @@ name=true]{%
         \OR \NOT\boolean{glshyperfirst}%
       }%
       {%
-        \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
       }%
       {%
-        \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+        \@gls@link[#1]{#2}{\@glo@text}%
       }%
     }%
     \ifKV@glslink@local
@@ -2241,17 +3041,12 @@ name=true]{%
     \edef\@glo@type{\glsentrytype{#2}}%
     \def\@gls@link@opts{#1}%
     \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @display\endcsname
-        {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}%
-    }%
-    {%
-      \def\@glo@text{%
-        \csname gls@\@glo@type @displayfirst\endcsname
-        {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}%
-    }%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \def\glscustomtext{#3}%
+    \def\glsinsert{}%
+    \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}%
     \ifglsused{#2}%
     {%
       \@gls@link[#1]{#2}{\@glo@text}%
@@ -2277,467 +3072,496 @@ name=true]{%
 \newrobustcmd*{\glstext}{\@ifstar\@sglstext\@glstext}
 \newcommand*{\@sglstext}[1][]{\@glstext[hyper=false,#1]}
 \newcommand*{\@glstext}[2][]{%
-\new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}}
 \def\@glstext@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrytext{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentrytext{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
 \newcommand*{\@sGLStext}[1][]{\@GLStext[hyper=false,#1]}
 \newcommand*{\@GLStext}[2][]{%
-\new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}}
 \def\@GLStext@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrytext{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrytext{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
 \newcommand*{\@sGlstext}[1][]{\@Glstext[hyper=false,#1]}
 \newcommand*{\@Glstext}[2][]{%
-\new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}}
 \def\@Glstext@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrytext{#2}}%
-\@gls@link[#1]{#2}{%
-   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentrytext{#2}#3}%
+  }%
 }
 \newrobustcmd*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
 \newcommand*{\@sglsfirst}[1][]{\@glsfirst[hyper=false,#1]}
 \newcommand*{\@glsfirst}[2][]{%
-\new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}}
 \def\@glsfirst@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryfirst{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryfirst{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
 \newcommand*{\@sGlsfirst}[1][]{\@Glsfirst[hyper=false,#1]}
 \newcommand*{\@Glsfirst}[2][]{%
-\new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}}
 \def\@Glsfirst@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryfirst{#2}}%
-\@gls@link[#1]{#2}{%
-   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+  \@gls@link[#1]{#2}{\Glsentryfirst{#2}#3}}%
 }
 \newrobustcmd*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
 \newcommand*{\@sGLSfirst}[1][]{\@GLSfirst[hyper=false,#1]}
 \newcommand*{\@GLSfirst}[2][]{%
-\new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}}
 \def\@GLSfirst@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryfirst{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
 \newcommand*{\@sglsplural}[1][]{\@glsplural[hyper=false,#1]}
 \newcommand*{\@glsplural}[2][]{%
-\new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}}
 \def\@glsplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
 \newcommand*{\@sGlsplural}[1][]{\@Glsplural[hyper=false,#1]}
 \newcommand*{\@Glsplural}[2][]{%
-\new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}}
 \def\@Glsplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryplural{#2}}%
-\@gls@link[#1]{#2}{%
-   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
 \newcommand*{\@sGLSplural}[1][]{\@GLSplural[hyper=false,#1]}
 \newcommand*{\@GLSplural}[2][]{%
-\new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}}
 \def\@GLSplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
 \newcommand*{\@sglsfirstplural}[1][]{\@glsfirstplural[hyper=false,#1]}
 \newcommand*{\@glsfirstplural}[2][]{%
-\new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}}
 \def\@glsfirstplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryfirstplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryfirstplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
 \newcommand*{\@sGlsfirstplural}[1][]{\@Glsfirstplural[hyper=false,#1]}
 \newcommand*{\@Glsfirstplural}[2][]{%
-\new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}}
 \def\@Glsfirstplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryfirstplural{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+   \@gls@link[#1]{#2}{\Glsentryfirstplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
 \newcommand*{\@sGLSfirstplural}[1][]{\@GLSfirstplural[hyper=false,#1]}
 \newcommand*{\@GLSfirstplural}[2][]{%
-\new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}}
 \def\@GLSfirstplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryfirstplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsname}{\@ifstar\@sglsname\@glsname}
 \newcommand*{\@sglsname}[1][]{\@glsname[hyper=false,#1]}
 \newcommand*{\@glsname}[2][]{%
-\new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}}
 \def\@glsname@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryname{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryname{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
 \newcommand*{\@sGlsname}[1][]{\@Glsname[hyper=false,#1]}
 \newcommand*{\@Glsname}[2][]{%
-\new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}}
 \def\@Glsname@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryname{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryname{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
 \newcommand*{\@sGLSname}[1][]{\@GLSname[hyper=false,#1]}
 \newcommand*{\@GLSname}[2][]{%
-\new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}}
 \def\@GLSname@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryname{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
 \newcommand*{\@sglsdesc}[1][]{\@glsdesc[hyper=false,#1]}
 \newcommand*{\@glsdesc}[2][]{%
-\new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}}
 \def\@glsdesc@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrydesc{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentrydesc{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
 \newcommand*{\@sGlsdesc}[1][]{\@Glsdesc[hyper=false,#1]}
 \newcommand*{\@Glsdesc}[2][]{%
-\new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}}
 \def\@Glsdesc@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrydesc{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentrydesc{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
 \newcommand*{\@sGLSdesc}[1][]{\@GLSdesc[hyper=false,#1]}
 \newcommand*{\@GLSdesc}[2][]{%
-\new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}}
 \def\@GLSdesc@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrydesc{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
 \newcommand*{\@sglsdescplural}[1][]{\@glsdescplural[hyper=false,#1]}
 \newcommand*{\@glsdescplural}[2][]{%
-\new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}}
 \def\@glsdescplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrydescplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentrydescplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
 \newcommand*{\@sGlsdescplural}[1][]{\@Glsdescplural[hyper=false,#1]}
 \newcommand*{\@Glsdescplural}[2][]{%
-\new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}}
 \def\@Glsdescplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrydescplural{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentrydescplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
 \newcommand*{\@sGLSdescplural}[1][]{\@GLSdescplural[hyper=false,#1]}
 \newcommand*{\@GLSdescplural}[2][]{%
-\new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}}
 \def\@GLSdescplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrydescplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
 \newcommand*{\@sglssymbol}[1][]{\@glssymbol[hyper=false,#1]}
 \newcommand*{\@glssymbol}[2][]{%
-\new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}}
 \def\@glssymbol@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrysymbol{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentrysymbol{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
 \newcommand*{\@sGlssymbol}[1][]{\@Glssymbol[hyper=false,#1]}
 \newcommand*{\@Glssymbol}[2][]{%
-\new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}}
 \def\@Glssymbol@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrysymbol{#2}}%
-\@gls@link[#1]{#2}{%
-   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentrysymbol{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
 \newcommand*{\@sGLSsymbol}[1][]{\@GLSsymbol[hyper=false,#1]}
 \newcommand*{\@GLSsymbol}[2][]{%
-\new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}}
 \def\@GLSsymbol@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrysymbol{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
 \newcommand*{\@sglssymbolplural}[1][]{\@glssymbolplural[hyper=false,#1]}
 \newcommand*{\@glssymbolplural}[2][]{%
-\new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}}
 \def\@glssymbolplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrysymbolplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentrysymbolplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
 \newcommand*{\@sGlssymbolplural}[1][]{\@Glssymbolplural[hyper=false,#1]}
 \newcommand*{\@Glssymbolplural}[2][]{%
-\new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}}
 \def\@Glssymbolplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrysymbolplural{#2}}%
-\@gls@link[#1]{#2}{%
-   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentrysymbolplural{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
 \newcommand*{\@sGLSsymbolplural}[1][]{\@GLSsymbolplural[hyper=false,#1]}
 \newcommand*{\@GLSsymbolplural}[2][]{%
-\new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}}
 \def\@GLSsymbolplural@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentrysymbolplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri}
 \newcommand*{\@sglsuseri}[1][]{\@glsuseri[hyper=false,#1]}
 \newcommand*{\@glsuseri}[2][]{%
-\new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}}
 \def\@glsuseri@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseri{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryuseri{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri}
 \newcommand*{\@sGlsuseri}[1][]{\@Glsuseri[hyper=false,#1]}
 \newcommand*{\@Glsuseri}[2][]{%
-\new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}}
 \def\@Glsuseri@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseri{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryuseri{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri}
 \newcommand*{\@sGLSuseri}[1][]{\@GLSuseri[hyper=false,#1]}
 \newcommand*{\@GLSuseri}[2][]{%
-\new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}}
 \def\@GLSuseri@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseri{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii}
 \newcommand*{\@sglsuserii}[1][]{\@glsuserii[hyper=false,#1]}
 \newcommand*{\@glsuserii}[2][]{%
-\new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}}
 \def\@glsuserii@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuserii{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryuserii{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii}
 \newcommand*{\@sGlsuserii}[1][]{\@Glsuserii[hyper=false,#1]}
 \newcommand*{\@Glsuserii}[2][]{%
-\new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}}
 \def\@Glsuserii@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuserii{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryuserii{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii}
 \newcommand*{\@sGLSuserii}[1][]{\@GLSuserii[hyper=false,#1]}
 \newcommand*{\@GLSuserii}[2][]{%
-\new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}}
 \def\@GLSuserii@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuserii{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii}
 \newcommand*{\@sglsuseriii}[1][]{\@glsuseriii[hyper=false,#1]}
 \newcommand*{\@glsuseriii}[2][]{%
-\new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}}
 \def\@glsuseriii@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseriii{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryuseriii{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii}
 \newcommand*{\@sGlsuseriii}[1][]{\@Glsuseriii[hyper=false,#1]}
 \newcommand*{\@Glsuseriii}[2][]{%
-\new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}}
 \def\@Glsuseriii@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseriii{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryuseriii{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii}
 \newcommand*{\@sGLSuseriii}[1][]{\@GLSuseriii[hyper=false,#1]}
 \newcommand*{\@GLSuseriii}[2][]{%
-\new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}}
 \def\@GLSuseriii@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseriii{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv}
 \newcommand*{\@sglsuseriv}[1][]{\@glsuseriv[hyper=false,#1]}
 \newcommand*{\@glsuseriv}[2][]{%
-\new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}}
 \def\@glsuseriv@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseriv{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryuseriv{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv}
 \newcommand*{\@sGlsuseriv}[1][]{\@Glsuseriv[hyper=false,#1]}
 \newcommand*{\@Glsuseriv}[2][]{%
-\new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}}
 \def\@Glsuseriv@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseriv{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryuseriv{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv}
 \newcommand*{\@sGLSuseriv}[1][]{\@GLSuseriv[hyper=false,#1]}
 \newcommand*{\@GLSuseriv}[2][]{%
-\new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}}
 \def\@GLSuseriv@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuseriv{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv}
 \newcommand*{\@sglsuserv}[1][]{\@glsuserv[hyper=false,#1]}
 \newcommand*{\@glsuserv}[2][]{%
-\new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}}
 \def\@glsuserv@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuserv{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryuserv{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv}
 \newcommand*{\@sGlsuserv}[1][]{\@Glsuserv[hyper=false,#1]}
 \newcommand*{\@Glsuserv}[2][]{%
 \new@ifnextchar[{\@Glsuserv@{#1}{#2}}{\@Glsuserv@{#1}{#2}[]}}
 \def\@Glsuserv@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuserv{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryuserv{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv}
 \newcommand*{\@sGLSuserv}[1][]{\@GLSuserv[hyper=false,#1]}
 \newcommand*{\@GLSuserv}[2][]{%
 \new@ifnextchar[{\@GLSuserv@{#1}{#2}}{\@GLSuserv@{#1}{#2}[]}}
 \def\@GLSuserv@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuserv{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi}
 \newcommand*{\@sglsuservi}[1][]{\@glsuservi[hyper=false,#1]}
 \newcommand*{\@glsuservi}[2][]{%
-\new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}}
+  \new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}}
 \def\@glsuservi@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuservi{#2}}%
-\@gls@link[#1]{#2}{\@glo@text#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\glsentryuservi{#2}#3}%
+  }%
 }
 \newrobustcmd*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi}
 \newcommand*{\@sGlsuservi}[1][]{\@Glsuservi[hyper=false,#1]}
 \newcommand*{\@Glsuservi}[2][]{%
-\new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}}
+  \new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}}
 \def\@Glsuservi@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuservi{#2}}%
-\@gls@link[#1]{#2}{%
-  \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\Glsentryuservi{#2}#3}%
+  }%
 }
 \newrobustcmd*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi}
 \newcommand*{\@sGLSuservi}[1][]{\@GLSuservi[hyper=false,#1]}
 \newcommand*{\@GLSuservi}[2][]{%
-\new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}}
+  \new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}}
 \def\@GLSuservi@#1#2[#3]{%
-\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
-\protected@edef\@glo@text{\glsentryuservi{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
-}%
+  \glsdoifexists{#2}%
+  {%
+    \edef\@glo@type{\glsentrytype{#2}}%
+    \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}%
+  }%
 }
 \newrobustcmd*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
 \newcommand*{\s@acrshort}[2][]{%
@@ -2751,8 +3575,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentryshort{#2}}%
-    \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsentryshort{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort}
@@ -2767,11 +3597,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentryshort{#2}}%
-    \@gls@link[#1]{#2}%
-    {%
-      \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@secondofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\Glsentryshort{#2}}#3%
     }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort}
@@ -2786,8 +3619,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentryshort{#2}}%
-    \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \mfirstucMakeUppercase{\acronymfont{\glsentryshort{#2}}#3}%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl}
@@ -2802,8 +3641,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentryshortpl{#2}}%
-    \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsentryshortpl{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl}
@@ -2818,11 +3663,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentryshortpl{#2}}%
-    \@gls@link[#1]{#2}%
-    {%
-      \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@secondofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\Glsentryshortpl{#2}}#3%
     }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl}
@@ -2837,8 +3685,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentryshortpl{#2}}%
-    \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \mfirstucMakeUppercase{\acronymfont{\glsentryshortpl{#2}}#3}%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong}
@@ -2853,8 +3707,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentrylong{#2}}%
-    \@gls@link[#1]{#2}{\@glo@text#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsentrylong{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong}
@@ -2869,11 +3729,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentrylong{#2}}%
-    \@gls@link[#1]{#2}%
-    {%
-      \expandafter\makefirstuc\expandafter{\@glo@text}#3%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@secondofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\Glsentrylong{#2}}#3%
     }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong}
@@ -2888,8 +3751,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentrylong{#2}}%
-    \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \mfirstucMakeUppercase{\acronymfont{\glsentrylong{#2}}#3}%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl}
@@ -2904,8 +3773,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentrylongpl{#2}}%
-    \@gls@link[#1]{#2}{\@glo@text#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsentrylongpl{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl}
@@ -2920,11 +3795,14 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentrylongpl{#2}}%
-    \@gls@link[#1]{#2}%
-    {%
-      \expandafter\makefirstuc\expandafter{\@glo@text}#3%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@secondofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\Glsentrylongpl{#2}}#3%
     }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newrobustcmd*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl}
@@ -2939,102 +3817,110 @@ name=true]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \protected@edef\@glo@text{\glsentrylongpl{#2}}%
-    \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@firstoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \mfirstucMakeUppercase{\acronymfont{\glsentrylongpl{#2}}#3}%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname}
-\newcommand*{\Glsentryname}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@name\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
+\newrobustcmd*{\Glsentryname}[1]{%
+  \protected@edef\@glo@text{\csname glo@#1@name\endcsname}%
+  \expandafter\makefirstuc\expandafter{\@glo@text}%
+}
 \newcommand*{\glsentrydesc}[1]{\csname glo@#1@desc\endcsname}
-\newcommand*{\Glsentrydesc}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@desc\endcsname}%
-\expandafter\makefirstuc\expandafter{\@glo@text}}
+\newrobustcmd*{\Glsentrydesc}[1]{%
+  \protected@edef\@glo@text{\csname glo@#1@desc\endcsname}%
+  \expandafter\makefirstuc\expandafter{\@glo@text}%
+}
 \newcommand*{\glsentrydescplural}[1]{%
-\csname glo@#1@descplural\endcsname}
-\newcommand*{\Glsentrydescplural}[1]{%
+  \csname glo@#1@descplural\endcsname}
+\newrobustcmd*{\Glsentrydescplural}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@descplural\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentrytext}[1]{\csname glo@#1@text\endcsname}
-\newcommand*{\Glsentrytext}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@text\endcsname}%
+\newrobustcmd*{\Glsentrytext}[1]{%
+  \protected@edef\@glo@text{\csname glo@#1@text\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryplural}[1]{\csname glo@#1@plural\endcsname}
-\newcommand*{\Glsentryplural}[1]{%
+\newrobustcmd*{\Glsentryplural}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@plural\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentrysymbol}[1]{\csname glo@#1@symbol\endcsname}
-\newcommand*{\Glsentrysymbol}[1]{%
+\newrobustcmd*{\Glsentrysymbol}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@symbol\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentrysymbolplural}[1]{%
-\csname glo@#1@symbolplural\endcsname}
-\newcommand*{\Glsentrysymbolplural}[1]{%
+  \csname glo@#1@symbolplural\endcsname}
+\newrobustcmd*{\Glsentrysymbolplural}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@symbolplural\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryfirst}[1]{\csname glo@#1@first\endcsname}
-\newcommand*{\Glsentryfirst}[1]{%
+\newrobustcmd*{\Glsentryfirst}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@first\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryfirstplural}[1]{%
-\csname glo@#1@firstpl\endcsname}
-\newcommand*{\Glsentryfirstplural}[1]{%
+  \csname glo@#1@firstpl\endcsname}
+\newrobustcmd*{\Glsentryfirstplural}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@firstpl\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentrytype}[1]{\csname glo@#1@type\endcsname}
 \newcommand*{\glsentrysort}[1]{\csname glo@#1@sort\endcsname}
 \newcommand*{\glsentryuseri}[1]{\csname glo@#1@useri\endcsname}
-\newcommand*{\Glsentryuseri}[1]{%
+\newrobustcmd*{\Glsentryuseri}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@useri\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryuserii}[1]{\csname glo@#1@userii\endcsname}
-\newcommand*{\Glsentryuserii}[1]{%
+\newrobustcmd*{\Glsentryuserii}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@userii\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryuseriii}[1]{\csname glo@#1@useriii\endcsname}
-\newcommand*{\Glsentryuseriii}[1]{%
+\newrobustcmd*{\Glsentryuseriii}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@useriii\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryuseriv}[1]{\csname glo@#1@useriv\endcsname}
-\newcommand*{\Glsentryuseriv}[1]{%
+\newrobustcmd*{\Glsentryuseriv}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@useriv\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryuserv}[1]{\csname glo@#1@userv\endcsname}
-\newcommand*{\Glsentryuserv}[1]{%
+\newrobustcmd*{\Glsentryuserv}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@userv\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryuservi}[1]{\csname glo@#1@uservi\endcsname}
-\newcommand*{\Glsentryuservi}[1]{%
+\newrobustcmd*{\Glsentryuservi}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@uservi\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryshort}[1]{\csname glo@#1@short\endcsname}
-\newcommand*{\Glsentryshort}[1]{%
+\newrobustcmd*{\Glsentryshort}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@short\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryshortpl}[1]{\csname glo@#1@shortpl\endcsname}
-\newcommand*{\Glsentryshortpl}[1]{%
+\newrobustcmd*{\Glsentryshortpl}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@shortpl\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentrylong}[1]{\csname glo@#1@long\endcsname}
-\newcommand*{\Glsentrylong}[1]{%
-\protected@edef\@glo@text{\csname glo@#1@long\endcsname}%
+\newrobustcmd*{\Glsentrylong}[1]{%
+  \protected@edef\@glo@text{\csname glo@#1@long\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentrylongpl}[1]{\csname glo@#1@longpl\endcsname}
-\newcommand*{\Glsentrylongpl}[1]{%
+\newrobustcmd*{\Glsentrylongpl}[1]{%
 \protected@edef\@glo@text{\csname glo@#1@longpl\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryfull}[1]{%
-  \glsentrylong{#1}\space(\glsentryshort{#1})%
+  \acrfullformat{\glsentrylong{#1}}{\glsentryshort{#1}}%
 }
-\newcommand*{\Glsentryfull}[1]{%
-  \Glsentrylong{#1}\space(\glsentryshort{#1})%
+\newrobustcmd*{\Glsentryfull}[1]{%
+  \acrfullformat{\Glsentrylong{#1}}{\glsentryshort{#1}}%
 }
 \newcommand*{\glsentryfullpl}[1]{%
-  \glsentrylongpl{#1}\space(\glsentryshortpl{#1})%
+  \acrfullformat{\glsentrylongpl{#1}}{\glsentryshortpl{#1}}%
 }
-\newcommand*{\Glsentryfullpl}[1]{%
-  \Glsentrylongpl{#1}\space(\glsentryshortpl{#1})%
+\newrobustcmd*{\Glsentryfullpl}[1]{%
+  \acrfullformat{\Glsentrylongpl{#1}}{\glsentryshortpl{#1}}%
 }
 \newcommand*{\glsentrynumberlist}[1]{%
   \glsdoifexists{#1}%
@@ -3042,8 +3928,7 @@ name=true]{%
     \csname glo@#1@numberlist\endcsname
   }%
 }
-\@ifpackageloaded{hyperref}
-{%
+\@ifpackageloaded{hyperref} {%
   \newcommand*{\glsdisplaynumberlist}[1]{%
     \GlossariesWarning
     {%
@@ -3107,10 +3992,17 @@ name=true]{%
   }%
 }
 \newrobustcmd*{\glsaddall}[1][]{%
-\edef\@glo@type{\@glo@types}%
-\setkeys{glossadd}{#1}%
-\forallglsentries[\@glo@type]{\@glo@entry}{%
-\glsadd[#1]{\@glo@entry}}%
+  \edef\@glo@type{\@glo@types}%
+  \setkeys{glossadd}{#1}%
+  \forallglsentries[\@glo@type]{\@glo@entry}{%
+    \glsadd[#1]{\@glo@entry}%
+  }%
+}
+\newrobustcmd*{\glsaddallunused}[1][\@glo@types]{%
+ \forallglsentries[#1]{\@glo@entry}%
+ {%
+    \ifglsused{\@glo@entry}{}{\glsadd[format=@gobble]{\@glo@entry}}%
+ }%
 }
 \edef\glsopenbrace{\expandafter\@gobble\string\{}
 \edef\glsclosebrace{\expandafter\@gobble\string\}}
@@ -3372,6 +4264,8 @@ name=true]{%
   hasn't been used,^^Jthe glossaries will not be updated}%
 }
 \newcommand*{\makeglossaries}{%
+  \protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}}
+  \protected@write\@auxout{}{\string\providecommand\string\@istfilename[1]{}}
   \protected@write\@auxout{}{\string\@istfilename{\istfilename}}%
   \protected@write\@auxout{}{\string\@glsorder{\glsorder}}
   \@for\@glo@type:=\@glo@types\do{%
@@ -3387,6 +4281,7 @@ name=true]{%
   \let\makeglossary\relax
   \let\makeglossaries\relax
   \@disable@onlypremakeg
+  \let\gls@checkseeallowed\relax
   \let\warn@nomakeglossaries\relax
   \ifglssavenumberlist
     \edef\@gls@dodeflistparser{\noexpand\DeclareListParser
@@ -3404,39 +4299,35 @@ name=true]{%
 \AtEndDocument{%
   \glswritefiles
 }
-\ifglssavewrites
-  \newcommand*{\glswritefiles}{%
-    \forallglossaries{\@glo@type}{%
-       \ifcsundef{glo@\@glo@type @filetok}%
-       {%
-          \def\gls@tmp{}%
-       }%
-       {%
-          \edef\gls@tmp{\expandafter\the
-             \csname glo@\@glo@type @filetok\endcsname}%
-       }%
-       \ifx\gls@tmp\@empty
-          \ifx\@glo@type\glsdefaulttype
-            \GlossariesWarningNoLine{Glossary `\@glo@type' has no
-               entries.^^JRemember to use package option `nomain' if
+\newcommand*{\@glswritefiles}{%
+  \forallglossaries{\@glo@type}{%
+     \ifcsundef{glo@\@glo@type @filetok}%
+     {%
+        \def\gls@tmp{}%
+     }%
+     {%
+        \edef\gls@tmp{\expandafter\the
+           \csname glo@\@glo@type @filetok\endcsname}%
+     }%
+     \ifx\gls@tmp\@empty
+        \ifx\@glo@type\glsdefaulttype
+          \GlossariesWarningNoLine{Glossary `\@glo@type' has no
+             entries.^^JRemember to use package option `nomain' if
 you
-               don't want to^^Juse the main glossary}%
-          \else
-            \GlossariesWarningNoLine{Glossary `\@glo@type' has no
-               entries}%
-          \fi
-       \else
-          \@glsopenfile{\glswrite}{\@glo@type}%
-          \immediate\write\glswrite{%
-             \expandafter\the
-               \csname glo@\@glo@type @filetok\endcsname}%
-          \immediate\closeout\glswrite
-       \fi
-    }%
-  }
-\else
-  \let\glswritefiles\relax
-\fi
+             don't want to^^Juse the main glossary}%
+        \else
+          \GlossariesWarningNoLine{Glossary `\@glo@type' has no
+             entries}%
+        \fi
+     \else
+        \@glsopenfile{\glswrite}{\@glo@type}%
+        \immediate\write\glswrite{%
+           \expandafter\the
+             \csname glo@\@glo@type @filetok\endcsname}%
+        \immediate\closeout\glswrite
+     \fi
+  }%
+}
 \renewcommand*{\glossary}[1][\glsdefaulttype]{%
   \@glossary[#1]%
 }
@@ -3583,12 +4474,13 @@ you
     \def#1{{#2#3}}%
   \fi
 }
-\newcommand*{\glssee}[3][\seename]{%
+\DeclareRobustCommand*{\glssee}[3][\seename]{%
   \@do@seeglossary{#2}{[#1]{#3}}}
 \newcommand*{\@glssee}[3][\seename]{%
   \glssee[#1]{#3}{#2}}
-\newcommand*{\glsseeformat}[3][\seename]{\emph{#1} \glsseelist{#2}}
-\newcommand*{\glsseelist}[1]{%
+\DeclareRobustCommand*{\glsseeformat}[3][\seename]{%
+  \emph{#1} \glsseelist{#2}}
+\DeclareRobustCommand*{\glsseelist}[1]{%
   \let\@gls@dolast\relax
   \let\@gls@donext\relax
   \@for\@gls@thislabel:=#1\do{%
@@ -3604,7 +4496,7 @@ you
 }
 \newcommand*{\glsseelastsep}{\space\andname\space}
 \newcommand*{\glsseesep}{, }
-\newcommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}}
+\DeclareRobustCommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}}
 \newcommand*{\glsseeitemformat}[1]{\glsentrytext{#1}}
 \newcommand*{\gls@save@numberlist}[1]{%
   \ifglssavenumberlist
@@ -3648,13 +4540,13 @@ you
     \let\nopostdesc\@nopostdesc
     \gls@dotoctitle
     \@glossarystyle
-    \let\gls@org@glossaryentryfield\glossaryentryfield
-    \let\gls@org@glossarysubentryfield\glossarysubentryfield
-    \renewcommand{\glossaryentryfield}[1]{%
+    \let\gls@org@glossaryentryfield\glossentry
+    \let\gls@org@glossarysubentryfield\subglossentry
+    \renewcommand{\glossentry}[1]{%
       \gdef\glscurrententrylabel{##1}%
       \gls@org@glossaryentryfield{##1}%
     }%
-    \renewcommand{\glossarysubentryfield}[2]{%
+    \renewcommand{\subglossentry}[2]{%
       \gdef\glscurrententrylabel{##2}%
       \gls@org@glossarysubentryfield{##1}{##2}%
     }%
@@ -3669,6 +4561,8 @@ you
         \edef\@do@auxoutstuff{%
           \noexpand\AtEndDocument{%
             \noexpand\immediate\noexpand\write\@auxout{%
+              \string\providecommand\string\@xdylanguage[2]{}}%
+            \noexpand\immediate\noexpand\write\@auxout{%
               \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}%
           }%
         }%
@@ -3677,6 +4571,8 @@ you
         \edef\@do@auxoutstuff{%
           \noexpand\AtEndDocument{%
             \noexpand\immediate\noexpand\write\@auxout{%
+              \string\providecommand\string\@xdylanguage[2]{}}%
+            \noexpand\immediate\noexpand\write\@auxout{%
               \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type
                 @language\endcsname}}%
           }%
@@ -3686,6 +4582,8 @@ you
       \edef\@do@auxoutstuff{%
         \noexpand\AtEndDocument{%
            \noexpand\immediate\noexpand\write\@auxout{%
+            \string\providecommand\string\@gls@codepage[2]{}}%
+           \noexpand\immediate\noexpand\write\@auxout{%
             \string\@gls@codepage{\@glo@type}{\gls@codepage}}%
         }%
       }%
@@ -3714,7 +4612,8 @@ you
     {Glossary style `#1' undefined}{}%
   }%
   {%
-    \def\@glossarystyle{\csname @glsstyle@#1\endcsname}%
+    \def\@glossarystyle{\setglossentrycompatibility
+      \csname @glsstyle@#1\endcsname}%
   }%
 }
 \define@choicekey{printgloss}{numberedsection}[\val\nr]{%
@@ -3729,6 +4628,9 @@ false,nolabel,autolabel}[nolabel]{%
   \renewcommand*{\@@glossarysecstar}{}%
   \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}%
 \fi}
+\define@choicekey{printgloss}{nogroupskip}{true,false}[true]{%
+  \csuse{glsnogroupskip#1}%
+}
 \define@boolkey{printgloss}[gls]{nonumberlist}[true]{%
 \ifglsnonumberlist
    \def\glossaryentrynumbers##1{}%
@@ -3837,14 +4739,106 @@ false,nolabel,autolabel}[nolabel]{%
 }
 \newcommand*{\glossaryheader}{}
 \newcommand*{\glstarget}[2]{\@glstarget{\glolinkprefix#1}{#2}}
-\newcommand*{\glossaryentryfield}[5]{%
-\noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par}
+\providecommand*{\compatibleglossentry}[2]{%
+  \toks@{#2}%
+  \protected@edef\@do@glossentry{\noexpand\glossaryentryfield{#1}%
+    {\noexpand\glsnamefont
+       {\expandafter\expandonce\csname glo@#1@name\endcsname}}%
+    {\expandafter\expandonce\csname glo@#1@desc\endcsname}%
+    {\expandafter\expandonce\csname glo@#1@symbol\endcsname}%
+    {\the\toks@}%
+  }%
+  \@do@glossentry
+}
+\newcommand*{\glossentryname}[1]{%
+  \glsdoifexists{#1}%
+  {%
+    \letcs{\glo@name}{glo@#1@name}%
+    \expandafter\glsnamefont\expandafter{\glo@name}%
+  }%
+}
+\newcommand*{\Glossentryname}[1]{%
+  \glsdoifexists{#1}%
+  {%
+    \glsnamefont{\Glsentryname{#1}}%
+  }%
+}
+\newcommand*{\glossentrydesc}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \glsentrydesc{#1}%
+  }%
+}
+\newcommand*{\Glossentrydesc}[1]{%
+  \glsdoifexists{#1}%
+  {%
+    \Glsentrydesc{#1}%
+  }%
+}
+\newcommand*{\glossentrysymbol}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \glsentrysymbol{#1}%
+  }%
+}
+\newcommand*{\Glossentrysymbol}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \Glsentrysymbol{#1}%
+  }%
+}
+\providecommand*{\compatiblesubglossentry}[3]{%
+  \toks@{#3}%
+  \protected@edef\@do@subglossentry{\noexpand\glossarysubentryfield{\number#1}%
+  {#2}%
+    {\noexpand\glsnamefont
+      {\expandafter\expandonce\csname glo@#2@name\endcsname}}%
+    {\expandafter\expandonce\csname glo@#2@desc\endcsname}%
+    {\expandafter\expandonce\csname glo@#2@symbol\endcsname}%
+    {\the\toks@}%
+  }%
+  \@do@subglossentry
+}
+\newcommand*{\setglossentrycompatibility}{%
+  \let\glossentry\compatibleglossentry
+  \let\subglossentry\compatiblesubglossentry
+}
+\setglossentrycompatibility
+\newcommand{\glossaryentryfield}[5]{%
+  \GlossariesWarning
+  {Deprecated use of \string\glossaryentryfield.^^J
+   I recommend you change to \string\glossentry.^^J
+   If you've just upgraded, try removing your gls auxiliary
+   files^^J and recompile}%
+  \noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par}
 \newcommand*{\glossarysubentryfield}[6]{%
-\glstarget{#2}{\strut}#4. #6\par}
+  \GlossariesWarning
+  {Deprecated use of \string\glossarysubentryfield.^^J
+   I recommend you change to \string\subglossentry.^^J
+   If you've just upgraded, try removing your gls auxiliary
+   files^^J and recompile}%
+  \glstarget{#2}{\strut}#4. #6\par}
 \newcommand*{\glsgroupskip}{}
 \newcommand*{\glsgroupheading}[1]{}
 \newcommand*{\glsgetgrouptitle}[1]{%
-  \ifcsundef{#1groupname}{#1}{\csname #1groupname\endcsname}%
+  \@gls@getgrouptitle{#1}{\@gls@grptitle}%
+  \@gls@grptitle
+}
+\newcommand*{\@gls@getgrouptitle}[2]{%
+ \dtl@ifsingle{#1}%
+ {%
+   \ifcsundef{#1groupname}{\def#2{#1}}{\letcs#2{#1groupname}}%
+ }%
+ {%
+   \ifboolexpr{test{\ifstrequal{#1}{glssymbols}}
+            or test{\ifstrequal{#1}{glsnumbers}}}%
+   {%
+     \ifcsundef{#1groupname}{\def#2{#1}}{\letcs#2{#1groupname}}%
+   }%
+   {%
+     \def#2{#1}%
+   }%
+ }%
 }
 \newcommand*{\glsgetgrouplabel}[1]{%
 \ifthenelse{\equal{#1}{\glssymbolsgroupname}}{glssymbols}{%
@@ -3858,13 +4852,30 @@ false,nolabel,autolabel}[nolabel]{%
   \fi
   \def\glsentrycounter{#2}%
 }
+\newcommand*{\setglossarystyle}[1]{%
+  \ifcsundef{@glsstyle@#1}%
+  {%
+    \PackageError{glossaries}{Glossary style `#1' undefined}{}%
+  }%
+  {%
+    \csname @glsstyle@#1\endcsname
+  }%
+}
 \newcommand*{\glossarystyle}[1]{%
   \ifcsundef{@glsstyle@#1}%
   {%
     \PackageError{glossaries}{Glossary style `#1' undefined}{}%
   }%
   {%
+    \GlossariesWarning
+    {Deprecated command \string\glossarystyle.^^J
+     I recommend you switch to \string\setglossarystyle\space unless
+     you want to maintain backward compatibility}%
+    \setglossentrycompatibility
     \csname @glsstyle@#1\endcsname
+    \ifcsdef{@glscompstyle@#1}%
+    {\setglossentrycompatibility\csuse{@glscompstyle@#1}}%
+    {}%
   }%
 }
 \newcommand{\newglossarystyle}[2]{%
@@ -3952,10 +4963,6 @@ false,nolabel,autolabel}[nolabel]{%
 \newcommand*{\hyperup}[1]{\textup{\glshypernumber{#1}}}
 \newcommand*{\hypersc}[1]{\textsc{\glshypernumber{#1}}}
 \newcommand*{\hyperemph}[1]{\emph{\glshypernumber{#1}}}
-\ifglsacronym
-  \newglossary[alg]{acronym}{acr}{acn}{\acronymname}
-  \renewcommand*{\acronymtype}{acronym}
-\fi
 \newcommand{\oldacronym}[4][\gls@label]{%
   \def\gls@label{#2}%
   \newacronym[#4]{#1}{#2}{#3}%
@@ -3974,6 +4981,7 @@ false,nolabel,autolabel}[nolabel]{%
 }
   \newcommand{\newacronym}[4][]{}
 \newcommand*{\acrpluralsuffix}{\glspluralsuffix}
+\newrobustcmd*{\glstextup}[1]{\ifdef\textulc{\textulc{#1}}{\textup{#1}}}
 \newcommand*{\glsshortkey}{short}
 \newcommand*{\glsshortpluralkey}{shortplural}
 \newcommand*{\glslongkey}{long}
@@ -4075,8 +5083,7 @@ false,nolabel,autolabel}[nolabel]{%
 \newtoks\glslongtok
 \newcommand*{\newacronymhook}{}
 \newcommand*{\SetDefaultAcronymDisplayStyle}[1]{%
-  \defglsdisplay[#1]{##1##4}%
-  \defglsdisplayfirst[#1]{##1##4}%
+  \defglsentryfmt[#1]{\glsgenentryfmt}%
 }
 \newcommand*{\DefaultNewAcronymDef}{%
   \edef\@do@newglossaryentry{%
@@ -4087,19 +5094,34 @@ false,nolabel,autolabel}[nolabel]{%
       sort={\the\glsshorttok},%
       text={\the\glsshorttok},%
       first={\acrfullformat{\the\glslongtok}{\the\glsshorttok}},%
-      plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
-      firstplural={\acrfullformat{\noexpand\@glo@longpl}%
-                                 {\noexpand\@glo@shortpl}},%
+      plural={\noexpand\expandonce\noexpand\@glo@shortpl},%
+      firstplural={\acrfullformat{\noexpand\expandonce\noexpand\@glo@longpl}%
+                                 {\noexpand\expandonce\noexpand\@glo@shortpl}},%
       short={\the\glsshorttok},%
       shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
       long={\the\glslongtok},%
       longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
       description={\the\glslongtok},%
-      descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+      descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       \the\glskeylisttok
     }%
   }%
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@descplural\gls@assign@descplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@descplural##1##2{%
+    \@@gls@expand@field{##1}{descplural}{##2}%
+  }%
   \@do@newglossaryentry
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
 }
 \newcommand*{\SetDefaultAcronymStyle}{%
   \@for\@gls@type:=\@glsacronymlists\do{%
@@ -4129,32 +5151,62 @@ false,nolabel,autolabel}[nolabel]{%
   \footnote{#3}%
 }
 \newcommand*{\SetDescriptionFootnoteAcronymDisplayStyle}[1]{%
-  \defglsdisplayfirst[#1]{%
-    \firstacronymfont{##1}##4%
-    \expandafter\protect\expandafter\acrfootnote\expandafter
-       {\@gls@link@opts}{\@gls@link@label}{##3}%
+  \defglsentryfmt[#1]{%
+     \ifglsused{\glslabel}%
+     {%
+       \acronymfont{\glsgenentryfmt}%
+     }%
+     {%
+       \firstacronymfont{\glsgenentryfmt}%
+       \ifglshassymbol{\glslabel}%
+       {%
+         \expandafter\protect\expandafter\acrfootnote\expandafter
+          {\@gls@link@opts}{\@gls@link@label}%
+          {%
+           \glsifplural
+             {\glsentrysymbolplural{\glslabel}}%
+             {\glsentrysymbol{\glslabel}}%
+          }%
+       }%
+     }%
   }%
-  \defglsdisplay[#1]{\acronymfont{##1}##4}%
 }
 \newcommand*{\DescriptionFootnoteNewAcronymDef}{%
-    \edef\@do@newglossaryentry{%
-      \noexpand\newglossaryentry{\the\glslabeltok}%
-      {%
-        type=\acronymtype,%
-        name={\noexpand\acronymfont{\the\glsshorttok}},%
-        sort={\the\glsshorttok},%
-        text={\the\glsshorttok},%
-        plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
-        short={\the\glsshorttok},%
-        shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
-        long={\the\glslongtok},%
-        longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
-        symbol={\the\glslongtok},%
-        symbolplural={\the\glslongtok\noexpand\acrpluralsuffix},%
-        \the\glskeylisttok
-      }%
+  \edef\@do@newglossaryentry{%
+    \noexpand\newglossaryentry{\the\glslabeltok}%
+    {%
+      type=\acronymtype,%
+      name={\noexpand\acronymfont{\the\glsshorttok}},%
+      sort={\the\glsshorttok},%
+      first={\the\glsshorttok},%
+      firstplural={\noexpand\expandonce\noexpand\@glo@shortpl},%
+      text={\the\glsshorttok},%
+      plural={\noexpand\expandonce\noexpand\@glo@shortpl},%
+      short={\the\glsshorttok},%
+      shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+      long={\the\glslongtok},%
+      longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+      symbol={\the\glslongtok},%
+      symbolplural={\noexpand\expandonce\noexpand\@glo@longpl},%
+      \the\glskeylisttok
     }%
-    \@do@newglossaryentry
+  }%
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@symbolplural##1##2{%
+    \@@gls@expand@field{##1}{symbolplural}{##2}%
+  }%
+  \@do@newglossaryentry
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
 }
 \newcommand*{\SetDescriptionFootnoteAcronymStyle}{%
   \renewcommand{\newacronym}[4][]{%
@@ -4177,7 +5229,7 @@ false,nolabel,autolabel}[nolabel]{%
   \ifglsacrsmallcaps
     \renewcommand*{\acronymfont}[1]{\textsc{##1}}%
     \renewcommand*{\acrpluralsuffix}{%
-      \textup{\glspluralsuffix}}%
+      \glstextup{\glspluralsuffix}}%
   \else
     \ifglsacrsmaller
       \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}%
@@ -4189,8 +5241,7 @@ false,nolabel,autolabel}[nolabel]{%
   \fi
 }%
 \newcommand*{\SetDescriptionDUAAcronymDisplayStyle}[1]{%
-  \defglsdisplay[#1]{##1##4}%
-  \defglsdisplayfirst[#1]{##1##4}%
+  \defglsentryfmt[#1]{\glsgenentryfmt}%
 }
 \newcommand*{\DescriptionDUANewAcronymDef}{%
   \edef\@do@newglossaryentry{%
@@ -4200,17 +5251,34 @@ false,nolabel,autolabel}[nolabel]{%
       name={\the\glslongtok},%
       sort={\the\glslongtok},
       text={\the\glslongtok},%
-      plural={\the\glslongtok\noexpand\acrpluralsuffix},%
+      first={\the\glslongtok},%
+      plural={\noexpand\expandonce\noexpand\@glo@longpl},%
+      firstplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       short={\the\glsshorttok},%
       shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
       long={\the\glslongtok},%
       longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
       symbol={\the\glsshorttok},%
-      symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+      symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       \the\glskeylisttok
     }%
   }%
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@symbolplural##1##2{%
+    \@@gls@expand@field{##1}{symbolplural}{##2}%
+  }%
   \@do@newglossaryentry
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
 }
 \newcommand*{\SetDescriptionDUAAcronymStyle}{%
   \ifglsacrsmallcaps
@@ -4241,9 +5309,33 @@ false,nolabel,autolabel}[nolabel]{%
   }%
 }%
 \newcommand*{\SetDescriptionAcronymDisplayStyle}[1]{%
-  \defglsdisplayfirst[#1]{%
-    ##1##4\glsdoparenifnotempty{##3}{\protect\firstacronymfont}}%
-  \defglsdisplay[#1]{\acronymfont{##1}##4}%
+  \defglsentryfmt[#1]{%
+    \ifglsused{\glslabel}%
+    {%
+      \let\gls@org@insert\glsinsert
+      \let\glsinsert\@empty
+      \acronymfont{\glsgenentryfmt}\gls@org@insert
+    }%
+    {%
+      \glsgenentryfmt
+      \ifglshassymbol{\glslabel}%
+        {%
+           \glsifplural
+           {%
+             \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}%
+           }%
+           {%
+             \def\@glo@symbol{\glsentrysymbol{\glslabel}}%
+           }%
+           \space(\protect\firstacronymfont
+           {\glscapscase
+            {\@glo@symbol}
+            {\@glo@symbol}
+            {\mfirstucMakeUppercase{\@glo@symbol}}})%
+        }%
+        {}%
+    }%
+  }%
 }
 \newcommand*{\DescriptionNewAcronymDef}{%
   \edef\@do@newglossaryentry{%
@@ -4254,18 +5346,33 @@ false,nolabel,autolabel}[nolabel]{%
         \acrnameformat{\the\glsshorttok}{\the\glslongtok}},%
       sort={\the\glsshorttok},%
       first={\the\glslongtok},%
-      firstplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+      firstplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       text={\the\glsshorttok},%
-      plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+      plural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       short={\the\glsshorttok},%
       shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
       long={\the\glslongtok},%
       longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
       symbol={\noexpand\@glo@text},%
-      symbolplural={\noexpand\@glo@plural},%
+      symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       \the\glskeylisttok}%
   }%
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@symbolplural##1##2{%
+    \@@gls@expand@field{##1}{symbolplural}{##2}%
+  }%
   \@do@newglossaryentry
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
 }
 \newcommand*{\SetDescriptionAcronymStyle}{%
   \renewcommand{\newacronym}[4][]{%
@@ -4288,7 +5395,7 @@ false,nolabel,autolabel}[nolabel]{%
   \ifglsacrsmallcaps
     \renewcommand{\acronymfont}[1]{\textsc{##1}}
     \renewcommand*{\acrpluralsuffix}{%
-      \textup{\glspluralsuffix}}%
+      \glstextup{\glspluralsuffix}}%
   \else
     \ifglsacrsmaller
       \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}%
@@ -4296,12 +5403,28 @@ false,nolabel,autolabel}[nolabel]{%
   \fi
 }%
 \newcommand*{\SetFootnoteAcronymDisplayStyle}[1]{%
-  \defglsdisplayfirst[#1]{%
-    \firstacronymfont{##1}##4%
-    \expandafter\protect\expandafter\acrfootnote\expandafter
-       {\@gls@link@opts}{\@gls@link@label}{##2}%
+  \defglsentryfmt[#1]{%
+    \let\gls@org@insert\glsinsert
+    \let\glsinsert\@empty
+    \ifglsused{\glslabel}%
+    {%
+      \acronymfont{\glsgenentryfmt}\gls@org@insert
+    }%
+    {%
+      \firstacronymfont{\glsgenentryfmt}\gls@org@insert
+      \ifglshaslong{\glslabel}%
+      {%
+        \expandafter\protect\expandafter\acrfootnote\expandafter
+         {\@gls@link@opts}{\@gls@link@label}%
+         {%
+          \glsifplural
+            {\glsentrylongpl{\glslabel}}%
+            {\glsentrylong{\glslabel}}%
+         }%
+      }%
+      {}%
+    }%
   }%
-  \defglsdisplay[#1]{\acronymfont{##1}##4}%
 }
 \newcommand*{\FootnoteNewAcronymDef}{%
   \edef\@do@newglossaryentry{%
@@ -4311,17 +5434,34 @@ false,nolabel,autolabel}[nolabel]{%
       name={\noexpand\acronymfont{\the\glsshorttok}},%
       sort={\the\glsshorttok},%
       text={\the\glsshorttok},%
-      plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+      plural={\noexpand\expandonce\noexpand\@glo@shortpl},%
+      first={\the\glsshorttok},%
+      firstplural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       short={\the\glsshorttok},%
       shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
       long={\the\glslongtok},%
       longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
       description={\the\glslongtok},%
-      descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+      descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       \the\glskeylisttok
     }%
   }%
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@descplural\gls@assign@descplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@descplural##1##2{%
+    \@@gls@expand@field{##1}{descplural}{##2}%
+  }%
   \@do@newglossaryentry
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@descplural\@org@gls@assign@descplural
 }
 \newcommand*{\SetFootnoteAcronymStyle}{%
   \renewcommand{\newacronym}[4][]{%
@@ -4344,7 +5484,7 @@ false,nolabel,autolabel}[nolabel]{%
   \ifglsacrsmallcaps
      \renewcommand*{\acronymfont}[1]{\textsc{##1}}%
      \renewcommand*{\acrpluralsuffix}{%
-        \textup{\glspluralsuffix}}%
+        \glstextup{\glspluralsuffix}}%
   \else
      \ifglsacrsmaller
         \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}%
@@ -4360,15 +5500,40 @@ false,nolabel,autolabel}[nolabel]{%
   \ifdefempty\gls@tmp
   {}%
   {%
-    \if\gls@tmp\relax
+    \ifx\gls@tmp\@gls@default@value
     \else
       \space (#2{#1})%
     \fi
   }%
 }
 \newcommand*{\SetSmallAcronymDisplayStyle}[1]{%
-  \defglsdisplayfirst[#1]{##1##4\glsdoparenifnotempty{##3}{\protect\firstacronymfont}}
-  \defglsdisplay[#1]{\acronymfont{##1}##4}%
+  \defglsentryfmt[#1]{%
+    \let\gls@org@insert\glsinsert
+    \let\glsinsert\@empty
+    \ifglsused{\glslabel}%
+    {%
+      \acronymfont{\glsgenentryfmt}\gls@org@insert
+    }%
+    {%
+      \glsgenentryfmt
+      \ifglshassymbol{\glslabel}%
+      {%
+        \glsifplural
+        {%
+          \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}%
+        }%
+        {%
+          \def\@glo@symbol{\glsentrysymbol{\glslabel}}%
+        }%
+        \space
+        (\glscapscase
+          {\firstacronymfont{\@glo@symbol}}%
+          {\firstacronymfont{\@glo@symbol}}%
+          {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})%
+      }%
+      {}%
+    }%
+  }%
 }
 \newcommand*{\SmallNewAcronymDef}{%
   \edef\@do@newglossaryentry{%
@@ -4377,22 +5542,42 @@ false,nolabel,autolabel}[nolabel]{%
       type=\acronymtype,%
       name={\noexpand\acronymfont{\the\glsshorttok}},%
       sort={\the\glsshorttok},%
-      text={\noexpand\@glo@symbol},%
-      plural={\noexpand\@glo@shortpl},%
+      text={\the\glsshorttok},%
+      plural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       first={\the\glslongtok},%
-      firstplural={\noexpand\@glo@longpl},%
+      firstplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       short={\the\glsshorttok},%
       shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
       long={\the\glslongtok},%
       longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
       description={\noexpand\@glo@first},%
-      descriptionplural={\noexpand\@glo@firstplural},%
+      descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       symbol={\the\glsshorttok},%
-      symbolplural={\noexpand\@glo@shortpl},%
+      symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       \the\glskeylisttok
     }%
   }%
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@descplural\gls@assign@descplural
+  \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@descplural##1##2{%
+    \@@gls@expand@field{##1}{descplural}{##2}%
+  }%
+  \def\gls@assign@symbolplural##1##2{%
+    \@@gls@expand@field{##1}{symbolplural}{##2}%
+  }%
   \@do@newglossaryentry
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@descplural\@org@gls@assign@descplural
+  \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
 }
 \newcommand*{\SetSmallAcronymStyle}{%
   \renewcommand{\newacronym}[4][]{%
@@ -4415,7 +5600,7 @@ false,nolabel,autolabel}[nolabel]{%
   \ifglsacrsmallcaps
     \renewcommand*{\acronymfont}[1]{\textsc{##1}}
     \renewcommand*{\acrpluralsuffix}{%
-       \textup{\glspluralsuffix}}%
+       \glstextup{\glspluralsuffix}}%
   \else
     \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}
   \fi
@@ -4430,8 +5615,7 @@ false,nolabel,autolabel}[nolabel]{%
   \fi
 }%
 \newcommand*{\SetDUADisplayStyle}[1]{%
-  \defglsdisplay[#1]{##1##4}%
-  \defglsdisplayfirst[#1]{##1##4}%
+  \defglsentryfmt[#1]{\glsgenentryfmt}%
 }
 \newcommand*{\DUANewAcronymDef}{%
   \edef\@do@newglossaryentry{%
@@ -4440,18 +5624,41 @@ false,nolabel,autolabel}[nolabel]{%
       type=\acronymtype,%
       name={\the\glsshorttok},%
       text={\the\glslongtok},%
-      plural={\the\glslongtok\noexpand\acrpluralsuffix},%
+      first={\the\glslongtok},%
+      plural={\noexpand\expandonce\noexpand\@glo@longpl},%
+      firstplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       short={\the\glsshorttok},%
       shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
       long={\the\glslongtok},%
       longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
       description={\the\glslongtok},%
+      descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},%
       symbol={\the\glsshorttok},%
-      symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+      symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},%
       \the\glskeylisttok
     }%
   }%
+  \let\@org@gls@assign@firstpl\gls@assign@firstpl
+  \let\@org@gls@assign@plural\gls@assign@plural
+  \let\@org@gls@assign@symbolplural\gls@assign@symbolplural
+  \let\@org@gls@assign@descplural\gls@assign@descplural
+  \def\gls@assign@firstpl##1##2{%
+    \@@gls@expand@field{##1}{firstpl}{##2}%
+  }%
+  \def\gls@assign@plural##1##2{%
+    \@@gls@expand@field{##1}{plural}{##2}%
+  }%
+  \def\gls@assign@symbolplural##1##2{%
+    \@@gls@expand@field{##1}{symbolplural}{##2}%
+  }%
+  \def\gls@assign@descplural##1##2{%
+    \@@gls@expand@field{##1}{descplural}{##2}%
+  }%
   \@do@newglossaryentry
+  \let\gls@assign@firstpl\@org@gls@assign@firstpl
+  \let\gls@assign@plural\@org@gls@assign@plural
+  \let\gls@assign@symbolplural\@org@gls@assign@symbolplural
+  \let\gls@assign@descplural\@org@gls@assign@descplural
 }
 \newcommand*{\SetDUAStyle}{%
   \renewcommand{\newacronym}[4][]{%
@@ -4503,15 +5710,15 @@ false,nolabel,autolabel}[nolabel]{%
 }
 \SetAcronymStyle
 \newcommand*{\SetCustomDisplayStyle}[1]{%
-  \defglsdisplay[#1]{##1##4}%
-  \defglsdisplayfirst[#1]{##1##4}%
+  \defglsentryfmt[#1]{\glsgenentryfmt}%
 }
 \newcommand*{\CustomAcronymFields}{%
   name={\the\glsshorttok},%
   description={\the\glslongtok},%
   first={\noexpand\acrfullformat{\the\glslongtok}{\the\glsshorttok}},%
   firstplural={\noexpand\acrfullformat
-    {\the\glslongtok\noexpand\acrpluralsuffix}{\the\glsshorttok}}%
+    {\noexpand\glsentrylongpl{\the\glslabeltok}}%
+    {\noexpand\glsentryshortpl{\the\glslabeltok}}}%
   text={\the\glsshorttok},%
   plural={\the\glsshorttok\noexpand\acrpluralsuffix}%
 }
@@ -4581,7 +5788,7 @@ false,nolabel,autolabel}[nolabel]{%
 \@gls@loadtree
 \ifx\@glossary@default@style\relax
 \else
-  \glossarystyle{\@glossary@default@style}
+  \setglossarystyle{\@glossary@default@style}
 \fi
 \newcommand*{\showgloparent}[1]{%
   \expandafter\show\csname glo@#1@parent\endcsname
@@ -4643,6 +5850,12 @@ false,nolabel,autolabel}[nolabel]{%
 \newcommand*{\showglosymbolplural}[1]{%
   \expandafter\show\csname glo@#1@symbolplural\endcsname
 }
+\newcommand*{\showgloshort}[1]{%
+  \expandafter\show\csname glo@#1@short\endcsname
+}
+\newcommand*{\showglolong}[1]{%
+  \expandafter\show\csname glo@#1@long\endcsname
+}
 \newcommand*{\showgloindex}[1]{%
   \expandafter\show\csname glo@#1@index\endcsname
 }
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index d3434bb6568..1f8f9d6eb79 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,12 +39,12 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc}[2012/05/21 v1.06 (NLCT)]
+\ProvidesPackage{mfirstuc}[2013/11/04 v1.08 (NLCT)]
 \RequirePackage{etoolbox}
 \newif\if@glscs
 \newtoks\@glsmfirst
 \newtoks\@glsmrest
-\def\makefirstuc#1{%
+\newrobustcmd*{\makefirstuc}[1]{%
   \def\gls@argi{#1}%
   \ifx\gls@argi\@empty
   \else
@@ -84,16 +84,16 @@
     \@glscsfalse
   \fi
 }
-\def\@gls@makefirstuc#1{\MakeUppercase #1}
+\def\@gls@makefirstuc#1{\mfirstucMakeUppercase #1}
+\newcommand*{\mfirstucMakeUppercase}{\MakeUppercase}
 \newcommand*{\glsmakefirstuc}[1]{\@gls@makefirstuc{#1}}
 \def\@gls@getbody#1#{\def\@gls@body{#1}\@gls@gobbletonil}
 \def\@gls@gobbletonil#1\@nil{\def\@gls@rest{#1}}
 \newcommand*{\xmakefirstuc}[1]{%
 \expandafter\makefirstuc\expandafter{#1}}
-\newcommand*{\capitalisewords}[1]{%
+\newrobustcmd*{\capitalisewords}[1]{%
   \def\gls@add@space{}%
   \mfu@capitalisewords#1 \@nil\mfu@endcap
-    %\gls@add@space\makefirstuc{##1}\def\gls@add@space{ }%
 }
 \def\mfu@capitalisewords#1 #2\mfu@endcap{%
   \def\mfu@cap@first{#1}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
index 144911fab7f..cf9b5b93e8e 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 ebd9683464c..ec0f382b3a6 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 5204fc76096..d496ada3cbb 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 d4936216654..c66296ef022 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 7d15db257b4..a0a76d10f4e 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 d31b0835be5..3c9f35887ba 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 0bc25f9a50b..be984033699 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 de91e4eaa07..0af3819cf2b 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 4287d819359..1715371500f 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 5d040548c93..5100cee0431 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
index 72215c69060..699f3e54738 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 3a436df9ace..3d1ed290e9b 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
@@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
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 5588e541771..06879015604 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,10 +39,35 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-accsupp}[2011/04/02 v3.0 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2013/11/14 v4.0 (NLCT)
   Experimental glossaries accessibility]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
 \ProcessOptions
+\newcommand*{\compatibleglossentry}[2]{%
+  \toks@{#2}%
+  \protected@edef\@do@glossentry{%
+    \noexpand\accsuppglossaryentryfield{#1}%
+    {\noexpand\glsnamefont
+       {\expandafter\expandonce\csname glo@#1@name\endcsname}}%
+    {\expandafter\expandonce\csname glo@#1@desc\endcsname}%
+    {\expandafter\expandonce\csname glo@#1@symbol\endcsname}%
+    {\the\toks@}%
+  }%
+  \@do@glossentry
+}
+\newcommand*{\compatiblesubglossentry}[3]{%
+  \toks@{#3}%
+  \protected@edef\@do@subglossentry{%
+    \noexpand\accsuppglossarysubentryfield{\number#1}%
+    {#2}%
+    {\noexpand\glsnamefont
+      {\expandafter\expandonce\csname glo@#2@name\endcsname}}%
+    {\expandafter\expandonce\csname glo@#2@desc\endcsname}%
+    {\expandafter\expandonce\csname glo@#2@symbol\endcsname}%
+    {\the\toks@}%
+  }%
+  \@do@subglossentry
+}
 \RequirePackage{glossaries}
 \RequirePackage{accsupp}
 \define@key{glossentry}{access}{%
@@ -84,6 +109,21 @@
 \define@key{glossentry}{longpluralaccess}{%
   \def\@glo@longpluralaccess{#1}%
 }
+\appto\@gls@keymap{,%
+  {access}{access},%
+  {textaccess}{textaccess},%
+  {firstaccess}{firstaccess},%
+  {pluralaccess}{pluralaccess},%
+  {firstpluralaccess}{firstpluralaccess},%
+  {symbolaccess}{symbolaccess},%
+  {symbolpluralaccess}{symbolpluralaccess},%
+  {descaccess}{descaccess},%
+  {descpluralaccess}{descpluralaccess},%
+  {shortaccess}{shortaccess},%
+  {shortpluralaccess}{shortpluralaccess},%
+  {longaccess}{longaccess},%
+  {longpluralaccess}{longpluralaccess}%
+}
 \def\@gls@noaccess{\relax}
 \let\@gls@oldnewglossaryentryprehook\@newglossaryentryprehook
 \renewcommand*{\@newglossaryentryprehook}{%
@@ -305,311 +345,289 @@
     \csname gls#1accessdisplay\endcsname{#2}{#3}%
   }%
 }
-\def\@gls@#1#2[#3]{%
-  \glsdoifexists{#2}%
+\renewcommand*{\@@gls@default@entryfmt}[2]{%
+  \ifdefempty\glscustomtext
   {%
-    \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@gls@link@opts{#1}%
-    \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
+    \glsifplural
     {%
-      \def\@glo@text{\csname gls@\@glo@type @display\endcsname
-        {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}%
-        {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
-        {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
-        {#3}}%
-    }%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
-        {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}%
-        {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
-        {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
-        {#3}}%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\@glo@text}%
-    }%
-    {%
-      \gls@checkisacronymlist\@glo@type
-      \ifthenelse{\(\boolean{@glsisacronymlist}\AND
-        \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}%
+      \glscapscase
       {%
-        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+        \ifglsused\glslabel
+        {%
+          #2{\glspluralaccessdisplay
+               {\glsentryplural{\glslabel}}{\glslabel}}%
+            {\glsdescriptionpluralaccessdisplay
+               {\glsentrydescplural{\glslabel}}{\glslabel}}%
+            {\glssymbolpluralaccessdisplay
+               {\glsentrysymbolplural{\glslabel}}{\glslabel}}
+            {\glsinsert}%
+        }%
+        {%
+          #1{\glsfirstpluralaccessdisplay
+               {\glsentryfirstplural{\glslabel}}{\glslabel}}%
+            {\glsdescriptionpluralaccessdisplay
+               {\glsentrydescplural{\glslabel}}{\glslabel}}%
+            {\glssymbolpluralaccessdisplay
+               {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
       }%
       {%
-        \@gls@link[#1]{#2}{\@glo@text}%
-      }%
-    }%
-    \glsunset{#2}%
-  }%
-}
-\def\@Gls@#1#2[#3]{%
-  \glsdoifexists{#2}%
-  {%
-    \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@gls@link@opts{#1}%
-    \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @display\endcsname
-        {\glstextaccessdisplay{\Glsentrytext{#2}}{#2}}%
-        {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
-        {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
-        {#3}}%
-    }%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
-        {\glsfirstaccessdisplay{\Glsentryfirst{#2}}{#2}}%
-        {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
-        {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
-        {#3}}%
-    }%
-  \ifglsused{#2}%
-  {%
-    \@gls@link[#1]{#2}{\@glo@text}%
-  }%
-  {%
-    \gls@checkisacronymlist\@glo@type
-    \ifthenelse{\(\boolean{@glsisacronymlist}\AND
-      \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}%
-    {%
-      \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
-    }%
-    {%
-    \@gls@link[#1]{#2}{\@glo@text}%
-    }%
-  }%
-    \glsunset{#2}%
-  }%
-}
-\def\@GLS@#1#2[#3]{%
-  \glsdoifexists{#2}{%
-    \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@gls@link@opts{#1}%
-    \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @display\endcsname
-        {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}%
-        {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
-        {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
-        {#3}}%
-    }%
-    {%
-      \edef\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
-        {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}%
-        {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}%
-        {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}%
-        {#3}}%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
-    }%
-    {%
-      \gls@checkisacronymlist\@glo@type
-      \ifthenelse{\(\boolean{@glsisacronymlist}\AND
-        \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}{%
-        \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+        \ifglsused\glslabel
+        {%
+          #2{\glspluralaccessdisplay
+              {\Glsentryplural{\glslabel}}{\glslabel}}%
+            {\glsdescriptionpluralaccessdisplay
+              {\glsentrydescplural{\glslabel}}{\glslabel}}%
+            {\glssymbolpluralaccessdisplay
+              {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
+        {%
+          #1{\glsfirstpluralaccessdisplay
+               {\Glsentryfirstplural{\glslabel}}{\glslabel}}%
+            {\glsdescriptionpluralaccessdisplay
+               {\glsentrydescplural{\glslabel}}{\glslabel}}%
+            {\glssymbolpluralaccessdisplay
+               {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
       }%
       {%
-        \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+        \ifglsused\glslabel
+        {%
+          \MakeUppercase{%
+            #2{\glspluralaccessdisplay
+                {\glsentryplural{\glslabel}}{\glslabel}}%
+              {\glsdescriptionpluralaccessdisplay
+                {\glsentrydescplural{\glslabel}}{\glslabel}}%
+              {\glssymbolpluralaccessdisplay
+                {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+              {\glsinsert}}%
+        }%
+        {%
+          \MakeUppercase{%
+            #1{\glsfirstpluralaccessdisplay
+                {\glsentryfirstplural{\glslabel}}{\glslabel}}%
+              {\glsdescriptionpluralaccessdisplay
+                {\glsentrydescplural{\glslabel}}{\glslabel}}%
+              {\glssymbolpluralaccessdisplay
+                {\glsentrysymbolplural{\glslabel}}{\glslabel}}%
+              {\glsinsert}}%
+        }%
       }%
     }%
-    \glsunset{#2}%
-  }%
-}
-\def\@glspl@#1#2[#3]{%
-  \glsdoifexists{#2}%
-  {%
-    \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@gls@link@opts{#1}%
-    \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @display\endcsname
-        {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}%
-        {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
-        {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
-        {#3}}%
-    }%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
-        {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}%
-        {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
-        {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
-        {#3}}%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\@glo@text}%
-    }%
     {%
-      \gls@checkisacronymlist\@glo@type
-      \ifthenelse{\(\boolean{@glsisacronymlist}\AND
-        \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}%
-      {%
-        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
-      }%
+      \glscapscase
       {%
-        \@gls@link[#1]{#2}{\@glo@text}%
+        \ifglsused\glslabel
+        {%
+          #2{\glstextaccessdisplay
+               {\glsentrytext{\glslabel}}{\glslabel}}%
+            {\glsdescriptionaccessdisplay
+               {\glsentrydesc{\glslabel}}{\glslabel}}%
+            {\glssymbolaccessdisplay
+               {\glsentrysymbol{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
+        {%
+          #1{\glsfirstaccessdisplay
+              {\glsentryfirst{\glslabel}}{\glslabel}}%
+            {\glsdescriptionaccessdisplay
+              {\glsentrydesc{\glslabel}}{\glslabel}}%
+            {\glssymbolaccessdisplay
+              {\glsentrysymbol{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
       }%
-    }%
-    \glsunset{#2}%
-  }%
-}
-\def\@Glspl@#1#2[#3]{%
-  \glsdoifexists{#2}%
-  {%
-    \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@gls@link@opts{#1}%
-    \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @display\endcsname
-        {\glspluralaccessdisplay{\Glsentryplural{#2}}{#2}}%
-        {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
-        {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
-        {#3}}%
-    }%
-    {%
-      \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
-        {\glsfirstpluralaccessdisplay{\Glsentryfirstplural{#2}}{#2}}%
-        {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
-        {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
-        {#3}}%
-    }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\@glo@text}%
-    }%
-    {%
-      \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
-        \boolean{glsacrfootnote}}%
       {%
-        \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+        \ifglsused\glslabel
+        {%
+          #2{\glstextaccessdisplay
+               {\Glsentrytext{\glslabel}}{\glslabel}}%
+            {\glsdescriptionaccessdisplay
+               {\glsentrydesc{\glslabel}}{\glslabel}}%
+            {\glssymbolaccessdisplay
+               {\glsentrysymbol{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
+        {%
+          #1{\glsfirstaccessdisplay
+              {\Glsentryfirst{\glslabel}}{\glslabel}}%
+            {\glsdescriptionaccessdisplay
+              {\glsentrydesc{\glslabel}}{\glslabel}}%
+            {\glssymbolaccessdisplay
+              {\glsentrysymbol{\glslabel}}{\glslabel}}%
+            {\glsinsert}%
+        }%
       }%
       {%
-        \@gls@link[#1]{#2}{\@glo@text}%
+        \ifglsused\glslabel
+        {%
+          \MakeUppercase{%
+            #2{\glstextaccessdisplay
+                {\glsentrytext{\glslabel}}{\glslabel}}%
+              {\glsdescriptionaccessdisplay
+                {\glsentrydesc{\glslabel}}{\glslabel}}%
+              {\glssymbolaccessdisplay
+                {\glsentrysymbol{\glslabel}}{\glslabel}}%
+              {\glsinsert}}%
+        }%
+        {%
+          \MakeUppercase{%
+            #1{\glsfirstaccessdisplay
+                {\glsentryfirst{\glslabel}}{\glslabel}}%
+              {\glsdescriptionaccessdisplay
+                {\glsentrydesc{\glslabel}}{\glslabel}}%
+              {\glssymbolaccessdisplay
+                {\glsentrysymbol{\glslabel}}{\glslabel}}%
+              {\glsinsert}}%
+        }%
       }%
     }%
-    \glsunset{#2}%
   }%
-}
-\def\@GLSpl@#1#2[#3]{%
-  \glsdoifexists{#2}%
   {%
-    \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@gls@link@opts{#1}%
-    \def\@gls@link@label{#2}%
-    \ifglsused{#2}%
+    \ifglsused{\glslabel}%
     {%
-      \def\@glo@text{\csname gls@\@glo@type @display\endcsname
-        {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}%
-        {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
-        {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
-        {#3}}%
+      #2{\glscustomtext}%
+        {\glsdescriptionaccessdisplay
+          {\glsentrydesc{\glslabel}}{\glslabel}}%
+        {\glssymbolaccessdisplay
+          {\glsentrysymbol{\glslabel}}{\glslabel}}%
+        {\glsinsert}%
     }%
     {%
-      \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
-      {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}%
-      {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}%
-      {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}%
-      {#3}}%
+      #1{\glscustomtext}%
+        {\glsdescriptionaccessdisplay
+          {\glsentrydesc{\glslabel}}{\glslabel}}%
+        {\glssymbolaccessdisplay
+          {\glsentrysymbol{\glslabel}}{\glslabel}}%
+        {\glsinsert}%
     }%
-    \ifglsused{#2}%
-    {%
-      \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
-    }%
-    {%
-      \gls@checkisacronymlist\@glo@type
-      \ifthenelse{\(\boolean{@glsisacronymlist}\AND
-        \boolean{glsacrfootnote}\)\OR\NOT\boolean{glshyperfirst}}%
-      {%
-        \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
-      }%
-      {%
-        \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
-      }%
-    }%
-    \glsunset{#2}%
   }%
 }
 \def\@acrshort#1#2[#3]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@glo@text{%
-      \glsshortaccessdisplay{\glsentryshort{#2}}{#2}%
-    }%
-    \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsshortaccessdisplay{\glsentryshort{#2}}{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \def\@Acrshort#1#2[#3]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@glo@text{%
-      \glsshortaccessdisplay{\Glsentryshort{#2}}{#2}%
-    }%
-    \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@secondofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsshortaccessdisplay{\Glsentryshort{#2}}{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \def\@ACRshort#1#2[#3]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@glo@text{%
-      \glsshortaccessdisplay{\MakeUppercase{\glsentryshort{#2}}}{#2}%
-    }%
-    \@gls@link[#1]{#2}{\acronymfont{\@glo@text#3}}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@thirdofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glsshortaccessdisplay
+          {\MakeUppercase{\glsentryshort{#2}}}{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \def\@acrlong#1#2[#3]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@glo@text{%
-      \glslongaccessdisplay{\glsentrylong{#2}}{#2}%
-    }%
-    \@gls@link[#1]{#2}{\@glo@text#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glslongaccessdisplay{\glsentrylong{#2}}{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \def\@Acrlong#1#2[#3]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@glo@text{%
-      \glslongaccessdisplay{\Glsentrylong{#2}}{#2}%
-    }%
-    \@gls@link[#1]{#2}{\@glo@text#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glslongaccessdisplay{\Glsentrylong{#2}}{#2}}#3%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
 }
 \def\@ACRlong#1#2[#3]{%
   \glsdoifexists{#2}%
   {%
     \edef\@glo@type{\glsentrytype{#2}}%
-    \def\@glo@text{%
-      \glslongaccessdisplay{\MakeUppercase{\glsentrylong{#2}}}{#2}%
-    }%
-    \@gls@link[#1]{#2}{\@glo@text#3}%
+    \def\glslabel{#2}%
+    \let\glsifplural\@secondoftwo
+    \let\glscapscase\@firstofthree
+    \let\glsinsert\@empty
+    \def\glscustomtext{%
+      \acronymfont{\glslongaccessdisplay{%
+        \MakeUppercase{\glsentrylong{#2}}}{#2}#3}%
+    }%
+    \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
+  }%
+}
+\renewcommand*{\glossentryname}[1]{%
+  \glsdoifexists{#1}%
+  {%
+    \glsnamefont{\glsnameaccessdisplay{\glsentryname{#1}}{#1}}%
+  }%
+}
+\renewcommand*{\glossentryname}[1]{%
+  \glsdoifexists{#1}%
+  {%
+    \glsnamefont{\glsnameaccessdisplay{\Glsentryname{#1}}{#1}}%
+  }%
+}
+\renewcommand*{\glossentrydesc}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \glsdescriptionaccessdisplay{\glsentrydesc{#1}}{#1}%
+  }%
+}
+\renewcommand*{\Glossentrydesc}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \glsdescriptionaccessdisplay{\Glsentrydesc{#1}}{#1}%
+  }%
+}
+\renewcommand*{\glossentrysymbol}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \glssymbolaccessdisplay{\glsentrysymbol{#1}}{#1}%
+  }%
+}
+\renewcommand*{\Glossentrysymbol}[1]{%
+  \glsdoifexists{#1}%
+  {%
+     \glssymbolaccessdisplay{\Glsentrysymbol{#1}}{#1}%
   }%
 }
-\ifglsxindy
-  \renewcommand*{\@glossaryentryfield}{%
-     \string\\accsuppglossaryentryfield}
-\else
-  \renewcommand*{\@glossaryentryfield}{%
-     \string\accsuppglossaryentryfield}
-\fi
-\ifglsxindy
-  \renewcommand*{\@glossarysubentryfield}{%
-    \string\\accsuppglossarysubentryfield}
-\else
-  \renewcommand*{\@glossarysubentryfield}{%
-    \string\accsuppglossarysubentryfield}
-\fi
 \newcommand*{\accsuppglossaryentryfield}[5]{%
   \glossaryentryfield{#1}%
   {\glsnameaccessdisplay{#2}{#1}}%
@@ -617,7 +635,7 @@
   {\glssymbolaccessdisplay{#4}{#1}}{#5}%
 }
 \newcommand*{\accsuppglossarysubentryfield}[6]{%
-  \glossaryentryfield{#1}{#2}%
+  \glossarysubentryfield{#1}{#2}%
   {\glsnameaccessdisplay{#3}{#2}}%
   {\glsdescriptionaccessdisplay{#4}{#2}}%
   {\glssymbolaccessdisplay{#5}{#2}}{#6}%
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 af113655e2d..ac0b7612d9c 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-hypernav}[2007/07/04 v1.01 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2013/11/14 v4.0 (NLCT)]
 \newcommand*{\glsnavhyperlink}[3][\@glo@type]{%
   \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
   \@glslink{glsn:#1@#2}{#3}}
@@ -80,7 +80,8 @@
 }%
 \@for\@gls@tmp:=\@gls@list\do{%
    \@gls@between
-   \glsnavhyperlink{\@gls@tmp}{\glsgetgrouptitle{\@gls@tmp}}%
+   \@gls@getgrouptitle{\@gls@tmp}{\@gls@grptitle}%
+   \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}%
    \let\@gls@between\glshypernavsep%
 }%
 }
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 d5891c47288..776345d8bb0 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-inline}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-inline}[2013/11/14 v4.0 (NLCT)]
 \newglossarystyle{inline}{%
   \renewenvironment{theglossary}%
     {%
@@ -49,19 +49,28 @@
     {\glspostinline}%
  \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand{\glossaryentryfield}[5]{%
+  \renewcommand{\glossentry}[2]{%
     \glsinlinedopostchild
     \gls@inlinesep
-    \def\glo@desc{##3}%
-    \def\@no@post@desc{\nopostdesc}%
-    \glsentryitem{##1}\glsinlinenameformat{##1}{##2}%
-    \ifx\glo@desc\@no@post@desc
-      \glsinlineemptydescformat{##4}{##5}%
-    \else
-      \ifstrempty{##3}%
-      {\glsinlineemptydescformat{##4}{##5}}%
-      {\glsinlinedescformat{##3}{##4}{##5}}%
-    \fi
+    \glsentryitem{##1}%
+    \glsinlinenameformat{##1}{%
+      \glossentryname{##1}%
+    }%
+   \ifglsdescsuppressed{##1}%
+   {%
+      \glsinlineemptydescformat
+      {%
+         \glossentrysymbol{##1}%
+      }%
+      {%
+        ##2%
+      }%
+    }%
+    {%
+      \ifglshasdesc{##1}%
+      {\glsinlinedescformat{\glossentrydesc{##1}}{\glossentrysymbol{##1}}{##2}}%
+      {\glsinlineemptydescformat{\glossentrysymbol{##1}}{##2}}%
+    }%
     \ifglshaschildren{##1}%
     {%
        \glsresetsubentrycounter
@@ -72,10 +81,12 @@
     {}%
     \def\gls@inlinesep{\glsinlineseparator}%
   }%
-  \renewcommand{\glossarysubentryfield}[6]{%
+  \renewcommand{\subglossentry}[3]{%
     \gls@inlinesubsep%
-    \glsinlinesubnameformat{##2}{##3}%
-    \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}%
+    \glsinlinesubnameformat{##2}{%
+       \glossentryname{##2}}%
+    \glssubentryitem{##2}%
+    \glsinlinesubdescformat{\glossentrydesc{##2}}{\glossentrysymbol{##2}}{##3}%
     \def\gls@inlinesubsep{\glsinlinesubseparator}%
   }%
   \renewcommand*{\glsgroupskip}{}%
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 d5f0030baa6..9fbe8f418ff 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,67 +38,71 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-list}[2012/11/11 v3.04 (NLCT)]
+\ProvidesPackage{glossary-list}[2013/11/14 v4.0 (NLCT)]
 \newglossarystyle{list}{%
   \renewenvironment{theglossary}%
     {\begin{description}}{\end{description}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \item[\glsentryitem{##1}\glstarget{##1}{##2}]
-       ##3\glspostdescription\space ##5}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+          \glstarget{##1}{\glossentryname{##1}}]
+       \glossentrydesc{##1}\glspostdescription\space ##2}%
+  \renewcommand*{\subglossentry}[3]{%
     \glssubentryitem{##2}%
-    \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}%
+    \glstarget{##2}{\strut}%
+    \glossentrydesc{##2}\glspostdescription\space ##3.}%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
 }
 \newglossarystyle{listgroup}{%
-  \glossarystyle{list}%
+  \setglossarystyle{list}%
   \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
 \newglossarystyle{listhypergroup}{%
-  \glossarystyle{list}%
+  \setglossarystyle{list}%
   \renewcommand*{\glossaryheader}{%
     \item[\glsnavigation]}%
   \renewcommand*{\glsgroupheading}[1]{%
     \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
 \newglossarystyle{altlist}{%
-  \glossarystyle{list}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \item[\glsentryitem{##1}\glstarget{##1}{##2}]%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+      \glstarget{##1}{\glossentryname{##1}}]%
       \mbox{}\par\nobreak\@afterheading
-      ##3\glspostdescription\space ##5}%
-  \renewcommand{\glossarysubentryfield}[6]{%
+      \glossentrydesc{##1}\glspostdescription\space ##2}%
+  \renewcommand{\subglossentry}[3]{%
     \par
     \glssubentryitem{##2}%
-    \glstarget{##2}{\strut}##4\glspostdescription\space ##6}%
+    \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}%
 }
 \newglossarystyle{altlistgroup}{%
-  \glossarystyle{altlist}%
+  \setglossarystyle{altlist}%
   \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
 \newglossarystyle{altlisthypergroup}{%
-  \glossarystyle{altlist}%
+  \setglossarystyle{altlist}%
   \renewcommand*{\glossaryheader}{%
     \item[\glsnavigation]}%
   \renewcommand*{\glsgroupheading}[1]{%
     \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
 \newglossarystyle{listdotted}{%
-  \glossarystyle{list}%
-  \renewcommand*{\glossaryentryfield}[5]{%
+  \setglossarystyle{list}%
+  \renewcommand*{\glossentry}[2]{%
     \item[]\makebox[\glslistdottedwidth][l]{%
-      \glsentryitem{##1}\glstarget{##1}{##2}%
-      \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+      \glsentryitem{##1}%
+      \glstarget{##1}{\glossentryname{##1}}%
+      \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}%
+  \renewcommand*{\subglossentry}[3]{%
     \item[]\makebox[\glslistdottedwidth][l]{%
     \glssubentryitem{##2}%
-    \glstarget{##2}{##3}%
-    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}%
+    \glstarget{##2}{\glossentryname{##2}}%
+    \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}%
 }
 \newlength\glslistdottedwidth
 \setlength{\glslistdottedwidth}{.5\hsize}
 \newglossarystyle{sublistdotted}{%
-  \glossarystyle{listdotted}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \item[\glsentryitem{##1}\glstarget{##1}{##2}]}%
+  \setglossarystyle{listdotted}%
+  \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}%
 }
 \endinput
 %%
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 1c9442650b6..84e43034e24 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-long}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-long}[2013/11/14 v4.0 (NLCT)]
 \RequirePackage{longtable}
 \@ifundefined{glsdescwidth}{%
   \newlength\glsdescwidth
@@ -54,29 +54,35 @@
      {\end{longtable}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}%
+     \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space
+     ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else &
+\tabularnewline\fi}%
 }
 \newglossarystyle{longborder}{%
-  \glossarystyle{long}%
+  \setglossarystyle{long}%
   \renewenvironment{theglossary}{%
     \begin{longtable}{|l|p{\glsdescwidth}|}}{\end{longtable}}%
   \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{longheader}{%
-  \glossarystyle{long}%
+  \setglossarystyle{long}%
   \renewcommand*{\glossaryheader}{%
-    \bfseries \entryname & \bfseries \descriptionname\\\endhead}%
+    \bfseries \entryname & \bfseries \descriptionname\tabularnewline\endhead}%
 }
 \newglossarystyle{longheaderborder}{%
-  \glossarystyle{longborder}%
+  \setglossarystyle{longborder}%
   \renewcommand*{\glossaryheader}{%
-    \hline\bfseries \entryname & \bfseries \descriptionname\\\hline
+    \hline\bfseries \entryname & \bfseries
+    \descriptionname\tabularnewline\hline
     \endhead
     \hline\endfoot}%
 }
@@ -86,33 +92,38 @@
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} & ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##6\\}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+    \ifglsnogroupskip\else & &\tabularnewline\fi}%
 }
 \newglossarystyle{long3colborder}{%
-  \glossarystyle{long3col}%
+  \setglossarystyle{long3col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}%
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{long3colheader}{%
-  \glossarystyle{long3col}%
+  \setglossarystyle{long3col}%
   \renewcommand*{\glossaryheader}{%
     \bfseries\entryname&\bfseries\descriptionname&
-    \bfseries\pagelistname\\\endhead}%
+    \bfseries\pagelistname\tabularnewline\endhead}%
 }
 \newglossarystyle{long3colheaderborder}{%
-  \glossarystyle{long3colborder}%
+  \setglossarystyle{long3colborder}%
   \renewcommand*{\glossaryheader}{%
     \hline
     \bfseries\entryname&\bfseries\descriptionname&
-    \bfseries\pagelistname\\\hline\endhead
+    \bfseries\pagelistname\tabularnewline\hline\endhead
     \hline\endfoot}%
 }
 \newglossarystyle{long4col}{%
@@ -121,58 +132,66 @@
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} &
+    \glossentrysymbol{##1} &
+    ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     \glossentrysymbol{##2} & ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+    \ifglsnogroupskip\else & & &\tabularnewline\fi}%
 }
 \newglossarystyle{long4colheader}{%
-  \glossarystyle{long4col}%
+  \setglossarystyle{long4col}%
   \renewcommand*{\glossaryheader}{%
     \bfseries\entryname&\bfseries\descriptionname&
     \bfseries \symbolname&
-    \bfseries\pagelistname\\\endhead}%
+    \bfseries\pagelistname\tabularnewline\endhead}%
 }
 \newglossarystyle{long4colborder}{%
-  \glossarystyle{long4col}%
+  \setglossarystyle{long4col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|l|l|l|}}%
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{long4colheaderborder}{%
-  \glossarystyle{long4col}%
+  \setglossarystyle{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}%
+    \bfseries\pagelistname\tabularnewline\hline\endhead
+    \hline\endfoot}%
 }
 \newglossarystyle{altlong4col}{%
-   \glossarystyle{long4col}%
+   \setglossarystyle{long4col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
     {\end{longtable}}%
 }
 \newglossarystyle{altlong4colheader}{%
-  \glossarystyle{long4colheader}%
+  \setglossarystyle{long4colheader}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
     {\end{longtable}}%
 }
 \newglossarystyle{altlong4colborder}{%
-   \glossarystyle{long4colborder}%
+   \setglossarystyle{long4colborder}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
     {\end{longtable}}%
 }
 \newglossarystyle{altlong4colheaderborder}{%
-  \glossarystyle{long4colheaderborder}%
+  \setglossarystyle{long4colheaderborder}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
     {\end{longtable}}%
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 b910fe34ce8..e156963e5e3 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-longragged}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2013/11/14 v4.0 (NLCT)]
 \RequirePackage{array}
 \RequirePackage{longtable}
 \@ifundefined{glsdescwidth}{%
@@ -55,31 +55,35 @@
      {\end{longtable}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
-    \tabularnewline}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1}\glspostdescription\space ##2%
+    \tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
-    \tabularnewline}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2}%
+     \glspostdescription\space ##3%
+     \tabularnewline
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}%
 }
 \newglossarystyle{longraggedborder}{%
-  \glossarystyle{longragged}%
+  \setglossarystyle{longragged}%
   \renewenvironment{theglossary}{%
     \begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|}}%
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{longraggedheader}{%
-  \glossarystyle{longragged}%
+  \setglossarystyle{longragged}%
   \renewcommand*{\glossaryheader}{%
     \bfseries \entryname & \bfseries \descriptionname
     \tabularnewline\endhead}%
 }
 \newglossarystyle{longraggedheaderborder}{%
-  \glossarystyle{longraggedborder}%
+  \setglossarystyle{longraggedborder}%
   \renewcommand*{\glossaryheader}{%
     \hline\bfseries \entryname & \bfseries \descriptionname
     \tabularnewline\hline
@@ -93,16 +97,21 @@
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} & ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+    \ifglsnogroupskip\else & &\tabularnewline\fi}%
 }
 \newglossarystyle{longragged3colborder}{%
-  \glossarystyle{longragged3col}%
+  \setglossarystyle{longragged3col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|%
       >{\raggedright}p{\glspagelistwidth}|}}%
@@ -110,13 +119,13 @@
   \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{longragged3colheader}{%
-  \glossarystyle{longragged3col}%
+  \setglossarystyle{longragged3col}%
   \renewcommand*{\glossaryheader}{%
     \bfseries\entryname&\bfseries\descriptionname&
     \bfseries\pagelistname\tabularnewline\endhead}%
 }
 \newglossarystyle{longragged3colheaderborder}{%
-  \glossarystyle{longragged3colborder}%
+  \setglossarystyle{longragged3colborder}%
   \renewcommand*{\glossaryheader}{%
     \hline
     \bfseries\entryname&\bfseries\descriptionname&
@@ -130,16 +139,22 @@
     {\end{longtable}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} & \glossentrydesc{##1} &
+    ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     \glossentrysymbol{##2} & ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+    \ifglsnogroupskip\else & & &\tabularnewline\fi}%
 }
 \newglossarystyle{altlongragged4colheader}{%
-  \glossarystyle{altlongragged4col}%
+  \setglossarystyle{altlongragged4col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}l%
       >{\raggedright}p{\glspagelistwidth}}}%
@@ -150,7 +165,7 @@
     \bfseries\pagelistname\tabularnewline\endhead}%
 }
 \newglossarystyle{altlongragged4colborder}{%
-   \glossarystyle{altlongragged4col}%
+   \setglossarystyle{altlongragged4col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|l|%
       >{\raggedright}p{\glspagelistwidth}|}}%
@@ -158,7 +173,7 @@
   \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}%
 }
 \newglossarystyle{altlongragged4colheaderborder}{%
-  \glossarystyle{altlongragged4col}%
+  \setglossarystyle{altlongragged4col}%
   \renewenvironment{theglossary}%
     {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|l|%
        >{\raggedright}p{\glspagelistwidth}|}}%
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 745374ad9b9..53c5e6fb2bd 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,12 +38,12 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-mcols}[2013/04/21 v3.05 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2013/11/14 v4.0 (NLCT)]
 \RequirePackage{multicol}
 \RequirePackage{glossary-tree}
 \newcommand*{\glsmcols}{2}
 \newglossarystyle{mcolindex}{%
-  \glossarystyle{index}%
+  \setglossarystyle{index}%
   \renewenvironment{theglossary}%
     {%
      \begin{multicols}{\glsmcols}
@@ -53,12 +53,12 @@
     {\end{multicols}}%
 }
 \newglossarystyle{mcolindexgroup}{%
- \glossarystyle{mcolindex}%
+ \setglossarystyle{mcolindex}%
  \renewcommand*{\glsgroupheading}[1]{%
     \item\textbf{\glsgetgrouptitle{##1}}\indexspace}%
 }
 \newglossarystyle{mcolindexhypergroup}{%
-  \glossarystyle{mcolindex}%
+  \setglossarystyle{mcolindex}%
   \renewcommand*{\glossaryheader}{%
     \item\textbf{\glsnavigation}\indexspace}%
   \renewcommand*{\glsgroupheading}[1]{%
@@ -66,7 +66,7 @@
     \indexspace}%
 }
 \newglossarystyle{mcoltree}{%
-  \glossarystyle{tree}%
+  \setglossarystyle{tree}%
   \renewenvironment{theglossary}%
   {%
      \begin{multicols}{\glsmcols}
@@ -76,12 +76,12 @@
   {\end{multicols}}%
 }
 \newglossarystyle{mcoltreegroup}{%
-  \glossarystyle{mcoltree}%
+  \setglossarystyle{mcoltree}%
   \renewcommand{\glsgroupheading}[1]{\par
     \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
 }
 \newglossarystyle{mcoltreehypergroup}{%
-  \glossarystyle{mcoltree}%
+  \setglossarystyle{mcoltree}%
   \renewcommand*{\glossaryheader}{%
     \par\noindent\textbf{\glsnavigation}\par\indexspace}%
   \renewcommand*{\glsgroupheading}[1]{%
@@ -90,7 +90,7 @@
     \indexspace}%
 }
 \newglossarystyle{mcoltreenoname}{%
-  \glossarystyle{treenoname}%
+  \setglossarystyle{treenoname}%
   \renewenvironment{theglossary}%
   {%
      \begin{multicols}{\glsmcols}
@@ -100,12 +100,12 @@
   {\end{multicols}}%
 }
 \newglossarystyle{mcoltreenonamegroup}{%
-  \glossarystyle{mcoltreenoname}%
+  \setglossarystyle{mcoltreenoname}%
   \renewcommand{\glsgroupheading}[1]{\par
     \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
 }
 \newglossarystyle{mcoltreenonamehypergroup}{%
-  \glossarystyle{mcoltreenoname}%
+  \setglossarystyle{mcoltreenoname}%
   \renewcommand*{\glossaryheader}{%
     \par\noindent\textbf{\glsnavigation}\par\indexspace}%
   \renewcommand*{\glsgroupheading}[1]{%
@@ -114,7 +114,7 @@
     \indexspace}%
 }
 \newglossarystyle{mcolalttree}{%
-  \glossarystyle{alttree}%
+  \setglossarystyle{alttree}%
   \renewenvironment{theglossary}%
   {%
      \begin{multicols}{\glsmcols}
@@ -124,7 +124,7 @@
   {\par\end{multicols}}%
 }
 \newglossarystyle{mcolalttreegroup}{%
-  \glossarystyle{mcolalttree}%
+  \setglossarystyle{mcolalttree}%
   \renewcommand{\glsgroupheading}[1]{\par
     \def\@gls@prevlevel{-1}%
     \hangindent0pt\relax
@@ -132,7 +132,7 @@
     \textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
 }
 \newglossarystyle{mcolalttreehypergroup}{%
-  \glossarystyle{mcolalttree}%
+  \setglossarystyle{mcolalttree}%
   \renewcommand*{\glossaryheader}{%
     \par
     \def\@gls@prevlevel{-1}%
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 bca74c30ce7..8b193f3c457 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-super}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-super}[2013/11/14 v4.0 (NLCT)]
 \RequirePackage{supertabular}
 \@ifundefined{glsdescwidth}{%
   \newlength\glsdescwidth
@@ -55,34 +55,40 @@
     {\end{supertabular}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}%
+     \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space
+     ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+    \ifglsnogroupskip\else & \tabularnewline\fi}%
 }
 \newglossarystyle{superborder}{%
-  \glossarystyle{super}%
+  \setglossarystyle{super}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}{|l|p{\glsdescwidth}|}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{superheader}{%
-  \glossarystyle{super}%
+  \setglossarystyle{super}%
 \renewenvironment{theglossary}%
-  {\tablehead{\bfseries \entryname & \bfseries \descriptionname\\}%
+  {\tablehead{\bfseries \entryname &
+   \bfseries\descriptionname\tabularnewline}%
    \tabletail{}%
    \begin{supertabular}{lp{\glsdescwidth}}}%
   {\end{supertabular}}%
 }
 \newglossarystyle{superheaderborder}{%
-  \glossarystyle{super}%
+  \setglossarystyle{super}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline\bfseries \entryname &
-       \bfseries \descriptionname\\\hline}%
+       \bfseries \descriptionname\tabularnewline\hline}%
      \tabletail{\hline}
      \begin{supertabular}{|l|p{\glsdescwidth}|}}%
     {\end{supertabular}}%
@@ -94,35 +100,40 @@
     {\end{supertabular}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} & ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##6\\}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+    \ifglsnogroupskip\else & &\tabularnewline\fi}%
 }
 \newglossarystyle{super3colborder}{%
-  \glossarystyle{super3col}%
+  \setglossarystyle{super3col}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{super3colheader}{%
-  \glossarystyle{super3col}%
+  \setglossarystyle{super3col}%
   \renewenvironment{theglossary}%
     {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
-       \bfseries\pagelistname\\}\tabletail{}%
+       \bfseries\pagelistname\tabularnewline}\tabletail{}%
      \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{super3colheaderborder}{%
-  \glossarystyle{super3colborder}%
+  \setglossarystyle{super3colborder}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline
         \bfseries\entryname&\bfseries\descriptionname&
-        \bfseries\pagelistname\\\hline}%
+        \bfseries\pagelistname\tabularnewline\hline}%
      \tabletail{\hline}%
      \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}%
     {\end{supertabular}}%
@@ -134,58 +145,65 @@
      \end{supertabular}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} &
+    \glossentrysymbol{##1} & ##3\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
-  \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     \glossentrysymbol{##2} & ##3\tabularnewline
+  }%
+  \renewcommand*{\glsgroupskip}{%
+     \ifglsnogroupskip\else & & &\tabularnewline\fi}%
 }
 \newglossarystyle{super4colheader}{%
-  \glossarystyle{super4col}%
+  \setglossarystyle{super4col}%
   \renewenvironment{theglossary}%
     {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
         \bfseries\symbolname &
-        \bfseries\pagelistname\\}%
+        \bfseries\pagelistname\tabularnewline}%
      \tabletail{}%
      \begin{supertabular}{llll}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{super4colborder}{%
-  \glossarystyle{super4col}%
+  \setglossarystyle{super4col}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}{|l|l|l|l|}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{super4colheaderborder}{%
-  \glossarystyle{super4col}%
+  \setglossarystyle{super4col}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname&
         \bfseries\symbolname &
-        \bfseries\pagelistname\\\hline}\tabletail{\hline}%
+        \bfseries\pagelistname\tabularnewline\hline}%
+     \tabletail{\hline}%
      \begin{supertabular}{|l|l|l|l|}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4col}{%
-  \glossarystyle{super4col}%
+  \setglossarystyle{super4col}%
   \renewenvironment{theglossary}%
     {\tablehead{}\tabletail{}%
      \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4colheader}{%
-  \glossarystyle{super4colheader}%
+  \setglossarystyle{super4colheader}%
   \renewenvironment{theglossary}%
     {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
       \bfseries\symbolname &
-      \bfseries\pagelistname\\}\tabletail{}%
+      \bfseries\pagelistname\tabularnewline}\tabletail{}%
      \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4colborder}{%
-  \glossarystyle{super4colborder}%
+  \setglossarystyle{super4colborder}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}%
@@ -193,13 +211,13 @@
     {\end{supertabular}}%
 }
 \newglossarystyle{altsuper4colheaderborder}{%
-  \glossarystyle{super4colheaderborder}%
+  \setglossarystyle{super4colheaderborder}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline
        \bfseries\entryname &
        \bfseries\descriptionname &
        \bfseries\symbolname &
-       \bfseries\pagelistname\\\hline}%
+       \bfseries\pagelistname\tabularnewline\hline}%
      \tabletail{\hline}%
      \begin{supertabular}%
        {|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}%
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 3d522a6b620..b9c4943dc77 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-superragged}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2013/11/14 v4.0 (NLCT)]
 \RequirePackage{array}
 \RequirePackage{supertabular}
 \@ifundefined{glsdescwidth}{%
@@ -56,25 +56,29 @@
     {\end{supertabular}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
-      \tabularnewline}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1}\glspostdescription\space ##2%
+    \tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
-     \tabularnewline}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space
+     ##3%
+     \tabularnewline
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}%
 }
 \newglossarystyle{superraggedborder}{%
-  \glossarystyle{superragged}%
+  \setglossarystyle{superragged}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}{|l|>{\raggedright}p{\glsdescwidth}|}}%
     {\end{supertabular}}%
 }
 \newglossarystyle{superraggedheader}{%
-  \glossarystyle{superragged}%
+  \setglossarystyle{superragged}%
 \renewenvironment{theglossary}%
   {\tablehead{\bfseries \entryname & \bfseries \descriptionname
      \tabularnewline}%
@@ -83,7 +87,7 @@
   {\end{supertabular}}%
 }
 \newglossarystyle{superraggedheaderborder}{%
-  \glossarystyle{superragged}%
+  \setglossarystyle{superragged}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline\bfseries \entryname &
        \bfseries \descriptionname\tabularnewline\hline}%
@@ -99,16 +103,21 @@
     {\end{supertabular}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} &
+    ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     ##3\tabularnewline
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}%
 }
 \newglossarystyle{superragged3colborder}{%
-  \glossarystyle{superragged3col}%
+  \setglossarystyle{superragged3col}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}{|l|>{\raggedright}p{\glsdescwidth}|%
@@ -116,7 +125,7 @@
     {\end{supertabular}}%
 }
 \newglossarystyle{superragged3colheader}{%
-  \glossarystyle{superragged3col}%
+  \setglossarystyle{superragged3col}%
   \renewenvironment{theglossary}%
     {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
        \bfseries\pagelistname\tabularnewline}\tabletail{}%
@@ -125,7 +134,7 @@
     {\end{supertabular}}%
 }
 \newglossarystyle{superragged3colheaderborder}{%
-  \glossarystyle{superragged3colborder}%
+  \setglossarystyle{superragged3colborder}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline
         \bfseries\entryname&\bfseries\descriptionname&
@@ -143,16 +152,21 @@
     {\end{supertabular}}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand*{\glossaryentryfield}[5]{%
-    \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1} &
+    \glossentrysymbol{##1} & ##2\tabularnewline
+  }%
+  \renewcommand{\subglossentry}[3]{%
      &
      \glssubentryitem{##2}%
-     \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
+     \glstarget{##2}{\strut}\glossentrydesc{##2} &
+     \glossentrysymbol{##2} & ##3\tabularnewline
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}%
 }
 \newglossarystyle{altsuperragged4colheader}{%
-  \glossarystyle{altsuperragged4col}%
+  \setglossarystyle{altsuperragged4col}%
   \renewenvironment{theglossary}%
     {\tablehead{\bfseries\entryname&\bfseries\descriptionname&
       \bfseries\symbolname &
@@ -162,7 +176,7 @@
     {\end{supertabular}}%
 }
 \newglossarystyle{altsuperragged4colborder}{%
-  \glossarystyle{altsuper4col}%
+  \setglossarystyle{altsuper4col}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline}\tabletail{\hline}%
      \begin{supertabular}%
@@ -171,7 +185,7 @@
     {\end{supertabular}}%
 }
 \newglossarystyle{altsuperragged4colheaderborder}{%
-  \glossarystyle{altsuperragged4col}%
+  \setglossarystyle{altsuperragged4col}%
   \renewenvironment{theglossary}%
     {\tablehead{\hline
        \bfseries\entryname &
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 166e8fe74de..35a971b8936 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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
@@ -38,23 +38,21 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-tree}[2012/09/21 v3.03 (NLCT)]
+\ProvidesPackage{glossary-tree}[2013/11/14 v4.0 (NLCT)]
 \newglossarystyle{index}{%
   \renewenvironment{theglossary}%
     {\setlength{\parindent}{0pt}%
      \setlength{\parskip}{0pt plus 0.3pt}%
      \let\item\@idxitem}%
-    {}%
+    {\par}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-\renewcommand*{\glossaryentryfield}[5]{%
-\item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
-  \ifx\relax##4\relax
-  \else
-    \space(##4)%
-  \fi
-  \space ##3\glspostdescription \space ##5}%
-  \renewcommand*{\glossarysubentryfield}[6]{%
+  \renewcommand*{\glossentry}[2]{%
+     \item\glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}%
+     \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
+     \space \glossentrydesc{##1}\glspostdescription\space ##2%
+  }%
+  \renewcommand{\subglossentry}[3]{%
     \ifcase##1\relax
       % level 0
       \item
@@ -66,20 +64,18 @@
       % all other levels
       \subsubitem
     \fi
-    \textbf{\glstarget{##2}{##3}}%
-    \ifx\relax##5\relax
-    \else
-      \space(##5)%
-    \fi
-    \space##4\glspostdescription\space ##6}%
+    \textbf{\glstarget{##2}{\glossentryname{##2}}}%
+    \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}%
+    \space\glossentrydesc{##2}\glspostdescription\space ##3%
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}}
 \newglossarystyle{indexgroup}{%
-  \glossarystyle{index}%
+  \setglossarystyle{index}%
   \renewcommand*{\glsgroupheading}[1]{%
     \item\textbf{\glsgetgrouptitle{##1}}\indexspace}%
 }
 \newglossarystyle{indexhypergroup}{%
-  \glossarystyle{index}%
+  \setglossarystyle{index}%
   \renewcommand*{\glossaryheader}{%
     \item\textbf{\glsnavigation}\indexspace}%
   \renewcommand*{\glsgroupheading}[1]{%
@@ -93,35 +89,31 @@
     {}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand{\glossaryentryfield}[5]{%
+  \renewcommand{\glossentry}[2]{%
     \hangindent0pt\relax
     \parindent0pt\relax
-    \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
-    \ifx\relax##4\relax
-    \else
-      \space(##4)%
-    \fi
-    \space ##3\glspostdescription \space ##5\par}%
-  \renewcommand{\glossarysubentryfield}[6]{%
+    \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}%
+    \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
+    \space\glossentrydesc{##1}\glspostdescription\space##2\par
+  }%
+  \renewcommand{\subglossentry}[3]{%
     \hangindent##1\glstreeindent\relax
     \parindent##1\glstreeindent\relax
     \ifnum##1=1\relax
       \glssubentryitem{##2}%
     \fi
-    \textbf{\glstarget{##2}{##3}}%
-    \ifx\relax##5\relax
-    \else
-      \space(##5)%
-    \fi
-    \space##4\glspostdescription\space ##6\par}%
+    \textbf{\glstarget{##2}{\glossentryname{##2}}}%
+    \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}%
+    \space\glossentrydesc{##2}\glspostdescription\space ##3\par
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}}
 \newglossarystyle{treegroup}{%
-  \glossarystyle{tree}%
+  \setglossarystyle{tree}%
   \renewcommand{\glsgroupheading}[1]{\par
     \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
 }
 \newglossarystyle{treehypergroup}{%
-  \glossarystyle{tree}%
+  \setglossarystyle{tree}%
   \renewcommand*{\glossaryheader}{%
     \par\noindent\textbf{\glsnavigation}\par\indexspace}%
   \renewcommand*{\glsgroupheading}[1]{%
@@ -137,33 +129,32 @@
      \setlength{\parskip}{0pt plus 0.3pt}}%
     {}%
   \renewcommand*{\glossaryheader}{}%
-\renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand{\glossaryentryfield}[5]{%
+  \renewcommand*{\glsgroupheading}[1]{}%
+  \renewcommand{\glossentry}[2]{%
     \hangindent0pt\relax
     \parindent0pt\relax
-    \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
-    \ifx\relax##4\relax
-    \else
-      \space(##4)%
-    \fi
-    \space ##3\glspostdescription \space ##5\par}%
-  \renewcommand{\glossarysubentryfield}[6]{%
+    \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}%
+    \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
+    \space\glossentrydesc{##1}\glspostdescription\space##2\par
+  }%
+  \renewcommand{\subglossentry}[3]{%
     \hangindent##1\glstreeindent\relax
     \parindent##1\glstreeindent\relax
     \ifnum##1=1\relax
       \glssubentryitem{##2}%
     \fi
     \glstarget{##2}{\strut}%
-    ##4\glspostdescription\space ##6\par}%
+    \glossentrydesc{##2}\glspostdescription\space##3\par
+  }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
 }
 \newglossarystyle{treenonamegroup}{%
-  \glossarystyle{treenoname}%
+  \setglossarystyle{treenoname}%
   \renewcommand{\glsgroupheading}[1]{\par
     \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
 }
 \newglossarystyle{treenonamehypergroup}{%
-  \glossarystyle{treenoname}%
+  \setglossarystyle{treenoname}%
   \renewcommand*{\glossaryheader}{%
     \par\noindent\textbf{\glsnavigation}\par\indexspace}%
   \renewcommand*{\glsgroupheading}[1]{%
@@ -183,7 +174,7 @@
     {\par}%
   \renewcommand*{\glossaryheader}{}%
   \renewcommand*{\glsgroupheading}[1]{}%
-  \renewcommand{\glossaryentryfield}[5]{%
+  \renewcommand{\glossentry}[2]{%
     \ifnum\@gls@prevlevel=0\relax
     \else
        \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}%
@@ -191,15 +182,12 @@
       \parindent\glstreeindent
     \fi
     \makebox[0pt][r]{\makebox[\glstreeindent][l]{%
-       \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}%
-    \ifx\relax##4\relax
-    \else
-      (##4)\space
-    \fi
-    ##3\glspostdescription \space ##5\par
+       \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}}}%
+    \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}%
+    \glossentrydesc{##1}\glspostdescription \space ##2\par
     \def\@gls@prevlevel{0}%
   }%
-  \renewcommand{\glossarysubentryfield}[6]{%
+  \renewcommand{\subglossentry}[3]{%
     \ifnum##1=1\relax
       \glssubentryitem{##2}%
     \fi
@@ -226,18 +214,15 @@
     \fi
     \hangindent\glstreeindent
     \makebox[0pt][r]{\makebox[\gls@tmplen][l]{%
-      \textbf{\glstarget{##2}{##3}}}}%
-    \ifx##5\relax\relax
-    \else
-      (##5)\space
-    \fi
-    ##4\glspostdescription\space ##6\par
+      \textbf{\glstarget{##2}{\glossentryname{##2}}}}}%
+    \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}%
+    \glossentrydesc{##2}\glspostdescription\space ##3\par
     \def\@gls@prevlevel{##1}%
   }%
   \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
 }
 \newglossarystyle{alttreegroup}{%
-  \glossarystyle{alttree}%
+  \setglossarystyle{alttree}%
   \renewcommand{\glsgroupheading}[1]{\par
     \def\@gls@prevlevel{-1}%
     \hangindent0pt\relax
@@ -245,7 +230,7 @@
     \textbf{\glsgetgrouptitle{##1}}\par\indexspace}%
 }
 \newglossarystyle{alttreehypergroup}{%
-  \glossarystyle{alttree}%
+  \setglossarystyle{alttree}%
   \renewcommand*{\glossaryheader}{%
     \par
     \def\@gls@prevlevel{-1}%