glossaries 3.01 (13apr11)

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

1 files changed, 98 insertions, 83 deletions

diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 76d7739d757..33ad66443ea 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2011/04/02 v3.0 (NLCT)]
+\ProvidesPackage{glossaries}[2011/04/12 v3.01 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -475,7 +475,7 @@ name=true]{%
 \newcommand*{\glsSetSuffixFF}[1]{%
   \renewcommand*{\gls@suffixFF}{#1}%
 }
-\ifcsdef{hyperlink}%
+\ifcsundef{hyperlink}%
 {%
   \newcommand*{\glsnumberformat}[1]{#1}%
 }%
@@ -1313,7 +1313,7 @@ name=true]{%
 \define@key{glslink}{format}{%
 \def\@glsnumberformat{#1}}
 \define@boolkey{glslink}{hyper}[true]{}
-\newcommand{\glslink}{%
+\newrobustcmd*{\glslink}{%
 \@ifstar\@sgls@link\@gls@@link}
 \newcommand*{\@sgls@link}[1][]{\@gls@@link[hyper=false,#1]}
 \newcommand*{\@gls@@link}[3][]{%
@@ -1723,7 +1723,7 @@ name=true]{%
 \renewcommand*\@glstarget[2]{%
   \settoheight{\gls@tmplen}{##2}%
   \raisebox{\gls@tmplen}{\hypertarget{##1}{}}##2}}
-\newcommand*{\gls}{\@ifstar\@sgls\@gls}
+\newrobustcmd*{\gls}{\@ifstar\@sgls\@gls}
 \newcommand*{\@sgls}[1][]{\@gls[hyper=false,#1]}
 \newcommand*{\@gls}[2][]{%
 \new@ifnextchar[{\@gls@{#1}{#2}}{\@gls@{#1}{#2}[]}}
@@ -1755,7 +1755,7 @@ name=true]{%
 }%
 \glsunset{#2}}%
 }
-\newcommand*{\Gls}{\@ifstar\@sGls\@Gls}
+\newrobustcmd*{\Gls}{\@ifstar\@sGls\@Gls}
 \newcommand*{\@sGls}[1][]{\@Gls[hyper=false,#1]}
 \newcommand*{\@Gls}[2][]{%
 \new@ifnextchar[{\@Gls@{#1}{#2}}{\@Gls@{#1}{#2}[]}}
@@ -1793,7 +1793,7 @@ name=true]{%
 }%
 \glsunset{#2}}%
 }
-\newcommand*{\GLS}{\@ifstar\@sGLS\@GLS}
+\newrobustcmd*{\GLS}{\@ifstar\@sGLS\@GLS}
 \newcommand*{\@sGLS}[1][]{\@GLS[hyper=false,#1]}
 \newcommand*{\@GLS}[2][]{%
 \new@ifnextchar[{\@GLS@{#1}{#2}}{\@GLS@{#1}{#2}[]}}
@@ -1820,7 +1820,7 @@ name=true]{%
 }%
 \glsunset{#2}}%
 }
-\newcommand*{\glspl}{\@ifstar\@sglspl\@glspl}
+\newrobustcmd*{\glspl}{\@ifstar\@sglspl\@glspl}
 \newcommand*{\@sglspl}[1][]{\@glspl[hyper=false,#1]}
 \newcommand*{\@glspl}[2][]{%
 \new@ifnextchar[{\@glspl@{#1}{#2}}{\@glspl@{#1}{#2}[]}}
@@ -1854,7 +1854,7 @@ name=true]{%
 }%
 \glsunset{#2}}%
 }
-\newcommand*{\Glspl}{\@ifstar\@sGlspl\@Glspl}
+\newrobustcmd*{\Glspl}{\@ifstar\@sGlspl\@Glspl}
 \newcommand*{\@sGlspl}[1][]{\@Glspl[hyper=false,#1]}
 \newcommand*{\@Glspl}[2][]{%
 \new@ifnextchar[{\@Glspl@{#1}{#2}}{\@Glspl@{#1}{#2}[]}}
@@ -1892,7 +1892,7 @@ name=true]{%
 }%
 \glsunset{#2}}%
 }
-\newcommand*{\GLSpl}{\@ifstar\@sGLSpl\@GLSpl}
+\newrobustcmd*{\GLSpl}{\@ifstar\@sGLSpl\@GLSpl}
 \newcommand*{\@sGLSpl}[1][]{\@GLSpl[hyper=false,#1]}
 \newcommand*{\@GLSpl}[2][]{%
 \new@ifnextchar[{\@GLSpl@{#1}{#2}}{\@GLSpl@{#1}{#2}[]}}
@@ -1921,7 +1921,7 @@ name=true]{%
 }%
 \glsunset{#2}}%
 }
-\newcommand*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
+\newrobustcmd*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
 \newcommand*{\@sglsdisp}[1][]{\@glsdisp[hyper=false,#1]}
 \newcommand*{\@glsdisp}[3][]{%
   \glsdoifexists{#2}{%
@@ -1957,7 +1957,7 @@ name=true]{%
     \glsunset{#2}%
   }%
 }
-\newcommand*{\glstext}{\@ifstar\@sglstext\@glstext}
+\newrobustcmd*{\glstext}{\@ifstar\@sglstext\@glstext}
 \newcommand*{\@sglstext}[1][]{\@glstext[hyper=false,#1]}
 \newcommand*{\@glstext}[2][]{%
 \new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}}
@@ -1967,7 +1967,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
+\newrobustcmd*{\GLStext}{\@ifstar\@sGLStext\@GLStext}
 \newcommand*{\@sGLStext}[1][]{\@GLStext[hyper=false,#1]}
 \newcommand*{\@GLStext}[2][]{%
 \new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}}
@@ -1977,7 +1977,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
+\newrobustcmd*{\Glstext}{\@ifstar\@sGlstext\@Glstext}
 \newcommand*{\@sGlstext}[1][]{\@Glstext[hyper=false,#1]}
 \newcommand*{\@Glstext}[2][]{%
 \new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}}
@@ -1988,7 +1988,7 @@ name=true]{%
    \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
+\newrobustcmd*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst}
 \newcommand*{\@sglsfirst}[1][]{\@glsfirst[hyper=false,#1]}
 \newcommand*{\@glsfirst}[2][]{%
 \new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}}
@@ -1998,7 +1998,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
+\newrobustcmd*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst}
 \newcommand*{\@sGlsfirst}[1][]{\@Glsfirst[hyper=false,#1]}
 \newcommand*{\@Glsfirst}[2][]{%
 \new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}}
@@ -2009,7 +2009,7 @@ name=true]{%
    \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
+\newrobustcmd*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst}
 \newcommand*{\@sGLSfirst}[1][]{\@GLSfirst[hyper=false,#1]}
 \newcommand*{\@GLSfirst}[2][]{%
 \new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}}
@@ -2019,7 +2019,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
+\newrobustcmd*{\glsplural}{\@ifstar\@sglsplural\@glsplural}
 \newcommand*{\@sglsplural}[1][]{\@glsplural[hyper=false,#1]}
 \newcommand*{\@glsplural}[2][]{%
 \new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}}
@@ -2029,7 +2029,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
+\newrobustcmd*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural}
 \newcommand*{\@sGlsplural}[1][]{\@Glsplural[hyper=false,#1]}
 \newcommand*{\@Glsplural}[2][]{%
 \new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}}
@@ -2040,7 +2040,7 @@ name=true]{%
    \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
+\newrobustcmd*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural}
 \newcommand*{\@sGLSplural}[1][]{\@GLSplural[hyper=false,#1]}
 \newcommand*{\@GLSplural}[2][]{%
 \new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}}
@@ -2050,7 +2050,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
+\newrobustcmd*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural}
 \newcommand*{\@sglsfirstplural}[1][]{\@glsfirstplural[hyper=false,#1]}
 \newcommand*{\@glsfirstplural}[2][]{%
 \new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}}
@@ -2060,7 +2060,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
+\newrobustcmd*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural}
 \newcommand*{\@sGlsfirstplural}[1][]{\@Glsfirstplural[hyper=false,#1]}
 \newcommand*{\@Glsfirstplural}[2][]{%
 \new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}}
@@ -2071,7 +2071,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
+\newrobustcmd*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural}
 \newcommand*{\@sGLSfirstplural}[1][]{\@GLSfirstplural[hyper=false,#1]}
 \newcommand*{\@GLSfirstplural}[2][]{%
 \new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}}
@@ -2081,7 +2081,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsname}{\@ifstar\@sglsname\@glsname}
+\newrobustcmd*{\glsname}{\@ifstar\@sglsname\@glsname}
 \newcommand*{\@sglsname}[1][]{\@glsname[hyper=false,#1]}
 \newcommand*{\@glsname}[2][]{%
 \new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}}
@@ -2091,7 +2091,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
+\newrobustcmd*{\Glsname}{\@ifstar\@sGlsname\@Glsname}
 \newcommand*{\@sGlsname}[1][]{\@Glsname[hyper=false,#1]}
 \newcommand*{\@Glsname}[2][]{%
 \new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}}
@@ -2102,7 +2102,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
+\newrobustcmd*{\GLSname}{\@ifstar\@sGLSname\@GLSname}
 \newcommand*{\@sGLSname}[1][]{\@GLSname[hyper=false,#1]}
 \newcommand*{\@GLSname}[2][]{%
 \new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}}
@@ -2112,7 +2112,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
+\newrobustcmd*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc}
 \newcommand*{\@sglsdesc}[1][]{\@glsdesc[hyper=false,#1]}
 \newcommand*{\@glsdesc}[2][]{%
 \new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}}
@@ -2122,7 +2122,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
+\newrobustcmd*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc}
 \newcommand*{\@sGlsdesc}[1][]{\@Glsdesc[hyper=false,#1]}
 \newcommand*{\@Glsdesc}[2][]{%
 \new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}}
@@ -2133,7 +2133,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
+\newrobustcmd*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc}
 \newcommand*{\@sGLSdesc}[1][]{\@GLSdesc[hyper=false,#1]}
 \newcommand*{\@GLSdesc}[2][]{%
 \new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}}
@@ -2143,7 +2143,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
+\newrobustcmd*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural}
 \newcommand*{\@sglsdescplural}[1][]{\@glsdescplural[hyper=false,#1]}
 \newcommand*{\@glsdescplural}[2][]{%
 \new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}}
@@ -2153,7 +2153,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
+\newrobustcmd*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural}
 \newcommand*{\@sGlsdescplural}[1][]{\@Glsdescplural[hyper=false,#1]}
 \newcommand*{\@Glsdescplural}[2][]{%
 \new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}}
@@ -2164,7 +2164,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
+\newrobustcmd*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural}
 \newcommand*{\@sGLSdescplural}[1][]{\@GLSdescplural[hyper=false,#1]}
 \newcommand*{\@GLSdescplural}[2][]{%
 \new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}}
@@ -2174,7 +2174,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
+\newrobustcmd*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol}
 \newcommand*{\@sglssymbol}[1][]{\@glssymbol[hyper=false,#1]}
 \newcommand*{\@glssymbol}[2][]{%
 \new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}}
@@ -2184,7 +2184,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
+\newrobustcmd*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol}
 \newcommand*{\@sGlssymbol}[1][]{\@Glssymbol[hyper=false,#1]}
 \newcommand*{\@Glssymbol}[2][]{%
 \new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}}
@@ -2195,7 +2195,7 @@ name=true]{%
    \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
+\newrobustcmd*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol}
 \newcommand*{\@sGLSsymbol}[1][]{\@GLSsymbol[hyper=false,#1]}
 \newcommand*{\@GLSsymbol}[2][]{%
 \new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}}
@@ -2205,7 +2205,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
+\newrobustcmd*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural}
 \newcommand*{\@sglssymbolplural}[1][]{\@glssymbolplural[hyper=false,#1]}
 \newcommand*{\@glssymbolplural}[2][]{%
 \new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}}
@@ -2215,7 +2215,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
+\newrobustcmd*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural}
 \newcommand*{\@sGlssymbolplural}[1][]{\@Glssymbolplural[hyper=false,#1]}
 \newcommand*{\@Glssymbolplural}[2][]{%
 \new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}}
@@ -2226,7 +2226,7 @@ name=true]{%
    \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
+\newrobustcmd*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural}
 \newcommand*{\@sGLSsymbolplural}[1][]{\@GLSsymbolplural[hyper=false,#1]}
 \newcommand*{\@GLSsymbolplural}[2][]{%
 \new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}}
@@ -2236,7 +2236,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri}
+\newrobustcmd*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri}
 \newcommand*{\@sglsuseri}[1][]{\@glsuseri[hyper=false,#1]}
 \newcommand*{\@glsuseri}[2][]{%
 \new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}}
@@ -2246,7 +2246,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri}
+\newrobustcmd*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri}
 \newcommand*{\@sGlsuseri}[1][]{\@Glsuseri[hyper=false,#1]}
 \newcommand*{\@Glsuseri}[2][]{%
 \new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}}
@@ -2257,7 +2257,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri}
+\newrobustcmd*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri}
 \newcommand*{\@sGLSuseri}[1][]{\@GLSuseri[hyper=false,#1]}
 \newcommand*{\@GLSuseri}[2][]{%
 \new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}}
@@ -2267,7 +2267,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii}
+\newrobustcmd*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii}
 \newcommand*{\@sglsuserii}[1][]{\@glsuserii[hyper=false,#1]}
 \newcommand*{\@glsuserii}[2][]{%
 \new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}}
@@ -2277,7 +2277,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii}
+\newrobustcmd*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii}
 \newcommand*{\@sGlsuserii}[1][]{\@Glsuserii[hyper=false,#1]}
 \newcommand*{\@Glsuserii}[2][]{%
 \new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}}
@@ -2288,7 +2288,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii}
+\newrobustcmd*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii}
 \newcommand*{\@sGLSuserii}[1][]{\@GLSuserii[hyper=false,#1]}
 \newcommand*{\@GLSuserii}[2][]{%
 \new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}}
@@ -2298,7 +2298,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii}
+\newrobustcmd*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii}
 \newcommand*{\@sglsuseriii}[1][]{\@glsuseriii[hyper=false,#1]}
 \newcommand*{\@glsuseriii}[2][]{%
 \new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}}
@@ -2308,7 +2308,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii}
+\newrobustcmd*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii}
 \newcommand*{\@sGlsuseriii}[1][]{\@Glsuseriii[hyper=false,#1]}
 \newcommand*{\@Glsuseriii}[2][]{%
 \new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}}
@@ -2319,7 +2319,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii}
+\newrobustcmd*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii}
 \newcommand*{\@sGLSuseriii}[1][]{\@GLSuseriii[hyper=false,#1]}
 \newcommand*{\@GLSuseriii}[2][]{%
 \new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}}
@@ -2329,7 +2329,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv}
+\newrobustcmd*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv}
 \newcommand*{\@sglsuseriv}[1][]{\@glsuseriv[hyper=false,#1]}
 \newcommand*{\@glsuseriv}[2][]{%
 \new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}}
@@ -2339,7 +2339,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv}
+\newrobustcmd*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv}
 \newcommand*{\@sGlsuseriv}[1][]{\@Glsuseriv[hyper=false,#1]}
 \newcommand*{\@Glsuseriv}[2][]{%
 \new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}}
@@ -2350,7 +2350,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv}
+\newrobustcmd*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv}
 \newcommand*{\@sGLSuseriv}[1][]{\@GLSuseriv[hyper=false,#1]}
 \newcommand*{\@GLSuseriv}[2][]{%
 \new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}}
@@ -2360,7 +2360,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv}
+\newrobustcmd*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv}
 \newcommand*{\@sglsuserv}[1][]{\@glsuserv[hyper=false,#1]}
 \newcommand*{\@glsuserv}[2][]{%
 \new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}}
@@ -2370,7 +2370,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv}
+\newrobustcmd*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv}
 \newcommand*{\@sGlsuserv}[1][]{\@Glsuserv[hyper=false,#1]}
 \newcommand*{\@Glsuserv}[2][]{%
 \new@ifnextchar[{\@Glsuserv@{#1}{#2}}{\@Glsuserv@{#1}{#2}[]}}
@@ -2381,7 +2381,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv}
+\newrobustcmd*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv}
 \newcommand*{\@sGLSuserv}[1][]{\@GLSuserv[hyper=false,#1]}
 \newcommand*{\@GLSuserv}[2][]{%
 \new@ifnextchar[{\@GLSuserv@{#1}{#2}}{\@GLSuserv@{#1}{#2}[]}}
@@ -2391,7 +2391,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi}
+\newrobustcmd*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi}
 \newcommand*{\@sglsuservi}[1][]{\@glsuservi[hyper=false,#1]}
 \newcommand*{\@glsuservi}[2][]{%
 \new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}}
@@ -2401,7 +2401,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\@glo@text#3}%
 }%
 }
-\newcommand*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi}
+\newrobustcmd*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi}
 \newcommand*{\@sGlsuservi}[1][]{\@Glsuservi[hyper=false,#1]}
 \newcommand*{\@Glsuservi}[2][]{%
 \new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}}
@@ -2412,7 +2412,7 @@ name=true]{%
   \expandafter\makefirstuc\expandafter{\@glo@text}#3}%
 }%
 }
-\newcommand*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi}
+\newrobustcmd*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi}
 \newcommand*{\@sGLSuservi}[1][]{\@GLSuservi[hyper=false,#1]}
 \newcommand*{\@GLSuservi}[2][]{%
 \new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}}
@@ -2422,7 +2422,7 @@ name=true]{%
 \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
 }%
 }
-\newcommand*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
+\newrobustcmd*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
 \newcommand*{\s@acrshort}[2][]{%
   \new@ifnextchar[{\@acrshort{hyper=false,#1}{#2}}%
                   {\@acrshort{hyper=false,#1}{#2}[]}%
@@ -2438,7 +2438,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
   }%
 }
-\newcommand*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort}
+\newrobustcmd*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort}
 \newcommand*{\s@Acrshort}[2][]{%
   \new@ifnextchar[{\@Acrshort{hyper=false,#1}{#2}}%
                   {\@Acrshort{hyper=false,#1}{#2}[]}%
@@ -2457,7 +2457,7 @@ name=true]{%
     }%
   }%
 }
-\newcommand*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort}
+\newrobustcmd*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort}
 \newcommand*{\s@ACRshort}[2][]{%
   \new@ifnextchar[{\@ACRshort{hyper=false,#1}{#2}}%
                   {\@ACRshort{hyper=false,#1}{#2}[]}%
@@ -2473,7 +2473,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}%
   }%
 }
-\newcommand*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl}
+\newrobustcmd*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl}
 \newcommand*{\s@acrshortpl}[2][]{%
   \new@ifnextchar[{\@acrshortpl{hyper=false,#1}{#2}}%
                   {\@acrshortpl{hyper=false,#1}{#2}[]}%
@@ -2489,7 +2489,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
   }%
 }
-\newcommand*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl}
+\newrobustcmd*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl}
 \newcommand*{\s@Acrshortpl}[2][]{%
   \new@ifnextchar[{\@Acrshortpl{hyper=false,#1}{#2}}%
                   {\@Acrshortpl{hyper=false,#1}{#2}[]}%
@@ -2508,7 +2508,7 @@ name=true]{%
     }%
   }%
 }
-\newcommand*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl}
+\newrobustcmd*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl}
 \newcommand*{\s@ACRshortpl}[2][]{%
   \new@ifnextchar[{\@ACRshortpl{hyper=false,#1}{#2}}%
                   {\@ACRshortpl{hyper=false,#1}{#2}[]}%
@@ -2524,7 +2524,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}%
   }%
 }
-\newcommand*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong}
+\newrobustcmd*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong}
 \newcommand*{\s@acrlong}[2][]{%
   \new@ifnextchar[{\@acrlong{hyper=false,#1}{#2}}%
                   {\@acrlong{hyper=false,#1}{#2}[]}%
@@ -2540,7 +2540,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\@glo@text#3}%
   }%
 }
-\newcommand*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong}
+\newrobustcmd*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong}
 \newcommand*{\s@Acrlong}[2][]{%
   \new@ifnextchar[{\@Acrlong{hyper=false,#1}{#2}}%
                   {\@Acrlong{hyper=false,#1}{#2}[]}%
@@ -2559,7 +2559,7 @@ name=true]{%
     }%
   }%
 }
-\newcommand*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong}
+\newrobustcmd*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong}
 \newcommand*{\s@ACRlong}[2][]{%
   \new@ifnextchar[{\@ACRlong{hyper=false,#1}{#2}}%
                   {\@ACRlong{hyper=false,#1}{#2}[]}%
@@ -2575,7 +2575,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
   }%
 }
-\newcommand*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl}
+\newrobustcmd*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl}
 \newcommand*{\s@acrlongpl}[2][]{%
   \new@ifnextchar[{\@acrlongpl{hyper=false,#1}{#2}}%
                   {\@acrlongpl{hyper=false,#1}{#2}[]}%
@@ -2591,7 +2591,7 @@ name=true]{%
     \@gls@link[#1]{#2}{\@glo@text#3}%
   }%
 }
-\newcommand*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl}
+\newrobustcmd*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl}
 \newcommand*{\s@Acrlongpl}[2][]{%
   \new@ifnextchar[{\@Acrlongpl{hyper=false#1}{#2}}%
                   {\@Acrlongpl{hyper=false,#1}{#2}[]}%
@@ -2610,7 +2610,7 @@ name=true]{%
     }%
   }%
 }
-\newcommand*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl}
+\newrobustcmd*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl}
 \newcommand*{\s@ACRlongpl}[2][]{%
   \new@ifnextchar[{\@ACRlongpl{hyper=false,#1}{#2}}%
                   {\@ACRlongpl{hyper=false,#1}{#2}[]}%
@@ -2711,13 +2711,13 @@ name=true]{%
   \glsentrylong{#1}\space(\glsentryshort{#1})%
 }
 \newcommand*{\Glsentryfull}[1]{%
-  \Glsentrylong{#1}\space(\glsentryshort{#1})%
+  \Glsentrylong{#1}\space(\glsentryshortpl{#1})%
 }
 \newcommand*{\glsentryfullpl}[1]{%
   \glsentrylongpl{#1}\space(\glsentryshort{#1})%
 }
 \newcommand*{\Glsentryfullpl}[1]{%
-  \Glsentrylongpl{#1}\space(\glsentryshort{#1})%
+  \Glsentrylongpl{#1}\space(\glsentryshortpl{#1})%
 }
 \newcommand*{\glshyperlink}[2][\glsentrytext{\@glo@label}]{%
 \def\@glo@label{#2}%
@@ -2725,7 +2725,7 @@ name=true]{%
 \define@key{glossadd}{counter}{\def\@gls@counter{#1}}
 \define@key{glossadd}{format}{\def\@glsnumberformat{#1}}
 \define@key{glossadd}{types}{\def\@glo@type{#1}}
-\newcommand*{\glsadd}[2][]{%
+\newrobustcmd*{\glsadd}[2][]{%
   \glsdoifexists{#2}%
   {%
     \def\@glsnumberformat{glsnumberformat}%
@@ -2735,7 +2735,7 @@ name=true]{%
     \@do@wrglossary{#2}%
   }%
 }
-\newcommand*{\glsaddall}[1][]{%
+\newrobustcmd*{\glsaddall}[1][]{%
 \edef\@glo@type{\@glo@types}%
 \setkeys{glossadd}{#1}%
 \forallglsentries[\@glo@type]{\@glo@entry}{%
@@ -3031,10 +3031,25 @@ name=true]{%
 \ifglssavewrites
   \newcommand*{\glswritefiles}{%
     \forallglossaries{\@glo@type}{%
-       \@glsopenfile{\glswrite}{\@glo@type}%
-       \immediate\write\glswrite{%
-          \expandafter\the\csname glo@\@glo@type @filetok\endcsname}%
-       \immediate\closeout\glswrite
+       \edef\gls@tmp{\expandafter\the\csname glo@\@glo@type
+@filetok\endcsname}%
+       \ifx\gls@tmp\@empty
+          \ifx\@glo@type\glsdefaulttype
+            \GlossariesWarningNoLine{Glossary `\@glo@type' has no
+               entries.^^JRemember to use package option `nomain' if
+you
+               don't want to^^Juse the main glossary}%
+          \else
+            \GlossariesWarningNoLine{Glossary `\@glo@type' has no
+               entries}%
+          \fi
+       \else
+          \@glsopenfile{\glswrite}{\@glo@type}%
+          \immediate\write\glswrite{%
+             \expandafter\the\csname glo@\@glo@type
+@filetok\endcsname}%
+          \immediate\closeout\glswrite
+       \fi
     }%
   }
 \else
@@ -3471,7 +3486,7 @@ false,nolabel,autolabel}[nolabel]{%
 \newcommand*{\glsshortpluralkey}{shortplural}
 \newcommand*{\glslongkey}{long}
 \newcommand*{\glslongpluralkey}{longplural}
-\newcommand*{\acrfull}{%
+\newrobustcmd*{\acrfull}{%
   \@ifstar\s@acrfull\ns@acrfull
 }
 \newcommand*\s@acrfull[2][]{%
@@ -3488,8 +3503,8 @@ false,nolabel,autolabel}[nolabel]{%
 \newcommand{\acrlinkfullformat}[5]{%
   \acrfullformat{#1{#3}{#4}[#5]}{#2{#3}{#4}[]}%
 }
-\newcommand{\acrfullformat}[2]{#1\space(\acronymfont{#2})}
-\newcommand*{\Acrfull}{%
+\newcommand{\acrfullformat}[2]{#1\space(#2)}
+\newrobustcmd*{\Acrfull}{%
   \@ifstar\s@Acrfull\ns@Acrfull
 }
 \newcommand*\s@Acrfull[2][]{%
@@ -3503,7 +3518,7 @@ false,nolabel,autolabel}[nolabel]{%
 \def\@Acrfull#1#2[#3]{%
   \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}%
 }
-\newcommand*{\ACRfull}{%
+\newrobustcmd*{\ACRfull}{%
   \@ifstar\s@ACRfull\ns@ACRfull
 }
 \newcommand*\s@ACRfull[2][]{%
@@ -3517,7 +3532,7 @@ false,nolabel,autolabel}[nolabel]{%
 \def\@ACRfull#1#2[#3]{%
   \acrlinkfullformat{\@ACRlong}{\@ACRshort}{#1}{#2}{#3}%
 }
-\newcommand*{\acrfullpl}{%
+\newrobustcmd*{\acrfullpl}{%
   \@ifstar\s@acrfullpl\ns@acrfullpl
 }
 \newcommand*\s@acrfullpl[2][]{%
@@ -3531,7 +3546,7 @@ false,nolabel,autolabel}[nolabel]{%
 \def\@acrfullpl#1#2[#3]{%
   \acrlinkfullformat{\@acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
 }
-\newcommand*{\Acrfullpl}{%
+\newrobustcmd*{\Acrfullpl}{%
   \@ifstar\s@Acrfullpl\ns@Acrfullpl
 }
 \newcommand*\s@Acrfullpl[2][]{%
@@ -3543,9 +3558,9 @@ false,nolabel,autolabel}[nolabel]{%
                   {\@Acrfullpl{#1}{#2}[]}%
 }
 \def\@Acrfullpl#1#2[#3]{%
-  \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}%
+  \acrlinkfullformat{\@Acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
 }
-\newcommand*{\ACRfullpl}{%
+\newrobustcmd*{\ACRfullpl}{%
   \@ifstar\s@ACRfullpl\ns@ACRfullpl
 }
 \newcommand*\s@ACRfullpl[2][]{%