glossaries 2.06 (14jun10)

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

4 files changed, 85 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
index e81b2ef813d..291fa313d0e 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -21,7 +21,7 @@
 %% 
 %%  The Current Maintainer of this work is Nicola Talbot.
 %% 
-%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
index fa2a6e17dc0..370d530b711 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
@@ -21,7 +21,7 @@
 %% 
 %%  The Current Maintainer of this work is Nicola Talbot.
 %% 
-%%  This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 2fc02b9fa8a..b1cfd0b2f65 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-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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{glossaries}[2010/02/06 v2.05 (NLCT)]
+\ProvidesPackage{glossaries}[2010/06/14 v2.06 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}[2006/11/18]
 \RequirePackage{mfirstuc}
@@ -690,6 +690,9 @@ name=true]{%
     \glsdisplayfirst}}{}%
   \@ifnextchar[{\@gls@setcounter{#2}}%
     {\@gls@setcounter{#2}[\glscounter]}}}
+\newcommand*{\altnewglossary}[3]{%
+  \newglossary[#2-glg]{#1}{#2-gls}{#2-glo}{#3}%
+}
 \@onlypreamble{\newglossary}
 \@onlypremakeg\newglossary
 \newcommand*{\@newglossary}[4]{}
@@ -1414,6 +1417,7 @@ counter as its value}}{%
 \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
 \def\@gls@link@opts{#1}%
 \def\@gls@link@label{#2}%
+\def\glslabel{#2}%
 \ifglsused{#2}%
 {%
   \protected@edef\@glo@text{%
@@ -1512,6 +1516,7 @@ counter as its value}}{%
 \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
 \def\@gls@link@opts{#1}%
 \def\@gls@link@label{#2}%
+\def\glslabel{#2}%
 \ifglsused{#2}%
 {%
   \protected@edef\@glo@text{%
@@ -3327,6 +3332,81 @@ style `#1' undefined}{}}{%
   \fi
 }
 \SetAcronymStyle
+\newcommand*{\SetCustomDisplayStyle}[1]{%
+  \defglsdisplay[#1]{##1##4}%
+  \defglsdisplayfirst[#1]{##1##4}%
+}
+\newcommand*{\CustomAcronymFields}{%
+  name={\the\glsshorttok},%
+  description={\the\glslongtok},%
+  first={\the\glslongtok\space(\the\glsshorttok)},%
+  firstplural={\the\glslongtok\noexpand\acrpluralsuffix\space
+    (\the\glsshorttok)}%
+  text={\the\glsshorttok},%
+  plural={\the\glsshorttok\noexpand\acrpluralsuffix}%
+}
+\newcommand*{\CustomNewAcronymDef}{%
+  \protected@edef\@do@newglossaryentry{%
+    \noexpand\newglossaryentry{\the\glslabeltok}%
+    {%
+      type=\acronymtype,%
+      user1={\the\glsshorttok},%
+      user2={\the\glsshorttok\noexpand\acrpluralsuffix},%
+      user3={\the\glslongtok},%
+      user4={\the\glslongtok\noexpand\acrpluralsuffix},%
+      \CustomAcronymFields,%
+      \the\glskeylisttok
+    }%
+  }%
+  \@do@newglossaryentry
+}
+\newcommand*{\SetCustomStyle}{%
+  \renewcommand{\newacronym}[4][]{%
+    \ifx\@glsacronymlists\@empty
+      \def\@glo@type{\acronymtype}%
+      \setkeys{glossentry}{##1}%
+      \DeclareAcronymList{\@glo@type}%
+      \SetCustomDisplayStyle{\@glo@type}%
+    \fi
+    \glskeylisttok{##1}%
+    \glslabeltok{##2}%
+    \glsshorttok{##3}%
+    \glslongtok{##4}%
+    \newacronymhook
+    \CustomNewAcronymDef
+  }%
+  \def\glsshortkey{user1}%
+  \def\glsshortpluralkey{user2}%
+  \def\glslongkey{user3}%
+  \def\glslongpluralkey{user4}%
+  \@for\@gls@type:=\@glsacronymlists\do{%
+    \SetCustomDisplayStyle{\@gls@type}%
+  }%
+  \def\@acrshort##1##2[##3]{\@glsuseri@{##1}{##2}[##3]}%
+  \def\@Acrshort##1##2[##3]{\@Glsuseri@{##1}{##2}[##3]}%
+  \def\@ACRshort##1##2[##3]{\@GLSuseri@{##1}{##2}[##3]}%
+  \def\@acrshortpl##1##2[##3]{\@glsuserii@{##1}{##2}[##3]}%
+  \def\@Acrshortpl##1##2[##3]{\@Glsuserii@{##1}{##2}[##3]}%
+  \def\@ACRshortpl##1##2[##3]{\@GLSuserii@{##1}{##2}[##3]}%
+  \def\@acrlong##1##2[##3]{\@glsuseriii@{##1}{##2}[##3]}%
+  \def\@Acrlong##1##2[##3]{\@Glsuseriii@{##1}{##2}[##3]}%
+  \def\@ACRlong##1##2[##3]{\@GLSuseriii@{##1}{##2}[##3]}%
+  \def\@acrlongpl##1##2[##3]{\@glsuseriv@{##1}{##2}[##3]}%
+  \def\@Acrlongpl##1##2[##3]{\@Glsuseriv@{##1}{##2}[##3]}%
+  \def\@ACRlongpl##1##2[##3]{\@GLSuseriv@{##1}{##2}[##3]}%
+  \def\@acrfull##1##2[##3]{\@glsuseriii@{##1}{##2}[##3]
+    (\acronymfont{\@glsuseri@{##1}{##2}[##3]})}%
+  \def\@Acrfull##1##2[##3]{\@Glsuseriii@{##1}{##2}[##3]
+    (\acronymfont{\@glsuseri@{##1}{##2}[##3]})}%
+  \def\@ACRfull##1##2[##3]{\@GLSuseriii@{##1}{##2}[##3]
+    (\acronymfont{\@GLSuseri@{##1}{##2}[##3]})}%
+  \def\@acrfullpl##1##2[##3]{\@glsuseriv@{##1}{##2}[##3]
+    (\acronymfont{\@glsuserii@{##1}{##2}[##3]})}%
+  \def\@Acrfullpl##1##2[##3]{\@Glsuseriv@{##1}{##2}[##3]
+    (\acronymfont{\@glsuserii@{##1}{##2}[##3]})}%
+  \def\@ACRfullpl##1##2[##3]{\@GLSuseriv@{##1}{##2}[##3]
+    (\acronymfont{\@GLSuserii@{##1}{##2}[##3]})}%
+}%
 \newcommand*{\DefineAcronymSynonyms}{%
   \let\acs\acrshort
   \let\Acs\Acrshort
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index 0ae3809c105..cb10834fddf 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-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, 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