diff options
7 files changed, 108 insertions, 703 deletions
diff --git a/Master/texmf-dist/bibtex/bib/computational-complexity/journals.bib b/Master/texmf-dist/bibtex/bib/computational-complexity/journals.bib index cff0f82781f..8ee8b6b9311 100644 --- a/Master/texmf-dist/bibtex/bib/computational-complexity/journals.bib +++ b/Master/texmf-dist/bibtex/bib/computational-complexity/journals.bib @@ -31,8 +31,8 @@ F{\"{u}}r "urltext"-Felder hier ein paar Strings: @String{LNCSBIB = "http://link.springer.de/link/service/series/0558/bibs/"} @String{INPREP = "In preparation"} -@String{PRE = "Preprint"} -@String{SM = "Submitted"} +@String{PRE = "Preprint,"} +@String{SM = "Submitted,"} @String{SMTO = "Submitted to "} @String{TAIN = "To appear in "} @String{DWNLD = "Last download "}% use this instead of: Last access, Last accessed diff --git a/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex b/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex index bfdc8214cff..eced1ac2c79 100644 --- a/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex +++ b/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex @@ -39,7 +39,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} @@ -1174,6 +1174,7 @@ computational complexity \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}} @@ -1235,6 +1236,9 @@ computational complexity \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 @@ -1379,7 +1383,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 @@ -2117,11 +2121,6 @@ computational complexity %% 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 @@ -2407,6 +2406,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 +} \typeout{Now adjusting margins.} \ifcase\@marginmode \AtEndOfClass{% @@ -3334,684 +3358,6 @@ computational complexity %% End of file `ccthm.sty'. \end{filecontents*} \begin{filecontents*}{develop.sty} -% \iffalse meta-comment -% -% Copyright 1998, 2005, Michael Nüsken -% -% develop.sty -% 30-jul-98 ... build from drafting.sty, ported to LateX2e, -% extracted best things ... -% 14-dec-98 ... added \pagestyle-change for signdraft -% 05-feb-99 ... now \ifshowlabels may be used for a `local' control -% 25-may-99 ... added \oopscomment -% 27-oct-99 ... Added \showlabelsfalse to \showoopslist. -% 05-apr-00 ... Replaced several \gray commands by \begingray...\endgray -% so that there is no additional group. -% 12-apr-00 ... Changed \begingray...\endgray due to missing "color -% pop"'s reported by dvips -% 15-dec-00 ... added \invisoops, \todo, \invistodo. \oopscomment -% gives \gray now. -% 19-dec-00 ... added environment draft which disappers in final. But -% we need the package skipenv now. -% 20-dec-00 ... added changed \@setref, shows labelname if \ref missing. -% 01-sep-09 ... corrected a small error in \thispagestyle -% -% drafting.sty -% 25-mar-92 ... first things -% 06-apr-92 ... more facilities -% 25-aug-92 ... repaired -% 07-apr-94 ... repaired \skipenv; changed \label,\ref,\pageref -% Remark: \onlysections does not work. I don't know why. -% 17-jun-96 ... changed \showlabels, added \dotproofs -% 04-oct-96 ... some small changes (using PSTricks, using \gray now) -% 18-jun-97 ... added \showcommas -% 29-apr-98 ... changed display of \ref, \pageref and \cite under -% \showlabels -% 22-sep-99 ... some extra options and updates -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3a -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3a or later is part of all distributions of LaTeX -% version 1999/12/01 or later. -% -% ----------------------------------------------------------- -% -%<*chartab> -%\fi -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -% \iffalse meta-comment -%</chartab> -% \fi - - -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{develop}[2009/09/22 v1.02 develop MNuesken] - -\newif\ifdraft -\DeclareOption{draft}{\drafttrue} -\DeclareOption{final}{\draftfalse - \oopslistfalse - \showlabelsfalse - \signdraftfalse - \showcommasfalse -} - -\newif\ifoopslist -\newif\ifoops \oopsfalse -\DeclareOption{oopslist}{\oopslisttrue} -\DeclareOption{nooopslist}{\oopslistfalse} - -\newif\ifshowlabels -\DeclareOption{dontshowlabels}{\showlabelsfalse} -\DeclareOption{showlabels}{\showlabelstrue} -\DeclareOption{nolabels}{\showlabelsfalse} -\DeclareOption{labels}{\showlabelstrue} - -\newif\ifpstrickslabels \pstrickslabelsfalse -\DeclareOption{nopstrickslabels}{\pstrickslabelsfalse} -\DeclareOption{pstrickslabels}{\pstrickslabelstrue} - -\newif\ifleftflag \leftflagtrue -\newif\ifrightflag \rightflagtrue -\DeclareOption{hiderightflag}{\rightflagfalse} -\DeclareOption{hideleftflag}{\leftflagfalse} -\DeclareOption{hideflags}{\rightflagfalse\leftflagfalse} -\DeclareOption{showflags}{\rightflagtrue\leftflagtrue} - -\newif\ifsigndraft -\DeclareOption{signdraft}{\signdrafttrue} -\DeclareOption{dontsigndraft}{\signdraftfalse} - -\newif\ifshowcommas -\DeclareOption{showcommas}{\showcommastrue} -\DeclareOption{dontshowcommas}{\showcommasfalse} - -\newif\ifdraftpagenumbering -\DeclareOption{draftpagenumbering}{\draftpagenumberingtrue} -\DeclareOption{finalpagenumbering}{\draftpagenumberingfalse} - -\ExecuteOptions{final,nooopslist,labels,signdraft,dontshowcommas,finalpagenumbering} -\ProcessOptions - -%%% Moved that to the Option "final"... so you can turn it on! -%%% \ifdraft\else -%%% \oopslistfalse -%%% \showlabelsfalse -%%% \signdraftfalse -%%% \showcommasfalse -%%% \fi - -\ifpstrickslabels -\RequirePackage{pst-node} -\fi - -% Provide a macro for writing \gray ! -\@ifundefined{gray}{% - \RequirePackage{color}% - \definecolor{mediumgray}{gray}{0.5}% - \definecolor{mediumblack}{gray}{0.1}% - \providecommand{\gray}{\color{mediumgray}}% - \providecommand{\black}{\color{mediumblack}}% - }{}% -\def\begingray{\begingroup\leavevmode\gray{}} -\def\endgray{\endgroup} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% Commands to display labels ... -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\def\developInfo#1#2{}% -\newif\ifwas@inlabel -\def\Fbox#1{{\fboxsep1pt\fbox{\tiny\tt #1}}} -\ifpstrickslabels -\newpsstyle{leftflag}{linewidth=.4pt,linecolor=black} -\newcounter{flag} -\def\leftflag#1{% - \@bsphack% space hack - %%% \typeout{LEFTFLAG #1}% - \def\next{\do@leftflagmargin{#1}}% - \if@inlabel - \def\next{\global\setbox\@labels\hbox{% - \unhbox\@labels - \do@leftflagimmediate{#1}}}% - \else - \ifvmode\ifinner\else - \edef\next{\everypar{\the\everypar - \noexpand\do@leftflagimmediate{#1}}}% - \fi\fi - \fi - %%% \show\next - \next - \@esphack} -\def\do@leftflagmargin#1{% - \stepcounter{flag}% - \rnode[t]{T\theflag}{}% - \marginpar{\rnode[t]{M\theflag}{\Fbox{% - \parbox[t]{\marginparwidth}{% - #1 =\whole\ref{#1}% - }% - }}% - \ncbar[style=leftflag, - angleA=90,armA=.3\baselineskip, - angleB=90]{M\theflag}{T\theflag}% - }% -} -\def\do@leftflagimmediate#1{% - \stepcounter{flag}% - \rnode[t]{T\theflag}{}% - \rput[br](0,.7\baselineskip){% - \rnode[br]{M\theflag}{\Fbox{% -%%% \parbox[t]{\marginparwidth}{% - #1% =\whole\ref{#1}% -%%% }% - }}}% - \ncangle[style=leftflag, - angleA=-90,armA=0mm, - angleB=90,armB=.7\baselineskip]{M\theflag}{T\theflag}% -} -\let\rightflag\leftflag -\else -\expandafter\ifx\csname rput\endcsname\relax -%%% Defs if PSTricks is NOT loaded. -\def\leftflag#1{% - \if@inlabel - \developInfo{develop}{leftflag #1 in label}% - \global\setbox\@labels\hbox{% - \unhbox\@labels - \makebox(0,0){% - \lower-2\baselineskip\hbox{% - \llap{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.6\baselineskip - }% - }}% - \else\ifvmode - \ifinner\else - \developInfo{develop}{leftflag #1 vmode outer}% - \marginpar{\rlap{% - \Fbox{#1}% - }% - }% - \fi - \else - \@bsphack - \developInfo{develop}{leftflag #1 hmode}% - \makebox(0,0){% - \lower-2\baselineskip\hbox{% - \llap{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.6\baselineskip - }% - }% - \@esphack - \fi\fi - } -\def\rightflag#1{% - \if@inlabel - \developInfo{develop}{rightflag #1 in label}% - \global\setbox\@labels\hbox{% - \unhbox\@labels - \makebox(0,0){% - \lower-2\baselineskip\hbox{% - \rlap{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.6\baselineskip - }% - }}% - \else\ifvmode - \ifinner\else - \developInfo{develop}{rightflag #1 vmode outer}% - \marginpar{\rlap{% - \Fbox{#1}% - }% - }% - \fi - \else - \@bsphack - \developInfo{develop}{rightflag #1 hmode}% - \makebox(0,0){% - \lower-2\baselineskip\hbox{% - \rlap{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.6\baselineskip - }% - }% - \@esphack - \fi\fi - } -\else -%%% Defs of \labelflag and \bibflag if PSTricks IS loaded. -\typeout{Using PSTricks ...} -\def\leftflag#1{% - \if@inlabel - \developInfo{develop}{leftflag #1 in label}% - \global\setbox\@labels\hbox{% - \unhbox\@labels - \makebox(0,0){% - \lower-1.8\baselineskip\hbox{\gray% - \psset{framesep=.4pt,border=0pt}\rput*[r]{0}{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.8\baselineskip - }% - }% - }% - \else\ifvmode - \ifinner\else - \developInfo{develop}{leftflag #1 vmode outer}% - \marginpar{{\gray\Fbox{#1}}}% - \fi - \else - \@bsphack - \developInfo{develop}{leftflag #1 hmode}% - \makebox(0,0){% - \lower-1.8\baselineskip\hbox{\gray% - \psset{framesep=.4pt,border=0pt}\rput*[r]{0}{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.8\baselineskip - }% - }% - \@esphack - \ifwas@inlabel\ignorespaces\fi - \fi\fi - } -\def\rightflag#1{% - \if@inlabel - \developInfo{develop}{rightflag #1 in label}% - \global\setbox\@labels\hbox{% - \unhbox\@labels - \makebox(0,0){% - \lower-1.8\baselineskip\hbox{\gray% - \psset{framesep=.4pt,border=0pt}\rput*[l]{0}{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.8\baselineskip - }% - }% - }% - \else\ifvmode - \ifinner\else - \developInfo{develop}{rightflag #1 vmode outer}% - \marginpar{{\gray\Fbox{#1}}}% - \fi - \else - \@bsphack - \developInfo{develop}{rightflag #1 hmode}% - \makebox(0,0){% - \lower-1.8\baselineskip\hbox{\gray% - \psset{framesep=.4pt,border=0pt}\rput*[l]{0}{% - \Fbox{#1}% - }% - \hskip-.4pt% - \vrule depth.8\baselineskip - }% - }% - \@esphack - \fi\fi - } -\fi -\fi - -\ifleftflag\else\def\leftflag#1{}\fi -\ifrightflag\else\def\rightflag#1{}\fi - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% Show labels and references ... -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\let\@@label\label -\let\@@ref\ref -\let\@@pageref\pageref -\let\@@cite\cite -\let\@@bibitem\@bibitem -\let\@@lbibitem\@lbibitem - -\newif\ifshowrefs \showrefsfalse -\newif\ifshowcites \showcitesfalse -% \def\ifshowcites{\ifshowrefs} -% \let\showcitestrue\showrefstrue -% \let\showcitesfalse\showrefsfalse -\ifshowlabels - \showrefstrue - \showcitestrue - - \def\@@@label{\protect\@@@@label} - \def\@@@@label#1{\@@label{#1}\ifshowlabels\leftflag{#1}\fi} - \def\@@@ref{\protect\@@@@ref} - \def\@@@@ref#1{\ifshowrefs\expandafter\begingray\fi\ifshowrefs\leavevmode\rightflag{#1}\fi\@@ref{#1}\ifshowrefs\expandafter\endgray\fi} - \def\@@@pageref{\protect\@@@@pageref} - \def\@@@@pageref#1{\ifshowrefs\leavevmode\rightflag{#1}\fi - {{\gray{\@@pageref{#1}}}}} - %%\def\@@@@cite#1#2{\ifshowrefs\rightflag{#1}\fi{{\gray{\@@cite{#1}{#2}}}}} - \def\@@@cite{\@ifnextchar[{\@@@citea}{\@@@citeb}} - \def\@@@citea[#1]#2{\ifshowcites\expandafter\begingray\fi\ifshowcites\rightflag{#2}\fi\@@cite[#1]{#2}\ifshowcites\expandafter\endgray\fi} - \def\@@@citeb#1{\ifshowcites\expandafter\begingray\fi\ifshowcites\rightflag{#1}\fi\@@cite{#1}\ifshowcites\expandafter\endgray\fi} - %%\@ifundefined{c@#2}{{\gray{\tt #1/#2}}}{}% Need to emulate \cite - %%instead of \@cite to get the original label ... - \def\@@@citex[#1][#2]#3{\ifshowcites\expandafter\begingray\fi\ifshowcites\rightflag{#3}\fi\@@citex[#1][#2]{#3}\ifshowcites\expandafter\endgray\fi} - \def\@@@bibitem#1{% - \@@bibitem{#1}\ifshowlabels\leavevmode\rightflag{#1}\ignorespaces\fi} - \def\@@@lbibitem[#1]#2{% - \@@lbibitem[#1]{#2}\ifshowlabels\leavevmode\rightflag{#2}\ignorespaces\fi} - \def\@@@citedata{\protect\@@@@citedata} - \def\@@@@citedata#1{\ifshowcites\expandafter\begingray\fi\ifshowcites\leavevmode\rightflag{#1}\fi\@@citedata{#1}\ifshowcites\expandafter\endgray\fi} - - \long\def\@gobblethree#1#2#3{} - \def\@@@setref#1#2#3{% - \ifx#1\relax - \protect\G@refundefinedtrue - \nfss@text{\reset@font\bfseries ?\texttt{\expandafter\@gobblethree\string#1}?}% - \@latex@warning{Reference `#3' on page \thepage \space - undefined}% - \else - \expandafter#2#1\null - \fi} - - \AtBeginDocument{% - \let\@@label\label \let\label\@@@label - \let\@@ref\ref \let\ref\@@@ref - \let\@@pageref\pageref \let\pageref\@@@pageref - \let\@setref\@@@setref - %%\let\@@cite\cite \let\cite\@@@cite - %%\let\@cite\@@@@cite - \@ifpackageloaded{natbib}{% - \let\@@citex\@citex \let\@citex\@@@citex - }{% - \let\@@cite\cite \let\cite\@@@cite - } - \let\@@bibitem\@bibitem \let\@bibitem\@@@bibitem - \let\@@lbibitem\@lbibitem \let\@lbibitem\@@@lbibitem - \let\@@citedata\@citedata \let\@citedata\@@@citedata - } - \@ifundefined{everyproof}{}{% - \everyproof\expandafter{\the\everyproof - \def\@itemlabel{\rlap{$\circ$}\hskip-\labelsep\hskip\parindent}% - }% - }% -\fi - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% Show commas ... -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\ifshowcommas - {% - \uccode`\~`\, - \uppercase{\gdef~}{% - \ifmmode,\else\smash{\textbf{\huge ,}}\fi - }}% - \AtBeginDocument{\catcode`\,\active}% -\fi - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% Now: time display ... -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% From now.sty 25-oct-91 -% A macro for time display - -% Calculate hour and minute and define macro \now for time. -\newcount\hour \hour\time\divide\hour60 -\newcount\minute \minute-\hour\multiply\minute60\advance\minute\time -\def\now{$\ifnum\hour<10 0\fi\the\hour - ^{\underline{\ifnum\minute<10 0\fi\the\minute}}$} - -% End now.sty - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% Sign draft ... -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\newtoks\draftsignature \draftsignature{Entwurf} -\ifsigndraft - \PackageInfo{develop}{% - Signdraft enabled. % - Use \string\draftsignature=\string{Bla\string} to change it.} - \gdef\draft@oddfoot{\rm\footnotesize - \the\draftsignature - \hfil - \thepage - \hfil - \LaTeXe(\texttt{\draft@filename}): \today, \now - } - \gdef\draft@evenfoot{\rm\footnotesize - \LaTeXe(\texttt{\draft@filename}): \today, \now - \hfil - \thepage - \hfil - \the\draftsignature - } - \global\let\@oddfoot\draft@oddfoot - \global\let\@evenfoot\draft@evenfoot - %% TODO: Modify \pagestyle - \let\@@pagestyle\pagestyle - \def\pagestyle#1{\@@pagestyle{#1}% - \let\@oddfoot\draft@oddfoot - \let\@evenfoot\draft@evenfoot} - \let\@@thispagestyle\thispagestyle - \def\thispagestyle#1{% - \expandafter\gdef\csname ps@@@#1\endcsname{% - \@nameuse{ps@#1}% - \let\@oddfoot\draft@oddfoot - \let\@evenfoot\draft@evenfoot - }% - \@@thispagestyle{@@#1}% - } - %% - \let\draft@include\include - \let\draft@filename\jobname - \def\draft@register#1{% - \gdef\draft@filename{}% - \@tfor\draft@x:=#1\do{% - \xdef\draft@filename{\draft@filename\noexpand\string\draft@x}% - }% - } - \def\include#1{% - \draft@register{#1}% -% %Starting \texttt{\draft@filename}\dots -% \addtocontents{toc}{\protect\ifdrafttoc -% \texttt{\draft@filename}\dots\par -% \protect\fi}% - \draft@include{#1}% -% \addtocontents{toc}{\protect\ifdrafttoc -% \dots\texttt{\draft@filename}\par -% \protect\fi}% -% %Ending \texttt{\draft@filename}. -% \clearpage - \global\let\draft@filename\jobname} - -\fi - - -\def\draftpagenumbering#1{% - \global\c@page \@ne \gdef\thepage{\csname @#1\endcsname - \c@page - \protect\ifsigndraft - \protect\rlap{(\protect\texttt{\draft@filename})}% - \protect\fi}} - -\ifsigndraft -\ifdraftpagenumbering - \let\pagenumbering\draftpagenumbering - \pagenumbering{arabic} -\fi -\fi - -\newif\ifdrafttoc \drafttocfalse -\def\drafttableofcontents{\drafttoctrue\tableofcontents\drafttocfalse} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% Oopsing ... -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\ifdraft - \let\oops@label\label - \PackageInfo{develop}{% - While in draft mode, you can use \string\oops\string{bla\string} - to mark critical points in your text (with comment bla). If you - use the option oopslist, then a list of all these is appended to - your document.} - \addtocounter{section}{-1}\refstepcounter{section}% - \global\let\oopsnewline\cl@@ckpt% Bei includes NICHT den fehlenden ... - \newcounter{oops}[section] - \global\let\cl@@ckpt\oopsnewline% ... Teil in der Zählung für oops - % berücksichtigen. - \def\theoops{\thesection.\arabic{oops}} - \newtoks\oopslist \oopslist{\@gobble} - \def\oopsnewline{,\\} - \let\oopschar\bigstar - \newcommand{\genericoops}[1]{% - \ifmmode - \oopschar\text{?`}\oopschar#1\oopschar?\oopschar% - \@temptokena{$#1$}% - \else - $\oopschar$?`$\oopschar$#1$\oopschar$?$\oopschar$% - \@temptokena{#1}% - \fi% - \oopstrue - \addtocounter{oops}{1}% - \edef\@tempa{% - \noexpand\protect\noexpand\oops@label{oops\theoops}% - \noexpand\expandafter - \noexpand\global - \noexpand\expandafter - \noexpand\oopslist - \noexpand\expandafter - {\noexpand\the\noexpand\oopslist - \noexpand\oopsnewline - \relax - $\oopschar$\theoops:\noexpand\pageref{oops\theoops} % - \expandafter\the\@temptokena\unskip - }% - }% - \@tempa\relax - }% - \newcommand{\oops}{\let\oopschar\bigstar\genericoops} - \newcommand{\invisoops}[1]{\let\oopschar\clubsuit - \genericoops{\oopscomment{#1}}} - \newcommand\oopscomment[1]{{\gray #1}}% - \newcommand\showoopslist{% - \ifoops - \section*{Oopslist} - \addcontentsline{toc}{section}{Oopslist}% - {\showrefsfalse\showcitesfalse - \the\oopslist. - \par} - \fi - } - \ifoopslist - \AtEndDocument{\showoopslist} - \fi - \newenvironment{draft} - {\par\noindent$\oopschar$?`$\oopschar$\gray\small} - {\black$\oopschar$?$\oopschar$\par\ignorespacesafterend} -\else - \newcommand\genericoops[1]{% - \ifmmode - \oopschar\oopschar\oopschar\text{?`}\oopschar#1\oopschar?\oopschar% - \else - $\oopschar\oopschar\oopschar$?`$\oopschar$#1$\oopschar$?$\oopschar$% - \fi% - \PackageError{develop}{% - You used \string\oops, which is reserved for drafts.}{% - Decide your remark.^^JIn a final version, all \string\oops-es - should be decided.}} - \newcommand\showoopslist{\PackageError{develop}{% - You used \string\showoopslist, which is reserved for drafts.}{}} - \newcommand\oopscomment[1]{}% - \newcommand{\oops}{\let\oopschar\bigstar\genericoops} - \newcommand{\invisoops}[1]{} - %% - \RequirePackage{skipenv} - \newenvironment{draft}{}{} - \skipenv{draft} -\fi -\AtBeginDocument{% - \providecommand{\todo}{\protect\oops} - \providecommand{\mtodo}[1]{\marginpar{\tiny\todo{#1}}} - \providecommand{\invistodo}{\protect\invisoops} - \providecommand{\text}{\mbox} - } - -\endinput - -To upload the package go to <http://dante.ctan.org/upload> and enter: - -Name of your contribution -Develop toolkit - -Your name -Michael Nüsken - -Your email -nuesken@bit.uni-bonn.de - -Summary description -This collects a set of macros useful during the development of articles. - -Suggested CTAN directory -macros/latex/contrib/gamma - -Short description for announcement. ------------------------------------------------------------------------------ -The LaTeX2e class develop collects a set of macros useful during the -development of articles. - -The author is Michael Nüsken. -The package is Copyright (c) 1998-2010 Michael Nüsken. - -Present version <see above>. -Differences to previous version: ??? ------------------------------------------------------------------------------ - -Indicate the license. -tpye=Free, LaTeX Project - -Input your file's name on your computer. - -Submit \end{filecontents*} \begin{filecontents*}{relabel.sty} %% diff --git a/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf b/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf Binary files differindex b9aa86d00d9..7ab60715bd3 100644 --- a/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf +++ b/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf 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 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{% |