easylist (13jan14)

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

3 files changed, 21 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/easylist/easylist-doc.pdf b/Master/texmf-dist/doc/latex/easylist/easylist-doc.pdf
index 46804a87a2b..844d2439d08 100644
--- a/Master/texmf-dist/doc/latex/easylist/easylist-doc.pdf
+++ b/Master/texmf-dist/doc/latex/easylist/easylist-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/easylist/easylist-doc.tex b/Master/texmf-dist/doc/latex/easylist/easylist-doc.tex
index b9d97718e9e..5296f26ca04 100644
--- a/Master/texmf-dist/doc/latex/easylist/easylist-doc.tex
+++ b/Master/texmf-dist/doc/latex/easylist/easylist-doc.tex
@@ -10,7 +10,7 @@
 \usepackage{xcolor}
 \usepackage{fancyvrb}
 \usepackage{easylist}
-\usepackage[pdfborder=0 0 1]{hyperref}
+\usepackage[pdfborder={0 0 0}]{hyperref}
 \let\ref\autoref
 
 \title{\Example{12}{\bfseries The \texttt{easylist} package for numbered items}}
@@ -1099,7 +1099,7 @@ Otherwise, we set the counters under investigation to 0, conditionally reset its
 We need some simple definitions, including a font definition for Zapf's Dingbats.
 \VI3.
 
-Now, here's the command that handles numbers and their punctuation. It defines +\el@ItemCounter+, to be inserted in the final product. First, we turn user's input into commands for the +Numbers+ parameter. We do this here because a command such as +\l+ has to be local, since it's used to typeset some letter. The +\z+ command actually changes the font.
+Now, here's the command that handles numbers and their punctuation. It defines +\el@ItemCounter+, to be inserted in the final product. The commands before match the +Numbers+ parameter with \LaTeX\ commands.
 \VI7.
 
 \noindent The definition is twofold: it prints the first numbers, and then the last one, i.e. the \n th one in an item of the \n th level. There are few differences. So, in case we're one of the first counters, i.e. in case +\el@ControlCounter+ is lower than +\el@CounterLevel+ (which basically records how many \S's we've seen), and if +Start*+ for this counter is unspecified (equal to +NA+) but +Start+ is not, then we turn that counter to the value of +Start+, set it back to +NA+ (because we don't want the counter to be stuck to that value), and reset lower counters. Indeed, if you say +\ListProperties(Start1=5)+ and then type \S\S, chances are you want the second counter to start at 1, don't you?
@@ -1111,8 +1111,8 @@ Now, here's the command that handles numbers and their punctuation. It defines +
 \noindent Now, if the current counter is higher than +Hide+ for the current level, we print it or rather store it in +\el@ItemCounter+, which before all stores itself, i.e. previous values of itself, so when we reiterate we retrieve everything from the previous iteration.
 \VI*2.
 
-\noindent We store the counter value in a group, because if its +Numbers+ parameter is +z+, we change the font, and we don't want that to spread. This parameter is used in a somewhat cumbersome but efficient fashion; we retrieve its value with +\csname Numbers\the\el@ControlCounter\endcsname+, which yields, say, +a+, and since it's enclosed in an additional +\csname+/+\endcsname+ pair, we get +\a+, which was defined at the beginning of the macro.
-\VI*3.
+\noindent We store the counter value in a group, because if its +Numbers+ parameter is +z+, we change the font, and we don't want that to spread.
+\VI*4.
 
 \noindent Finally, we put the punctuation mark, close the +\el@ItemCounter+ and the conditional and set the stage for tail recursion:
 \VI*4.
@@ -1124,7 +1124,7 @@ Now, if we're concerned with the last counter of the item, first we increment it
 \VI*9.
 
 \noindent We build +\el@ItemCounter+ just the same except that if +FinalMark+ is specified, we put it instead of +Mark+.
-\VI*11.
+\VI*12.
 
 \noindent And we stop the iteration and close:
 \VI*4.
@@ -1171,8 +1171,8 @@ First, we turn +#+ into a normal character because we'll need it in the error me
 \noindent If +Hang+ is turned off, we simply set +\parindent+ to value specified by the user:
 \VI*3.
 
-\noindent Finally, we set the left margin, and with +\hangafter0+ we tell \TeX\ to start indenting from the first line on. Then we add the negative space (set to 0pt if +Align+ is not +alreadymoved+) and release the box.
-\VI*2.
+\noindent Finally, we set the left margin, and with +\hangafter0+ we tell \TeX\ to start indenting from the first line on. Then we add the negative space (set to 0pt if +Align+ is not +alreadymoved+) and release the box. The +\if@afterindent+ conditional is set to +true+ to prevent \LaTeX\ from removing indentation after section titles.
+\VI*3.
 
 \noindent We're done with the counter and we must now set the stage for the item text. First, we open a group for the reason above, set +\@currentlabel+ (used by \LaTeX\ to know what should be +\label+'ed with +\label+) to +\el@ItemCounter+ and clear the latter (since it recusively defines itself, see above).
 \VI*3.
@@ -1207,4 +1207,4 @@ Now, according to the option loaded with the package, we create the proper envir
 At last, we restore the original catcodes and say goodbye.
 \VI5.
 
-\end{document}
\ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/easylist/easylist.sty b/Master/texmf-dist/tex/latex/easylist/easylist.sty
index 6cf96574d92..613f322637a 100644
--- a/Master/texmf-dist/tex/latex/easylist/easylist.sty
+++ b/Master/texmf-dist/tex/latex/easylist/easylist.sty
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                          %%
-%% easylist.sty v.1.3 by Paul Isambert                                      %%
+%% easylist.sty v.1.4 by Paul Isambert                                      %%
 %% See the documentation for a comment on the implementation.               %% 
 %%                                                                          %%
 %% This set of macros is published under the LaTeX Project Public License.  %%
@@ -15,7 +15,7 @@
 %%                                                                          %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{easylist}[2010/02/28 v.1.3 Numbered items with a single command.]
+\ProvidesPackage{easylist}[2014/01/11 v.1.4 Numbered items with a single command.]
 
 \makeatletter
 
@@ -627,13 +627,13 @@
 \def\el@NA{NA}
 \font\el@ZapfDingbats=pzdr
 
+\expandafter\def\csname el@NumberDenotation:a\endcsname{\arabic}%
+\expandafter\def\csname el@NumberDenotation:l\endcsname{\alph}%
+\expandafter\def\csname el@NumberDenotation:L\endcsname{\Alph}%
+\expandafter\def\csname el@NumberDenotation:r\endcsname{\roman}%
+\expandafter\def\csname el@NumberDenotation:R\endcsname{\Roman}%
+\expandafter\def\csname el@NumberDenotation:z\endcsname{\el@ZapfDingbats\arabic}%
 \def\el@PrintCounters{%
-\def\a{\arabic}%
-\def\l{\alph}%
-\def\L{\Alph}%
-\def\r{\roman}%
-\def\R{\Roman}%
-\def\z{\el@ZapfDingbats\arabic}%
 \ifnum\el@ControlCounter<\el@CounterLevel
 	\expandafter\ifx\csname Start\the\el@ControlCounter*\endcsname\el@NA
 		\expandafter\ifx\csname Start\the\el@ControlCounter\endcsname\el@NA
@@ -653,7 +653,8 @@
 	\ifnum\el@ControlCounter>\csname Hide\the\el@CounterLevel\endcsname
 		\xdef\el@ItemCounter{\el@ItemCounter
 		\bgroup
-		\csname\csname Numbers\the\el@ControlCounter\endcsname\endcsname{List\the\el@ControlCounter}%
+		\csname el@NumberDenotation:\csname Numbers\the\el@ControlCounter\endcsname\endcsname{%
+      List\the\el@ControlCounter}%
 		\egroup
 		\csname Mark\the\el@ControlCounter\endcsname}%
 	\fi
@@ -674,7 +675,8 @@
 	\ifnum\el@ControlCounter>\csname Hide\the\el@CounterLevel\endcsname
 		\xdef\el@ItemCounter{\el@ItemCounter
 		\bgroup
-		\csname\csname Numbers\the\el@ControlCounter\endcsname\endcsname{List\the\el@ControlCounter}%
+		\csname el@NumberDenotation:\csname Numbers\the\el@ControlCounter\endcsname\endcsname{%
+      List\the\el@ControlCounter}%
 		\egroup
 		\expandafter\ifx\csname FinalMark\the\el@ControlCounter\endcsname\el@NA
 			\csname Mark\the\el@ControlCounter\endcsname
@@ -797,6 +799,7 @@
 		\else
 			\parindent=\csname Indent\the\el@CounterLevel\endcsname
 		\fi
+    \@afterindenttrue
 		\hangafter0\hangindent\el@TotalMargin
 		\hskip-\el@LeftMove\box\el@CounterBox
 		\begingroup