diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex | 704 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/computational-complexity/cc.pdf | bin | 752892 -> 752749 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/computational-complexity/cc.dtx | 38 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/computational-complexity/cc.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty | 24 |
5 files changed, 713 insertions, 55 deletions
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 59939cf6f69..bfdc8214cff 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/17 v2.12 +2010/06/21 v2.13 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} @@ -1131,6 +1131,8 @@ computational complexity \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 @@ -1172,7 +1174,6 @@ computational complexity \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}} @@ -1197,9 +1198,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}} \newcommand{\algonumerate@makelabelexplicit}[1]{% @@ -1323,9 +1324,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 @@ -1393,23 +1391,22 @@ computational complexity \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 @@ -1421,15 +1418,10 @@ computational complexity } \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}{% @@ -3342,6 +3334,684 @@ 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 04e3a795d4f..b9aa86d00d9 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 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} 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}{% |