From 40d21c9d3b589f01ffcd2d6c7ef6c2bd88e0d5ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Jun 2010 22:28:21 +0000 Subject: computational-complexity update (21jun10) git-svn-id: svn://tug.org/texlive/trunk@19098 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/computational-complexity/cc.cls | 2 +- .../tex/latex/computational-complexity/ccalgo.sty | 24 ++++++++-------------- 2 files changed, 9 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/computational-complexity') diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index 225949f1291..9d334920136 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls @@ -38,7 +38,7 @@ \ifclass\expandafter\ProvidesClass\else\expandafter\ProvidesPackage\fi {\ifclass cc\else cc-cls\fi} [% CC MAIN DATE AND VERSION ON NEXT LINE -2010/06/17 v2.12 +2010/06/21 v2.13 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty index 83fc6ae847b..4ce41fb050d 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty @@ -114,6 +114,8 @@ \parshape \@ne \@totalleftmargin \linewidth} \newdimen\reinit@list@last \def\reinit@list#1{% +%%% \dimen@i#1\relax +%%% \typeout{Reinit: old \the\reinit@list@last, new \the\dimen@i}%%% DEBUG \advance\itemindent\reinit@list@last \advance\@totalleftmargin-\reinit@list@last \advance\linewidth\reinit@list@last @@ -155,7 +157,6 @@ \newdimen\algo@labelsep \newdimen\steplabelwidth \newtoks\AtNextItem -\newif\if@requireditemscomplete \newif\if@noitemargcopy \let\orig@item\item \def\item{\@ifnextchar[{\@noitemargcopyfalse\orig@item}{\@noitemargcopytrue\orig@item}} @@ -180,9 +181,9 @@ \global\last@algolabeltype\this@algolabeltype \global\this@algolabeltype\tw@ \else + \let\next\algonumerate@labelexplicit \global\last@algolabeltype\this@algolabeltype \global\this@algolabeltype\z@ - \let\next\algonumerate@labelexplicit \fi \fi\next{#1}} \newcommand{\algonumerate@makelabelexplicit}[1]{% @@ -306,9 +307,6 @@ \setcounter{algonumerate}{-\algonumerate@items}% \ifnum\algonumerate@items>\z@ \addtocounter{algonumerate}\m@ne - \global\@requireditemscompletefalse - \else - \global\@requireditemscompletetrue \fi \setcounter{block@cnt}\z@ \let\step\algo@step @@ -376,23 +374,22 @@ \let\@currentlabel\latest@item@currentlabel \let\@bare@currentlabel\latest@item@bare@currentlabel } +\newdimen\indention@reinit@list@last \newenvironment{algo@indention}{% \par - \if@requireditemscomplete + \indention@reinit@list@last\reinit@list@last \advance\leftmargin\blockindent \advance\labelsep\blockindent \advance\@totalleftmargin\blockindent \advance\linewidth-\blockindent \def\algo@indention@undo{% + \reinit@list{\indention@reinit@list@last}% \advance\leftmargin-\blockindent \advance\labelsep-\blockindent \advance\@totalleftmargin-\blockindent \advance\linewidth\blockindent } \list@parshape - \else - \let\algo@indention@undo\relax - \fi }{% \par \algo@indention@undo @@ -404,15 +401,10 @@ } \newif\ifindented@block \newenvironment{algo@block}{% - \indented@blockfalse - \if@requireditemscomplete\indented@blocktrue\fi - \ifindented@block\algo@indention - \else - \sbox\@tempboxa{\makelabel{}}% - \fi + \algo@indention \algo@range}{% \endalgo@range - \ifindented@block\endalgo@indention\fi + \endalgo@indention } \newdimen\meta@indent \newenvironment{algo@meta}{% -- cgit v1.2.3