computaional-complexity update 2010/06/29 v2.14

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

1 files changed, 44 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
index 144a418cfac..be7f94d45c4 100644
--- a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
+++ b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
@@ -2648,6 +2648,8 @@ multilingual,english]{cc}
 %    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}
+%  \changes{v2.13}{2010/05/29}{Advanced version to 2.14, debugged
+%    setrefrange in ccalgo, Michael N{\"{u}}sken, Bonn}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \providecommand\ignorespacesafterend{\@ignoretrue}
@@ -2656,7 +2658,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/21 v2.13
+2010/06/29 v2.14
 computational complexity
 \ifclass document class\else package\fi]
 %    \end{macrocode}
@@ -3710,14 +3712,8 @@ computational complexity
 %  The following macros supplement the traditional |\author|,
 %  |\title| and |\date| declarations.  First, |\contact| declares the
 %  email address of the contact author.
-%  \changes{v2.11}{2010/06/17}{Deactivate fullpage.sty with ccpublish.}
 %    \begin{macrocode}
 %<*cclayout>
-\if@ccpublish
-\expandafter\xdef\csname ver@fullpage.sty\endcsname{9999}%
-\typeout{The package fullpage is forbidden when publishing in the
-  journal computation complexity.  It will be ignored.}
-\fi
 \let\@contact\relax
 \newcommand{\contact}[1]{\gdef\@contact{#1}}
 \AtBeginDocument{\if@ccpublish
@@ -4211,6 +4207,11 @@ computational complexity
 %   \lclo{cctextarea} is active. Michael N{\"{u}}sken, Paderborn}
 % \changes{v2.01}{2001/08/20}{Removed bug: \cs{@abswidth} must always
 %   be defined.  Michael N{\"{u}}sken, Paderborn}
+%  \changes{v2.11}{2010/06/17}{Deactivate fullpage.sty with
+%    ccpublish. Michael N{\"{u}}sken, Bonn}
+%  \changes{v2.13}{2010/06/22}{Disabled the file control, instead with
+%    ccpublish the compilation will abort with a FATAL ERROR. Michael
+%    N{\"{u}}sken, Bonn}
 %    \begin{macrocode}
 \if@cctextarea
 \textwidth=141mm
@@ -4225,6 +4226,31 @@ computational complexity
 \else
 \@abstrwidth0.85\textwidth
 \fi
+%%% \if@ccpublish
+%%% \expandafter\xdef\csname ver@fullpage.sty\endcsname{9999}%
+%%% \expandafter\xdef\csname ver@a4wide.sty\endcsname{9999}%
+%%% \ClassWarning{cc}{The packages fullpage, a4wide are ignored
+%%%   when publishing in the journal \cc.}{}%
+%%% \fi
+\AtBeginDocument{%
+  \if@ccpublish\@tempswafalse
+  \ifdim\topmargin=0mm\relax\else\@tempswatrue\fi
+  \ifdim\textwidth=141mm\relax\else\@tempswatrue\fi
+  \ifdim\textheight=200mm\relax\else\@tempswatrue\fi
+  \if@tempswa
+  \ClassError{cc}{FATAL ERROR! For publishing in cc the page and text
+    dimension must not be manipulated. Remove any packages that
+    modify the text or page dimensions. In particular: remove the
+    packages^^J
+    fullpage.sty,^^J
+    a4wide.sty,^^J
+    geometry.sty,^^J
+    vmargin.sty,^^J
+    typearea.sty}{}%
+  \endinput
+  \fi
+  \fi
+}
 %    \end{macrocode}
 %  We fit the margins so that 1~in + |\oddsidemargin| + |\textwidth| +
 %  |\evensidemargin| + 1~in = |\paperwidth|.  (Note that the margins
@@ -5744,8 +5770,11 @@ computational complexity
 \newdimen\steplabelwidth
 %    \end{macrocode}
 %  This token list is executed at the next |\item|.
+%  \changes{v2.13}{2010/05/29}{Introduced \cs{AtNextNumberedItem}, Michael
+%    N{\"{u}}sken, Bonn}
 %    \begin{macrocode}
 \newtoks\AtNextItem
+\newtoks\AtNextNumberedItem
 %    \end{macrocode}
 %  A toggle noting whether the named items are complete or not.
 %  \changes{v2.10}{2010/05/11}{Redesign: implement another mechanism
@@ -5846,9 +5875,15 @@ computational complexity
     \fi
     \global\@speciallabeltrue
 %    \end{macrocode}
-%  Execute |\AtNextItem| once and clear it.
+%  Execute |\AtNextItem| once and clear it. If in a numbered item
+%  execute |\AtNextNumberedItem| once and clear it.
+%  \changes{v2.13}{2010/05/29}{Introduced \cs{AtNextNumberedItem}, Michael
+%    N{\"{u}}sken, Bonn}
 %    \begin{macrocode}
     \the\AtNextItem \global\AtNextItem{}%
+    \ifnum\this@algolabeltype=\@ne
+    \the\AtNextNumberedItem \global\AtNextNumberedItem{}%
+    \fi
 %    \end{macrocode}
 %  Reinitialize the list indentions.
 %    \begin{macrocode}
@@ -6060,7 +6095,7 @@ computational complexity
   \par
   \stepcounter{block@cnt}\edef\block@{\arabic{block@cnt}}%
   \refsetrange{bob\block@}{eob\block@}%
-  \AtNextItem{\algolabel{bob\block@}}%
+  \AtNextNumberedItem{\algolabel{bob\block@}}%
   }{%
   \algolabel{eob\block@}%
   \par