enumitem (29sep11)

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

4 files changed, 48 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/enumitem/README b/Master/texmf-dist/doc/latex/enumitem/README
index ffb375b20e6..dc3f320e75f 100644
--- a/Master/texmf-dist/doc/latex/enumitem/README
+++ b/Master/texmf-dist/doc/latex/enumitem/README
@@ -1,4 +1,4 @@
-Enumitem 3.5.1
+Enumitem 3.5.2
 ~~~~~~~~~~~~~~
 
 A package to customize the three basic lists (enumerate,
@@ -93,10 +93,14 @@ documented.
 - resume* only worked once, and subsequent ones
 behaved like resume.
 
+3.5.2
+~~~~~
+- \setlist* didn't work.
+
 _________________________________________________________________
 Javier Bezos                    | http://www.tex-tipografia.com
 .................................................................
-2011-09-05
+2011-09-28
 
 
 
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
index e77dfcb4ff1..35249ad491c 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 7c9ad1ffc1e..33cbb130ff2 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.1
+% This file is part of the enumitem distribution release 3.5.2
 % ------------------------------------------------------------
 % 
 % 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.1\\2011-09-05}
+\date{Version 3.5.2\\2011-09-28}
 
 \IfFileExists{enumitem.sty}{\usepackage{enumitem}}{}
 
@@ -291,6 +291,13 @@ following all labels with |align=right| are set as superscripts:
 \end{verbatim}
 (A new name is also possible, of course.)
 
+If you want the internal settings for \texttt{align} and \texttt{font}
+be ignored, you can override the \textsf{enumitem} definition of
+\verb|\makelabel| in \texttt{before}:
+\begin{verbatim}
+\begin{description}[before={\renewcommand\makelabel[1]{\ref{##1}}}]
+\end{verbatim}
+(Alternatively, define a macro and use \verb|\let|.) 
 
 \subsection{Horizontal spacing of labels}
 
@@ -653,6 +660,14 @@ combine it with |noitemsep| or |nolistsep|.
 
 \3
 
+Inline lists are ``horizontal'' lists set as ordinary text inside a
+paragraph.  With this package you can create inline lists, as
+explained below, with \verb|\newlist|, which have their own labels and
+counters.  However, in most cases inline versions of standard lists,
+with the same labelling schema, will be enough -- the package option
+\verb|inline| does that.
+
+
 \begin{desc}
 |inline| \qquad(package option)\\
 \texttt{enumerate*}\qquad\texttt{itemize*}\qquad
@@ -668,7 +683,8 @@ are shared with the displayed (ie, ``normal'') lists \texttt{enumerate},
 remember resuming is based on environment names, not on list types).  This applies
 only to those created with \texttt{inline} -- inline lists created
 with |\newlist| as described below are independent and use their
-own labels and settings.
+own labels and settings. Note as well \verb|inline| is not required 
+if you needn't inline versions of standard lists.
 
 \begin{desc}
 |itemjoin=<string>|\qquad|itemjoin*=<string>|
@@ -1362,6 +1378,11 @@ 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.
 
+\item (3.5.2) An incompatibility with 2.x has popped up -- if you were
+using the optional argument to pass a value to a \verb|\ref| or other 
+macro requiring expandable macros, an error is raised. A quick fix 
+is letting \verb|\makelabel| to |\descriptionlabel| in \texttt{before}.
+
 \end{itemize}
 
 \subsection{What's new in 3.0}
@@ -1434,6 +1455,7 @@ provided.
 \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}.
+\item (3.5.2) Fixed |\setlist*|, which didn't work.
 \end{itemize}
 
 
diff --git a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
index 637f38ce930..7a505b85541 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.1
+% This file is part of the enumitem distribution release 3.5.2
 % -----------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
@@ -44,7 +44,7 @@
 % ~~~~~~~
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{enumitem}[2011/09/05 v3.5.1 Customized lists]
+\ProvidesPackage{enumitem}[2011/09/28 v3.5.2 Customized lists]
 
 % +=============================+
 % |      EMULATING KEYVAL       |
@@ -1422,17 +1422,27 @@
 \def\enit@shortenumerate{enum}
 \def\enit@shortitemize{item}
 
-\newcommand\setlist[1][]{%
-  \@ifstar{\enit@setlist{#1}\@ne}{\enit@setlist{#1}\z@}}
+\newcommand\setlist{%
+  \@ifstar{\enit@setlist\@ne}{\enit@setlist\z@}}
+
+\def\enit@setlist#1{%
+  \@ifnextchar[{\enit@setlist@x#1}{\enit@setlist@i#1\@empty}}
+
+% Let's accept \setlist[]*{}, too, because an error in <=3.5.1
+
+\def\enit@setlist@x#1[#2]{%
+  \@ifstar{\enit@setlist@i\@ne{#2}}{\enit@setlist@i#1{#2}}}
 
 % #1 list names/levels, #2 keys/values
 
-\def\enit@setlist#1#2#3{%
+% #1 star flag, #2 list names/levels, #3 keys/values
+
+\def\enit@setlist@i#1#2#3{%
   \let\enit@eltnames\relax
   \let\enit@b\@empty
   \let\enit@eltlevels\relax
   \let\enit@c\@empty
-  \protected@edef\enit@a{#1}%
+  \protected@edef\enit@a{#2}%
   \@for\enit@a:=\enit@a\do{% the 2nd enit@a is first expanded
     \@ifundefined{enitdp@\enit@meaning\enit@a}%
       {\edef\enit@c{\enit@c\enit@eltlevels{\enit@a}}}%
@@ -1450,7 +1460,7 @@
     \def\enit@a{##1}%
     \enit@c}%
   \def\enit@eltlevels##1{%
-    \enit@saveset\enit@a{##1}#2{#3}}%
+    \enit@saveset\enit@a{##1}#1{#3}}%
   \enit@b}%
 
 % Deprecated: