From c16b83c6785e81ae8a34b87155fc8d7d98edadaa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 29 Sep 2011 23:43:12 +0000 Subject: enumitem (29sep11) git-svn-id: svn://tug.org/texlive/trunk@24146 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/enumitem/enumitem.sty | 24 ++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/enumitem') 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: -- cgit v1.2.3