enumitem (28aug11)

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

4 files changed, 38 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/enumitem/README b/Master/texmf-dist/doc/latex/enumitem/README
index 945805d57c9..20c73abb36b 100644
--- a/Master/texmf-dist/doc/latex/enumitem/README
+++ b/Master/texmf-dist/doc/latex/enumitem/README
@@ -1,5 +1,5 @@
-Enumitem 3.4
-~~~~~~~~~~~~
+Enumitem 3.5.0
+~~~~~~~~~~~~~~
 
 A package to customize the three basic lists (enumerate,
 itemize and description) by means of a set of parameters,
@@ -82,11 +82,16 @@ documented.
 - Fixed spacing in inline boxed lists.
 - Fixed (hopefully) the bug with noitemsep and shorlabels.
 
+3.5.0
+~~~~~
+- Fixed the fix related to inline lists (spacefactor).
+- Fixed some problems in nested boxed inline lists.
+(- And sub-sub-versions are introduced.)
 
 _________________________________________________________________
 Javier Bezos                    | http://www.tex-tipografia.com
 .................................................................
-2011-08-06
+2011-08-28
 
 
 
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
index 46d388652b6..eb051b6a456 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 876390ae9e2..fc67ecf3f34 100644
--- a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
+++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
@@ -5,8 +5,8 @@
 % Copyright (c) 2003-2011 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the enumitem distribution release 3.4
-% -----------------------------------------------------------
+% This file is part of the enumitem distribution release 3.5.0
+% ------------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -48,7 +48,7 @@ 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 3.4\\2011-08-06}
+\date{Version 3.5.0\\2011-08-28}
 
 \IfFileExists{enumitem.sty}{\usepackage{enumitem}}{}
 
@@ -926,13 +926,15 @@ multicolumn lists, with \textsf{multicol}:
   after=\end{multicols}}
 \end{verbatim}
 
-(The settings for \texttt{itemsep} and \texttt{parsep} kill the 
-stretch and shrink parts. Of course, you may want to define a new 
-list or a key.)
+(The settings for \texttt{itemsep} and \texttt{parsep} kill the
+stretch and shrink parts.  Of course, you may want to define a
+new list.)
 
 Note the package may introduce new keys in the future, so
 \verb|\SetEnumitemKey| is a potential source of forward
-incompatibilities.
+incompatibilities.  However, it's safe using a non-letter character
+other than hyphen or star in the key name (e.g., \verb|:name| or 
+\verb|2_col|).
 
 \begin{desc}
 |\SetEnumitemValue{<key>}{<string-value>}{<replacement>}|\3
@@ -1342,10 +1344,11 @@ but it is your responsability to make sure the result is correct.
 It seems there is no way to catch a misspelled name in |\setlist|
 and a meaningless error ``Missing number, treated as zero'' is raised.
 
-\item The behaviour of mixed boxed labels (including enumerate and 
-itemize) and unboxed labels is not well-defined. Similarly, resuming 
-a series and a list at the same time is allowed, too, but again its
-behaviour is not well-defined.
+\item The behaviour of mixed boxed labels (including enumerate and
+itemize) and unboxed labels is not well-defined.  The same applies to
+boxed and unboxed inline lists (which could even raise an error).
+Similarly, resuming a series and a list at the same time is allowed,
+too, but again its behaviour is not well-defined.
 
 \end{itemize}
 
@@ -1415,6 +1418,8 @@ error has been there for several years, a new key \verb|nosep| is
 provided.
 \item (3.4) The issue with \verb|nolistsep| with \verb|shortlabels| 
 (see above) was not fixed in all cases. Hopefully now it is.
+\item (3.5.0) Fixed the fix related to the spacefactor between items.
+\item (3.5.0) Fixed a problem with nested boxed inline lists.
 \end{itemize}
 
 \subsection{Acknowledgements}
diff --git a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
index e81a0d894c8..ca72fe4b328 100644
--- a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
+++ b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
@@ -5,7 +5,7 @@
 % Copyright (c) 2003-2011 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the enumitem distribution release 3.4
+% This file is part of the enumitem distribution release 3.5.0
 % -----------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
@@ -44,7 +44,7 @@
 % ~~~~~~~
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{enumitem}[2011/08/06 v3.4 Customized lists]
+\ProvidesPackage{enumitem}[2011/08/28 v3.5.0 Customized lists]
 
 % +=============================+
 % |      EMULATING KEYVAL       |
@@ -1002,16 +1002,17 @@
   \def\@itemlabel{#1}%
   \@nmbrlistfalse
   \ifenit@changed@item\else
-   \enit@changed@itemtrue
-   \let\enit@outer@triv\@trivlist
-   \let\@trivlist\enit@intrivlist
-   \@setpar\@empty
-   \let\enit@outer@item\@item
+    \enit@changed@itemtrue
+    \let\enit@outer@triv\@trivlist
+    \let\@trivlist\enit@intrivlist
+    \@setpar\@empty
+    \let\enit@outer@item\@item
   \fi
   #2\relax
   \global\@newlisttrue
   \ifenit@boxmode
     \ifenit@changeditem\else
+      \enit@changeditemtrue
       \let\enit@outeritem\item
     \fi
     \let\@item\enit@boxitem
@@ -1023,10 +1024,10 @@
     \fi
   \fi
   \let\enit@calcleft\relax
+  \let\enit@afteritem\relax
   \ifenit@boxmode
     \global\setbox\enit@inbox\hbox\bgroup\color@begingroup
       \let\item\enit@endinbox
-      \enit@changeditemtrue
   \fi
   \ignorespaces}
 
@@ -1034,12 +1035,9 @@
   \ifenit@boxmode
       \unskip
       \xdef\enit@afteritem{%
-        \ifhmode
-          \spacefactor\the\spacefactor\relax
-        \fi}%
+        \ifhmode\spacefactor\the\spacefactor\relax\fi}%
       \color@endgroup
     \egroup
-    \enit@afteritem
     \ifdim\wd\enit@inbox=\z@
       \enit@itemerror
     \else
@@ -1052,6 +1050,7 @@
       \unhbox\@labels
       \enit@afterlabel
       \unhbox\enit@inbox
+      \enit@afteritem
     \fi
   \else
     \unskip
@@ -1119,12 +1118,9 @@
 \def\enit@endinbox{%
     \unskip
     \xdef\enit@afteritem{%
-      \ifhmode
-        \spacefactor\the\spacefactor\relax
-      \fi}%
+      \ifhmode\spacefactor\the\spacefactor\relax\fi}%
     \color@endgroup
   \egroup
-  \enit@afteritem
   \enit@outeritem}
 
 \def\enit@boxitem[#1]{%
@@ -1148,6 +1144,7 @@
       \unhbox\@labels
       \enit@afterlabel
       \unhbox\enit@inbox
+      \enit@afteritem
     \fi
   \fi
   \if@noitemarg
@@ -1157,6 +1154,7 @@
     \fi
   \fi
   \sbox\@labels{\makelabel{#1}}%
+  \let\enit@afteritem\relax
   \setbox\enit@inbox\hbox\bgroup\color@begingroup
     \let\item\enit@endinbox
     \hskip1sp % in case the first thing is \label