From ca6a098e2e1413be5291b8ada623a166843ef436 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Wed, 30 Jun 2010 11:34:07 +0000 Subject: computaional-complexity update 2010/06/29 v2.14 git-svn-id: svn://tug.org/texlive/trunk@19191 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/computational-complexity/cc.cls | 2 +- .../tex/latex/computational-complexity/ccalgo.sty | 6 ++++- .../latex/computational-complexity/cclayout.sty | 30 ++++++++++++++++++---- 3 files changed, 31 insertions(+), 7 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 9d334920136..029a8abc0db 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/21 v2.13 +2010/06/29 v2.14 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 4ce41fb050d..99e87eb073d 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty @@ -157,6 +157,7 @@ \newdimen\algo@labelsep \newdimen\steplabelwidth \newtoks\AtNextItem +\newtoks\AtNextNumberedItem \newif\if@noitemargcopy \let\orig@item\item \def\item{\@ifnextchar[{\@noitemargcopyfalse\orig@item}{\@noitemargcopytrue\orig@item}} @@ -218,6 +219,9 @@ \fi \global\@speciallabeltrue \the\AtNextItem \global\AtNextItem{}% + \ifnum\this@algolabeltype=\@ne + \the\AtNextNumberedItem \global\AtNextNumberedItem{}% + \fi \reinit@list@label } \newcommand{\algonumerate@labelexplicit}[1]{% For algorithm i/o @@ -362,7 +366,7 @@ \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 diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty index f092c8402ee..d9d7abe00d3 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty @@ -31,11 +31,6 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\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 @@ -321,6 +316,31 @@ \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 +} \typeout{Now adjusting margins.} \ifcase\@marginmode \AtEndOfClass{% -- cgit v1.2.3