glossaries 2.05 (6feb10)

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

2 files changed, 27 insertions, 19 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 748fe82c28c..7ebb84fc52f 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -27,7 +27,7 @@
 %   -doc "glossaries-manual.tex"
 %   -codetitle "Glossaries Documented Code"
 %   glossaries
-% Created on 2009/11/10 12:57
+% Created on 2010/2/6 13:23
 %\fi
 %\iffalse
 %<*package>
@@ -50,7 +50,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2009 Nicola Talbot, all rights reserved.
+% Copyright (C) 2010 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -88,7 +88,7 @@
 \makeatother
 \RecordChanges
 \PageIndex
-\CheckSum{10923}
+\CheckSum{10933}
 \CodelineNumbered
 \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}}
 \newcommand*{\term}[1]{#1\iterm{#1}}
@@ -180,7 +180,7 @@
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{glossaries.sty v 2.04: \LaTeXe\ Package to Assist Generating Glossaries}
+% \title{glossaries.sty v 2.05: \LaTeXe\ Package to Assist Generating Glossaries}
 % \author{Nicola L.C. Talbot\\[10pt]
 %School of Computing Sciences\\
 %University of East Anglia\\
@@ -188,7 +188,7 @@
 %NR4 7TJ. United Kingdom.\\
 %\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
 %
-% \date{10 November 2009}
+% \date{6th Feb 2010}
 % \maketitle
 %\tableofcontents
 %
@@ -4888,7 +4888,7 @@
 % This package requires \LaTeXe.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2009/11/01 v2.04 (NLCT)]
+\ProvidesPackage{glossaries}[2010/02/06 v2.05 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -8884,7 +8884,10 @@ counter as its value}}{%
 %    \begin{macrocode}
 \newcommand*{\@glsdisp}[3][]{%
   \glsdoifexists{#2}{%
-    \edef\@glo@type{\glsentrytype{#2}%
+%    \end{macrocode}
+%\changes{2.05}{2010 Feb 6}{Added closing brace. Patch provided by Sergiu Dotenco}
+%    \begin{macrocode}
+    \edef\@glo@type{\glsentrytype{#2}}%
 %    \end{macrocode}
 % Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
 %    \begin{macrocode}
@@ -8934,8 +8937,9 @@ counter as its value}}{%
     }%
 %    \end{macrocode}
 % Indicate that this entry has now been used
+%\changes{2.05}{2010 Feb 6}{Removed spurious brace. Patch provided by Sergiu Dotenco}
 %    \begin{macrocode}
-    \glsunset{#2}}%
+    \glsunset{#2}%
   }%
 }
 %    \end{macrocode}
@@ -11295,20 +11299,24 @@ counter as its value}}{%
     \write\istfile{item_x2
       \string"\string\\relax \string\\glsresetentrylist\string\n
       \string"}
-    \write\istfile{delim_0 \string"\{\string
-      \\glossaryentrynumbers\{\string\\relax \string"}
-    \write\istfile{delim_1 \string"\{\string
-      \\glossaryentrynumbers\{\string\\relax \string"}
-    \write\istfile{delim_2 \string"\{\string
-      \\glossaryentrynumbers\{\string\\relax \string"}
-    \write\istfile{delim_t \string"\}\}\string"}
+%    \end{macrocode}
+%\changes{2.05}{2010 Feb 6}{Added \cs{string} before opening 
+% and closing braces. Patch provided by Segiu Dotenco}
+%    \begin{macrocode}
+    \write\istfile{delim_0 \string"\string\{\string
+      \\glossaryentrynumbers\string\{\string\\relax \string"}
+    \write\istfile{delim_1 \string"\string\{\string
+      \\glossaryentrynumbers\string\{\string\\relax \string"}
+    \write\istfile{delim_2 \string"\string\{\string
+      \\glossaryentrynumbers\string\{\string\\relax \string"}
+    \write\istfile{delim_t \string"\string\}\string\}\string"}
     \write\istfile{delim_n \string"\string\\delimN \string"}
     \write\istfile{delim_r \string"\string\\delimR \string"}
     \write\istfile{headings_flag 1}
     \write\istfile{heading_prefix 
-       \string"\string\\glsgroupheading\{\string"}
+       \string"\string\\glsgroupheading\string\{\string"}
     \write\istfile{heading_suffix
-       \string"\}\string\\relax
+       \string"\string\}\string\\relax
        \string\\glsresetentrylist \string"}
     \write\istfile{symhead_positive \string"glssymbols\string"}
     \write\istfile{numhead_positive \string"glsnumbers\string"}
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 3700a3a9e16..b3065eb8c58 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,10 +1,10 @@
-% glossaries.ins generated using makedtx version 0.94b 2009/11/10 12:57
+% glossaries.ins generated using makedtx version 0.94b 2010/2/6 13:23
 \input docstrip
 
 \preamble
 
  glossaries.dtx
- Copyright 2009 Nicola Talbot
+ Copyright 2010 Nicola Talbot
 
  This work may be distributed and/or modified under the
  conditions of the LaTeX Project Public License, either version 1.3