computational-complexity update (21jun10)

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

1 files changed, 17 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
index d026cdb60a6..144a418cfac 100644
--- a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
+++ b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
@@ -2643,9 +2643,11 @@ multilingual,english]{cc}
 %    minor changes, Michael N{\"{u}}sken, Bonn}
 %  \changes{v2.10}{2010/05/11}{Advanced version to 2.11, redesign of
 %    algorithms, Michael N{\"{u}}sken, Bonn}
-%  \changes{v2.11}{2010/05/11}{Advanced version to 2.12, deactivate
+%  \changes{v2.11}{2010/05/16}{Advanced version to 2.12, deactivate
 %    fullpage.sty when ccpublish is active, remove debug output in
 %    ccalgo, Michael N{\"{u}}sken, Bonn}
+%  \changes{v2.12}{2010/05/21}{Advanced version to 2.13, debugged
+%    indention processing in ccalgo, Michael N{\"{u}}sken, Bonn}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \providecommand\ignorespacesafterend{\@ignoretrue}
@@ -2654,7 +2656,7 @@ multilingual,english]{cc}
 \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]
 %    \end{macrocode}
@@ -5641,6 +5643,8 @@ computational complexity
 %    \begin{macrocode}
 \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
@@ -5747,7 +5751,6 @@ computational complexity
 %  \changes{v2.10}{2010/05/11}{Redesign: implement another mechanism
 %    to get information about the type of \cs{item} that was called.}
 %    \begin{macrocode}
-\newif\if@requireditemscomplete
 \newif\if@noitemargcopy
 \let\orig@item\item
 \def\item{\@ifnextchar[{\@noitemargcopyfalse\orig@item}{\@noitemargcopytrue\orig@item}}
@@ -5790,9 +5793,9 @@ computational complexity
       \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}}
 %    \end{macrocode}
@@ -5852,9 +5855,9 @@ computational complexity
     \reinit@list@label
 }
 %    \end{macrocode}
-%  The next four macros are similar.  For each item type they produces
-%  the label and use the dirty trick to get counting and paragraph
-%  formatting as desired.
+%  The next four macros are similar to each other.  For each item type
+%  they produces the label and use the dirty trick to get counting and
+%  paragraph formatting as desired.
 %    \begin{macrocode}
 \newcommand{\algonumerate@labelexplicit}[1]{% For algorithm i/o
 %%%   \typeout{item explicit [#1]}%
@@ -5973,9 +5976,6 @@ computational complexity
   \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
@@ -6084,24 +6084,25 @@ computational complexity
 %  \begin{environment}{indention}
 %    The items inside this environment are indented by an amount of
 %    |\blockindent|.
+%  \changes{v2.12}{2010/05/21}{Debugged indention processing, Michael
+%    N{\"{u}}sken, Bonn}
 %    \begin{macrocode}
+\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
@@ -6122,15 +6123,10 @@ computational complexity
 %    \begin{macrocode}
 \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
   }
 %    \end{macrocode}
 %  \end{environment}