glossaries (6dec13)

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

6 files changed, 736 insertions, 144 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 1daab6e2276..e7736fce866 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, 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.
+%%  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, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.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-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
index f98a7e05bb0..b42fa4a33ec 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, 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.
+%%  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, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.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
index 3d6ad8267d8..7a520508b48 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
@@ -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, 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.
+%%  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, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.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-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
index 3c4f4ba4b66..e1e6d41a174 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, 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.
+%%  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, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.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.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 39da8e08913..629cc72c41e 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, 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.
+%%  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, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.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}[2013/11/16 v4.01 (NLCT)]
+\ProvidesPackage{glossaries}[2013/12/05 v4.02 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -105,7 +105,7 @@ subsection,subsubsection,paragraph,subparagraph}[section]{%
 \newcommand*{\@@glossaryseclabel}{}
 \newcommand*{\glsautoprefix}{}
 \define@choicekey{glossaries.sty}{numberedsection}[\val\nr]{%
-false,nolabel,autolabel}[nolabel]{%
+false,nolabel,autolabel,nameref}[nolabel]{%
   \ifcase\nr\relax
     \renewcommand*{\@@glossarysecstar}{*}%
     \renewcommand*{\@@glossaryseclabel}{}%
@@ -116,6 +116,11 @@ false,nolabel,autolabel}[nolabel]{%
     \renewcommand*{\@@glossarysecstar}{}%
     \renewcommand*{\@@glossaryseclabel}{%
       \label{\glsautoprefix\@glo@type}}%
+  \or
+    \renewcommand*{\@@glossarysecstar}{*}%
+    \renewcommand*{\@@glossaryseclabel}{%
+      \protected@edef\@currentlabelname{\glossarytoctitle}%
+      \label{\glsautoprefix\@glo@type}}%
   \fi
 }
 \newcommand*{\@glossary@default@style}{list}
@@ -421,7 +426,7 @@ deprecated}%
 }
 \glssanitizesorttrue
 \glssetnoexpandfield{sortvalue}%
-\define@choicekey{sanitize}{sort}{true,false}[true]{%
+\define@choicekey[gls]{sanitize}{sort}{true,false}[true]{%
   \setbool{glssanitizesort}{#1}%
   \ifglssanitizesort
     \glssetnoexpandfield{sortvalue}%
@@ -523,6 +528,10 @@ name=true]{%
 \@gls@declareoption{xindygloss}{%
   \glsxindytrue
 }
+\@gls@declareoption{xindynoglsnumbers}{%
+  \glsxindytrue
+  \gls@xindy@glsnumbersfalse
+}
 \define@boolkey{glossaries.sty}[gls]{savewrites}[true]{%
   \ifglssavewrites
     \renewcommand*{\glswritefiles}{\@glswritefiles}%
@@ -542,20 +551,33 @@ name=true]{%
   {}%
 }
 \boolfalse{glscompatible-2.07}
-\newcommand{\@gls@do@symbolsdef}{}
 \@gls@declareoption{symbols}{%
-  \renewcommand{\@gls@do@symbolsdef}{%
-    \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}%
-    \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,#1]}%
-  }%
+  \let\@gls@do@symbolsdef\@gls@symbolsdef
 }
-\newcommand{\@gls@do@numbersdef}{}
+\newcommand*{\@gls@do@symbolsdef}{}
+\newcommand*{\@gls@symbolsdef}{%
+  \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}%
+  \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,##1]}%
+}%
 \@gls@declareoption{numbers}{%
-  \renewcommand{\@gls@do@numbersdef}{%
-    \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}%
-    \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,#1]}%
-  }%
+  \let\@gls@do@numbersdef\@gls@numbersdef
 }
