diff options
author | Karl Berry <karl@freefriends.org> | 2010-03-01 01:50:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-03-01 01:50:01 +0000 |
commit | 6f87913b0d00d9633eac6d8d9a8f6faa52770f40 (patch) | |
tree | d4dfb7b33dcef3f5cad7e4f0fae118e704d96fa6 /Master/texmf-dist/tex | |
parent | 27d008d28aa94829355ee834ce50e79c55f21bb5 (diff) |
easylist update (28feb10)
git-svn-id: svn://tug.org/texlive/trunk@17241 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/easylist/easylist.sty | 826 |
1 files changed, 413 insertions, 413 deletions
diff --git a/Master/texmf-dist/tex/latex/easylist/easylist.sty b/Master/texmf-dist/tex/latex/easylist/easylist.sty index a13309af743..b9cc9210e55 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.2 by Paul Isambert %% +%% easylist.sty v.1.3 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}[2009/01/06 v.1.2 Numbered items with a single command.] +\ProvidesPackage{easylist}[2010/02/28 v.1.3 Numbered items with a single command.] \makeatletter @@ -32,21 +32,21 @@ \def\el@NumberCheck#1{% \expandafter\if#1?% - \el@Scratch0% + \el@Scratch0 \def\e@synext##1{\relax}% -\else% - \ifnum\el@Scratch=10% - \el@Scratch0% +\else + \ifnum\el@Scratch=10 + \el@Scratch0 \def\e@synext##1?{\relax}% - \DubiousFiguretrue% - \else% - \expandafter\if#1\the\el@Scratch% - \el@Scratch0% + \DubiousFiguretrue + \else + \expandafter\if#1\the\el@Scratch + \el@Scratch0 \def\e@synext##1{\el@NumberCheck}% - \else% - \el@Advance\el@Scratch% - \let\e@synext\el@NumberCheck% - \fi% + \else + \el@Advance\el@Scratch + \let\e@synext\el@NumberCheck + \fi \fi \fi\e@synext{#1}} @@ -56,40 +56,40 @@ \DeclareOption{ampersand}{\Ampersandtrue} \DeclareOption*{% \expandafter\el@NumberCheck\CurrentOption?% -\ifDubiousFigure% +\ifDubiousFigure \PackageError{easylist}{% ^^J==> `\CurrentOption' is not a valid number (in package options). ^^J==> It is ignored and there are only 10 counters}{}% -\else% - \el@CounterTotal\CurrentOption% +\else + \el@CounterTotal\CurrentOption \fi\DubiousFigurefalse} \ProcessOptions\relax \newcount\el@ControlCounter -\el@ControlCounter1% +\el@ControlCounter1 \newcount\el@CounterLevel -\el@CounterLevel1% +\el@CounterLevel1 \def\el@GenericCounter{% -\ifnum\el@ControlCounter>\el@CounterTotal% - \el@ControlCounter1% -\else% +\ifnum\el@ControlCounter>\el@CounterTotal + \el@ControlCounter1 +\else \newcounter{List\the\el@ControlCounter}% - \el@Advance\el@ControlCounter% - \expandafter\el@GenericCounter% + \el@Advance\el@ControlCounter + \expandafter\el@GenericCounter \fi} \el@GenericCounter \newcommand{\el@GenericDef}[3][]{% -\ifnum\el@ControlCounter>\el@CounterTotal% +\ifnum\el@ControlCounter>\el@CounterTotal \def\easynext[##1]##2##3{\relax}% - \el@ControlCounter1% -\else% + \el@ControlCounter1 +\else \expandafter\gdef\csname #2\the\el@ControlCounter#1\endcsname{#3}% - \el@Advance\el@ControlCounter% - \let\easynext\el@GenericDef% -\fi% + \el@Advance\el@ControlCounter + \let\easynext\el@GenericDef +\fi \easynext[#1]{#2}{#3}} \def\el@PreviousItem{0} @@ -115,25 +115,25 @@ \newdimen\el@ProgressiveDimension \def\el@ProgressiveMargin{% -\@ifstar% +\@ifstar {\ProgressiveStartrue\el@ProgressiveM@rgin}% {\ProgressiveStarfalse\el@ProgressiveM@rgin}} \def\el@ProgressiveM@rgin#1{% -\ifnum\el@ControlCounter>\el@CounterTotal% +\ifnum\el@ControlCounter>\el@CounterTotal \def\easynext##1{\relax}% - \el@ControlCounter1% -\else% + \el@ControlCounter1 +\else \el@ProgressiveDimension#1% - \multiply\el@ProgressiveDimension by \el@ControlCounter% - \ifProgressiveStar% + \multiply\el@ProgressiveDimension by \el@ControlCounter + \ifProgressiveStar \advance\el@ProgressiveDimension by -#1% - \fi% + \fi \expandafter\xdef\csname Margin\the\el@ControlCounter\endcsname{% \the\el@ProgressiveDimension}% - \el@Advance\el@ControlCounter% - \let\easynext\el@ProgressiveM@rgin% -\fi% + \el@Advance\el@ControlCounter + \let\easynext\el@ProgressiveM@rgin +\fi \easynext{#1}} \def\ListProperties(#1){% @@ -141,7 +141,7 @@ \el@GenericNumberCheck{Hide}% \el@GenericNumberCheck{Start}% \el@GenericNumberCheck[*]{Start}% -\el@GenericLetterCheck% +\el@GenericLetterCheck \el@GenericUnitSearch{Margin}% \el@GenericUnitSearch{Indent}% \el@GenericUnitSearch{Space}% @@ -154,8 +154,8 @@ {\el@NewList}} \def\el@NewList{% -\el@ControlCounter0% -\el@ResetCounters% +\el@ControlCounter0 +\el@ResetCounters \gdef\el@PreviousItem{0}% \el@GenericDef{FinalSpace}{.3em} \el@GenericDef{FinalMark}{NA}% @@ -208,152 +208,152 @@ ^^J==> \string\the\space in \string\ListProperties]{#1}{#2}{dimension}} \def\el@ListProperties#1=#2,{% -\DubiousFigurefalse% -\DubiousLetterfalse% -\DubiousNumberfalse% -\DubiousParameterfalse% -\Pointfalse% -\Signfalse% +\DubiousFigurefalse +\DubiousLetterfalse +\DubiousNumberfalse +\DubiousParameterfalse +\Pointfalse +\Signfalse \def\el@Parameter{}% \def\el@ParameterNumber{}% -\let\easynext@Properties\el@ListProperties% +\let\easynext@Properties\el@ListProperties \def\el@TempParameter{#1}% \def\el@TempValue{#2}% \if#1Z% - \let\easynext@Properties\relax% + \let\easynext@Properties\relax \else\if#1A% -\else\ifx\el@TempParameter\el@MarginTest% +\else\ifx\el@TempParameter\el@MarginTest \expandafter\el@UnitSearch#2? - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@GenericDef{Margin}{#2}% - \fi% -\else\ifx\el@TempParameter\el@ProgressiveTest% + \fi +\else\ifx\el@TempParameter\el@ProgressiveTest \expandafter\el@UnitSearch#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@ProgressiveMargin{#2}% - \fi% -\else\ifx\el@TempParameter\el@ProgressiveStarTest% + \fi +\else\ifx\el@TempParameter\el@ProgressiveStarTest \expandafter\el@UnitSearch#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@ProgressiveMargin*{#2}% - \fi% -\else\ifx\el@TempParameter\el@IndentTest% + \fi +\else\ifx\el@TempParameter\el@IndentTest \expandafter\el@UnitSearch#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@GenericDef{Indent}{#2}% - \fi% -\else\ifx\el@TempParameter\el@SpaceTest% + \fi +\else\ifx\el@TempParameter\el@SpaceTest \expandafter\el@UnitSearch#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@GenericDef{Space}{#2}% - \fi% -\else\ifx\el@TempParameter\el@SpaceStarTest% + \fi +\else\ifx\el@TempParameter\el@SpaceStarTest \expandafter\el@UnitSearch#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@GenericDef[*]{Space}{#2}% - \fi% -\else\ifx\el@TempParameter\el@FinalSpaceTest% + \fi +\else\ifx\el@TempParameter\el@FinalSpaceTest \expandafter\el@UnitSearch#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@DimenError{#1}{#2}% - \else% + \else \el@GenericDef{FinalSpace}{#2}% - \fi% -\else\ifx\el@TempParameter\el@HideTest% + \fi +\else\ifx\el@TempParameter\el@HideTest \expandafter\el@NumberCheck#2?% - \ifDubiousFigure% + \ifDubiousFigure \el@Error{#1}{#2}{number}% - \else% + \else \el@GenericDef{Hide}{#2}% - \fi% -\else\ifx\el@TempParameter\el@NumbersTest% + \fi +\else\ifx\el@TempParameter\el@NumbersTest \el@LetterCheck{#2}% - \ifDubiousLetter% - \el@Error% + \ifDubiousLetter + \el@Error {#1}{#2}{number denotation}% - \else% + \else \el@GenericDef{Numbers}{#2}% - \fi% -\else\ifx\el@TempParameter\el@AlignTest% - \ifx\el@TempValue\el@Fixed% + \fi +\else\ifx\el@TempParameter\el@AlignTest + \ifx\el@TempValue\el@Fixed \el@GenericDef{Align}{fixed}% - \else\ifx\el@TempValue\el@Move% + \else\ifx\el@TempValue\el@Move \el@GenericDef{Align}{move}% - \else\ifx\el@TempValue\el@False% - \else% + \else\ifx\el@TempValue\el@False + \else \expandafter\el@UnitSearch\el@TempValue?% - \ifDubiousFigure% - \el@Error% + \ifDubiousFigure + \el@Error [.^^J==> Admissible values are `false', `fixed', `move' or a dimension]% {#1}{#2}{value for `Align'}% - \DubiousFigurefalse% - \else% + \DubiousFigurefalse + \else \el@GenericDef{Align}{#2}% - \fi% - \fi\fi\fi% -\else\ifx\el@TempParameter\el@HangTest% - \ifx\el@TempValue\el@True% + \fi + \fi\fi\fi +\else\ifx\el@TempParameter\el@HangTest + \ifx\el@TempValue\el@True \el@GenericDef{Hang}{true}% - \else\ifx\el@TempValue\el@False% + \else\ifx\el@TempValue\el@False \el@GenericDef{Hang}{false}% - \else% - \el@Error% + \else + \el@Error [.^^J==> Admissible values are `true' or `false']% {#1}{#2}{value for `Hang'}% - \fi\fi% -\else\ifx\el@TempParameter\el@StartTest% + \fi\fi +\else\ifx\el@TempParameter\el@StartTest \PackageError{easylist}% {^^J==> `Start' can't be used without a number, so it is ignored}{}% -\else\ifx\el@TempParameter\el@StartStarTest% +\else\ifx\el@TempParameter\el@StartStarTest \PackageError{easylist}% {^^J==> `Start*' can't be used without a number, so it is ignored}{}% -\else\ifx\el@TempParameter\el@MarkTest% +\else\ifx\el@TempParameter\el@MarkTest \el@GenericDef{Mark}{#2}% -\else\ifx\el@TempParameter\el@FinalMarkTest% +\else\ifx\el@TempParameter\el@FinalMarkTest \el@GenericDef{FinalMark}{#2}% -\else\ifx\el@TempParameter\el@StyleTest% +\else\ifx\el@TempParameter\el@StyleTest \el@GenericDef{Style}{#2}% -\else\ifx\el@TempParameter\el@CtrStyleTest% +\else\ifx\el@TempParameter\el@CtrStyleTest \el@GenericDef[*]{Style}{#2}% -\else\ifx\el@TempParameter\el@ParStyleTest% +\else\ifx\el@TempParameter\el@ParStyleTest \el@GenericDef[**]{Style}{#2}% -\else\ifx\el@TempParameter\el@CounterCommandTest% +\else\ifx\el@TempParameter\el@CounterCommandTest \el@GenericDef{CtrCom}{#2}% -\else\expandafter\ifx\csname #1\endcsname\relax% +\else\expandafter\ifx\csname #1\endcsname\relax \el@DubiousParameter#1?% - \ifDubiousParameter% - \ifDubiousNumber% + \ifDubiousParameter + \ifDubiousNumber \PackageError{easylist}{^^J==> `#1' is not a valid parameter. It is ignored.% ^^J==> Besides, you don't have \el@ParameterNumber\space counters}{}% - \else% + \else \PackageError{easylist}{^^J==> `#1' is not a valid parameter. It is ignored}{}% - \fi% - \else% - \ifDubiousNumber% - \PackageError{easylist}{^^J==> You don't have \el@ParameterNumber\space% + \fi + \else + \ifDubiousNumber + \PackageError{easylist}{^^J==> You don't have \el@ParameterNumber\space counters, so `#1' is ignored.% ^^J==> Ask for more of them}{}% - \else% + \else \PackageError{easylist}{^^J==> Something is wrong with `#1' but I don't know what.% ^^J==> Maybe you put stars before numbers or you specified a number% ^^J==> to Progressive. Anyway, it is ignored}{}% - \fi% - \fi% -\else% + \fi + \fi +\else \expandafter\gdef\csname #1\endcsname{#2}% -\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi% +\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \el@CommaKiller} \def\el@Comm@Killer#1{\el@CommaKiller} @@ -370,178 +370,178 @@ \def\el@Void{} \def\el@DubiousParameter#1{% -\let\el@P@rameter\el@Parameter% -\let\el@P@rameterNumber\el@ParameterNumber% -\DubiousFigurefalse% +\let\el@P@rameter\el@Parameter +\let\el@P@rameterNumber\el@ParameterNumber +\DubiousFigurefalse \if#1?% \def\easynext{\el@ParameterNumberTest\el@ParameterTest}% -\else% - \let\easynext\el@DubiousParameter% +\else + \let\easynext\el@DubiousParameter \ifcat#1a% \edef\el@Parameter{\el@P@rameter#1}% - \else% - \el@ParameterTest% + \else + \el@ParameterTest \if#1* \edef\el@Parameter{\el@P@rameter#1}% - \else% + \else \el@NumberCheck#1? - \ifDubiousFigure% - \DubiousParametertrue% - \else% + \ifDubiousFigure + \DubiousParametertrue + \else \edef\el@ParameterNumber{\el@P@rameterNumber#1}% - \fi% - \fi% - \fi% + \fi + \fi + \fi \fi\easynext} \def\el@ParameterTest{% -\ifx\el@Parameter\el@MarginTest% -\else\ifx\el@Parameter\el@MarkTest% -\else\ifx\el@Parameter\el@FinalMarkTest% -\else\ifx\el@Parameter\el@NumbersTest% -\else\ifx\el@Parameter\el@IndentTest% -\else\ifx\el@Parameter\el@StyleTest% -\else\ifx\el@Parameter\el@CtrStyleTest% -\else\ifx\el@Parameter\el@ParStyleTest% -\else\ifx\el@Parameter\el@CounterCommandTest% -\else\ifx\el@Parameter\el@ProgressiveTest% - \DubiousNumberfalse% -\else\ifx\el@Parameter\el@ProgressiveStarTest% - \DubiousNumberfalse% -\else\ifx\el@Parameter\el@StartTest% -\else\ifx\el@Parameter\el@StartStarTest% -\else\ifx\el@Parameter\el@HideTest% -\else\ifx\el@Parameter\el@SpaceTest% -\else\ifx\el@Parameter\el@SpaceStarTest% -\else\ifx\el@Parameter\el@HangTest% -\else\ifx\el@Parameter\el@FinalSpaceTest% -\else\ifx\el@Parameter\el@AlignTest% -\else\DubiousParametertrue% +\ifx\el@Parameter\el@MarginTest +\else\ifx\el@Parameter\el@MarkTest +\else\ifx\el@Parameter\el@FinalMarkTest +\else\ifx\el@Parameter\el@NumbersTest +\else\ifx\el@Parameter\el@IndentTest +\else\ifx\el@Parameter\el@StyleTest +\else\ifx\el@Parameter\el@CtrStyleTest +\else\ifx\el@Parameter\el@ParStyleTest +\else\ifx\el@Parameter\el@CounterCommandTest +\else\ifx\el@Parameter\el@ProgressiveTest + \DubiousNumberfalse +\else\ifx\el@Parameter\el@ProgressiveStarTest + \DubiousNumberfalse +\else\ifx\el@Parameter\el@StartTest +\else\ifx\el@Parameter\el@StartStarTest +\else\ifx\el@Parameter\el@HideTest +\else\ifx\el@Parameter\el@SpaceTest +\else\ifx\el@Parameter\el@SpaceStarTest +\else\ifx\el@Parameter\el@HangTest +\else\ifx\el@Parameter\el@FinalSpaceTest +\else\ifx\el@Parameter\el@AlignTest +\else\DubiousParametertrue \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} \def\el@ParameterNumberTest{% -\ifx\el@ParameterNumber\el@Void% -\else% - \ifnum\el@ParameterNumber>\el@CounterTotal% - \DubiousNumbertrue% - \fi% +\ifx\el@ParameterNumber\el@Void +\else + \ifnum\el@ParameterNumber>\el@CounterTotal + \DubiousNumbertrue + \fi \fi} \def\el@UnitSearch#1{% -\let\easynext\el@UnitSearch% +\let\easynext\el@UnitSearch \if#1-% - \ifSign% - \DubiousFiguretrue% + \ifSign + \DubiousFiguretrue \def\easynext##1?{\relax}% - \else% - \Signtrue% - \fi% -\else% + \else + \Signtrue + \fi +\else \if#1+% - \ifSign% - \DubiousFiguretrue% + \ifSign + \DubiousFiguretrue \def\easynext##1?{\relax}% - \else% - \Signtrue% - \fi% - \else% - \Signtrue% + \else + \Signtrue + \fi + \else + \Signtrue \if#1?% - \DubiousFiguretrue% - \let\easynext\relax% - \else% + \DubiousFiguretrue + \let\easynext\relax + \else \if#1.% - \ifPoint% - \DubiousFiguretrue% + \ifPoint + \DubiousFiguretrue \def\easynext##1?{\relax}% - \else% - \Pointtrue% - \fi% - \else% + \else + \Pointtrue + \fi + \else \if#1,% \ifPoint - \DubiousFiguretrue% + \DubiousFiguretrue \def\easynext##1?{\relax}% - \else% - \Pointtrue% - \fi% - \else% + \else + \Pointtrue + \fi + \else \ifcat#1a% \def\easynext{\el@UnitCheck#1}% - \else% + \else \el@NumberCheck#1?% - \ifDubiousFigure% + \ifDubiousFigure \def\easynext{\el@DimenUnitCheck#1}% - \fi% - \fi% - \fi% - \fi% - \fi% - \fi% + \fi + \fi + \fi + \fi + \fi + \fi \fi\easynext} -\def\el@Em{em}% -\def\el@Ex{ex}% -\def\el@Centimetre{cm}% -\def\el@Millimetre{mm}% -\def\el@Inch{in}% -\def\el@Pica{pc}% +\def\el@Em{em} +\def\el@Ex{ex} +\def\el@Centimetre{cm} +\def\el@Millimetre{mm} +\def\el@Inch{in} +\def\el@Pica{pc} \def\el@Point{pt} -\def\el@Didot{dd}% -\def\el@Cicero{cc}% -\def\el@BigPoint{bp}% -\def\el@ScaledPoint{sp}% +\def\el@Didot{dd} +\def\el@Cicero{cc} +\def\el@BigPoint{bp} +\def\el@ScaledPoint{sp} \def\el@UnitCheck#1?{% \def\el@TempUnit{#1}% -\ifx\el@TempUnit\el@Em% -\else\ifx\el@TempUnit\el@Ex% -\else\ifx\el@TempUnit\el@Centimetre% -\else\ifx\el@TempUnit\el@Millimetre% -\else\ifx\el@TempUnit\el@Inch% -\else\ifx\el@TempUnit\el@Pica% -\else\ifx\el@TempUnit\el@Point% -\else\ifx\el@TempUnit\el@Didot% -\else\ifx\el@TempUnit\el@Cicero% -\else\ifx\el@TempUnit\el@BigPoint% -\else\ifx\el@TempUnit\el@ScaledPoint% +\ifx\el@TempUnit\el@Em +\else\ifx\el@TempUnit\el@Ex +\else\ifx\el@TempUnit\el@Centimetre +\else\ifx\el@TempUnit\el@Millimetre +\else\ifx\el@TempUnit\el@Inch +\else\ifx\el@TempUnit\el@Pica +\else\ifx\el@TempUnit\el@Point +\else\ifx\el@TempUnit\el@Didot +\else\ifx\el@TempUnit\el@Cicero +\else\ifx\el@TempUnit\el@BigPoint +\else\ifx\el@TempUnit\el@ScaledPoint \else\DubiousFiguretrue\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} \def\el@DimenUnitCheck#1#2?{% \if#1p% \if#2t% - \DubiousFigurefalse% - \fi% + \DubiousFigurefalse + \fi \fi} \newcommand{\el@GenericUnitSearch}[2][]{% -\Pointfalse% -\Signfalse% -\ifnum\el@ControlCounter>\el@CounterTotal% - \el@ControlCounter1% +\Pointfalse +\Signfalse +\ifnum\el@ControlCounter>\el@CounterTotal + \el@ControlCounter1 \def\easynext[##1]##2{\relax}% -\else% +\else \edef\el@TempTestable{\csname #2\the\el@ControlCounter#1\endcsname}% \expandafter\el@UnitSearch\el@TempTestable?% - \ifDubiousFigure% + \ifDubiousFigure \def\el@Name{#2}% - \ifx\el@Name\el@FinalSpace% + \ifx\el@Name\el@FinalSpace \el@Error[^^J==> and #2\the\el@ControlCounter#1\space is set to .3em.% ^^J==> Note that true TeX dimensions should be prefixed with% ^^J==> \string\the\space in \string\ListProperties]% {#2\the\el@ControlCounter#1}{\el@TempTestable}{dimension}% \expandafter\gdef\csname #2\the\el@ControlCounter#1\endcsname{.3em}% - \else% + \else \el@Error[^^J==> and #2\the\el@ControlCounter#1\space is set to 0cm.% ^^J==> Note that true TeX dimensions should be prefixed with% ^^J==> \string\the\space in \string\ListProperties]% {#2\the\el@ControlCounter#1}{\el@TempTestable}{dimension}% \expandafter\gdef\csname #2\the\el@ControlCounter#1\endcsname{0cm}% - \fi% - \fi% - \DubiousFigurefalse% - \el@Advance\el@ControlCounter% - \let\easynext\el@GenericUnitSearch% + \fi + \fi + \DubiousFigurefalse + \el@Advance\el@ControlCounter + \let\easynext\el@GenericUnitSearch \fi\easynext[#1]{#2}}% \def\el@LetterCheck#1{% @@ -551,81 +551,81 @@ \else\if#1l% \else\if#1L% \else\if#1z% -\else\DubiousLettertrue% +\else\DubiousLettertrue \fi\fi\fi\fi\fi\fi} \def\el@GenericLetterCheck{% -\ifnum\el@ControlCounter>\el@CounterTotal% - \el@ControlCounter1% +\ifnum\el@ControlCounter>\el@CounterTotal + \el@ControlCounter1 \def\easynext{\relax}% -\else% +\else \edef\el@TempTestable{\csname Numbers\the\el@ControlCounter\endcsname}% - \expandafter\el@LetterCheck\el@TempTestable% - \ifDubiousLetter% + \expandafter\el@LetterCheck\el@TempTestable + \ifDubiousLetter \PackageError{easylist}% {^^J==> `\el@TempTestable' is not a valid number denotation % (Numbers\the\el@ControlCounter=\el@TempTestable).% ^^J==> It is ignored and those numbers will be arabic numbers}{}% \expandafter\gdef\csname Numbers\the\el@ControlCounter\endcsname{a}% - \fi% - \DubiousLetterfalse% - \el@Advance\el@ControlCounter% - \let\easynext\el@GenericLetterCheck% + \fi + \DubiousLetterfalse + \el@Advance\el@ControlCounter + \let\easynext\el@GenericLetterCheck \fi\easynext}% \newcommand{\el@GenericNumberCheck}[2][]{% -\ifnum\el@ControlCounter>\el@CounterTotal% - \el@ControlCounter1% +\ifnum\el@ControlCounter>\el@CounterTotal + \el@ControlCounter1 \def\easynext[##1]##2{\relax}% -\else% +\else \edef\el@TempTestable{\csname #2\the\el@ControlCounter#1\endcsname}% - \ifx\el@TempTestable\el@NA% - \else% + \ifx\el@TempTestable\el@NA + \else \expandafter\el@NumberCheck\el@TempTestable?% - \ifDubiousFigure% + \ifDubiousFigure \def\el@Name{#2}% - \ifx\el@Name\el@HideTest% + \ifx\el@Name\el@HideTest \el@Error[^^J==> and no counter will be hidden for items of level \the\el@ControlCounter]% {#2\the\el@ControlCounter#1}{\el@TempTestable}{number}% \expandafter\gdef\csname #2\the\el@ControlCounter#1\endcsname{0}% - \else% + \else \if#1*% \el@Error[^^J==> and this counter will continue its progression]% {#2\the\el@ControlCounter#1}{\el@TempTestable}{counter}% - \else% + \else \el@Error[^^J==> and this counter will continue its progression]% {#2\the\el@ControlCounter#1}{\el@TempTestable}{number}% - \fi% + \fi \expandafter\gdef\csname #2\the\el@ControlCounter#1\endcsname{NA}% - \fi% - \fi% - \fi% - \DubiousFigurefalse% - \el@Advance\el@ControlCounter% - \let\easynext\el@GenericNumberCheck% + \fi + \fi + \fi + \DubiousFigurefalse + \el@Advance\el@ControlCounter + \let\easynext\el@GenericNumberCheck \fi\easynext[#1]{#2}}% \def\el@ResetCounters{% -\el@Scratch\el@ControlCounter% -\el@Advance\el@Scratch% +\el@Scratch\el@ControlCounter +\el@Advance\el@Scratch \el@@ResetCounters} \def\el@@ResetCounters{% -\ifnum\el@Scratch>\el@CounterTotal% - \let\easynext\relax% - \el@Scratch0% -\else% +\ifnum\el@Scratch>\el@CounterTotal + \let\easynext\relax + \el@Scratch0 +\else \setcounter{List\the\el@Scratch}{0}% - \ifnum\el@ControlCounter=\el@CounterLevel% + \ifnum\el@ControlCounter=\el@CounterLevel \expandafter\gdef\csname Start\the\el@Scratch\endcsname{NA}% - \fi% - \el@Advance\el@Scratch% - \let\easynext\el@@ResetCounters% + \fi + \el@Advance\el@Scratch + \let\easynext\el@@ResetCounters \fi\easynext} \def\el@ItemCounter{} \def\el@NA{NA} -\font\el@ZapfDingbats=pzdr% +\font\el@ZapfDingbats=pzdr \def\el@PrintCounters{% \def\a{\arabic}% @@ -633,58 +633,58 @@ \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% - \else% +\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 + \else \setcounter{List\the\el@ControlCounter}{\csname Start\the\el@ControlCounter\endcsname}% \expandafter\gdef\csname Start\the\el@ControlCounter\endcsname{NA}% - \el@ResetCounters% - \fi% - \else% + \el@ResetCounters + \fi + \else \expandafter\ifnum\csname theList\the\el@ControlCounter\endcsname=% - \csname Start\the\el@ControlCounter*\endcsname% - \else% - \el@ResetCounters% + \csname Start\the\el@ControlCounter*\endcsname + \else + \el@ResetCounters \fi \setcounter{List\the\el@ControlCounter}{\csname Start\the\el@ControlCounter*\endcsname}% - \fi% - \ifnum\el@ControlCounter>\csname Hide\the\el@CounterLevel\endcsname% - \xdef\el@ItemCounter{\el@ItemCounter% - \bgroup% + \fi + \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}% - \egroup% + \egroup \csname Mark\the\el@ControlCounter\endcsname}% - \fi% - \el@Advance\el@ControlCounter% - \let\easynext\el@PrintCounters% -\else% + \fi + \el@Advance\el@ControlCounter + \let\easynext\el@PrintCounters +\else \stepcounter{List\the\el@CounterLevel}% - \el@ResetCounters% - \expandafter\ifx\csname Start\the\el@ControlCounter*\endcsname\el@NA% - \expandafter\ifx\csname Start\the\el@ControlCounter\endcsname\el@NA% - \else% + \el@ResetCounters + \expandafter\ifx\csname Start\the\el@ControlCounter*\endcsname\el@NA + \expandafter\ifx\csname Start\the\el@ControlCounter\endcsname\el@NA + \else \setcounter{List\the\el@ControlCounter}{\csname Start\the\el@ControlCounter\endcsname}% \expandafter\gdef\csname Start\the\el@ControlCounter\endcsname{NA}% - \fi% - \else% + \fi + \else \setcounter{List\the\el@ControlCounter}{\csname Start\the\el@ControlCounter*\endcsname}% - \fi% - \ifnum\el@ControlCounter>\csname Hide\the\el@CounterLevel\endcsname% - \xdef\el@ItemCounter{\el@ItemCounter% - \bgroup% + \fi + \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}% - \egroup% - \expandafter\ifx\csname FinalMark\the\el@ControlCounter\endcsname\el@NA% - \csname Mark\the\el@ControlCounter\endcsname% - \else% - \csname FinalMark\the\el@ControlCounter\endcsname% + \egroup + \expandafter\ifx\csname FinalMark\the\el@ControlCounter\endcsname\el@NA + \csname Mark\the\el@ControlCounter\endcsname + \else + \csname FinalMark\the\el@ControlCounter\endcsname \fi}% - \fi% - \el@ControlCounter1% - \let\easynext\relax% -\fi% + \fi + \el@ControlCounter1 + \let\easynext\relax +\fi \easynext} \newbox\el@CounterBox @@ -695,77 +695,77 @@ \catcode`#=12 \def\elCreateItem{% -\ifx\elNextToken\el@Space% +\ifx\elNextToken\el@Space \global\el@LeftMove=0pt% - \endgroup% - \ifnum\el@CounterLevel>\el@CounterTotal% + \endgroup + \ifnum\el@CounterLevel>\el@CounterTotal \PackageError{easylist}{^^J==> Too many % - \ifAmpersand&\else\ifAt @\else\ifPilcrow¶\else\ifSharp#\else§\fi\fi\fi\fi's.% - ^^J==> You can't use more than \el@CounterTotal\space% - \ifAmpersand&\else\ifAt @\else\ifPilcrow¶\else\ifSharp#\else§\fi\fi\fi\fi's% + \ifAmpersand&\else\ifAt @\else\ifPilcrow^^b6\else\ifSharp#\else^^a7\fi\fi\fi\fi's.% + ^^J==> You can't use more than \the\el@CounterTotal\space + \ifAmpersand&\else\ifAt @\else\ifPilcrow^^b6\else\ifSharp#\else^^a7\fi\fi\fi\fi's% ^^J==> unless you specify it when calling the package}{} - \par\noindent\fbox{!!!}\begingroup% - \else% - \par% + \par\noindent\fbox{!!!}\begingroup + \else + \par \expandafter\ifnum\el@PreviousItem=0% - \else% - \expandafter\ifnum\el@PreviousItem=\el@CounterLevel% - \vskip\csname Space\the\el@CounterLevel*\endcsname% - \else% - \vskip\csname Space\the\el@CounterLevel\endcsname% - \fi% - \fi% - \el@PrintCounters% - \el@TotalMargin\csname Margin\the\el@CounterLevel\endcsname% + \else + \expandafter\ifnum\el@PreviousItem=\el@CounterLevel + \vskip\csname Space\the\el@CounterLevel*\endcsname + \else + \vskip\csname Space\the\el@CounterLevel\endcsname + \fi + \fi + \el@PrintCounters + \el@TotalMargin\csname Margin\the\el@CounterLevel\endcsname \setbox\el@CounterBox=\hbox{{% \csname CtrCom\the\el@CounterLevel\endcsname{% - \csname Style\the\el@CounterLevel\endcsname% - \csname Style\the\el@CounterLevel*\endcsname% + \csname Style\the\el@CounterLevel\endcsname + \csname Style\the\el@CounterLevel*\endcsname \el@ItemCounter}% - \ifnum\el@CounterLevel>\csname Hide\the\el@CounterLevel\endcsname% - \hskip\csname FinalSpace\the\el@CounterLevel\endcsname% + \ifnum\el@CounterLevel>\csname Hide\the\el@CounterLevel\endcsname + \hskip\csname FinalSpace\the\el@CounterLevel\endcsname \fi}}% - \expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@False% - \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@Fixed% + \expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@False + \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@Fixed \expandafter\xdef\csname CounterBoxWidth\the\el@CounterLevel\endcsname{% \the\wd\el@CounterBox}% \expandafter\gdef\csname Align\the\el@CounterLevel\endcsname{alreadyfixed}% - \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@AlreadyFixed% + \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@AlreadyFixed \setbox\el@CounterBox=\hbox to \csname CounterBoxWidth\the\el@CounterLevel\endcsname{{% \csname CtrCom\the\el@CounterLevel\endcsname{% - \csname Style\the\el@CounterLevel\endcsname% - \csname Style\the\el@CounterLevel*\endcsname% + \csname Style\the\el@CounterLevel\endcsname + \csname Style\the\el@CounterLevel*\endcsname \el@ItemCounter}% \hfil}}% \setbox\el@ControlBox=\hbox{\unhcopy\el@CounterBox}% - \expandafter\ifdim\wd\el@ControlBox>\csname CounterBoxWidth\the\el@CounterLevel\endcsname% + \expandafter\ifdim\wd\el@ControlBox>\csname CounterBoxWidth\the\el@CounterLevel\endcsname \PackageWarning{easylist}{% ^^J==> This counter is to wide and will spread on% ^^J==> the item text. You should increase FinalSpace% ^^J==> if you use `fixed' or increase the dimension% ^^J==> if you specified one. ^^J==>}% - \fi% - \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@Move% + \fi + \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@Move \expandafter\xdef\csname CounterBoxWidth\the\el@CounterLevel\endcsname{% \the\wd\el@CounterBox}% \expandafter\gdef\csname Align\the\el@CounterLevel\endcsname{alreadymoved}% - \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@AlreadyMoved% - \el@LeftMove=\wd\el@CounterBox% - \advance\el@LeftMove by -\csname CounterBoxWidth\the\el@CounterLevel\endcsname% - \else% + \else\expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@AlreadyMoved + \el@LeftMove=\wd\el@CounterBox + \advance\el@LeftMove by -\csname CounterBoxWidth\the\el@CounterLevel\endcsname + \else \edef\el@TempTestable{\csname Align\the\el@CounterLevel\endcsname}% - \DubiousFigurefalse% - \Signfalse% - \Pointfalse% + \DubiousFigurefalse + \Signfalse + \Pointfalse \expandafter\el@UnitSearch\el@TempTestable?% - \ifDubiousFigure% - \el@Error% + \ifDubiousFigure + \el@Error [.^^J==> Admissible values are `false', `fixed', `move' or a dimension]% {Align\the\el@CounterLevel}{\csname Align\the\el@CounterLevel\endcsname}% {value for `Align'}% \expandafter\gdef\csname Align\the\el@CounterLevel\endcsname{false}% - \else% + \else \expandafter\xdef\csname CounterBoxWidth\the\el@CounterLevel\endcsname{% \csname Align\the\el@CounterLevel\endcsname}% \setbox\el@CounterBox=\hbox to \csname CounterBoxWidth\the\el@CounterLevel\endcsname{{% @@ -776,41 +776,41 @@ \hfil}}% \expandafter\gdef\csname Align\the\el@CounterLevel\endcsname{alreadyfixed}% \setbox\el@ControlBox=\hbox{\unhcopy\el@CounterBox}% - \expandafter\ifdim\wd\el@ControlBox>\csname CounterBoxWidth\the\el@CounterLevel\endcsname% + \expandafter\ifdim\wd\el@ControlBox>\csname CounterBoxWidth\the\el@CounterLevel\endcsname \PackageWarning{easylist}{% ^^J==> This counter is to wide and will spread on% ^^J==> the item text. You should increase FinalSpace% ^^J==> if you use `fixed' or increase the dimension% ^^J==> if you specified one. ^^J==>}% - \fi% - \fi% - \fi\fi\fi\fi\fi% - \expandafter\ifx\csname Hang\the\el@CounterLevel\endcsname\el@True% - \expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@AlreadyMoved% - \advance\el@TotalMargin by \csname CounterBoxWidth\the\el@CounterLevel\endcsname% - \parindent=-\csname CounterBoxWidth\the\el@CounterLevel\endcsname% - \else% - \advance\el@TotalMargin by \wd\el@CounterBox% - \parindent=-\wd\el@CounterBox% - \fi% - \else% - \parindent=\csname Indent\the\el@CounterLevel\endcsname% - \fi% - \hangafter0\hangindent\el@TotalMargin% - \hskip-\el@LeftMove\box\el@CounterBox% - \begingroup% - \edef\@currentlabel{\el@ItemCounter}% - \gdef\el@ItemCounter{}% - \parindent=\csname Indent\the\el@CounterLevel\endcsname% - \everypar{\hangafter0\hangindent\el@TotalMargin}% - \csname Style\the\el@CounterLevel\endcsname% - \csname Style\the\el@CounterLevel**\endcsname% - \fi% - \xdef\el@PreviousItem{\the\el@CounterLevel}% - \global\el@CounterLevel1% -\else% - \global\el@Advance\el@CounterLevel% + \fi + \fi + \fi\fi\fi\fi\fi + \expandafter\ifx\csname Hang\the\el@CounterLevel\endcsname\el@True + \expandafter\ifx\csname Align\the\el@CounterLevel\endcsname\el@AlreadyMoved + \advance\el@TotalMargin by \csname CounterBoxWidth\the\el@CounterLevel\endcsname + \parindent=-\csname CounterBoxWidth\the\el@CounterLevel\endcsname + \else + \advance\el@TotalMargin by \wd\el@CounterBox + \parindent=-\wd\el@CounterBox + \fi + \else + \parindent=\csname Indent\the\el@CounterLevel\endcsname + \fi + \hangafter0\hangindent\el@TotalMargin + \hskip-\el@LeftMove\box\el@CounterBox + \begingroup + \edef\@currentlabel{\el@ItemCounter} + \gdef\el@ItemCounter{} + \parindent=\csname Indent\the\el@CounterLevel\endcsname + \everypar{\hangafter0\hangindent\el@TotalMargin} + \csname Style\the\el@CounterLevel\endcsname + \csname Style\the\el@CounterLevel**\endcsname + \fi + \xdef\el@PreviousItem{\the\el@CounterLevel} + \global\el@CounterLevel1 +\else + \global\el@Advance\el@CounterLevel \fi\ignorespaces} \catcode`#=6 @@ -825,61 +825,61 @@ \def\el@PredefinedStyle[#1]{% \def\el@TempStyle{#1}% -\ifx\el@TempStyle\el@Tractatus% +\ifx\el@TempStyle\el@Tractatus \NewList(Mark=,Mark1=.)% -\else\ifx\el@TempStyle\el@CheckList% +\else\ifx\el@TempStyle\el@CheckList \NewList(% Hide=1000,Progressive*=1em,Hang=true,% Style*={\framebox(7,7){}}\hskip.6em, Style1**=\bfseries) -\else\ifx\el@TempStyle\el@BookToc% +\else\ifx\el@TempStyle\el@BookToc \NewList(% Hang=true,FinalMark=,Hide=1,% Style1=\large\bfseries,Numbers1=R,Space1=2.25em,Space1*=2.25em,Hide1=0,Hang1=false,Align1=2em,% Style2=\bfseries,Space2=1em,Space2*=1em,Align2=1.5em,% Margin3=1.5em,Margin4=3.8em,Margin5=7em,Margin6=10em,Margin7=12em,% Align3=2.3em,Align4=3.2em,Align5=4.1em,Align6=5em,Align7=6em)% -\else\ifx\el@TempStyle\el@ArticleToc% +\else\ifx\el@TempStyle\el@ArticleToc \NewList(% Hang=true,FinalMark=,% Align1=1.5em,Style1=\bfseries,Space1=1em,Space1*=1em,% Margin2=1.5em,Margin3=3.8em,Margin4=7em,Margin5=10em,% Align2=2.3em,Align3=3.2em,Align4=4.1em,Align5=5em)% -\else\ifx\el@TempStyle\el@Enumerate% +\else\ifx\el@TempStyle\el@Enumerate \NewList(% FinalSpace=.5em,Hang=true,Mark=.,Space=4pt,Space*=4pt,Align=move,% Margin1=1.2em,% Margin2=2.9em,Style2*={(},Mark2={)},Numbers2=l,Hide2=1,% Margin3=5.6em,Numbers3=r,Hide3=2,% Margin4=6.8em,Numbers4=L,Hide4=3)% -\else\ifx\el@TempStyle\el@Itemize% +\else\ifx\el@TempStyle\el@Itemize \NewList(% Hang=true,Space=4pt,Space*=4pt,Hide=1000,% Margin1=1.5em,Style1*=\textbullet\hskip .5em,% Margin2=3.7em,Style2*=--\hskip .5em,% Margin3=5.9em,Style3*=$\ast$\hskip .5em,% Margin4=7.8em,Style4*=$\cdot$\hskip .5em)% -\else% +\else \PackageError{easylist}{^^J==> `\el@TempStyle' is not a valid predefined style}{}% \fi\fi\fi\fi\fi\fi} \makeatother -\edef\SectionCatcode{\number\catcode`§}% -\edef\PilcrowCatcode{\number\catcode`¶}% -\edef\SharpCatcode{\number\catcode`#}% -\edef\AtCatcode{\number\catcode`@}% -\edef\AmpersandCatcode{\number\catcode`&}% +\edef\SectionCatcode{\number\catcode`^^a7} +\edef\PilcrowCatcode{\number\catcode`^^b6} +\edef\SharpCatcode{\number\catcode`#} +\edef\AtCatcode{\number\catcode`@} +\edef\AmpersandCatcode{\number\catcode`&} -\catcode`§=\active -\catcode`¶=\active +\catcode`^^a7=\active +\catcode`^^b6=\active \catcode`@=\active \catcode`#=\active \catcode`&=\active \ifAt \def\easylist{% - \catcode`@=\active% + \catcode`@=\active \def@{\futurelet\elNextToken\elCreateItem}% \begingroup\elPredefinedStyle} \def\endeasylist{\endgroup\par} @@ -890,18 +890,18 @@ \else \ifPilcrow \def\easylist{% - \catcode`¶=\active% - \def¶{\futurelet\elNextToken\elCreateItem}% + \catcode`^^b6=\active + \def^^b6{\futurelet\elNextToken\elCreateItem}% \begingroup\elPredefinedStyle} \def\endeasylist{\endgroup\par} \gdef\Activate{% - \xdef\PilcrowCatcode{\number\catcode`¶}% - \catcode`¶=\active} - \gdef\Deactivate{\catcode`¶=\PilcrowCatcode} + \xdef\PilcrowCatcode{\number\catcode`^^b6}% + \catcode`^^b6=\active} + \gdef\Deactivate{\catcode`^^b6=\PilcrowCatcode} \else \ifSharp \def\easylist{% - \catcode`#=\active% + \catcode`#=\active \def#{\futurelet\elNextToken\elCreateItem}% \begingroup\elPredefinedStyle} \def\endeasylist{\endgroup\par} @@ -912,7 +912,7 @@ \else \ifAmpersand \def\easylist{% - \catcode`&=\active% + \catcode`&=\active \def&{\futurelet\elNextToken\elCreateItem}% \begingroup\elPredefinedStyle} \def\endeasylist{\endgroup\par} @@ -922,14 +922,14 @@ \gdef\Deactivate{\catcode`&=\AmpersandCatcode} \else \def\easylist{% - \catcode`§=\active% - \def§{\futurelet\elNextToken\elCreateItem}% + \catcode`^^a7=\active + \def^^a7{\futurelet\elNextToken\elCreateItem}% \begingroup\elPredefinedStyle}% \def\endeasylist{\endgroup\par} \gdef\Activate{% - \xdef\SectionCatcode{\number\catcode`§}% - \catcode`§=\active} - \gdef\Deactivate{\catcode`§=\SectionCatcode} + \xdef\SectionCatcode{\number\catcode`^^a7}% + \catcode`^^a7=\active} + \gdef\Deactivate{\catcode`^^a7=\SectionCatcode} \fi \fi \fi @@ -938,5 +938,5 @@ \catcode`&=\AmpersandCatcode \catcode`#=\SharpCatcode \catcode`@=\AtCatcode -\catcode`¶=\PilcrowCatcode -\catcode`§=\SectionCatcode
\ No newline at end of file +\catcode`^^b6=\PilcrowCatcode +\catcode`^^a7=\SectionCatcode
\ No newline at end of file |