glossaries update, including makeglossaries.bat in bin/win32 (4mar08)

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

15 files changed, 1224 insertions, 134 deletions

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
new file mode 100644
index 00000000000..11ebed0f117
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Danish.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-Danish.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{Danish}
+\providetranslation{Glossary}{Ordliste}
+\providetranslation{Acronyms}{Akronymer}
+\providetranslation{Notation (glossaries)}{Symbolforklaring}
+\providetranslation{Description (glossaries)}{Beskrivelse}
+\providetranslation{Symbol (glossaries)}{Symbol}
+\providetranslation{Page List (glossaries)}{Side}
+\providetranslation{Symbols (glossaries)}{Symboler}
+\providetranslation{Numbers (glossaries)}{Tal}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Danish.dict'.
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
new file mode 100644
index 00000000000..abfff1740e5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Dutch.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-Dutch.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{Dutch}
+\providetranslation{Glossary}{Woordenlijst}
+\providetranslation{Acronyms}{Acroniemen}
+\providetranslation{Notation (glossaries)}{Benaming}
+\providetranslation{Description (glossaries)}{Beschrijving}
+\providetranslation{Symbol (glossaries)}{Symbool}
+\providetranslation{Page List (glossaries)}{Pagina's}
+\providetranslation{Symbols (glossaries)}{Symbolen}
+\providetranslation{Numbers (glossaries)}{Cijfers}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Dutch.dict'.
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
new file mode 100644
index 00000000000..64140682399
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-English.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-English.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{English}
+\providetranslation{Glossary}{Glossary}
+\providetranslation{Acronyms}{Acronyms}
+\providetranslation{Notation (glossaries)}{Notation}
+\providetranslation{Description (glossaries)}{Description}
+\providetranslation{Symbol (glossaries)}{Symbol}
+\providetranslation{Page List (glossaries)}{Page List}
+\providetranslation{Symbols (glossaries)}{Symbols}
+\providetranslation{Numbers (glossaries)}{Numbers}
+\endinput
+%%
+%% End of file `glossaries-dictionary-English.dict'.
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
new file mode 100644
index 00000000000..41e36266967
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-French.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-French.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{French}
+\providetranslation{Glossary}{Glossaire}
+\providetranslation{Acronyms}{Acronymes}
+\providetranslation{Notation (glossaries)}{Terme}
+\providetranslation{Description (glossaries)}{Description}
+\providetranslation{Symbol (glossaries)}{Symbole}
+\providetranslation{Page List (glossaries)}{Pages}
+\providetranslation{Symbols (glossaries)}{Symboles}
+\providetranslation{Numbers (glossaries)}{Nombres}
+\endinput
+%%
+%% End of file `glossaries-dictionary-French.dict'.
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
new file mode 100644
index 00000000000..03ce4a53d80
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-German.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-German.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{German}
+\providetranslation{Glossary}{Glossar}
+\providetranslation{Acronyms}{Akronyme}
+\providetranslation{Notation (glossaries)}{Bezeichnung}
+\providetranslation{Description (glossaries)}{Beschreibung}
+\providetranslation{Symbol (glossaries)}{Symbol}
+\providetranslation{Page List (glossaries)}{Seiten}
+\providetranslation{Symbols (glossaries)}{Symbole}
+\providetranslation{Numbers (glossaries)}{Zahlen}
+\endinput
+%%
+%% End of file `glossaries-dictionary-German.dict'.
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
new file mode 100644
index 00000000000..72f5e8f3e2c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Irish.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-Irish.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{Irish}
+\providetranslation{Glossary}{Gluais}
+\providetranslation{Acronyms}{Acrainmneacha}
+\providetranslation{Notation (glossaries)}{Ciall}
+\providetranslation{Description (glossaries)}{Tuairisc}
+\providetranslation{Symbol (glossaries)}{Comhartha}
+\providetranslation{Page List (glossaries)}{Leathanaigh}
+\providetranslation{Symbols (glossaries)}{Comhartha\'{\i}}
+\providetranslation{Numbers (glossaries)}{Uimhreacha}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Irish.dict'.
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
new file mode 100644
index 00000000000..f12f26816ce
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Italian.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-Italian.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{Italian}
+\providetranslation{Glossary}{Glossario}
+\providetranslation{Acronyms}{Acronimi}
+\providetranslation{Notation (glossaries)}{Nomenclatura}
+\providetranslation{Description (glossaries)}{Descrizione}
+\providetranslation{Symbol (glossaries)}{Simbolo}
+\providetranslation{Page List (glossaries)}{Elenco delle pagine}
+\providetranslation{Symbols (glossaries)}{Simboli}
+\providetranslation{Numbers (glossaries)}{Numeri}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Italian.dict'.
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
new file mode 100644
index 00000000000..b364df126b0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Magyar.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-Magyar.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{Magyar}
+\providetranslation{Glossary}{Sz\'ojegyz\'ek}
+\providetranslation{Acronyms}{Bet\H uszavak}
+\providetranslation{Notation (glossaries)}{Kifejez\'es}
+\providetranslation{Description (glossaries)}{Magyar\'azat}
+\providetranslation{Symbol (glossaries)}{Jel\"ol\'es}
+\providetranslation{Page List (glossaries)}{Oldalsz\'am}
+\providetranslation{Symbols (glossaries)}{Jelek}
+\providetranslation{Numbers (glossaries)}{Sz\'amjegyek}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Magyar.dict'.
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
new file mode 100644
index 00000000000..1579534bbed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Spanish.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-dictionary-Spanish.dict,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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         \~}
+\ProvidesDictionary{glossaries-dictionary}{Spanish}
+\providetranslation{Glossary}{Glosario}
+\providetranslation{Acronyms}{Siglas}
+\providetranslation{Notation (glossaries)}{Entrada}
+\providetranslation{Description (glossaries)}{Descripci\'on}
+\providetranslation{Symbol (glossaries)}{S\'{\i}mbolo}
+\providetranslation{Page List (glossaries)}{Lista de p\'aginas}
+\providetranslation{Symbols (glossaries)}{S\'{\i}mbolos}
+\providetranslation{Numbers (glossaries)}{N\'umeros}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Spanish.dict'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/glossaries-babel.sty
new file mode 100644
index 00000000000..695e13dc5a2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/glossaries-babel.sty
@@ -0,0 +1,137 @@
+%%
+%% This is file `glossaries-babel.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx  (with options: `glossaries-babel.sty,package')
+%% 
+%%  glossaries.dtx
+%%  Copyright 2008 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%% 
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   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-babel}[2008/02/22 v1.0 (NLCT)]
+\addto\captionsenglish{%
+\renewcommand*{\glossaryname}{Glossary}%
+\renewcommand*{\acronymname}{Acronyms}%
+\renewcommand*{\entryname}{Notation}%
+\renewcommand*{\descriptionname}{Description}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Page List}%
+\renewcommand*{\glssymbolsgroupname}{Symbols}%
+\renewcommand*{\glsnumbersgroupname}{Numbers}%
+}%
+\addto\captionsgerman{%
+\renewcommand*{\glossaryname}{Glossar}%
+\renewcommand*{\acronymname}{Akronyme}%
+\renewcommand*{\entryname}{Bezeichnung}%
+\renewcommand*{\descriptionname}{Beschreibung}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Seiten}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Zahlen}}
+\addto\captionsngerman{%
+\renewcommand*{\glossaryname}{Glossar}%
+\renewcommand*{\acronymname}{Akronyme}%
+\renewcommand*{\entryname}{Bezeichnung}%
+\renewcommand*{\descriptionname}{Beschreibung}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Seiten}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Zahlen}}
+\addto\captionsitalian{%
+\renewcommand*{\glossaryname}{Glossario}%
+\renewcommand*{\acronymname}{Acronimi}%
+\renewcommand*{\entryname}{Nomenclatura}%
+\renewcommand*{\descriptionname}{Descrizione}%
+\renewcommand*{\symbolname}{Simbolo}%
+\renewcommand*{\pagelistname}{Elenco delle pagine}%
+\renewcommand*{\glssymbolsgroupname}{Simboli}%
+\renewcommand*{\glsnumbersgroupname}{Numeri}}
+\addto\captionsdutch{%
+\renewcommand*{\glossaryname}{Woordenlijst}%
+\renewcommand*{\acronymname}{Acroniemen}%
+\renewcommand*{\entryname}{Benaming}%
+\renewcommand*{\descriptionname}{Beschrijving}%
+\renewcommand*{\symbolname}{Symbool}%
+\renewcommand*{\pagelistname}{Pagina's}%
+\renewcommand*{\glssymbolsgroupname}{Symbolen}%
+\renewcommand*{\glsnumbersgroupname}{Cijfers}}
+\addto\captionsspanish{%
+\renewcommand*{\glossaryname}{Glosario}%
+\renewcommand*{\acronymname}{Siglas}%
+\renewcommand*{\entryname}{Entrada}%
+\renewcommand*{\descriptionname}{Descripci\'on}%
+\renewcommand*{\symbolname}{S\'{\i}mbolo}%
+\renewcommand*{\pagelistname}{Lista de p\'aginas}%
+\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}%
+\renewcommand*{\glsnumbersgroupname}{N\'umeros}}
+\addto\captionsfrench{%
+\renewcommand*{\glossaryname}{Glossaire}%
+\renewcommand*{\acronymname}{Acronymes}%
+\renewcommand*{\entryname}{Terme}%
+\renewcommand*{\descriptionname}{Description}%
+\renewcommand*{\symbolname}{Symbole}%
+\renewcommand*{\pagelistname}{Pages}%
+\renewcommand*{\glssymbolsgroupname}{Symboles}%
+\renewcommand*{\glsnumbersgroupname}{Nombres}}
+\addto\captionsdanish{%
+\renewcommand*{\glossaryname}{Ordliste}%
+\renewcommand*{\acronymname}{Akronymer}%
+\renewcommand*{\entryname}{Symbolforklaring}%
+\renewcommand*{\descriptionname}{Beskrivelse}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Side}%
+\renewcommand*{\glssymbolsgroupname}{Symboler}%
+\renewcommand*{\glsnumbersgroupname}{Tal}}
+\addto\captionsirish{%
+\renewcommand*{\glossaryname}{Gluais}%
+\renewcommand*{\acronymname}{Acrainmneacha}%
+\renewcommand*{\entryname}{Ciall}%
+\renewcommand*{\descriptionname}{Tuairisc}%
+\renewcommand*{\symbolname}{Comhartha}%
+\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}%
+\renewcommand*{\pagelistname}{Leathanaigh}%
+\renewcommand*{\glsnumbersgroupname}{Uimhreacha}}
+\addto\captionsmagyar{%
+\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}%
+\renewcommand*{\acronymname}{Bet\H uszavak}%
+\renewcommand*{\entryname}{Kifejez\'es}%
+\renewcommand*{\descriptionname}{Magyar\'azat}%
+\renewcommand*{\symbolname}{Jel\"ol\'es}%
+\renewcommand*{\pagelistname}{Oldalsz\'am}%
+\renewcommand*{\glssymbolsgroupname}{Jelek}%
+\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}%
+}
+\endinput
+%%
+%% End of file `glossaries-babel.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
index 2e390251c1c..e75d00d56eb 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossaries.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2007 Nicola Talbot
+%%  Copyright 2008 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,16 +39,31 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2007/10/13 v1.08 (NLCT)]
+\ProvidesPackage{glossaries}[2008/02/22 v1.11 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
-\RequirePackage{xspace}
+\RequirePackage{amsgen}
 \define@boolkey{glossaries.sty}[gls]{toc}[true]{}
+\define@boolkey{glossaries.sty}[gls]{numberline}[true]{}
 \@ifundefined{chapter}{\newcommand*{\@@glossarysec}{section}}{%
 \newcommand*{\@@glossarysec}{chapter}}
 \define@choicekey{glossaries.sty}{section}{part,chapter,section,%
 subsection,subsubsection,paragraph,subparagraph}[section]{%
 \renewcommand*{\@@glossarysec}{#1}}
+\newcommand*{\@@glossarysecstar}{*}
+\newcommand*{\@@glossaryseclabel}{}
+\define@choicekey{glossaries.sty}{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{\@glo@type}}%
+\fi}
 \newcommand*{\@glossary@default@style}{list}
 \define@key{glossaries.sty}{style}{%
 \renewcommand*{\@glossary@default@style}{#1}}
@@ -92,6 +107,23 @@ name=true]{%
 \renewcommand*{\@gls@sanitizesymbol}{}%
 }{\setkeys[gls]{sanitize}{#1}}%
 }
+\define@boolkey{glossaries.sty}[gls]{translate}[true]{}
+\glstranslatefalse
+\@ifpackageloaded{translator}{\glstranslatetrue}{%
+\@ifpackageloaded{babel}{\glstranslatetrue}{}}
+\define@boolkey{glossaries.sty}[glsacr]{footnote}[true]{%
+\ifthenelse{\boolean{glsacrdescription}}{}%
+{\renewcommand*{\@gls@sanitizedesc}{}}%
+}
+\define@boolkey{glossaries.sty}[glsacr]{description}[true]{%
+  \renewcommand*{\@gls@sanitizesymbol}{}%
+}
+\define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{%
+  \renewcommand*{\@gls@sanitizesymbol}{}%
+}
+\define@boolkey{glossaries.sty}[glsacr]{dua}[true]{%
+  \renewcommand*{\@gls@sanitizesymbol}{}%
+}
 \ProcessOptionsX
 \ifthenelse{\equal{\glscounter}{section}}{%
 \@ifundefined{chapter}{}{%
@@ -106,100 +138,19 @@ name=true]{%
 \providecommand*{\pagelistname}{Page List}
 \providecommand*{\glssymbolsgroupname}{Symbols}
 \providecommand*{\glsnumbersgroupname}{Numbers}
-\@ifpackageloaded{babel}{%
-\addto\captionsenglish{%
-\renewcommand*{\glossaryname}{Glossary}%
-\renewcommand*{\acronymname}{Acronyms}%
-\renewcommand*{\entryname}{Notation}%
-\renewcommand*{\descriptionname}{Description}%
-\renewcommand*{\symbolname}{Symbol}%
-\renewcommand*{\pagelistname}{Page List}%
-\renewcommand*{\glssymbolsgroupname}{Symbols}%
-\renewcommand*{\glsnumbersgroupname}{Numbers}%
-}%
-\addto\captionsgerman{%
-\renewcommand*{\glossaryname}{Glossar}%
-\renewcommand*{\acronymname}{Akronyme}%
-\renewcommand*{\entryname}{Bezeichnung}%
-\renewcommand*{\descriptionname}{Beschreibung}%
-\renewcommand*{\symbolname}{Symbol}%
-\renewcommand*{\pagelistname}{Seiten}%
-\renewcommand*{\glssymbolsgroupname}{Symbole}%
-\renewcommand*{\glsnumbersgroupname}{Zahlen}}
-\addto\captionsngerman{%
-\renewcommand*{\glossaryname}{Glossar}%
-\renewcommand*{\acronymname}{Akronyme}%
-\renewcommand*{\entryname}{Bezeichnung}%
-\renewcommand*{\descriptionname}{Beschreibung}%
-\renewcommand*{\symbolname}{Symbol}%
-\renewcommand*{\pagelistname}{Seiten}%
-\renewcommand*{\glssymbolsgroupname}{Symbole}%
-\renewcommand*{\glsnumbersgroupname}{Zahlen}}
-\addto\captionsitalian{%
-\renewcommand*{\glossaryname}{Glossario}%
-\renewcommand*{\acronymname}{Acronimi}%
-\renewcommand*{\entryname}{Nomenclatura}%
-\renewcommand*{\descriptionname}{Descrizione}%
-\renewcommand*{\symbolname}{Simbolo}%
-\renewcommand*{\pagelistname}{Elenco delle pagine}%
-\renewcommand*{\glssymbolsgroupname}{Simboli}%
-\renewcommand*{\glsnumbersgroupname}{Numeri}}
-\addto\captionsdutch{%
-\renewcommand*{\glossaryname}{Woordenlijst}%
-\renewcommand*{\acronymname}{Acroniemen}%
-\renewcommand*{\entryname}{Benaming}%
-\renewcommand*{\descriptionname}{Beschrijving}%
-\renewcommand*{\symbolname}{Symbool}%
-\renewcommand*{\pagelistname}{Pagina's}%
-\renewcommand*{\glssymbolsgroupname}{Symbolen}%
-\renewcommand*{\glsnumbersgroupname}{Cijfers}}
-\addto\captionsspanish{%
-\renewcommand*{\glossaryname}{Glosario}%
-\renewcommand*{\acronymname}{Siglas}%
-\renewcommand*{\entryname}{Entrada}%
-\renewcommand*{\descriptionname}{Descripci\'on}%
-\renewcommand*{\symbolname}{S\'{\i}mbolo}%
-\renewcommand*{\pagelistname}{Lista de p\'aginas}%
-\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}%
-\renewcommand*{\glsnumbersgroupname}{N\'umeros}}
-\addto\captionsfrench{%
-\renewcommand*{\glossaryname}{Glossaire}%
-\renewcommand*{\acronymname}{Acronymes}%
-\renewcommand*{\entryname}{Terme}%
-\renewcommand*{\descriptionname}{Description}%
-\renewcommand*{\symbolname}{Symbole}%
-\renewcommand*{\pagelistname}{Pages}%
-\renewcommand*{\glssymbolsgroupname}{Symboles}%
-\renewcommand*{\glsnumbersgroupname}{Nombres}}
-\addto\captionsdanish{%
-\renewcommand*{\glossaryname}{Ordliste}%
-\renewcommand*{\acronymname}{Akronymer}%
-\renewcommand*{\entryname}{Symbolforklaring}%
-\renewcommand*{\descriptionname}{Beskrivelse}%
-\renewcommand*{\symbolname}{Symbol}%
-\renewcommand*{\pagelistname}{Side}%
-\renewcommand*{\glssymbolsgroupname}{Symboler}%
-\renewcommand*{\glsnumbersgroupname}{Tal}}
-\addto\captionsirish{%
-\renewcommand*{\glossaryname}{Gluais}%
-\renewcommand*{\acronymname}{Acrainmneacha}% 'Acronyms'
-\renewcommand*{\entryname}{Ciall}%
-\renewcommand*{\descriptionname}{Tuairisc}%
-\renewcommand*{\symbolname}{Comhartha}%
-\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}%OR
-\renewcommand*{\pagelistname}{Leathanaigh}%
-\renewcommand*{\glsnumbersgroupname}{Uimhreacha}}
-\addto\captionsmagyar{%
-\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}%
-\renewcommand*{\acronymname}{Bet\H uszavak}%
-\renewcommand*{\entryname}{Kifejez\'es}%
-\renewcommand*{\descriptionname}{Magyar\'azat}%
-\renewcommand*{\symbolname}{Jel\"ol\'es}%
-\renewcommand*{\pagelistname}{Oldalsz\'am}%
-\renewcommand*{\glssymbolsgroupname}{Jelek}%
-\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}%
-}
-}{}
+\ifglstranslate
+\@ifpackageloaded{translator}{\usedictionary{glossaries-dictionary}%
+\renewcommand*{\glossaryname}{\translate{Glossary}}%
+\renewcommand*{\acronymname}{\translate{Acronyms}}%
+\renewcommand*{\entryname}{\translate{Notation (glossaries)}}%
+\renewcommand*{\descriptionname}{\translate{Description (glossaries)}}%
+\renewcommand*{\symbolname}{\translate{Symbol (glossaries)}}%
+\renewcommand*{\pagelistname}{\translate{Page List (glossaries)}}%
+\renewcommand*{\glssymbolsgroupname}{\translate{Symbols (glossaries)}}%
+\renewcommand*{\glsnumbersgroupname}{\translate{Numbers (glossaries)}}%
+}{%
+\@ifpackageloaded{babel}{\RequirePackage{glossaries-babel}}{}}
+\fi
 \newcommand*{\glspostdescription}{.}
 \providecommand*{\istfilename}{\jobname.ist}
 \newcommand*{\@istfilename}[1]{}
@@ -217,19 +168,38 @@ name=true]{%
 \@glossarysection{#1}{#2}}{\@p@glossarysection{#1}{#2}}%
 \@mkboth{\glossarytoctitle}{\glossarytoctitle}%
 }
+\newcommand*{\setglossarysection}[1]{%
+\setkeys{glossaries.sty}{section=#1}}
 \newcommand*{\@glossarysection}[2]{%
-\csname\@@glossarysec\endcsname*{#2}%
-\@gls@toc{#1}{\@@glossarysec}}
+\ifx\@@glossarysecstar\@empty
+  \csname\@@glossarysec\endcsname{#2}%
+\else
+  \csname\@@glossarysec\endcsname*{#2}%
+  \@gls@toc{#1}{\@@glossarysec}%
+\fi
+\@@glossaryseclabel}
 \newcommand*{\@p@glossarysection}[2]{%
 \gls@doclearpage
-\phantomsection\@gls@toc{#1}{\@@glossarysec}%
-\csname\@@glossarysec\endcsname*{#2}}
+\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}}{%
 \@ifundefined{cleardoublepage}{\clearpage}{\cleardoublepage}}{}%
 }
 \newcommand*{\@gls@toc}[2]{%
-\ifglstoc \addcontentsline{toc}{#2}{#1}\fi}
+\ifglstoc
+  \ifglsnumberline
+    \addcontentsline{toc}{#2}{\numberline{}#1}%
+  \else
+    \addcontentsline{toc}{#2}{#1}%
+  \fi
+\fi}
 \newcommand*{\forallglossaries}[3][\@glo@types]{%
 \@for#2:=#1\do{\ifthenelse{\equal{#2}{}}{}{#3}}}
 \newcommand*{\forglsentries}[3][\glsdefaulttype]{%
@@ -475,7 +445,7 @@ counter as its value}}{%
 \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}%
 }
 \def\@gls@updatechecked#1\@nil#2{\def#2{#1}}
-\toksdef\@gls@tmpb=2
+\newtoks\@gls@tmpb
 \def\@gls@checkquote#1"#2"#3\null{%
 \@gls@tmpb=\expandafter{\@gls@checkedmkidx}%
 \toks@={#1}%
@@ -669,93 +639,405 @@ counter as its value}}{%
 \newcommand*{\gls}{\@ifstar\@sgls\@gls}
 \newcommand*{\@sgls}[1][]{\@gls[hyper=false,#1]}
 \newcommand*{\@gls}[2][]{%
-\@ifnextchar[{\@gls@{#1}{#2}}{\@gls@{#1}{#2}[]}}
+\new@ifnextchar[{\@gls@{#1}{#2}}{\@gls@{#1}{#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}{\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}}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\ifglsused{#2}{%
+  \@gls@link[#1]{#2}{\@glo@text}%
+}{%
+  \ifglsacrfootnote
+    \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+  \else
+    \@gls@link[#1]{#2}{\@glo@text}%
+  \fi
+}%
 \glsunset{#2}}%
-\xspace}
+}
 \newcommand*{\Gls}{\@ifstar\@sGls\@Gls}
 \newcommand*{\@sGls}[1][]{\@Gls[hyper=false,#1]}
 \newcommand*{\@Gls}[2][]{%
-\@ifnextchar[{\@Gls@{#1}{#2}}{\@Gls@{#1}{#2}[]}}
+\new@ifnextchar[{\@Gls@{#1}{#2}}{\@Gls@{#1}{#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}{\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}}}%
-\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+\ifglsused{#2}{%
+  \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}{%
+  \ifglsacrfootnote
+    \@gls@link[#1,hyper=false]{#2}{\expandafter\MakeUppercase\@glo@text}%
+  \else
+    \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+  \fi
+}%
 \glsunset{#2}}%
-\xspace}
+}
 \newcommand*{\GLS}{\@ifstar\@sGLS\@GLS}
 \newcommand*{\@sGLS}[1][]{\@GLS[hyper=false,#1]}
 \newcommand*{\@GLS}[2][]{%
-\@ifnextchar[{\@GLS@{#1}{#2}}{\@GLS@{#1}{#2}[]}}
+\new@ifnextchar[{\@GLS@{#1}{#2}}{\@GLS@{#1}{#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}{\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}}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\ifglsused{#2}{%
+  \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}{%
+  \ifglsacrfootnote
+    \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+  \else
+    \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+  \fi
+}%
 \glsunset{#2}}%
-\xspace}
+}
 \newcommand*{\glspl}{\@ifstar\@sglspl\@glspl}
 \newcommand*{\@sglspl}[1][]{\@glspl[hyper=false,#1]}
 \newcommand*{\@glspl}[2][]{%
-\@ifnextchar[{\@glspl@{#1}{#2}}{\@glspl@{#1}{#2}[]}}
+\new@ifnextchar[{\@glspl@{#1}{#2}}{\@glspl@{#1}{#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}{\protected@edef\@glo@text{%
 \csname gls@\@glo@type @display\endcsname
 {\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{%
 \protected@edef\@glo@text{%
 \csname gls@\@glo@type @displayfirst\endcsname
 {\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\ifglsused{#2}{%
+  \@gls@link[#1]{#2}{\@glo@text}%
+}{%
+  \ifglsacrfootnote
+    \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+  \else
+    \@gls@link[#1]{#2}{\@glo@text}%
+  \fi
+}%
 \glsunset{#2}}%
-\xspace}
+}
 \newcommand*{\Glspl}{\@ifstar\@sGlspl\@Glspl}
 \newcommand*{\@sGlspl}[1][]{\@Glspl[hyper=false,#1]}
 \newcommand*{\@Glspl}[2][]{%
-\@ifnextchar[{\@Glspl@{#1}{#2}}{\@Glspl@{#1}{#2}[]}}
+\new@ifnextchar[{\@Glspl@{#1}{#2}}{\@Glspl@{#1}{#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}{\protected@edef\@glo@text{%
 \csname gls@\@glo@type @display\endcsname
 {\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{%
 \protected@edef\@glo@text{%
 \csname gls@\@glo@type @displayfirst\endcsname
 {\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}%
-\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+\ifglsused{#2}{%
+  \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}{%
+  \ifglsacrfootnote
+    \@gls@link[#1,hyper=false]{#2}{\expandafter\MakeUppercase\@glo@text}%
+  \else
+    \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+  \fi
+}%
 \glsunset{#2}}%
-\xspace}
+}
 \newcommand*{\GLSpl}{\@ifstar\@sGLSpl\@GLSpl}
 \newcommand*{\@sGLSpl}[1][]{\@GLSpl[hyper=false,#1]}
 \newcommand*{\@GLSpl}[2][]{%
-\@ifnextchar[{\@GLSpl@{#1}{#2}}{\@GLSpl@{#1}{#2}[]}}
+\new@ifnextchar[{\@GLSpl@{#1}{#2}}{\@GLSpl@{#1}{#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}{\protected@edef\@glo@text{%
 \csname gls@\@glo@type @display\endcsname
 {\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{%
 \protected@edef\@glo@text{%
 \csname gls@\@glo@type @displayfirst\endcsname
 {\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\ifglsused{#2}{%
+  \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}{%
+  \ifglsacrfootnote
+    \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+  \else
+    \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+  \fi
+}%
 \glsunset{#2}}%
-\xspace}
+}
+\newcommand*{\glstext}{\@ifstar\@sglstext\@glstext}
+\newcommand*{\@sglstext}[1][]{\@glstext[hyper=false,#1]}
+\newcommand*{\@glstext}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
+\newcommand*{\@sGLStext}[1][]{\@GLStext[hyper=false,#1]}
+\newcommand*{\@GLStext}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
+\newcommand*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
+\newcommand*{\@sGlstext}[1][]{\@Glstext[hyper=false,#1]}
+\newcommand*{\@Glstext}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
+\newcommand*{\@sglsfirst}[1][]{\@glsfirst[hyper=false,#1]}
+\newcommand*{\@glsfirst}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
+\newcommand*{\@sGlsfirst}[1][]{\@Glsfirst[hyper=false,#1]}
+\newcommand*{\@Glsfirst}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
+\newcommand*{\@sGLSfirst}[1][]{\@GLSfirst[hyper=false,#1]}
+\newcommand*{\@GLSfirst}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
+\newcommand*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
+\newcommand*{\@sglsplural}[1][]{\@glsplural[hyper=false,#1]}
+\newcommand*{\@glsplural}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
+\newcommand*{\@sGlsplural}[1][]{\@Glsplural[hyper=false,#1]}
+\newcommand*{\@Glsplural}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
+\newcommand*{\@sGLSplural}[1][]{\@GLSplural[hyper=false,#1]}
+\newcommand*{\@GLSplural}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
+\newcommand*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
+\newcommand*{\@sglsfirstplural}[1][]{\@glsfirstplural[hyper=false,#1]}
+\newcommand*{\@glsfirstplural}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
+\newcommand*{\@sGlsfirstplural}[1][]{\@Glsfirstplural[hyper=false,#1]}
+\newcommand*{\@Glsfirstplural}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
+\newcommand*{\@sGLSfirstplural}[1][]{\@GLSfirstplural[hyper=false,#1]}
+\newcommand*{\@GLSfirstplural}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
+\newcommand*{\glsname}{\@ifstar\@sglsname\@glsname}
+\newcommand*{\@sglsname}[1][]{\@glsname[hyper=false,#1]}
+\newcommand*{\@glsname}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
+\newcommand*{\@sGlsname}[1][]{\@Glsname[hyper=false,#1]}
+\newcommand*{\@Glsname}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
+\newcommand*{\@sGLSname}[1][]{\@GLSname[hyper=false,#1]}
+\newcommand*{\@GLSname}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
+\newcommand*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
+\newcommand*{\@sglsdesc}[1][]{\@glsdesc[hyper=false,#1]}
+\newcommand*{\@glsdesc}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
+\newcommand*{\@sGlsdesc}[1][]{\@Glsdesc[hyper=false,#1]}
+\newcommand*{\@Glsdesc}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
+\newcommand*{\@sGLSdesc}[1][]{\@GLSdesc[hyper=false,#1]}
+\newcommand*{\@GLSdesc}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
+\newcommand*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
+\newcommand*{\@sglssymbol}[1][]{\@glssymbol[hyper=false,#1]}
+\newcommand*{\@glssymbol}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\@glo@text}%
+}%
+}
+\newcommand*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
+\newcommand*{\@sGlssymbol}[1][]{\@Glssymbol[hyper=false,#1]}
+\newcommand*{\@Glssymbol}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}%
+}%
+}
+\newcommand*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
+\newcommand*{\@sGLSsymbol}[1][]{\@GLSsymbol[hyper=false,#1]}
+\newcommand*{\@GLSsymbol}[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{%
+\csname gls@\@glo@type @display\endcsname
+{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+}%
+}
 \newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname}
 \newcommand*{\Glsentryname}[1]{\expandafter
 \MakeUppercase\csname glo@#1@name\endcsname}
@@ -976,15 +1258,211 @@ style `#1' undefined}{}}{%
 \newcommand*{\hypersc}[1]{\textsc{\glshypernumber{#1}}}
 \newcommand*{\hyperemph}[1]{\emph{\glshypernumber{#1}}}
 \ifglsacronym
-\newglossary[alg]{acronym}{acr}{acn}{\acronymname}
-\renewcommand{\acronymtype}{acronym}
-\defglsdisplay[acronym]{#1#4}\defglsdisplayfirst[acronym]{#1#4}
+  \newglossary[alg]{acronym}{acr}{acn}{\acronymname}
+  \renewcommand{\acronymtype}{acronym}
+  \defglsdisplay[acronym]{#1#4}
+  \defglsdisplayfirst[acronym]{#1#4}
 \fi
 \newcommand{\newacronym}[4][]{%
 \newglossaryentry{#2}{type=\acronymtype,%
 name={#3},description={#4},text={#3},%
 first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}}
 \@onlypreamble{\newacronym}
+\newcommand*{\acrshort}[2][]{%
+\new@ifnextchar[{\@acrshort{#1}{#2}}{\@acrshort{#1}{#2}[]}}
+\def\@acrshort#1#2[#3]{\@glstext@{#1}{#2}[#3]}
+\newcommand*{\Acrshort}[2][]{%
+\new@ifnextchar[{\@Acrshort{#1}{#2}}{\@Acrshort{#1}{#2}[]}}
+\def\@Acrshort#1#2[#3]{\@glstext@{#1}{#2}[#3]}
+\newcommand*{\ACRshort}[2][]{%
+\new@ifnextchar[{\@ACRshort{#1}{#2}}{\@ACRshort{#1}{#2}[]}}
+\def\@ACRshort#1#2[#3]{\@glstext@{#1}{#2}[#3]}
+\newcommand*{\acrlong}[2][]{%
+\new@ifnextchar[{\@acrlong{#1}{#2}}{\@acrlong{#1}{#2}[]}}
+\def\@acrlong#1#2[#3]{\@glsdesc@{#1}{#2}[#3]}
+\newcommand*{\Acrlong}[2][]{%
+\new@ifnextchar[{\@Acrlong{#1}{#2}}{\@Acrlong{#1}{#2}[]}}
+\def\@Acrlong#1#2[#3]{\@glsdesc@{#1}{#2}[#3]}
+\newcommand*{\ACRlong}[2][]{%
+\new@ifnextchar[{\@ACRlong{#1}{#2}}{\@ACRlong{#1}{#2}[]}}
+\def\@ACRlong#1#2[#3]{\@glsdesc@{#1}{#2}[#3]}
+\newcommand*{\acrfull}[2][]{%
+\new@ifnextchar[{\@acrfull{#1}{#2}}{\@acrfull{#1}{#2}[]}}
+\def\@acrfull#1#2[#3]{\@glsfirst@{#1}{#2}[#3]}
+\newcommand*{\Acrfull}[2][]{%
+\new@ifnextchar[{\@Acrfull{#1}{#2}}{\@Acrfull{#1}{#2}[]}}
+\def\@Acrfull#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]}
+\newcommand*{\ACRfull}[2][]{%
+\new@ifnextchar[{\@ACRfull{#1}{#2}}{\@ACRfull{#1}{#2}[]}}
+\def\@ACRfull#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]}
+\newcommand{\acronymfont}[1]{#1}
+\ifglsacrdescription
+  \ifglsacrfootnote
+    \renewcommand{\newacronym}[4][]{%
+    \newglossaryentry{#2}{type=\acronymtype,%
+    name={#3},%
+    symbol={#4},%
+    #1}}
+    \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}}
+    \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}}
+    \def\@ACRshort#1#2[#3]{\acronymfont{\@GLStext@{#1}{#2}[#3]}}
+    \def\@acrlong#1#2[#3]{\@glssymbol@{#1}{#2}[#3]}
+    \def\@Acrlong#1#2[#3]{\@Glssymbol@{#1}{#2}[#3]}
+    \def\@ACRlong#1#2[#3]{\@GLSsymbol@{#1}{#2}[#3]}
+    \def\@acrfull#1#2[#3]{\@glssymbol@{#1}{#2}[#3]
+      (\acronymfont{\@glstext@{#1}{#2}[#3]})}
+    \def\@Acrfull#1#2[#3]{\@Glssymbol@{#1}{#2}[#3]
+      (\acronymfont{\@glstext@{#1}{#2}[#3]})}
+    \def\@ACRfull#1#2[#3]{\@GLSsymbol@{#1}{#2}[#3]
+      (\acronymfont{\@GLStext@{#1}{#2}[#3]})}
+    \defglsdisplayfirst[\acronymtype]{%
+      \acronymfont{#1}#4\noexpand\footnote{%
+      \noexpand\glslink[\@gls@link@opts]{\@gls@link@label}{#3}}}%
+    \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}%
+    \ifglsacrsmallcaps
+       \renewcommand*{\acronymfont}[1]{\textsc{#1}}
+    \fi
+    \ifglsacrdua
+       \PackageError{glossaries}{Option clash: `footnote' and `dua'
+        can't both be set}{}%
+    \fi
+  \else
+    \ifglsacrdua
+      \ifglsacrsmallcaps
+        \PackageError{glossaries}{Option clash: `smallcaps' and `dua'
+         can't both be set}{}%
+      \fi
+      \renewcommand{\newacronym}[4][]{%
+      \newglossaryentry{#2}{type=\acronymtype,%
+      name={#4},%
+      first={#4},%
+      symbol={#3},%
+      #1}}
+      \def\@acrshort#1#2[#3]{\acronymfont{\@glssymbol@{#1}{#2}[#3]}}
+      \def\@Acrshort#1#2[#3]{\acronymfont{\@Glssymbol@{#1}{#2}[#3]}}
+      \def\@ACRshort#1#2[#3]{\acronymfont{\@GLSsymbol@{#1}{#2}[#3]}}
+      \def\@acrlong#1#2[#3]{\@glsfirst@{#1}{#2}[#3]}
+      \def\@Acrlong#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]}
+      \def\@ACRlong#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]}
+      \def\@acrfull#1#2[#3]{\@glsfirst@{#1}{#2}[#3]
+        (\acronymfont{\@glssymbol@{#1}{#2}[#3]})}
+      \def\@Acrfull#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]
+        (\acronymfont{\@glssymbol@{#1}{#2}[#3]})}
+      \def\@ACRfull#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]
+        (\acronymfont{\@GLSsymbol@{#1}{#2}[#3]})}
+      \defglsdisplayfirst[\acronymtype]{#1#4}
+      \defglsdisplay[\acronymtype]{#1#4}
+    \else
+      \renewcommand{\newacronym}[4][]{%
+      \newglossaryentry{#2}{type=\acronymtype,%
+      name={#3},%
+      first={#4},%
+      symbol={#3},%
+      #1}}
+      \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}}
+      \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}}
+      \def\@ACRshort#1#2[#3]{\acronymfont{\@GLStext@{#1}{#2}[#3]}}
+      \def\@acrlong#1#2[#3]{\@glsfirst@{#1}{#2}[#3]}
+      \def\@Acrlong#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]}
+      \def\@ACRlong#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]}
+      \def\@acrfull#1#2[#3]{\@glsfirst@{#1}{#2}[#3]
+        (\acronymfont{\@glssymbol@{#1}{#2}[#3]})}
+      \def\@Acrfull#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]
+        (\acronymfont{\@glssymbol@{#1}{#2}[#3]})}
+      \def\@ACRfull#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]
+        (\acronymfont{\@GLSsymbol@{#1}{#2}[#3]})}
+      \defglsdisplayfirst[\acronymtype]{#1#4 (\acronymfont{#3})}
+      \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}
+      \ifglsacrsmallcaps
+         \renewcommand{\acronymfont}[1]{\textsc{#1}}
+      \fi
+    \fi
+  \fi
+\else
+  \ifglsacrfootnote
+    \renewcommand{\newacronym}[4][]{%
+    \newglossaryentry{#2}{type=\acronymtype,%
+    name={#3},%
+    description={#4},%
+    #1}}
+    \defglsdisplayfirst[\acronymtype]{%
+    \acronymfont{#1}#4\noexpand\footnote{%
+       \noexpand\glslink[\@gls@link@opts]{\@gls@link@label}{#2}}}%
+    \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}%
+    \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}}
+    \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}}
+    \def\@ACRshort#1#2[#3]{\acronymfont{\@GLStext@{#1}{#2}[#3]}}
+    \def\@acrlong#1#2[#3]{\@glsdesc@{#1}{#2}[#3]}
+    \def\@Acrlong#1#2[#3]{\@Glsdesc@{#1}{#2}[#3]}
+    \def\@ACRlong#1#2[#3]{\@GLSdesc@{#1}{#2}[#3]}
+    \def\@acrfull#1#2[#3]{\@glsdesc@{#1}{#2}[#3]
+      (\@glstext@{#1}{#2}[#3])}
+    \def\@Acrfull#1#2[#3]{\@Glsdesc@{#1}{#2}[#3]
+      (\@glstext@{#1}{#2}[#3])}
+    \def\@ACRfull#1#2[#3]{\@GLSdesc@{#1}{#2}[#3]
+      (\@GLStext@{#1}{#2}[#3])}
+    \ifglsacrsmallcaps
+       \renewcommand*{\acronymfont}[1]{\textsc{#1}}%
+    \fi
+    \ifglsacrdua
+       \PackageError{glossaries}{Option clash: `footnote' and `dua'
+       can't both be set}{}%
+    \fi
+  \else
+    \ifglsacrsmallcaps
+      \renewcommand{\newacronym}[4][]{%
+      \newglossaryentry{#2}{type=\acronymtype,%
+      name={#3},%
+      first={#4},%
+      description={#4},%
+      symbol={#3},%
+      #1}}
+      \defglsdisplayfirst[\acronymtype]{#1#4 (\acronymfont{#3})}
+      \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}
+      \renewcommand*{\acronymfont}[1]{\textsc{#1}}
+      \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}}
+      \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}}
+      \def\@ACRshort#1#2[#3]{\acronymfont{\@GLStext@{#1}{#2}[#3]}}
+      \def\@acrlong#1#2[#3]{\@glsfirst@{#1}{#2}[#3]}
+      \def\@Acrlong#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]}
+      \def\@ACRlong#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]}
+      \def\@acrfull#1#2[#3]{\@glsfirst@{#1}{#2}[#3]
+        (\acronymfont{\@glstext@{#1}{#2}[#3]})}
+      \def\@Acrfull#1#2[#3]{\@Glsfirst@{#1}{#2}[#3]
+        (\acronymfont{\@glstext@{#1}{#2}[#3]})}
+      \def\@ACRfull#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]
+        (\acronymfont{\@GLStext@{#1}{#2}[#3]})}
+      \ifglsacrdua
+        \PackageError{glossaries}{Option clash: `smallcaps' and `dua'
+        can't both be set}{}%
+      \fi
+    \else
+      \ifglsacrdua
+        \renewcommand{\newacronym}[4][]{%
+        \newglossaryentry{#2}{type=\acronymtype,%
+        name={#3},%
+        description={#4},%
+        text={#4},%
+        symbol={#3},%
+        #1}}
+        \defglsdisplayfirst[\acronymtype]{#1#4}
+        \defglsdisplay[\acronymtype]{#1#4}
+        \def\@acrshort#1#2[#3]{\@glssymbol@{#1}{#2}[#3]}
+        \def\@Acrshort#1#2[#3]{\@Glssymbol@{#1}{#2}[#3]}
+        \def\@ACRshort#1#2[#3]{\@GLSsymbol@{#1}{#2}[#3]}
+        \def\@acrlong#1#2[#3]{\@glstext@{#1}{#2}[#3]}
+        \def\@Acrlong#1#2[#3]{\@Glstext@{#1}{#2}[#3]}
+        \def\@ACRlong#1#2[#3]{\@GLStext@{#1}{#2}[#3]}
+        \def\@acrfull#1#2[#3]{\@glstext@{#1}{#2}[#3]
+          (\acronymfont{\@glssymbol@{#1}{#2}[#3]})}
+        \def\@Acrfull#1#2[#3]{\@Glstext@{#1}{#2}[#3]
+          (\acronymfont{\@glssymbol@{#1}{#2}[#3]})}
+        \def\@ACRfull#1#2[#3]{\@GLStext@{#1}{#2}[#3]
+          (\acronymfont{\@GLSsymbol@{#1}{#2}[#3]})}
+      \fi
+    \fi
+  \fi
+\fi
 \RequirePackage{glossary-hypernav}
 \RequirePackage{glossary-list}
 \RequirePackage{glossary-long}
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty
index 8e7e9b6d670..0b165f3f5c2 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-hypernav.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2007 Nicola Talbot
+%%  Copyright 2008 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
index fe07f6ae2ab..66bc2e17350 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-list.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2007 Nicola Talbot
+%%  Copyright 2008 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{glossary-list}[2007/10/04 v1.02 (NLCT)]
+\ProvidesPackage{glossary-list}[2008/02/16 v1.03 (NLCT)]
 \newglossarystyle{list}{%
 \renewenvironment{theglossary}{\begin{description}}{\end{description}}%
 \renewcommand*{\glossaryheader}{}%
@@ -69,6 +69,13 @@
 \item[]\glsnavigation}%
 \renewcommand*{\glsgroupheading}[1]{%
 \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}}
+\newlength\glslistdottedwidth
+\setlength{\glslistdottedwidth}{.5\linewidth}
+\newglossarystyle{listdotted}{%
+\glossarystyle{list}%
+\renewcommand*{\glossaryentryfield}[5]{%
+\item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##1}{##2}%
+\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}}
 \endinput
 %%
 %% End of file `glossary-list.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty
index b74e44fe426..c17680f813c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-long.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2007 Nicola Talbot
+%%  Copyright 2008 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty
index 80deb72b175..b05bbd1cf8a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty
@@ -7,7 +7,7 @@
 %% glossaries.dtx  (with options: `glossary-super.sty,package')
 %% 
 %%  glossaries.dtx
-%%  Copyright 2007 Nicola Talbot
+%%  Copyright 2008 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries.perl.
+%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z