+\newcommand*{\@gls@do@numbersdef}{}
+\newcommand*{\@gls@numbersdef}{%
+  \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}%
+  \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,##1]}%
+}%
+\@gls@declareoption{index}{%
+  \let\@gls@do@indexdef\@gls@indexdef
+}
+\newcommand*{\@gls@do@indexdef}{}
+\newcommand*{\@gls@indexdef}{%
+  \newglossary[ilg]{index}{ind}{idx}{\indexname}%
+  \newcommand*{\printindex}[1][]{\printglossary[type=index,##1]}%
+  \newcommand*{\newterm}[2][]{%
+    \newglossaryentry{##2}%
+    {type={index},name={##2},description={\nopostdesc},##1}}
+}%
 \@for\CurrentOption :=\@declaredoptions\do{%
   \ifx\CurrentOption\@empty
   \else
@@ -570,7 +592,7 @@ name=true]{%
 \ProcessOptionsX
 \RequirePackage{glossaries-compatible-307}
 \disable@keys{glossaries.sty}{compatible-2.07,%
- xindy,xindygloss,makeindex,%
+ xindy,xindygloss,xindynoglsnumbers,makeindex,%
  acronym,translate,notranslate,nolong,nosuper,notree,nostyles,nomain}
 \newcommand*{\setupglossaries}[1]{%
   \renewcommand*{\@gls@setacrstyle}{}%
@@ -586,6 +608,7 @@ name=true]{%
   \glsacrshortcutsfalse
   \let\@gls@do@numbersdef\relax
   \let\@gls@do@symbolssdef\relax
+  \let\@gls@do@indexdef\relax
   \let\@gls@do@acronymsdef\relax
   \setkeys{glossaries.sty}{#1}%
   \@gls@setacrstyle
@@ -593,6 +616,7 @@ name=true]{%
   \@gls@do@acronymsdef
   \@gls@do@numbersdef
   \@gls@do@symbolssdef
+  \@gls@do@indexdef
 }
 \ifglstranslate
   \@ifpackageloaded{polyglossia}%
@@ -834,23 +858,27 @@ name=true]{%
 \newcommand*{\setglossarysection}[1]{%
 \setkeys{glossaries.sty}{section=#1}}
 \newcommand*{\@glossarysection}[2]{%
-  \ifx\@@glossarysecstar\@empty
+  \ifdefempty\@@glossarysecstar
+  {%
     \csname\@@glossarysec\endcsname{#2}%
-  \else
+  }%
+  {%
     \csname\@@glossarysec\endcsname*{#2}%
     \@gls@toc{#1}{\@@glossarysec}%
-  \fi
+  }%
   \@@glossaryseclabel
 }
 \newcommand*{\@p@glossarysection}[2]{%
   \glsclearpage
   \phantomsection
-  \ifx\@@glossarysecstar\@empty
+  \ifdefempty\@@glossarysecstar
+  {%
     \csname\@@glossarysec\endcsname{#2}%
-  \else
+  }%
+  {%
     \@gls@toc{#1}{\@@glossarysec}%
       \csname\@@glossarysec\endcsname*{#2}%
-  \fi
+  }%
   \@@glossaryseclabel
 }
 \newcommand*{\gls@doclearpage}{%
@@ -1342,6 +1370,7 @@ name=true]{%
 \@gls@do@acronymsdef
 \@gls@do@symbolsdef
 \@gls@do@numbersdef
+\@gls@do@indexdef
 \define@key{glossentry}{name}{%
 \def\@glo@name{#1}%
 }
@@ -2300,6 +2329,89 @@ name=true]{%
     \glscustomtext\glsinsert
   }%
 }
+\newcommand*{\glsgenacfmt}{%
+  \ifdefempty\glscustomtext
+  {%
+    \ifglsused\glslabel
+    {%
+      \glsifplural
+      {%
+        \glscapscase
+        {%
+          \acronymfont{\glsentryshortpl{\glslabel}}\glsinsert
+        }%
+        {%
+          \acronymfont{\Glsentryshortpl{\glslabel}}\glsinsert
+        }%
+        {%
+          \mfirstucMakeUppercase
+            {\acronymfont{\glsentryshortpl{\glslabel}}\glsinsert}%
+        }%
+      }%
+      {%
+        \glscapscase
+        {%
+          \acronymfont{\glsentryshort{\glslabel}}\glsinsert
+        }%
+        {%
+          \acronymfont{\Glsentryshort{\glslabel}}\glsinsert
+        }%
+        {%
+          \mfirstucMakeUppercase
+            {\acronymfont{\glsentryshort{\glslabel}}\glsinsert}%
+        }%
+      }%
+    }%
+    {%
+      \glsifplural
+      {%
+        \glscapscase
+        {%
+          \genplacrfullformat{\glslabel}{\glsinsert}%
+        }%
+        {%
+          \Genplacrfullformat{\glslabel}{\glsinsert}%
+        }%
+        {%
+          \mfirstucMakeUppercase
+            {\genplacrfullformat{\glslabel}{\glsinsert}}%
+        }%
+      }%
+      {%
+        \glscapscase
+        {%
+          \genacrfullformat{\glslabel}{\glsinsert}%
+        }%
+        {%
+          \Genacrfullformat{\glslabel}{\glsinsert}%
+        }%
+        {%
+          \mfirstucMakeUppercase
+           {\genacrfullformat{\glslabel}{\glsinsert}}%
+        }%
+      }%
+    }%
+  }%
+  {%
+    \glscustomtext
+  }%
+}
+\newcommand*{\genacrfullformat}[2]{%
+   \glsentrylong{#1}#2\space
+   (\protect\firstacronymfont{\glsentryshort{#1}})%
+}
+\newcommand*{\Genacrfullformat}[2]{%
+  \protected@edef\gls@text{\genacrfullformat{#1}{#2}}%
+  \xmakefirstuc\gls@text
+}
+\newcommand*{\genplacrfullformat}[2]{%
+   \glsentrylongpl{#1}#2\space
+   (\protect\firstacronymfont{\glsentryshortpl{#1}})%
+}
+\newcommand*{\Genplacrfullformat}[2]{%
+  \protected@edef\gls@text{\genplacrfullformat{#1}{#2}}%
+  \xmakefirstuc\gls@text
+}
 \newcommand*{\glsdisplayfirst}[4]{#1#4}
 \newcommand*{\glsdisplay}[4]{#1#4}
 \newcommand*{\defglsdisplay}[2][\glsdefaulttype]{%
@@ -3731,7 +3843,7 @@ name=true]{%
     \let\glscapscase\@firstofthree
     \let\glsinsert\@empty
     \def\glscustomtext{%
-      \acronymfont{\glsentrylong{#2}}#3%
+      \glsentrylong{#2}#3%
     }%
     \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
@@ -3753,7 +3865,7 @@ name=true]{%
     \let\glscapscase\@secondofthree
     \let\glsinsert\@empty
     \def\glscustomtext{%
-      \acronymfont{\Glsentrylong{#2}}#3%
+      \Glsentrylong{#2}#3%
     }%
     \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
@@ -3775,7 +3887,7 @@ name=true]{%
     \let\glscapscase\@thirdofthree
     \let\glsinsert\@empty
     \def\glscustomtext{%
-      \mfirstucMakeUppercase{\acronymfont{\glsentrylong{#2}}#3}%
+      \mfirstucMakeUppercase{\glsentrylong{#2}#3}%
     }%
     \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
@@ -3797,7 +3909,7 @@ name=true]{%
     \let\glscapscase\@firstofthree
     \let\glsinsert\@empty
     \def\glscustomtext{%
-      \acronymfont{\glsentrylongpl{#2}}#3%
+      \glsentrylongpl{#2}#3%
     }%
     \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
@@ -3819,7 +3931,7 @@ name=true]{%
     \let\glscapscase\@secondofthree
     \let\glsinsert\@empty
     \def\glscustomtext{%
-      \acronymfont{\Glsentrylongpl{#2}}#3%
+      \Glsentrylongpl{#2}#3%
     }%
     \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
@@ -3841,7 +3953,7 @@ name=true]{%
     \let\glscapscase\@thirdofthree
     \let\glsinsert\@empty
     \def\glscustomtext{%
-      \mfirstucMakeUppercase{\acronymfont{\glsentrylongpl{#2}}#3}%
+      \mfirstucMakeUppercase{\glsentrylongpl{#2}#3}%
     }%
     \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}%
   }%
@@ -3930,16 +4042,16 @@ name=true]{%
 \protected@edef\@glo@text{\csname glo@#1@longpl\endcsname}%
 \expandafter\makefirstuc\expandafter{\@glo@text}}
 \newcommand*{\glsentryfull}[1]{%
-  \acrfullformat{\glsentrylong{#1}}{\glsentryshort{#1}}%
+  \acrfullformat{\glsentrylong{#1}}{\acronymfont{\glsentryshort{#1}}}%
 }
 \newrobustcmd*{\Glsentryfull}[1]{%
-  \acrfullformat{\Glsentrylong{#1}}{\glsentryshort{#1}}%
+  \acrfullformat{\Glsentrylong{#1}}{\acronymfont{\glsentryshort{#1}}}%
 }
 \newcommand*{\glsentryfullpl}[1]{%
-  \acrfullformat{\glsentrylongpl{#1}}{\glsentryshortpl{#1}}%
+  \acrfullformat{\glsentrylongpl{#1}}{\acronymfont{\glsentryshortpl{#1}}}%
 }
 \newrobustcmd*{\Glsentryfullpl}[1]{%
-  \acrfullformat{\Glsentrylongpl{#1}}{\glsentryshortpl{#1}}%
+  \acrfullformat{\Glsentrylongpl{#1}}{\acronymfont{\glsentryshortpl{#1}}}%
 }
 \newcommand*{\glsentrynumberlist}[1]{%
   \glsdoifexists{#1}%
@@ -4308,6 +4420,7 @@ name=true]{%
     \@gls@dodeflistparser
   \fi
 }
+\@onlypreamble{\makeglossaries}
 \let\makeglossary\makeglossaries
 \AtEndDocument{%
   \warn@nomakeglossaries
@@ -4636,17 +4749,23 @@ you
   }%
 }
 \define@choicekey{printgloss}{numberedsection}[\val\nr]{%
-false,nolabel,autolabel}[nolabel]{%
-\ifcase\nr\relax
-  \renewcommand*{\@@glossarysecstar}{*}%
-  \renewcommand*{\@@glossaryseclabel}{}%
-\or
-  \renewcommand*{\@@glossarysecstar}{}%
-  \renewcommand*{\@@glossaryseclabel}{}%
-\or
-  \renewcommand*{\@@glossarysecstar}{}%
-  \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}%
-\fi}
+false,nolabel,autolabel,nameref}[nolabel]{%
+  \ifcase\nr\relax
+    \renewcommand*{\@@glossarysecstar}{*}%
+    \renewcommand*{\@@glossaryseclabel}{}%
+  \or
+    \renewcommand*{\@@glossarysecstar}{}%
+    \renewcommand*{\@@glossaryseclabel}{}%
+  \or
+    \renewcommand*{\@@glossarysecstar}{}%
+    \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}%
+  \or
+    \renewcommand*{\@@glossarysecstar}{*}%
+    \renewcommand*{\@@glossaryseclabel}{%
+      \protected@edef\@currentlabelname{\glossarytoctitle}%
+      \label{\glsautoprefix\@glo@type}}%
+  \fi
+}
 \define@choicekey{printgloss}{nogroupskip}{true,false}[true]{%
   \csuse{glsnogroupskip#1}%
 }
@@ -5017,6 +5136,9 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@acrfull{#1}{#2}[]}%
 }
 \def\@acrfull#1#2[#3]{%
+  \acrfullfmt{#1}{#2}{#3}%
+}
+\newcommand*{\acrfullfmt}[3]{%
   \acrlinkfullformat{\@acrlong}{\@acrshort}{#1}{#2}{#3}%
 }
 \newcommand{\acrlinkfullformat}[5]{%
@@ -5035,6 +5157,9 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@Acrfull{#1}{#2}[]}%
 }
 \def\@Acrfull#1#2[#3]{%
+  \Acrfullfmt{#1}{#2}{#3}%
+}
+\newcommand*{\Acrfullfmt}[3]{%
   \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}%
 }
 \newrobustcmd*{\ACRfull}{%
@@ -5049,6 +5174,9 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@ACRfull{#1}{#2}[]}%
 }
 \def\@ACRfull#1#2[#3]{%
+  \ACRfullfmt{#1}{#2}{#3}%
+}
+\newcommand*{\ACRfullfmt}[3]{%
   \acrlinkfullformat{\@ACRlong}{\@ACRshort}{#1}{#2}{#3}%
 }
 \newrobustcmd*{\acrfullpl}{%
@@ -5063,6 +5191,9 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@acrfullpl{#1}{#2}[]}%
 }
 \def\@acrfullpl#1#2[#3]{%
+  \acrfullplfmt{#1}{#2}{#3}%
+}
+\newcommand*{\acrfullplfmt}[3]{%
   \acrlinkfullformat{\@acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
 }
 \newrobustcmd*{\Acrfullpl}{%
@@ -5077,7 +5208,10 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@Acrfullpl{#1}{#2}[]}%
 }
 \def\@Acrfullpl#1#2[#3]{%
-  \acrlinkfullformat{\@Acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
+  \Acrfullplfmt{#1}{#2}{#3}%
+}
+\newcommand*{\Acrfullplfmt}[3]{%
+  \acrlinkfullformat{\@acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
 }
 \newrobustcmd*{\ACRfullpl}{%
   \@ifstar\s@ACRfullpl\ns@ACRfullpl
@@ -5091,6 +5225,9 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@ACRfullpl{#1}{#2}[]}%
 }
 \def\@ACRfullpl#1#2[#3]{%
+  \ACRfullplfmt{#1}{#2}{#3}%
+}
+\newcommand*{\ACRfullplfmt}[3]{%
   \acrlinkfullformat{\@ACRlongpl}{\@ACRshortpl}{#1}{#2}{#3}%
 }
 \newcommand{\acronymfont}[1]{#1}
@@ -5101,6 +5238,466 @@ false,nolabel,autolabel}[nolabel]{%
 \newtoks\glsshorttok
 \newtoks\glslongtok
 \newcommand*{\newacronymhook}{}
+\newcommand*{\SetGenericNewAcronym}{%
+  \renewcommand{\newacronym}[4][]{%
+    \ifdefempty{\@glsacronymlists}%
+    {%
+      \def\@glo@type{\acronymtype}%
+      \setkeys{glossentry}{##1}%
+      \DeclareAcronymList{\@glo@type}%
+    }%
+    {}%
+    \glskeylisttok{##1}%
+    \glslabeltok{##2}%
+    \glsshorttok{##3}%
+    \glslongtok{##4}%
+    \newacronymhook
+    \protected@edef\@do@newglossaryentry{%
+      \noexpand\newglossaryentry{\the\glslabeltok}%
+      {%
+        type=\acronymtype,%
+        name={\expandonce{\acronymentry{##2}}},%
+        sort={\acronymsort{\the\glsshorttok}{\the\glslongtok}},%
+        text={\the\glsshorttok},%
+        short={\the\glsshorttok},%
+        shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+        long={\the\glslongtok},%
+        longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+        \GenericAcronymFields,%
+        \the\glskeylisttok
+      }%
+    }%
+    \@do@newglossaryentry
+  }%
+  \renewcommand*{\acrfullfmt}[3]{%
+    \glslink[##1]{##2}{\genacrfullformat{##2}{##3}}}%
+  \renewcommand*{\Acrfullfmt}[3]{%
+    \glslink[##1]{##2}{\Genacrfullformat{##2}{##3}}}%
+  \renewcommand*{\ACRfullfmt}[3]{%
+    \glslink[##1]{##2}{%
+      \mfirstucMakeUppercase{\genacrfullformat{##2}{##3}}}}%
+  \renewcommand*{\acrfullplfmt}[3]{%
+    \glslink[##1]{##2}{\genplacrfullformat{##2}{##3}}}%
+  \renewcommand*{\Acrfullplfmt}[3]{%
+    \glslink[##1]{##2}{\Genplacrfullformat{##2}{##3}}}%
+  \renewcommand*{\ACRfullplfmt}[3]{%
+    \glslink[##1]{##2}{%
+      \mfirstucMakeUppercase{\genplacrfullformat{##2}{##3}}}}%
+  \renewcommand*{\glsentryfull}[1]{\genacrfullformat{##1}{}}%
+  \renewcommand*{\Glsentryfull}[1]{\Genacrfullformat{##1}{}}%
+  \renewcommand*{\glsentryfullpl}[1]{\genplacrfullformat{##1}{}}%
+  \renewcommand*{\Glsentryfullpl}[1]{\Genplacrfullformat{##1}{}}%
+}
+\newcommand*{\GenericAcronymFields}{description={\the\glslongtok}}
+\newcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{#1}}}
+\newcommand*{\acronymsort}[2]{#1}
+\newcommand*{\setacronymstyle}[1]{%
+  \ifcsundef{@glsacr@dispstyle@#1}
+  {%
+    \PackageError{glossaries}{Undefined acronym style `#1'}{}%
+  }%
+  {%
+    \ifdefempty{\@glsacronymlists}%
+    {%
+      \DeclareAcronymList{\acronymtype}%
+    }%
+    {}%
+    \SetGenericNewAcronym
+    \GlsUseAcrStyleDefs{#1}%
+    \@for\@gls@type:=\@glsacronymlists\do{%
+      \defglsentryfmt[\@gls@type]{\GlsUseAcrEntryDispStyle{#1}}%
+    }%
+  }%
+}
+\newcommand*{\newacronymstyle}[3]{%
+  \ifcsdef{@glsacr@dispstyle@#1}%
+  {%
+    \PackageError{glossaries}{Acronym style `#1' already exists}{}%
+  }%
+  {%
+    \csdef{@glsacr@dispstyle@#1}{#2}%
+    \csdef{@glsacr@styledefs@#1}{#3}%
+  }%
+}
+\newcommand*{\GlsUseAcrEntryDispStyle}[1]{\csuse{@glsacr@dispstyle@#1}}
+\newcommand*{\GlsUseAcrStyleDefs}[1]{\csuse{@glsacr@styledefs@#1}}
+\newacronymstyle{long-short}%
+{%
+  \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}%
+}%
+{%
+  \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+  \renewcommand*{\genacrfullformat}[2]{%
+   \glsentrylong{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshort{##1}})%
+  }%
+  \renewcommand*{\Genacrfullformat}[2]{%
+   \Glsentrylong{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshort{##1}})%
+  }%
+  \renewcommand*{\genplacrfullformat}[2]{%
+   \glsentrylongpl{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshortpl{##1}})%
+  }%
+  \renewcommand*{\Genplacrfullformat}[2]{%
+   \Glsentrylongpl{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshortpl{##1}})%
+  }%
+  \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
+  \renewcommand*{\acronymsort}[2]{##1}%
+  \renewcommand*{\acronymfont}[1]{##1}%
+  \renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\newacronymstyle{short-long}%
+{%
+  \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}%
+}%
+{%
+  \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+  \renewcommand*{\genacrfullformat}[2]{%
+   \protect\firstacronymfont{\glsentryshort{##1}}##2\space
+   (\glsentrylong{##1})%
+  }%
+  \renewcommand*{\Genacrfullformat}[2]{%
+   \protect\firstacronymfont{\Glsentryshort{##1}}##2\space
+   (\glsentrylong{##1})%
+  }%
+  \renewcommand*{\genplacrfullformat}[2]{%
+   \protect\firstacronymfont{\glsentryshortpl{##1}}##2\space
+   (\glsentrylongpl{##1})%
+  }%
+  \renewcommand*{\Genplacrfullformat}[2]{%
+   \protect\firstacronymfont{\Glsentryshortpl{##1}}##2\space
+   (\glsentrylongpl{##1})%
+  }%
+  \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
+  \renewcommand*{\acronymsort}[2]{##1}%
+  \renewcommand*{\acronymfont}[1]{##1}%
+  \renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\newacronymstyle{long-sc-short}%
+{%
+  \GlsUseAcrEntryDispStyle{long-short}%
+}%
+{%
+  \GlsUseAcrStyleDefs{long-short}%
+  \renewcommand{\acronymfont}[1]{\textsc{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+}
+\newacronymstyle{long-sm-short}%
+{%
+  \GlsUseAcrEntryDispStyle{long-short}%
+}%
+{%
+  \GlsUseAcrStyleDefs{long-short}%
+  \renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\newacronymstyle{sc-short-long}%
+{%
+  \GlsUseAcrEntryDispStyle{short-long}%
+}%
+{%
+  \GlsUseAcrStyleDefs{short-long}%
+  \renewcommand{\acronymfont}[1]{\textsc{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+}
+\newacronymstyle{sm-short-long}%
+{%
+  \GlsUseAcrEntryDispStyle{short-long}%
+}%
+{%
+  \GlsUseAcrStyleDefs{short-long}%
+  \renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\newacronymstyle{long-short-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{long-short}%
+}%
+{%
+  \GlsUseAcrStyleDefs{long-short}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{long-sc-short-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{long-sc-short}%
+}%
+{%
+  \GlsUseAcrStyleDefs{long-sc-short}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{long-sm-short-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{long-sm-short}%
+}%
+{%
+  \GlsUseAcrStyleDefs{long-sm-short}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{short-long-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{short-long}%
+}%
+{%
+  \GlsUseAcrStyleDefs{short-long}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{sc-short-long-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{sc-short-long}%
+}%
+{%
+  \GlsUseAcrStyleDefs{sc-short-long}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{sm-short-long-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{sm-short-long}%
+}%
+{%
+  \GlsUseAcrStyleDefs{sm-short-long}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{dua}%
+{%
+  \ifdefempty\glscustomtext
+  {%
+    \ifglshaslong{\glslabel}%
+    {%
+      \glsifplural
+      {%
+        \glscapscase
+        {%
+          \glsentrylongpl{\glslabel}\glsinsert
+        }%
+        {%
+          \Glsentrylongpl{\glslabel}\glsinsert
+        }%
+        {%
+          \mfirstucMakeUppercase
+            {\glsentrylongpl{\glslabel}\glsinsert}%
+        }%
+      }%
+      {%
+        \glscapscase
+        {%
+          \glsentrylong{\glslabel}\glsinsert
+        }%
+        {%
+          \Glsentrylong{\glslabel}\glsinsert
+        }%
+        {%
+          \mfirstucMakeUppercase
+            {\glsentrylong{\glslabel}\glsinsert}%
+        }%
+      }%
+    }%
+    {%
+      \glsgenentryfmt
+    }%
+  }%
+  {\glscustomtext\glsinsert}%
+}%
+{%
+  \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+  \renewcommand*{\acrfullfmt}[3]{%
+    \glslink[##1]{##2}{\glsentryshort{##2}##3\space
+      (\acronymfont{\glsentryshort{##2}})}}%
+  \renewcommand*{\Acrfullfmt}[3]{%
+    \glslink[##1]{##2}{\Glsentrylong{##2}##3\space
+      (\acronymfont{\glsentryshort{##2}})}}%
+  \renewcommand*{\ACRfullfmt}[3]{%
+    \glslink[##1]{##2}{%
+      \mfirstucMakeUppercase{\glsentrylong{##2}##3\space
+      (\acronymfont{\glsentryshort{##2}})}}}%
+  \renewcommand*{\acrfullplfmt}[3]{%
+    \glslink[##1]{##2}{\glsentryshortpl{##2}##3\space
+      (\acronymfont{\glsentryshortpl{##2}})}}%
+  \renewcommand*{\Acrfullplfmt}[3]{%
+    \glslink[##1]{##2}{\Glsentryshortpl{##2}##3\space
+      (\acronymfont{\glsentryshortpl{##2}})}}%
+  \renewcommand*{\ACRfullplfmt}[3]{%
+    \glslink[##1]{##2}{%
+      \mfirstucMakeUppercase{\glsentrylongpl{##2}##3\space
+      (\acronymfont{\glsentryshortpl{##2}})}}}%
+  \renewcommand*{\glsentryfull}[1]{%
+    \glsentrylong{##1}\space(\acronymfont{\glsentryshort{##1}})%
+  }%
+  \renewcommand*{\Glsentryfull}[1]{%
+    \Glsentrylong{##1}\space(\acronymfont{\glsentryshort{##1}})%
+  }%
+  \renewcommand*{\glsentryfullpl}[1]{%
+    \glsentrylongpl{##1}\space(\acronymfont{\glsentryshortpl{##1}})%
+  }%
+  \renewcommand*{\Glsentryfullpl}[1]{%
+    \Glsentrylongpl{##1}\space(\acronymfont{\glsentryshortpl{##1}})%
+  }%
+  \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}%
+  \renewcommand*{\acronymsort}[2]{##1}%
+  \renewcommand*{\acronymfont}[1]{##1}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}
+\newacronymstyle{dua-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{dua}%
+}%
+{%
+  \GlsUseAcrStyleDefs{dua}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentrylong{##1}}}
+  \renewcommand*{\acronymsort}[2]{##2}%
+}%
+\newacronymstyle{footnote}%
+{%
+  \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}%
+}%
+{%
+  \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}%
+  \glshyperfirstfalse
+  \renewcommand*{\genacrfullformat}[2]{%
+   \protect\firstacronymfont{\glsentryshort{##1}}##2%
+   \protect\footnote{\glsentrylong{##1}}%
+  }%
+  \renewcommand*{\Genacrfullformat}[2]{%
+   \firstacronymfont{\Glsentryshort{##1}}##2%
+   \protect\footnote{\glsentrylong{##1}}%
+  }%
+  \renewcommand*{\genplacrfullformat}[2]{%
+   \protect\firstacronymfont{\glsentryshortpl{##1}}##2%
+   \protect\footnote{\glsentrylongpl{##1}}%
+  }%
+  \renewcommand*{\Genplacrfullformat}[2]{%
+   \protect\firstacronymfont{\Glsentryshortpl{##1}}##2%
+   \protect\footnote{\glsentrylongpl{##1}}%
+  }%
+  \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}%
+  \renewcommand*{\acronymsort}[2]{##1}%
+  \renewcommand*{\acronymfont}[1]{##1}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+  \renewcommand*{\acrfullfmt}[3]{%
+    \glslink[##1]{##2}{\acronymfont{\glsentryshort{##2}}##3\space
+      (\glsentrylong{##2})}}%
+  \renewcommand*{\Acrfullfmt}[3]{%
+    \glslink[##1]{##2}{\acronymfont{\Glsentryshort{##2}}##3\space
+      (\glsentrylong{##2})}}%
+  \renewcommand*{\ACRfullfmt}[3]{%
+    \glslink[##1]{##2}{%
+      \mfirstucMakeUppercase{\acronymfont{\glsentryshort{##2}}##3\space
+      (\glsentrylong{##2})}}}%
+  \renewcommand*{\acrfullplfmt}[3]{%
+    \glslink[##1]{##2}{\acronymfont{\glsentryshortpl{##2}}##3\space
+      (\glsentrylongpl{##2})}}%
+  \renewcommand*{\Acrfullplfmt}[3]{%
+    \glslink[##1]{##2}{\acronymfont{\Glsentryshortpl{##2}}##3\space
+      (\glsentrylongpl{##2})}}%
+  \renewcommand*{\ACRfullplfmt}[3]{%
+    \glslink[##1]{##2}{%
+      \mfirstucMakeUppercase{\acronymfont{\glsentryshortpl{##2}}##3\space
+      (\glsentrylongpl{##2})}}}%
+  \renewcommand*{\glsentryfull}[1]{%
+     \acronymfont{\glsentryshort{##1}}\space(\glsentrylong{##1})}%
+  \renewcommand*{\Glsentryfull}[1]{%
+     \acronymfont{\Glsentryshort{##1}}\space(\glsentrylong{##1})}%
+  \renewcommand*{\glsentryfullpl}[1]{%
+     \acronymfont{\glsentryshortpl{##1}}\space(\glsentrylongpl{##1})}%
+  \renewcommand*{\Glsentryfullpl}[1]{%
+     \acronymfont{\Glsentryshortpl{##1}}\space(\glsentrylongpl{##1})}%
+}
+\newacronymstyle{footnote-sc}%
+{%
+  \GlsUseAcrEntryDispStyle{footnote}%
+}%
+{%
+  \GlsUseAcrStyleDefs{footnote}%
+  \renewcommand{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
+  \renewcommand{\acronymfont}[1]{\textsc{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
+}%
+\newacronymstyle{footnote-sm}%
+{%
+  \GlsUseAcrEntryDispStyle{footnote}%
+}%
+{%
+  \GlsUseAcrStyleDefs{footnote}%
+  \renewcommand{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}
+  \renewcommand{\acronymfont}[1]{\textsmaller{##1}}%
+  \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
+}%
+\newacronymstyle{footnote-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{footnote}%
+}%
+{%
+  \GlsUseAcrStyleDefs{footnote}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{footnote-sc-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{footnote-sc}%
+}%
+{%
+  \GlsUseAcrStyleDefs{footnote-sc}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newacronymstyle{footnote-sm-desc}%
+{%
+  \GlsUseAcrEntryDispStyle{footnote-sm}%
+}%
+{%
+  \GlsUseAcrStyleDefs{footnote-sm}%
+  \renewcommand*{\GenericAcronymFields}{}%
+  \renewcommand*{\acronymsort}[2]{##2}%
+  \renewcommand*{\acronymentry}[1]{%
+    \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}%
+}
+\newcommand*{\DefineAcronymSynonyms}{%
+  \let\acs\acrshort
+  \let\Acs\Acrshort
+  \let\acsp\acrshortpl
+  \let\Acsp\Acrshortpl
+  \let\acl\acrlong
+  \let\aclp\acrlongpl
+  \let\Acl\Acrlong
+  \let\Aclp\Acrlongpl
+  \let\acf\acrfull
+  \let\acfp\acrfullpl
+  \let\Acf\Acrfull
+  \let\Acfp\Acrfullpl
+  \let\ac\gls
+  \let\Ac\Gls
+  \let\acp\glspl
+  \let\Acp\Glspl
+}
+\ifglsacrshortcuts
+  \DefineAcronymSynonyms
+\fi
 \newcommand*{\SetDefaultAcronymDisplayStyle}[1]{%
   \defglsentryfmt[#1]{\glsgenentryfmt}%
 }
@@ -5171,23 +5768,27 @@ false,nolabel,autolabel}[nolabel]{%
 }
 \newcommand*{\SetDescriptionFootnoteAcronymDisplayStyle}[1]{%
   \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}}%
-          }%
-       }%
-     }%
+    \ifdefempty\glscustomtext
+    {%
+      \ifglsused{\glslabel}%
+      {%
+        \acronymfont{\glsgenentryfmt}%
+      }%
+      {%
+        \firstacronymfont{\glsgenentryfmt}%
+        \ifglshassymbol{\glslabel}%
+        {%
+          \expandafter\protect\expandafter\acrfootnote\expandafter
+           {\@gls@link@opts}{\@gls@link@label}%
+           {%
+            \glsifplural
+              {\glsentrysymbolplural{\glslabel}}%
+              {\glsentrysymbol{\glslabel}}%
+           }%
+        }%
+      }%
+    }%
+    {\glscustomtext\glsinsert}%
   }%
 }
 \newcommand*{\DescriptionFootnoteNewAcronymDef}{%
@@ -5329,31 +5930,35 @@ false,nolabel,autolabel}[nolabel]{%
 }%
 \newcommand*{\SetDescriptionAcronymDisplayStyle}[1]{%
   \defglsentryfmt[#1]{%
-    \ifglsused{\glslabel}%
+    \ifdefempty\glscustomtext
     {%
-      \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}}})%
-        }%
-        {}%
+      \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}}})%
+          }%
+          {}%
+      }%
     }%
+    {\glscustomtext\glsinsert}%
   }%
 }
 \newcommand*{\DescriptionNewAcronymDef}{%
@@ -5423,26 +6028,30 @@ false,nolabel,autolabel}[nolabel]{%
 }%
 \newcommand*{\SetFootnoteAcronymDisplayStyle}[1]{%
   \defglsentryfmt[#1]{%
-    \let\gls@org@insert\glsinsert
-    \let\glsinsert\@empty
-    \ifglsused{\glslabel}%
-    {%
-      \acronymfont{\glsgenentryfmt}\gls@org@insert
-    }%
+    \ifdefempty\glscustomtext
     {%
-      \firstacronymfont{\glsgenentryfmt}\gls@org@insert
-      \ifglshaslong{\glslabel}%
+      \let\gls@org@insert\glsinsert
+      \let\glsinsert\@empty
+      \ifglsused{\glslabel}%
       {%
-        \expandafter\protect\expandafter\acrfootnote\expandafter
-         {\@gls@link@opts}{\@gls@link@label}%
-         {%
-          \glsifplural
-            {\glsentrylongpl{\glslabel}}%
-            {\glsentrylong{\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}}%
+           }%
+        }%
+        {}%
       }%
-      {}%
     }%
+    {\glscustomtext\glsinsert}%
   }%
 }
 \newcommand*{\FootnoteNewAcronymDef}{%
@@ -5527,31 +6136,35 @@ false,nolabel,autolabel}[nolabel]{%
 }
 \newcommand*{\SetSmallAcronymDisplayStyle}[1]{%
   \defglsentryfmt[#1]{%
-    \let\gls@org@insert\glsinsert
-    \let\glsinsert\@empty
-    \ifglsused{\glslabel}%
-    {%
-      \acronymfont{\glsgenentryfmt}\gls@org@insert
-    }%
+    \ifdefempty\glscustomtext
     {%
-      \glsgenentryfmt
-      \ifglshassymbol{\glslabel}%
+      \let\gls@org@insert\glsinsert
+      \let\glsinsert\@empty
+      \ifglsused{\glslabel}%
       {%
-        \glsifplural
-        {%
-          \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}%
-        }%
+        \acronymfont{\glsgenentryfmt}\gls@org@insert
+      }%
+      {%
+        \glsgenentryfmt
+        \ifglshassymbol{\glslabel}%
         {%
-          \def\@glo@symbol{\glsentrysymbol{\glslabel}}%
+          \glsifplural
+          {%
+            \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}%
+          }%
+          {%
+            \def\@glo@symbol{\glsentrysymbol{\glslabel}}%
+          }%
+          \space
+            (\glscapscase
+            {\firstacronymfont{\@glo@symbol}}%
+            {\firstacronymfont{\@glo@symbol}}%
+            {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})%
         }%
-        \space
-        (\glscapscase
-          {\firstacronymfont{\@glo@symbol}}%
-          {\firstacronymfont{\@glo@symbol}}%
-          {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})%
+        {}%
       }%
-      {}%
     }%
+    {\glscustomtext\glsinsert}%
   }%
 }
 \newcommand*{\SmallNewAcronymDef}{%
@@ -5779,27 +6392,6 @@ false,nolabel,autolabel}[nolabel]{%
     \SetCustomDisplayStyle{\@gls@type}%
   }%
 }
-\newcommand*{\DefineAcronymSynonyms}{%
-  \let\acs\acrshort
-  \let\Acs\Acrshort
-  \let\acsp\acrshortpl
-  \let\Acsp\Acrshortpl
-  \let\acl\acrlong
-  \let\aclp\acrlongpl
-  \let\Acl\Acrlong
-  \let\Aclp\Acrlongpl
-  \let\acf\acrfull
-  \let\acfp\acrfullpl
-  \let\Acf\Acrfull
-  \let\Acfp\Acrfullpl
-  \let\ac\gls
-  \let\Ac\Gls
-  \let\acp\glspl
-  \let\Acp\Glspl
-}
-\ifglsacrshortcuts
-  \DefineAcronymSynonyms
-\fi
 \RequirePackage{glossary-hypernav}
 \@gls@loadlist
 \@gls@loadlong
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index 1f8f9d6eb79..f6791eb582a 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, 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.
+%%  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, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.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