enumitem 2.2 (18may09)

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

4 files changed, 17 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/enumitem/README b/Master/texmf-dist/doc/latex/enumitem/README
index 8f38d0ed660..ccbadeaf525 100644
--- a/Master/texmf-dist/doc/latex/enumitem/README
+++ b/Master/texmf-dist/doc/latex/enumitem/README
@@ -23,10 +23,13 @@ Recent changes
 in the previous list, since we want to continue it, not to restart
 it.
 
+2.2 fixes a bug in some description styles, which didn't empty the
+box containing the labels.
+
 _________________________________________________________________
 Javier Bezos                    | http://www.tex-tipografia.com
 .................................................................
-2007-06-30
+2009-05-18
 
 
 
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
index c1a30d1bc27..f0705b8220f 100644
--- a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
+++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
index c13799e7750..ee15d9ff848 100644
--- a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
+++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
@@ -2,10 +2,10 @@
 % | Typeset this file to document enumitem.sty       |
 % +--------------------------------------------------+
 %
-% Copyright (c) 2003-2007 by Javier Bezos.
+% Copyright (c) 2003-2009 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the enumitem distribution release 2.1
+% This file is part of the enumitem distribution release 2.2
 % -----------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
@@ -29,14 +29,14 @@
 \title{Customizing lists\\with the\\\textsf{enumitem} package}
 
 \author{Javier Bezos\footnote{For bug reports, comments and
-suggestions go to \href{http://www.tex-tipografia.com/contact.html}%
-{\texttt{http://www.tex-tipografia.com/contact.html}}.
+suggestions go to \href{http://www.tex-tipografia.com/enumitem.html}%
+{\texttt{http://www.tex-tipografia.com/enumitem.html}}.
 English is not my strong point, so contact me when you
 find mistakes in the manual. Other packages by the same author:
 \textsf{gloss} (with Jos\'e Luis D\'{\i}az), \textsf{accents,
 tensind, esindex, dotlessi, titlesec, titletoc}.}}
 
-\date{Version 2.1\\2007-06-30}
+\date{Version 2.2\\2009-05-18}
 
 \IfFileExists{enumitem.sty}{\usepackage{enumitem}}{}
 
diff --git a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
index c7868e7ee27..d008eee65be 100644
--- a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
+++ b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
@@ -2,10 +2,10 @@
 % | Typeset enumitem.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 2003-2007 by Javier Bezos.
+% Copyright (c) 2003-2009 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the enumitem distribution release 2.1
+% This file is part of the enumitem distribution release 2.2
 % -----------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
@@ -33,7 +33,7 @@
 % ~~~~~~~
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{enumitem}[2007/06/30 v2.1 Customized lists]
+\ProvidesPackage{enumitem}[2009/05/18 v2.2 Customized lists]
 
 % The package uses a token register very often. To be on the
 % safe side, instead of \toks@, etc., a new one is declared:
@@ -543,7 +543,7 @@
 % the next definition is somewhat tricky because
 % labels are boxed. That's fine when the label is
 % just placed at the begining of a line of text,
-% but when the box is placed whithout horizontal
+% but when the box is placed without horizontal
 % material, leading is killed. Therefore,
 % solutions based on the LaTeX Companion are wrong.
 % Here, the \everypar in \@item is overriden
@@ -586,6 +586,7 @@
          \rlap{#1}%
          \hskip\leftmargin\hskip\labelsep\hskip-\labelindent
        \fi}%
+       \setbox\@labels\box\voidb@x
     \fi
     \enit@break}}
 
@@ -596,6 +597,7 @@
   \sbox\z@{%
     \parbox[t]\dimen@{%
       \raggedright\hskip-\labelsep#1}}%
+  \setbox\@labels\box\voidb@x
   \dp\z@\z@
   \hskip\labelsep\box\z@
   \hfil}
@@ -614,6 +616,7 @@
        \hskip-\leftmargin\hskip-\labelsep\hskip\labelindent
        #1%
        \hskip\labelsep}%
+       \setbox\@labels\box\voidb@x
     \fi
     \enit@break}}
 
@@ -644,6 +647,7 @@
          \hskip\labelsep
          \hskip-\labelindent
        \fi}%
+       \setbox\@labels\box\voidb@x
     \fi
     \enit@break}}