enumitem (5sep11)

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

4 files changed, 40 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/enumitem/README b/Master/texmf-dist/doc/latex/enumitem/README
index 20c73abb36b..ffb375b20e6 100644
--- a/Master/texmf-dist/doc/latex/enumitem/README
+++ b/Master/texmf-dist/doc/latex/enumitem/README
@@ -1,4 +1,4 @@
-Enumitem 3.5.0
+Enumitem 3.5.1
 ~~~~~~~~~~~~~~
 
 A package to customize the three basic lists (enumerate,
@@ -88,10 +88,15 @@ documented.
 - Fixed some problems in nested boxed inline lists.
 (- And sub-sub-versions are introduced.)
 
+3.5.1
+~~~~~
+- resume* only worked once, and subsequent ones
+behaved like resume.
+
 _________________________________________________________________
 Javier Bezos                    | http://www.tex-tipografia.com
 .................................................................
-2011-08-28
+2011-09-05
 
 
 
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
index eb051b6a456..e77dfcb4ff1 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 fc67ecf3f34..7c9ad1ffc1e 100644
--- a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
+++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
@@ -5,7 +5,7 @@
 % Copyright (c) 2003-2011 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the enumitem distribution release 3.5.0
+% This file is part of the enumitem distribution release 3.5.1
 % ------------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
@@ -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.5.0\\2011-08-28}
+\date{Version 3.5.1\\2011-09-05}
 
 \IfFileExists{enumitem.sty}{\usepackage{enumitem}}{}
 
@@ -478,8 +478,10 @@ example:
 \begin{verbatim}
 \begin{enumerate}[resume*,start=1] % or [start=1,resume*]
 \end{verbatim}
-uses the keys in the previuos \texttt{enumerate}, but restarts the 
-counter.
+uses the keys in the previuos \texttt{enumerate}, but restarts the
+counter.  If there is a series of a certain list with
+\texttt{resume*}, options are taken from the list previous to the
+first one, except for \texttt{start}.
 
 \subsection{Series}
 
@@ -815,6 +817,16 @@ environments behaving like them.  To define a new lists (or redefine a
 existing one), use |\newlist| (or |\renewlist|), where |<type>| is
 |enumerate|, |itemize| or |description|.
 
+If <type> is |enumerate|, a set of counters with names |<name>i|,
+|<name>ii|, |<name>iii|, |<name>iv|, etc.  (depending on <max-depth>)
+is defined.  Don't use an arbitrarily large number for <max-depth>, to
+avoid creating too many counters.  Then you can use those counters in
+labels; e.  g., if you have defined a list named \texttt{steps}, you
+can define a label with:
+\begin{verbatim}
+label=\arabic{stepsii}.\arabic{stepsi}
+\end{verbatim}
+
 \begin{desc}
 \verb|\setlist[<names>,<levels>]{<keys/values>}|\\
 \verb|\setlist*[<names>,<levels>]{<keys/values>}|
@@ -1420,8 +1432,11 @@ provided.
 (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.
+\item (3.5.1) \texttt{resume*} only worked once, and subsequent ones
+bahaved like \texttt{resume}.
 \end{itemize}
 
+
 \subsection{Acknowledgements}
 
 I wish to thank particularly the comments and suggestions from Lars
diff --git a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
index ca72fe4b328..637f38ce930 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.5.0
+% This file is part of the enumitem distribution release 3.5.1
 % -----------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
@@ -44,7 +44,7 @@
 % ~~~~~~~
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{enumitem}[2011/08/28 v3.5.0 Customized lists]
+\ProvidesPackage{enumitem}[2011/09/05 v3.5.1 Customized lists]
 
 % +=============================+
 % |      EMULATING KEYVAL       |
@@ -940,14 +940,18 @@
   \enit@after
   \endlist
   \ifx\enit@series\relax\else % discards resume*, too
-    \ifnum\enit@resuming=\@ne % ie, series
+    \ifnum\enit@resuming=\@ne % ie, series=
       \enit@setresumekeys{series@\enit@series}\global\global
-    \else % ie, resume, resume* (save count, but not keys)
+    \else % ie, resume=, resume*= (save count, but not keys)
       \enit@setresumekeys{series@\enit@series}\@gobblefour\global
     \fi
     \enit@afterlist
   \fi
-  \enit@setresumekeys\@currenvir\@empty\@empty
+  \ifnum\enit@resuming=\thr@@ % ie, resume* list (save count only)
+    \enit@setresumekeys\@currenvir\@gobblefour\global
+  \else
+    \enit@setresumekeys\@currenvir\@empty\@empty
+  \fi
   \aftergroup\enit@afterlist}
 
 % #1 = either \@currenvir or series@<series>
@@ -1073,7 +1077,11 @@
     \fi
     \enit@afterlist
   \fi
-  \enit@setresumekeys\@currenvir\@empty\@empty
+  \ifnum\enit@resuming=\thr@@ % ie, resume* list (save count only)
+    \enit@setresumekeys\@currenvir\@gobblefour\global
+  \else
+    \enit@setresumekeys\@currenvir\@empty\@empty
+  \fi
   \aftergroup\enit@afterlist}
 
 % \@item: unboxed