summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty146
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty408
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty6
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict52
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty2
17 files changed, 522 insertions, 118 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
new file mode 100644
index 00000000000..656439ffc09
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -0,0 +1,146 @@
+%%
+%% 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%%
+%% \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}%
+}
+\addto\captionspolish{%
+\renewcommand*{\glossaryname}{S{\l}ownik termin\'ow}%
+\renewcommand*{\acronymname}{Skr\'ot}%
+\renewcommand*{\entryname}{Termin}%
+\renewcommand*{\descriptionname}{Opis}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Strony}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Liczby}}
+\endinput
+%%
+%% End of file `glossaries-babel.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 0387464125f..9eb6e8071f1 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,10 +39,12 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2008/03/08 v1.12 (NLCT)]
+\ProvidesPackage{glossaries}[2008/05/10 v1.13 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
+\@ifpackageloaded{babel}{\IfFileExists{translator.sty}{%
+ \RequirePackage{translator}}{}}{}
\RequirePackage{amsgen}
\define@boolkey{glossaries.sty}[gls]{toc}[true]{}
\define@boolkey{glossaries.sty}[gls]{numberline}[true]{}
@@ -122,9 +124,13 @@ name=true]{%
\define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{%
\renewcommand*{\@gls@sanitizesymbol}{}%
}
+\define@boolkey{glossaries.sty}[glsacr]{smaller}[true]{%
+ \renewcommand*{\@gls@sanitizesymbol}{}%
+}
\define@boolkey{glossaries.sty}[glsacr]{dua}[true]{%
\renewcommand*{\@gls@sanitizesymbol}{}%
}
+\define@boolkey{glossaries.sty}[glsacr]{shortcuts}[true]{}
\ProcessOptionsX
\ifthenelse{\equal{\glscounter}{section}}{%
\@ifundefined{chapter}{}{%
@@ -139,18 +145,23 @@ name=true]{%
\providecommand*{\pagelistname}{Page List}
\providecommand*{\glssymbolsgroupname}{Symbols}
\providecommand*{\glsnumbersgroupname}{Numbers}
+\newcommand*{\glspluralsuffix}{s}
\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}}{}}
+ \@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}
@@ -296,9 +307,9 @@ counter as its value}}{%
\def\@glo@symbol{\relax}%
\def\@glo@symbolplural{\@glo@symbol}%
\def\@glo@text{\@glo@name}%
-\def\@glo@plural{\@glo@text s}%
-\def\@glo@first{\@glo@text}%
-\def\@glo@firstplural{\@glo@first s}%
+\def\@glo@plural{\@glo@text\glspluralsuffix}%
+\def\@glo@first{\relax}%
+\def\@glo@firstplural{\relax}%
\def\@glo@sort{\@glo@name}%
\def\@glo@counter{\@gls@getcounter{\@glo@type}}%
\setkeys{glossentry}{#2}%
@@ -309,6 +320,18 @@ in it}}{%
\protected@edef\@glolist@{\csname glolist@\@glo@type\endcsname}%
\expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}%
}%
+\if\relax\@glo@firstplural\relax%
+ \if\relax\@glo@first\relax%
+ \def\@glo@firstplural{\@glo@plural}%
+ \def\@glo@first{\@glo@text}%
+ \else
+ \def\@glo@firstplural{\@glo@first\glspluralsuffix}%
+ \fi
+\else
+ \if\relax\@glo@first\relax%
+ \def\@glo@first{\@glo@text}%
+ \fi
+\fi
\expandafter\protected@xdef\csname glo@#1@text\endcsname{\@glo@text}%
\expandafter\protected@xdef\csname glo@#1@plural\endcsname{\@glo@plural}%
\expandafter\protected@xdef\csname glo@#1@first\endcsname{\@glo@first}%
@@ -332,7 +355,6 @@ in it}}{%
\let\csname ifglo@#1@flag\endcsname\iftrue}%
\csname glo@#1@flagfalse\endcsname
}}
-\@onlypreamble{\newglossaryentry}
\newcommand*{\glsreset}[1]{%
\glsdoifexists{#1}{%
\expandafter\global\csname glo@#1@flagfalse\endcsname}}
@@ -821,7 +843,7 @@ counter as its value}}{%
\def\@glstext@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrytext{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
@@ -831,7 +853,7 @@ counter as its value}}{%
\def\@GLStext@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrytext{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
@@ -842,7 +864,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrytext{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
@@ -852,7 +874,7 @@ counter as its value}}{%
\def\@glsfirst@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryfirst{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
@@ -863,7 +885,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryfirst{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
@@ -873,7 +895,7 @@ counter as its value}}{%
\def\@GLSfirst@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryfirst{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
@@ -883,7 +905,7 @@ counter as its value}}{%
\def\@glsplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
@@ -894,7 +916,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryplural{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
@@ -904,7 +926,7 @@ counter as its value}}{%
\def\@GLSplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
@@ -914,7 +936,7 @@ counter as its value}}{%
\def\@glsfirstplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryfirstplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
@@ -925,7 +947,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryfirstplural{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
@@ -935,7 +957,7 @@ counter as its value}}{%
\def\@GLSfirstplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryfirstplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glsname}{\@ifstar\@sglsname\@glsname}
@@ -945,7 +967,7 @@ counter as its value}}{%
\def\@glsname@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryname{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
@@ -956,7 +978,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryname{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
@@ -966,7 +988,7 @@ counter as its value}}{%
\def\@GLSname@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentryname{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
@@ -976,7 +998,7 @@ counter as its value}}{%
\def\@glsdesc@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrydesc{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
@@ -987,7 +1009,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrydesc{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
@@ -997,7 +1019,7 @@ counter as its value}}{%
\def\@GLSdesc@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrydesc{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
@@ -1007,7 +1029,7 @@ counter as its value}}{%
\def\@glsdescplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrydescplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
@@ -1018,7 +1040,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrydescplural{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
@@ -1028,7 +1050,7 @@ counter as its value}}{%
\def\@GLSdescplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrydescplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
@@ -1038,7 +1060,7 @@ counter as its value}}{%
\def\@glssymbol@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrysymbol{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
@@ -1049,7 +1071,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrysymbol{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
@@ -1059,7 +1081,7 @@ counter as its value}}{%
\def\@GLSsymbol@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrysymbol{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
@@ -1069,7 +1091,7 @@ counter as its value}}{%
\def\@glssymbolplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrysymbolplural{#2}}%
-\@gls@link[#1]{#2}{\@glo@text}%
+\@gls@link[#1]{#2}{\@glo@text#3}%
}%
}
\newcommand*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
@@ -1080,7 +1102,7 @@ counter as its value}}{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrysymbolplural{#2}}%
\@gls@link[#1]{#2}{%
- \expandafter\makefirstuc\expandafter{\@glo@text}}%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
}%
}
\newcommand*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
@@ -1090,7 +1112,7 @@ counter as its value}}{%
\def\@GLSsymbolplural@#1#2[#3]{%
\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
\protected@edef\@glo@text{\glsentrysymbolplural{#2}}%
-\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
\newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname}
@@ -1337,11 +1359,12 @@ style `#1' undefined}{}}{%
\fi
\newcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
-name={#3},description={#4},text={#3},descriptionplural={#4s},%
-first={#4 (#3)},plural={#3s},%
+name={#3},description={#4},text={#3},%
+descriptionplural={#4\acrpluralsuffix},%
+first={#4 (#3)},plural={#3\acrpluralsuffix},%
firstplural={\@glo@descplural\space (\@glo@plural)},%
#1}}
-\@onlypreamble{\newacronym}
+\newcommand*{\acrpluralsuffix}{\glspluralsuffix}
\newcommand*{\glsshortkey}{text}
\newcommand*{\glsshortpluralkey}{plural}
\newcommand*{\glslongkey}{description}
@@ -1351,19 +1374,37 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\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]}
+\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]}
+\def\@ACRshort#1#2[#3]{\@GLStext@{#1}{#2}[#3]}
+\newcommand*{\acrshortpl}[2][]{%
+\new@ifnextchar[{\@acrshortpl{#1}{#2}}{\@acrshortpl{#1}{#2}[]}}
+\def\@acrshortpl#1#2[#3]{\@glsplural@{#1}{#2}[#3]}
+\newcommand*{\Acrshortpl}[2][]{%
+\new@ifnextchar[{\@Acrshortpl{#1}{#2}}{\@Acrshortpl{#1}{#2}[]}}
+\def\@Acrshortpl#1#2[#3]{\@Glsplural@{#1}{#2}[#3]}
+\newcommand*{\ACRshortpl}[2][]{%
+\new@ifnextchar[{\@ACRshortpl{#1}{#2}}{\@ACRshortpl{#1}{#2}[]}}
+\def\@ACRshortpl#1#2[#3]{\@GLSplural@{#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]}
+\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]}
+\def\@ACRlong#1#2[#3]{\@GLSdesc@{#1}{#2}[#3]}
+\newcommand*{\acrlongpl}[2][]{%
+\new@ifnextchar[{\@acrlongpl{#1}{#2}}{\@acrlongpl{#1}{#2}[]}}
+\def\@acrlongpl#1#2[#3]{\@glsdescplural@{#1}{#2}[#3]}
+\newcommand*{\Acrlongpl}[2][]{%
+\new@ifnextchar[{\@Acrlongpl{#1}{#2}}{\@Acrlongpl{#1}{#2}[]}}
+\def\@Acrlongpl#1#2[#3]{\@Glsdescplural@{#1}{#2}[#3]}
+\newcommand*{\ACRlongpl}[2][]{%
+\new@ifnextchar[{\@ACRlongpl{#1}{#2}}{\@ACRlongpl{#1}{#2}[]}}
+\def\@ACRlongpl#1#2[#3]{\@GLSdescplural@{#1}{#2}[#3]}
\newcommand*{\acrfull}[2][]{%
\new@ifnextchar[{\@acrfull{#1}{#2}}{\@acrfull{#1}{#2}[]}}
\def\@acrfull#1#2[#3]{\@glsfirst@{#1}{#2}[#3]}
@@ -1373,38 +1414,69 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\newcommand*{\ACRfull}[2][]{%
\new@ifnextchar[{\@ACRfull{#1}{#2}}{\@ACRfull{#1}{#2}[]}}
\def\@ACRfull#1#2[#3]{\@GLSfirst@{#1}{#2}[#3]}
+\newcommand*{\acrfullpl}[2][]{%
+\new@ifnextchar[{\@acrfullpl{#1}{#2}}{\@acrfullpl{#1}{#2}[]}}
+\def\@acrfullpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]}
+\newcommand*{\Acrfullpl}[2][]{%
+\new@ifnextchar[{\@Acrfullpl{#1}{#2}}{\@Acrfullpl{#1}{#2}[]}}
+\def\@Acrfullpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]}
+\newcommand*{\ACRfullpl}[2][]{%
+\new@ifnextchar[{\@ACRfullpl{#1}{#2}}{\@ACRfullpl{#1}{#2}[]}}
+\def\@ACRfullpl#1#2[#3]{\@GLSfirstplural@{#1}{#2}[#3]}
\newcommand{\acronymfont}[1]{#1}
\ifglsacrdescription
\ifglsacrfootnote
\renewcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
- name={#3},%
+ name={\acronymfont{#3}},%
+ sort={#3},%
+ text={#3},%
+ plural={#3\acrpluralsuffix},%
symbol={#4},%
+ symbolplural={#4\acrpluralsuffix},%
#1}}
-\def\glsshortkey{text}%
-\def\glsshortpluralkey{plural}%
-\def\glslongkey{symbol}%
-\def\glslongpluralkey{symbolplural}%
- \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\protect\noexpand\footnote{%
- \noexpand\protect\noexpand\glslink
- [\@gls@link@opts]{\@gls@link@label}{#3}}}%
- \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}%
- \ifglsacrsmallcaps
- \renewcommand*{\acronymfont}[1]{\textsc{#1}}
- \fi
+ \def\glsshortkey{text}%
+ \def\glsshortpluralkey{plural}%
+ \def\glslongkey{symbol}%
+ \def\glslongpluralkey{symbolplural}%
+ \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\@acrshortpl#1#2[#3]{\acronymfont{\@glsplural@{#1}{#2}[#3]}}
+ \def\@Acrshortpl#1#2[#3]{\acronymfont{\@Glsplural@{#1}{#2}[#3]}}
+ \def\@ACRshortpl#1#2[#3]{\acronymfont{\@GLSplural@{#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\@acrlongpl#1#2[#3]{\@glssymbolplural@{#1}{#2}[#3]}
+ \def\@Acrlongpl#1#2[#3]{\@Glssymbolplural@{#1}{#2}[#3]}
+ \def\@ACRlongpl#1#2[#3]{\@GLSsymbolplural@{#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]})}
+ \def\@acrfullpl#1#2[#3]{\@glssymbolplural@{#1}{#2}[#3]
+ (\acronymfont{\@glsplural@{#1}{#2}[#3]})}
+ \def\@Acrfullpl#1#2[#3]{\@Glssymbolplural@{#1}{#2}[#3]
+ (\acronymfont{\@glsplural@{#1}{#2}[#3]})}
+ \def\@ACRfullpl#1#2[#3]{\@GLSsymbolplural@{#1}{#2}[#3]
+ (\acronymfont{\@GLSplural@{#1}{#2}[#3]})}
+ \defglsdisplayfirst[\acronymtype]{%
+ \acronymfont{#1}#4\noexpand\protect\noexpand\footnote{%
+ \noexpand\protect\noexpand\glslink
+ [\@gls@link@opts]{\@gls@link@label}{#3}}}%
+ \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}%
+ \ifglsacrsmallcaps
+ \renewcommand*{\acronymfont}[1]{\textsc{#1}}%
+ \renewcommand*{\acrpluralsuffix}{%
+ \textup{\glspluralsuffix}}%
+ \else
+ \ifglsacrsmaller
+ \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \fi
+ \fi
\ifglsacrdua
\PackageError{glossaries}{Option clash: `footnote' and `dua'
can't both be set}{}%
@@ -1414,58 +1486,106 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\ifglsacrsmallcaps
\PackageError{glossaries}{Option clash: `smallcaps' and `dua'
can't both be set}{}%
+ \else
+ \ifglsacrsmaller
+ \PackageError{glossaries}{Option clash: `smaller' and `dua'
+ can't both be set}{}%
+ \fi
\fi
\renewcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
- name={#4},%
+ name={\acronymfont#4},%
+ sort={#4},
first={#4},%
+ firstplural={#4\acrpluralsuffix},%
+ text={#4},%
+ plural={#4\acrpluralsuffix},%
symbol={#3},%
+ symbolplural={#3\acrpluralsuffix},%
#1}}
-\def\glsshortkey{symbol}%
-\def\glsshortpluralkey{symbolplural}%
-\def\glslongkey{first}%
-\def\glslongpluralkey{plural}%
+ \def\glsshortkey{symbol}%
+ \def\glsshortpluralkey{symbolplural}%
+ \def\glslongkey{first}%
+ \def\glslongpluralkey{plural}%
\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\@acrshortpl#1#2[#3]{%
+ \acronymfont{\@glssymbolplural@{#1}{#2}[#3]}}
+ \def\@Acrshortpl#1#2[#3]{%
+ \acronymfont{\@Glssymbolplural@{#1}{#2}[#3]}}
+ \def\@ACRshortpl#1#2[#3]{%
+ \acronymfont{\@GLSsymbolplural@{#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\@acrlongpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]}
+ \def\@Acrlongpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]}
+ \def\@ACRlongpl#1#2[#3]{\@GLSfirstplural@{#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]})}
+ \def\@acrfullpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@glssymbolplural@{#1}{#2}[#3]})}
+ \def\@Acrfullpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@glssymbolplural@{#1}{#2}[#3]})}
+ \def\@ACRfullpl#1#2[#3]{\@GLSfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@GLSsymbolplural@{#1}{#2}[#3]})}
\defglsdisplayfirst[\acronymtype]{#1#4}
\defglsdisplay[\acronymtype]{#1#4}
\else
\renewcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
- name={#3},%
+ name={\acronymfont{#3}},%
+ sort={#3},%
first={#4},%
+ firstplural={#4\acrpluralsuffix},%
+ text={#3},%
+ plural={#3\acrpluralsuffix},%
symbol={#3},%
+ symbolplural={#3\acrpluralsuffix},%
#1}}
-\def\glsshortkey{text}%
-\def\glsshortpluralkey{plural}%
-\def\glslongkey{first}%
-\def\glslongpluralkey{firstplural}%
+ \def\glsshortkey{text}%
+ \def\glsshortpluralkey{plural}%
+ \def\glslongkey{first}%
+ \def\glslongpluralkey{firstplural}%
\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\@acrshortpl#1#2[#3]{\acronymfont{\@glsplural@{#1}{#2}[#3]}}
+ \def\@Acrshortpl#1#2[#3]{\acronymfont{\@Glsplural@{#1}{#2}[#3]}}
+ \def\@ACRshortpl#1#2[#3]{\acronymfont{\@GLSplural@{#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\@acrlongpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]}
+ \def\@Acrlongpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]}
+ \def\@ACRlongpl#1#2[#3]{\@GLSfirstplural@{#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]})}
+ \def\@acrfullpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@glssymbolplural@{#1}{#2}[#3]})}
+ \def\@Acrfullpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@glssymbolplural@{#1}{#2}[#3]})}
+ \def\@ACRfullpl#1#2[#3]{\@GLSfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@GLSsymbolplural@{#1}{#2}[#3]})}
\defglsdisplayfirst[\acronymtype]{#1#4 (\acronymfont{#3})}
\defglsdisplay[\acronymtype]{\acronymfont{#1}#4}
\ifglsacrsmallcaps
\renewcommand{\acronymfont}[1]{\textsc{#1}}
+ \renewcommand*{\acrpluralsuffix}{%
+ \textup{\glspluralsuffix}}%
+ \else
+ \ifglsacrsmaller
+ \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \fi
\fi
\fi
\fi
@@ -1473,8 +1593,12 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\ifglsacrfootnote
\renewcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
- name={#3},%
+ name={\acronymfont{#3}},%
+ sort={#3},%
+ text={#3},%
+ plural={#3\acrpluralsuffix},%
description={#4},%
+ descriptionplural={#4\acrpluralsuffix},%
#1}}
\def\glsshortkey{text}%
\def\glsshortpluralkey{plural}%
@@ -1488,85 +1612,165 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\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\@acrshortpl#1#2[#3]{\acronymfont{\@glsplural@{#1}{#2}[#3]}}
+ \def\@Acrshortpl#1#2[#3]{\acronymfont{\@Glsplural@{#1}{#2}[#3]}}
+ \def\@ACRshortpl#1#2[#3]{\acronymfont{\@GLSplural@{#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\@acrlongpl#1#2[#3]{\@glsdescplural@{#1}{#2}[#3]}
+ \def\@Acrlongpl#1#2[#3]{\@Glsdescplural@{#1}{#2}[#3]}
+ \def\@ACRlongpl#1#2[#3]{\@GLSdescplural@{#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])}
+ \def\@acrfullpl#1#2[#3]{\@glsdescplural@{#1}{#2}[#3]
+ (\@glsplural@{#1}{#2}[#3])}
+ \def\@Acrfullpl#1#2[#3]{\@Glsdesctext@{#1}{#2}[#3]
+ (\@glsplural@{#1}{#2}[#3])}
+ \def\@ACRfullpl#1#2[#3]{\@GLSdesctext@{#1}{#2}[#3]
+ (\@GLSplural@{#1}{#2}[#3])}
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{#1}}%
+ \renewcommand*{\acrpluralsuffix}{%
+ \textup{\glspluralsuffix}}%
+ \else
+ \ifglsacrsmaller
+ \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \fi
\fi
\ifglsacrdua
\PackageError{glossaries}{Option clash: `footnote' and `dua'
can't both be set}{}%
\fi
\else
- \ifglsacrsmallcaps
+ \ifthenelse{\boolean{glsacrsmallcaps}\or\boolean{glsacrsmaller}}{%
\renewcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
- name={#3},%
+ name={\acronymfont{#3}},%
+ sort={#3},%
+ text={#3},%
+ plural={#3\acrpluralsuffix},%
first={#4},%
+ firstplural={#4\acrpluralsuffix},%
description={#4},%
+ descriptionplural={#4\acrpluralsuffix},%
symbol={#3},%
+ symbolplural={#3\acrpluralsuffix},%
#1}}
-\def\glsshortkey{symbol}%
-\def\glsshortpluralkey{symbolplural}%
-\def\glslongkey{first}%
-\def\glslongpluralkey{firstplural}%
+ \def\glsshortkey{symbol}%
+ \def\glsshortpluralkey{symbolplural}%
+ \def\glslongkey{first}%
+ \def\glslongpluralkey{firstplural}%
\defglsdisplayfirst[\acronymtype]{#1#4 (\acronymfont{#3})}
\defglsdisplay[\acronymtype]{\acronymfont{#1}#4}
- \renewcommand*{\acronymfont}[1]{\textsc{#1}}
+ \ifglsacrsmallcaps
+ \renewcommand*{\acronymfont}[1]{\textsc{#1}}
+ \renewcommand*{\acrpluralsuffix}{%
+ \textup{\glspluralsuffix}}%
+ \else
+ \renewcommand*{\acronymfont}[1]{{\smaller #1}}
+ \fi
\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\@acrshortpl#1#2[#3]{\acronymfont{\@glsplural@{#1}{#2}[#3]}}
+ \def\@Acrshortpl#1#2[#3]{\acronymfont{\@Glsplural@{#1}{#2}[#3]}}
+ \def\@ACRshortpl#1#2[#3]{\acronymfont{\@GLSplural@{#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\@acrlongpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]}
+ \def\@Acrlongpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]}
+ \def\@ACRlongpl#1#2[#3]{\@GLSfirstplural@{#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]})}
+ \def\@acrfullpl#1#2[#3]{\@glsfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@glsplural@{#1}{#2}[#3]})}
+ \def\@Acrfullpl#1#2[#3]{\@Glsfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@glsplural@{#1}{#2}[#3]})}
+ \def\@ACRfullpl#1#2[#3]{\@GLSfirstplural@{#1}{#2}[#3]
+ (\acronymfont{\@GLSplural@{#1}{#2}[#3]})}
\ifglsacrdua
- \PackageError{glossaries}{Option clash: `smallcaps' and `dua'
- can't both be set}{}%
+ \ifglsacrsmallcaps
+ \PackageError{glossaries}{Option clash: `smallcaps' and `dua'
+ can't both be set}{}%
+ \else
+ \PackageError{glossaries}{Option clash: `smaller' and `dua'
+ can't both be set}{}%
+ \fi
\fi
- \else
+ }{%
\ifglsacrdua
\renewcommand{\newacronym}[4][]{%
\newglossaryentry{#2}{type=\acronymtype,%
name={#3},%
description={#4},%
+ descriptionplural={#4\acrpluralsuffix},%
text={#4},%
+ plural={#4\acrpluralsuffix},%
symbol={#3},%
+ symbolplural={#3\acrpluralsuffix},%
#1}}
-\def\glsshortkey{symbol}%
-\def\glsshortpluralkey{symbolplural}%
-\def\glslongkey{text}%
-\def\glslongpluralkey{plural}%
+ \def\glsshortkey{symbol}%
+ \def\glsshortpluralkey{symbolplural}%
+ \def\glslongkey{text}%
+ \def\glslongpluralkey{plural}%
\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\@acrshortpl#1#2[#3]{\@glssymbolplural@{#1}{#2}[#3]}
+ \def\@Acrshortpl#1#2[#3]{\@Glssymbolplural@{#1}{#2}[#3]}
+ \def\@ACRshortpl#1#2[#3]{\@GLSsymbolplural@{#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\@acrlongpl#1#2[#3]{\@glsplural@{#1}{#2}[#3]}
+ \def\@Acrlongpl#1#2[#3]{\@Glsplural@{#1}{#2}[#3]}
+ \def\@ACRlongpl#1#2[#3]{\@GLSplural@{#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]})}
+ \def\@acrfullpl#1#2[#3]{\@glsplural@{#1}{#2}[#3]
+ (\acronymfont{\@glssymbolplural@{#1}{#2}[#3]})}
+ \def\@Acrfullpl#1#2[#3]{\@Glsplural@{#1}{#2}[#3]
+ (\acronymfont{\@glssymbolplural@{#1}{#2}[#3]})}
+ \def\@ACRfullpl#1#2[#3]{\@GLSplural@{#1}{#2}[#3]
+ (\acronymfont{\@GLSsymbolplural@{#1}{#2}[#3]})}
\fi
- \fi
+ }%
\fi
\fi
+\ifglsacrshortcuts
+ \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
+\fi
\RequirePackage{glossary-hypernav}
\RequirePackage{glossary-list}
\RequirePackage{glossary-long}
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index 24c55288a1b..fee68259460 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \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{mfirstuc}[2008/03/08 v1.0 (NLCT)]
+\ProvidesPackage{mfirstuc}[2008/05/13 v1.01 (NLCT)]
\newif\if@glscs
\def\makefirstuc#1{%
\def\gls@argi{#1}%
@@ -71,6 +71,8 @@
\def\@gls@makefirstuc#1{\MakeUppercase #1}
\def\@gls@getbody#1#{\def\@gls@body{#1}\@gls@gobbletonil}
\def\@gls@gobbletonil#1\@nil{\def\@gls@rest{#1}}
+\newcommand*{\xmakefirstuc}[1]{%
+\expandafter\makefirstuc\expandafter{#1}}
\endinput
%%
%% End of file `mfirstuc.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
index 0f99fa88fe0..d323f4fce54 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
index 247ecb15e77..9260278bd44 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
index ad793008dde..ae0176873f1 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
index 28e2a790146..fc569e4c615 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
index ee7a2810ed1..451d3d63958 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
index 1bc102453c8..98d7fc6d95a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
index f8852c772bd..68903c327e3 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
index 55d3984c53a..02bc3d50ed9 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
new file mode 100644
index 00000000000..eb76529f778
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
@@ -0,0 +1,52 @@
+%%
+%% This is file `glossaries-dictionary-Polish.dict',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx (with options: `glossaries-dictionary-Polish.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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
+%%
+%% \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}{Polish}
+\providetranslation{Glossary}{S{\l}ownik termin\'ow}
+\providetranslation{Acronyms}{Skr\'ot}
+\providetranslation{Notation (glossaries)}{Termin}
+\providetranslation{Description (glossaries)}{Opis}
+\providetranslation{Symbol (glossaries)}{Symbol}
+\providetranslation{Page List (glossaries)}{Strony}
+\providetranslation{Symbols (glossaries)}{Symbole}
+\providetranslation{Numbers (glossaries)}{Liczby}
+\endinput
+%%
+%% End of file `glossaries-dictionary-Polish.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
index c19ee9274e5..17c72044495 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \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/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
index d37948d34f9..b79b1e8a822 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \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/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
index cb3a4964f6b..db784552c3e 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \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/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
index 630d47e31b5..ff84856213b 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \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
@@ -129,7 +129,7 @@
\renewcommand*{\glossaryheader}{%
\hline\bfseries\entryname&\bfseries\descriptionname&
\bfseries \symbolname&
-\bfseries\pagelistname\\\hline\endhead\hline\\\endfoot}%
+\bfseries\pagelistname\\\hline\endhead\hline\endfoot}%
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
index 88680332267..7de79f26b45 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -21,7 +21,7 @@
%%
%% The Current Maintainer of this work is Nicola Talbot.
%%
-%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-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.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl.
%%
%% \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