From af14dce2ed8e2cd8157783358de054b25e3e07c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 Jul 2011 23:04:33 +0000 Subject: computational-complexity 2.19 (28jul11) git-svn-id: svn://tug.org/texlive/trunk@23259 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/computational-complexity/cc-cls.sty | 2 +- .../tex/latex/computational-complexity/cc.cls | 91 +-- .../tex/latex/computational-complexity/cc2cite.sty | 2 +- .../latex/computational-complexity/cc4amsart.sty | 10 +- .../latex/computational-complexity/cc4apjrnl.sty | 2 +- .../latex/computational-complexity/cc4elsart.sty | 13 +- .../tex/latex/computational-complexity/cc4jT.sty | 10 +- .../latex/computational-complexity/cc4llncs.sty | 7 +- .../latex/computational-complexity/cc4siamltex.sty | 3 +- .../latex/computational-complexity/cc4svjour.sty | 33 +- .../tex/latex/computational-complexity/ccalgo.sty | 24 +- .../tex/latex/computational-complexity/ccaux.sty | 24 +- .../tex/latex/computational-complexity/cccite.sty | 2 +- .../tex/latex/computational-complexity/ccdbs.sty | 2 +- .../latex/computational-complexity/cclayout.sty | 619 ++++++++++++++++++--- .../tex/latex/computational-complexity/ccproof.sty | 2 +- .../tex/latex/computational-complexity/ccqed.sty | 2 +- .../tex/latex/computational-complexity/ccref.sty | 62 +++ .../tex/latex/computational-complexity/ccreltx.sty | 2 +- .../tex/latex/computational-complexity/ccthm.sty | 27 +- .../tex/latex/computational-complexity/relabel.sty | 2 +- .../tex/latex/computational-complexity/thcc.sty | 16 +- 22 files changed, 702 insertions(+), 255 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/computational-complexity/ccref.sty (limited to 'Master/texmf-dist/tex/latex/computational-complexity') diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty index 2e84be3a73b..fc30ad1eba2 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccsty,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index 3ed5505ccdc..44ee5d1c057 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cccls,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -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/10/14 v2.15 +2011/07/28 v2.19 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} @@ -76,10 +76,14 @@ computational complexity \DeclareOption{manualbibliography}{\@manualbibliographytrue} \DeclareOption{twocolumnbibliography}{\@twocolumnbibliographytrue} \DeclareOption{onecolumnbibliography}{\@twocolumnbibliographyfalse} +\DeclareOption{twocolumnendtitle}{\@twocolumnendtitletrue} +\DeclareOption{onecolumnendtitle}{\@twocolumnendtitlefalse} \DeclareOption{nosort}{% \def\@natbibsort{}} \DeclareOption{sort}{% \def\@natbibsort{\PassOptionsToPackage{sort}{natbib}}} +\DeclareOption{compress}{% + \def\@natbibsort{\PassOptionsToPackage{compress}{natbib}}} \DeclareOption{sort&compress}{% \def\@natbibsort{\PassOptionsToPackage{sort&compress}{natbib}}} \DeclareOption{cctheorems}{\@cctheoremstrue\@standardtheoremstrue} @@ -100,6 +104,11 @@ computational complexity \PassOptionsToPackage{notheoremitemprefixes}{ccthm}} \DeclareOption{ccpublish}{\@ccpublishtrue} \DeclareOption{noccpublish}{\@ccpublishfalse} +\DeclareOption{textarea=full}{\@textareaversion\m@ne} +\DeclareOption{textarea=none}{\@textareaversion\z@} +\DeclareOption{textarea=cc1}{\@textareaversion\@ne} +\DeclareOption{textarea=cc2}{\@textareaversion\tw@} +\DeclareOption{textarea=cc}{\@cctextareatrue} \DeclareOption{cctextarea}{\@cctextareatrue} \DeclareOption{nocctextarea}{\@cctextareafalse} \DeclareOption{noothermargins}{\@marginmode\m@ne} @@ -140,7 +149,7 @@ computational complexity OT1,nolatin1,nobabel,% localnumbering,bare,% leqno,ams,ccpublish,cclayout,autotitle,ccsectioning,% - onecolumnbibliography,natbib,sort&compress,% + onecolumnbibliography,twocolumnendtitle,natbib,sort&compress,% cctheorems,theoremitemprefixes,noseparateequationcounting,% ccalgorithms} \else @@ -148,7 +157,7 @@ computational complexity OT1,nolatin1,nobabel,% localnumbering,bare,% leqno,ams,noccpublish,nocclayout,noautotitle,ccsectioning,% - onecolumnbibliography,natbib,sort&compress,% + onecolumnbibliography,twocolumnendtitle,natbib,sort&compress,% cctheorems,theoremitemprefixes,noseparateequationcounting,% ccalgorithms} \fi @@ -175,8 +184,6 @@ computational complexity \if@Tone \RequirePackage[T1]{fontenc} \fi -%%german.sty is not allowed. Use global options: -%%multilingual,german. \@pass@ptions\@pkgextension{}{german} \global\expandafter\let\csname ver@german.\@pkgextension\endcsname\@empty \if@babel @@ -198,19 +205,12 @@ computational complexity \expandafter\noexpand\csname the#3\endcsname% .\noexpand#1{#2}}}}% } -%% \def\numberwithin#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}{% -%% \@ifundefined{c@#2}{\@nocnterr{#2}}{% -%% \@addtoreset{#1}{#2}% -%% \toks@\expandafter\expandafter\expandafter{\csname the#1\endcsname}% -%% \expandafter\xdef\csname the#1\endcsname -%% {\expandafter\noexpand\csname the#2\endcsname -%% .\the\toks@}}}} \let\@ifempty\cc@ifempty \let\@ifnotempty\cc@ifnotempty \let\bigstar\bullet \let\lozenge\circ -\def\square{{\fboxsep.3em{\vbox{\hbox{\fbox{}}\vskip0pt}}}} -\let\text\mbox% This is a poor man's version! +\def\square{{\fboxsep.3em{\vbox{\hbox{\fbox{}}\vskip0pt}}}}% +\let\text\mbox \fi \RequirePackage{url}[1999/03/02 ver 1.4] \expandafter\def\expandafter\UrlSpecials\expandafter{% @@ -228,6 +228,7 @@ computational complexity \newdimen\headrulewidth \headrulewidth.4pt \def\cctitlehead{} \def\ccauthorhead{} +\let\ps@ccfirst\ps@empty \def\ps@cc{\let\@mkboth\markboth \def\@oddhead{\vbox{\hbox to\textwidth{\reset@font\strut \null @@ -358,32 +359,7 @@ computational complexity \let\thebibliography\nthebibliography \let\endthebibliography\endnthebibliography} \fi -\RequirePackage{relabel}[1998/09/07 v1.01] -\let\nref\ref -\babel\def\partname{Part}[german=Teil,french=\protect\@Fpt partie] -\defprefix{part}{\partname~} -\babel\def\chaptername{Chapter}[german=Kapitel,french=Chapitre] -\defprefix{chapter}{\chaptername~} -\babel\def\sectionname{Section}[german=Abschnitt,french=Section] -\defprefix{section}{\sectionname~} -\babel\def\subsectionname{Section}[german=Abschnitt,french=Section] -\defprefix{subsection}{\subsectionname~} -\babel\def\subsubsectionname{Section}[german=Abschnitt,french=Section] -\defprefix{subsubsection}{\subsubsectionname~} -\let\ccorg@appendix\appendix -\babel\def\appendixname{Appendix}[german=Anhang,french=Annexe] -\def\appendix{% - \defprefix{section}{\appendixname~}% - \defprefix{subsection}{\appendixname~}% - \defprefix{subsubsection}{\appendixname~}% - \ccorg@appendix} -\defprefix{equation}#1{(#1)} -\babel\def\figurename{Figure}[german=Figur,french={\scshape Figure}] -\defprefix{figure}{\figurename~} -\babel\def\tablename{Table}[german=Tafel,french={\scshape Table}] -\defprefix{table}{\tablename~} -\numberallwithin{section} -\AtBeginDocument{\@adjustnumbering} +\RequirePackage{ccref} \if@cctheorems \RequirePackage{ccthm} \RequirePackage{ccproof} @@ -391,9 +367,40 @@ computational complexity \if@ccalgo \RequirePackage{ccalgo} \fi +\let\orig@newtheorem\newtheorem +\def\newtheorem{% + \ClassWarning{cc}{You should not use newtheorem.\MessageBreak + See Section 3.1 of the documentation.}% + \orig@newtheorem} \babel\def\ccacknowledgementsname{Acknowledgements}[% german=Danksagung,french=Remerciements] -\newenvironment{acknowledge}{\section*{\ccacknowledgementsname}}{} +\newif\if@ccack \@ccacktrue% usually acknowledgements are not required +\AtEndDocument{% + \if@ccack\else + \ClassError{cc}{Missing acknowledgements} + {You must use either\MessageBreak + \protect\begin{acknowledge} ... \protect\end{acknowledge}\MessageBreak + or \protect\noacknowledge.}% + \fi +} +\newenvironment{acknowledge}{% + \section*{\ccacknowledgementsname}% + \addcontentsline{toc}{section}{\ccacknowledgementsname}% +}{% + \noacknowledge +} +\newcommand{\noacknowledge}{% + \ifKV@ccsps@openaccess\if@ccack\else% + \noindent{\small\@octxt\par}% + \fi\fi% + \global\@ccacktrue +}% +\def\@octxt{}% +\def\openchoicetext#1{\gdef\@octxt{\paragraph{Open Access.} #1}}% +\openchoicetext{This article is distributed under the terms of the + Creative Commons Attribution Noncommercial License which permits any + noncommercial use, distribution, and reproduction in any medium, + provided the original author(s) and source are credited.}% \def\labelitemi{$\circ$} \def\footnoterule{\kern-3\p@\hrule\@width18mm\kern 2.6\p@} \let\ccorg@include\include diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty index ee5f71ec309..f964133b38b 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc2cite,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty index 3877578c053..753809cbd12 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4amsart,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -41,14 +41,6 @@ \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \gdef\theorem@headerfont{\bfseries} -%% \def\th@cc{% -%% \normalfont\itshape -%% \def\@begintheorem##1##2{\item -%% [\hskip\labelsep \theorem@headerfont ##1\ ##2.]}% -%% \def\@opargbegintheorem##1##2##3{\item -%% [\hskip\labelsep \theorem@headerfont ##1\ ##2\ % -%% \normalfont({\activate@shortcite{}##3}).]}% -%% } \@longarticletrue \RequirePackage{ccthm} \babel\def\ccacknowledgementsname{Acknowledgements}[% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty index 17e501b706b..54e83805cab 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4apjrnl,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty index 80be14eca6d..bbb965e9919 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4elsart,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -40,15 +40,6 @@ % definitions. \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} -%%% \gdef\theorem@headerfont{\bfseries} -%%% %% \def\th@cc{% -%%% %% \normalfont\itshape -%%% %% \def\@begintheorem##1##2{\item -%%% %% [\hskip\labelsep \theorem@headerfont ##1\ ##2.]}% -%%% %% \def\@opargbegintheorem##1##2##3{\item -%%% %% [\hskip\labelsep \theorem@headerfont ##1\ ##2\ % -%%% %% \normalfont({\activate@shortcite{}##3}).]}% -%%% %% } \@longarticletrue \let\claim\relax \let\fact\relax @@ -88,8 +79,6 @@ \RequirePackage{amssymb}[1996/11/03 v2.2b] \numberallwithin{section} \AtBeginDocument{\@adjustnumbering} -%%% \RequirePackage{cc2cite} -%%% \RequirePackage{url} \endinput %% %% End of file `cc4elsart.sty'. diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty index 585eea530f9..af8f2d211b7 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4jT,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -41,14 +41,6 @@ \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \gdef\theorem@headerfont{\bfseries} -%% \def\th@cc{% -%% \normalfont\itshape -%% \def\@begintheorem##1##2{\item -%% [\hskip\labelsep \theorem@headerfont ##1\ ##2.]}% -%% \def\@opargbegintheorem##1##2##3{\item -%% [\hskip\labelsep \theorem@headerfont ##1\ ##2\ % -%% \normalfont({\activate@shortcite{}##3}).]}% -%% } \@longarticletrue \let\proof\relax\let\endproof\relax \RequirePackage{ccthm} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty index 7b2f96a4475..e41bff4367c 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4llncs,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -58,6 +58,7 @@ \let\thesis\relax \let\endthesis\relax \let\warning\relax \let\endwarning\relax \let\example\relax \let\endexample\relax +\let\proof\relax \let\endproof\relax \RequirePackage{amsmath}[1997/03/20 v1.2d] \RequirePackage{amsfonts}[1997/09/17 v2.2e] \RequirePackage{amssymb}[1996/11/03 v2.2b] @@ -65,7 +66,8 @@ \@longarticletrue \RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's % definitions. -\RequirePackage{ccthm} +\RequirePackage{ccref} +\RequirePackage{ccthm,ccproof} \theoremheaderfont{\upshape\bfseries} \RequirePackage{ccalgo} \let\origthebibliography\thebibliography @@ -84,7 +86,6 @@ \pagebreak[3]% \vskip 0pt plus -#1% \relax} -%%% \endinput %% %% End of file `cc4llncs.sty'. diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty index 563cf698c0d..552ea93db6c 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4siamltex,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -55,7 +55,6 @@ \RequirePackage{ccaux} \RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's % definitions. -%% \PassOptionsToPackage{bare}{relabel} \RequirePackage{ccthm} \RequirePackage{relabel} \RequirePackage{cc2cite} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty index 3d973ceed43..5c66f9daa43 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4svjour,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -42,16 +42,7 @@ \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \gdef\theorem@headerfont{\bfseries} -%% \def\th@cc{% -%% \normalfont\itshape -%% \def\@begintheorem##1##2{\item -%% [\hskip\labelsep \theorem@headerfont ##1\ ##2.]}% -%% \def\@opargbegintheorem##1##2##3{\item -%% [\hskip\labelsep \theorem@headerfont ##1\ ##2\ % -%% \normalfont({\activate@shortcite{}##3}).]}% -%% } -%% -%%% Deactivate svjour3's theorem definitions: +%% Deactivate svjour3's theorem definitions: \let\claim\relax \let\endclaim\relax \let\conjecture\relax \let\endconjecture\relax \let\corollary\relax \let\endcorollary\relax @@ -75,26 +66,6 @@ \let\thesis\relax \let\endthesis\relax \let\warning\relax \let\endwarning\relax \let\example\relax \let\endexample\relax -%%% \makeatletter -%%% \def\gund@f#1{% -%%% \expandafter\global\expandafter\let\csname #1\endcsname\@undefined -%%% \expandafter\global\expandafter\let\csname end#1\endcsname\@undefined -%%% } -%%% \makeatother -%%% \gund@f{claim} -%%% \gund@f{conjecture} -%%% \gund@f{corollary} -%%% \gund@f{definition} -%%% \gund@f{example} -%%% \gund@f{exercise} -%%% \gund@f{fact} -%%% \gund@f{lemma} -%%% \gund@f{note} -%%% \gund@f{problem} -%%% \gund@f{proposition} -%%% \gund@f{question} -%%% \gund@f{remark} -%%% \gund@f{theorem} \@longarticletrue \RequirePackage{ccthm} \babel\def\ccacknowledgementsname{Acknowledgements}[% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty index 99e87eb073d..4252db4ab5e 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccalgo,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -110,12 +110,10 @@ \RequirePackage{thcc} \RequirePackage{relabel} \def\list@parshape{% - %%\typeout{parshape 1 \the\@totalleftmargin+\the\linewidth}% + %\typeout{parshape 1 \the\@totalleftmargin+\the\linewidth}% \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 @@ -125,7 +123,7 @@ \advance\itemindent-\reinit@list@last \advance\@totalleftmargin\reinit@list@last \advance\linewidth-\reinit@list@last - %%\typeout{\the\@totalleftmargin + \the\linewidth}% + %\typeout{\the\@totalleftmargin + \the\linewidth}% \list@parshape} \def\reinit@list@label{% \reinit@list{\wd\@tempboxa}% @@ -205,7 +203,6 @@ } \newcommand{\algonumerate@postprocess}[1]{% \expandafter\count@\value{algonumerate}% - %%{\tracingall\nonstopmode\showbox\@tempboxa}% \ifnum\last@algolabeltype<\@ne \ifnum\this@algolabeltype=\@ne \medskip @@ -225,7 +222,6 @@ \reinit@list@label } \newcommand{\algonumerate@labelexplicit}[1]{% For algorithm i/o -%%% \typeout{item explicit [#1]}% \algonumerate@makelabelexplicit{#1}% \global\let\algonumerate@global\global \gdef\global{\algonumerate@global\let\global\algonumerate@global @@ -237,7 +233,6 @@ \global}% } \newcommand{\algonumerate@labelempty}[1]{% For algorithm i/o -%%% \typeout{item empty [#1]}% \algonumerate@makelabelempty{}% \global\let\algonumerate@global\global \gdef\global{\algonumerate@global\let\global\algonumerate@global @@ -245,7 +240,6 @@ \global}% } \newcommand{\algonumerate@labelautomatic}[1]{% For algorithm steps -%%% \typeout{item automatic [#1]}% \algonumerate@makelabelautomatic{#1}% \global\let\algonumerate@global\global \gdef\global{\algonumerate@global\let\global\algonumerate@global @@ -257,14 +251,12 @@ \global}% } \newcommand{\algonumerate@labelnumber}[1]{% For algorithm steps -%%% \typeout{item numbered [#1]}% \algonumerate@makelabelnumber{#1}% \global\let\algonumerate@global\global \gdef\global{\algonumerate@global\let\global\algonumerate@global \algonumerate@postprocess{}% \global}% } -%%% \newdimen\algonumerate@maxindent \newdimen\@algolongestlabel \AtBeginDocument{\ifdim\algonumerate@maxindent=\z@ @@ -338,11 +330,11 @@ \let\@tempa\relax \protected@edef\@tempa{% \csname r@\the\algorithmmasterkey-#1\endcsname}% - %%\show\@tempa + %\show\@tempa \let\@tempc\relax \protected@edef\@tempc{% \csname r@\the\algorithmmasterkey-#2\endcsname}% - %%\show\@tempc + %\show\@tempc \ifx\@tempa\@tempc\global\@trivialrangetrue \else\global\@trivialrangefalse\fi }% @@ -415,9 +407,9 @@ \@newlistfalse \vskip\topskip \par - %%\meta@indent\leftmargin - %%\advance\meta@indent\algo@labelsep - %%\advance\meta@indent\steplabelwidth + %\meta@indent\leftmargin + %\advance\meta@indent\algo@labelsep + %\advance\meta@indent\steplabelwidth \meta@indent\@totalleftmargin \advance\labelsep-\meta@indent \advance\@totalleftmargin-\meta@indent diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty index 0a6af049c11..994a55cb022 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccaux,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -47,13 +47,18 @@ \newif\if@natbib \@natbibtrue \newif\if@manualbibliography \@manualbibliographyfalse \newif\if@twocolumnbibliography \@twocolumnbibliographyfalse +\newif\if@twocolumnendtitle \@twocolumnendtitletrue \newif\if@cctheorems \@cctheoremstrue \newif\if@standardtheorems \@standardtheoremstrue \newif\if@ccnosepeqncnt \@ccnosepeqncnttrue \newif\if@ccalgo \@ccalgotrue \newif\if@theoremitemprefixes \@theoremitemprefixestrue \newif\if@ccpublish \@ccpublishfalse -\newif\if@cctextarea \@cctextareatrue +\newcount\@textareaversion +\expandafter\def\csname if@cctextarea\endcsname{\ifnum\@textareaversion>0} +\def\@cctextareafalse{\@textareaversion\z@} +\def\@cctextareatrue{\@textareaversion\tw@} +\@cctextareatrue \newcount\@marginmode \@marginmode\tw@ \def\numberallwithin#1{\gdef\cc@numberingtoplevel{#1}} \def\@adjustnumbering{% @@ -163,16 +168,6 @@ \long\def\cc@xifempty#1#2@#3#4#5\@nil{% \ifx#3#4\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} \long\def\cc@ifnotempty#1{\cc@ifempty{#1}{}} -%%% \def\oldbabel\def#1#2#3#4#5#6{\def#1{#2}% -%%% \cc@ifnotempty{#2}{\addto\captionsenglish{\def#1{#2}}}% -%%% \cc@ifnotempty{#3}{% -%%% \addto\captionsgerman{\def#1{#3}}% -%%% \addto\captionsngerman{\def#1{#3}}% -%%% }% -%%% \cc@ifnotempty{#4}{\addto\captionsfrench{\def#1{#4}}}% -%%% \cc@ifnotempty{#5}{\addto\captionsitalian{\def#1{#5}}}% -%%% \cc@ifnotempty{#6}{\addto\captionsspanish{\def#1{#6}}}% -%%% } \def\babel\def#1#2{% \@ifnextchar[{\n@wbabel{#1}{#2}}{\n@wbabel{#1}{#2}[]}} \def\n@wbabel#1#2[#3]{% @@ -182,12 +177,7 @@ } \def\b@beladdlang#1=#2=#3\@@@#4{% \cc@ifnotempty{#2}{% - %%% \@ifundefined{captions#1}{% - %%% \ClassWarning{cc}{Language `#1' undefined, ignoring - %%% translation \string#4=#2.}% - %%% }{% \expandafter\addto\csname captions#1\endcsname{\def#4{#2}}% - %%% }% }% } \def\babeladdtranslations#1#2{% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty b/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty index def9ffb3316..05daac82c20 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cccite,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty index b1576a2c96c..6e1c48b4dad 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccdbs,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty index c5c8aa89b27..e1e9ced1ad2 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cclayout,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -31,6 +31,8 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{cclayout}[2011/07/27 v2.18 cclayout. MNuesken] \let\@contact\relax \newcommand{\contact}[1]{\gdef\@contact{#1}} \AtBeginDocument{\if@ccpublish @@ -43,10 +45,11 @@ \newcommand{\received}[1]{\gdef\@received{#1}} \AtBeginDocument{\if@ccpublish \@ifundefined{@received}{% - \ClassWarningNoLine{cc}{Missing received date.\MessageBreak + \ClassWarningNoLine{cc}{Missing submission/received date.\MessageBreak Use \protect\received\space in the preamble.}{}% }{}% \fi} +\def\submitted{\received} \let\@titlehead\relax \newcommand{\titlehead}[1]{\gdef\@titlehead{#1}} \let\@authorhead\@undefined @@ -91,8 +94,6 @@ \topsep 2\p@ \@plus2\p@ \@minus1\p@ \parsep 1\p@ \itemsep \parsep}% -%%% \let\origcclist\list -%%% \def\list{\ifnum\@listdepth>0\relax\@toodeep\fi\origcclist}% \let\@listii\@toodeep \let\@listiii\@toodeep \let\@listiv\@toodeep @@ -121,9 +122,38 @@ \newcommand{\subtitle}[1]{\def\@subtitle{#1}} \def\@version{} \newcommand{\version}[1]{\def\@version{#1}} +\AtBeginDocument{\addtocounter{section}{-1}\refstepcounter{section}}% +\AtEndDocument{\hrule height0pt\label{ccenddocument}}% +\def\@ccunknown{??} +\def\@ccfirst{1}% +\let\@cclast\@ccunknown% +\let\@ccnumberofpages\@ccunknown% +\AtBeginDocument{% + \@ifundefined{r@ccenddocument}{}{% + \@tempcnta\@ne + \advance\@tempcnta-\@ccfirst + \xdef\@cclast{\csname r@ccenddocument\endcsname}% + \ifx\@secondoffive\@@@@undefined% hyperref launches this! + \xdef\@cclast{\expandafter\@secondoftwo\@cclast{}{}{}{}{}}% + \else + \xdef\@cclast{\expandafter\@secondoffive\@cclast{}{}{}{}{}}% + \fi% + \advance\@tempcnta\@cclast% + \xdef\@ccnumberofpages{\the\@tempcnta}% + }% +} \def\@cctxt{} \newif\if@cchead -\newcommand{\ccpublish}[4]{% +\newcommand{\noccpublish}[1]{% + \global\@ccpublishfalse + \global\@abstractoptionaltrue% Abstract optional + \global\@keywordsoptionaltrue% Keywords optional + \global\@subjectoptionaltrue% Subject class. optional + \global\@ccheadfalse + \gdef\@cctxt{#1}% + %\global\@twosidefalse + } +\newcommand{\ccpublish}[4]{% Deprecated since 2011/07/25 \global\@ccpublishtrue \global\@abstractoptionalfalse% Abstract required \global\@keywordsoptionalfalse% Keywords required @@ -131,28 +161,232 @@ \global\@ccheadtrue \gdef\@ccyear{#1}% \gdef\@ccvolume{#2}% - \gdef\@ccnumber{#3}% + \gdef\@ccissue{#3}% \gdef\@ccfirst{#4}% \gdef\@cctxt{cc \textbf{#2} (#1)}% \global\@autotitletrue \AtBeginDocument{\addtocounter{section}{-1}\refstepcounter{section}}% - \AtEndDocument{\label{ccenddocument}}% - } -\newcommand{\noccpublish}[1]{% - \global\@ccpublishfalse - \global\@abstractoptionaltrue% Abstract required - \global\@keywordsoptionaltrue% Keywords required - \global\@subjectoptionaltrue% Subject class. required - \global\@ccheadfalse - \gdef\@cctxt{#1}% - %%\global\@twosidefalse } +\RequirePackage{xkeyval}[2008/08/13] +\def\cc@fixlencountdown#1{% + \@tfor\@x:=#1\do{\advance\@tempcnta\m@ne}} +\def\cc@fixelendef#1#2#3#4{% + \@tempcnta#1% + \edef\@tempa{#4}\expandafter\cc@fixlencountdown\expandafter{\@tempa}% + \gdef#3{}\relax + \@whilenum\@tempcnta>\z@\do{% + \expandafter\gdef\expandafter#3\expandafter{#3#2}% + \advance\@tempcnta\m@ne}% + \expandafter\gdef\expandafter#3\expandafter{#3#4}% +} +\def\cc@fixelen#1#2#3{% + \@tempcnta#1 + \edef\@tempa{#3}\expandafter\cc@fixlencountdown\expandafter{\@tempa}% + \@whilenum\@tempcnta>\z@\do{% + #2% + \advance\@tempcnta\m@ne}% + \edef\@tempa{\noexpand\cc@fixelena#3\noexpand\@@@}\@tempa% +} +\def\cc@fixelena#1\@@@{% + \@tfor\@x:=#1\do{% + \advance\@tempcnta\@ne + \ifnum\@tempcnta>\z@\@x\fi + }% +} +\define@boolkey{ccsps}{sps}[true]{}% +\define@key{ccsps}{journal}[cc]{\gdef\@journalname{#1}}% +\define@key{ccsps}{journalnumber}[37]{\gdef\@journalnumber{#1}}% +\define@key{ccsps}{submitted}[??dd Month yyyy??]{% + \gdef\@received{#1}% + \gdef\received##1{\ClassWarning{cc} + {Received/submitted date (##1) override!\MessageBreak + Using \@received.}}} +\define@boolkey{ccsps}{revisionstage}[true]{% + %%% \ifKV@ccsps@revisionstage\let\revisionstage=Y\else\let\revisionstage=N\fi +} +\define@key{ccsps}{DOImsnr}[??]{% manuscript number + \gdef\@DOImsnr{#1}} +\define@boolkey{ccsps}{TYPESET}[true]{% + \ifKV@ccsps@TYPESET\let\TYPESET=Y\else\let\TYPESET=N\fi} +\define@boolkey{ccsps}{DISK}[true]{% + \ifKV@ccsps@DISK\let\DISK=Y\else\let\DISK=N\fi} +\define@boolkey{ccsps}{LE}[true]{% + \ifKV@ccsps@LE\let\LE=Y\else\let\LE=N\fi} +\define@boolkey{ccsps}{CP}[true]{% + \ifKV@ccsps@CP\let\CP=Y\else\let\CP=N\fi} +\define@key{ccsps}{draftcopy}[Uncorrected proof]{% watermark text + \gdef\cc@watermarktext{#1}} +\define@boolkey{ccsps}{helperstrip}[true]{}% +\define@boolkey{ccsps}{grid}[true]{} +\define@boolkey{ccsps}{issuestage}[true]{% + %%% \ifKV@ccsps@issuestage\let\issuestage=Y\else\let\issuestage=N\fi +} +\define@boolkey{ccsps}{openaccess}[true]{% + %%% \ifKV@ccsps@openaccess\let\stageaccess=Y\else\let\stageaccess=N\fi +} +\define@boolkey{ccsps}{stageaccess}[true]{% Deprecated. + \setkeys{ccsps}{openaccess=#1}} +\define@key{ccsps}{year}[????]{\gdef\@ccyear{#1}} +\define@key{ccsps}{volume}[??]{\gdef\@ccvolume{#1}} +\define@key{ccsps}{issue}[??]{\gdef\@ccissue{#1}}% +%%% \@tempcnta\tw@\@tfor\@x:=#1\do{\advance\@tempcnta\m@ne}% +%%% \ifcase\@tempcnta\gdef\@ccissue{#1} +%%% \or\gdef\@ccissue{0#1}% +%%% \or\gdef\@ccissue{00}% +%%% \fi} +\define@key{ccsps}{firstpage}[1]{% + \gdef\@ccfirst{#1}% + %\cc@fixelendef40\@ccfirstiv{#1}% + \@tempcnta4\@tfor\@x:=#1\do{\advance\@tempcnta\m@ne}% + \ifcase\@tempcnta\gdef\@ccfirstiv{#1}% + \or\gdef\@ccfirstiv{0#1}% + \or\gdef\@ccfirstiv{00#1}% + \or\gdef\@ccfirstiv{000#1}% + \else\ClassError{cc}{First page number too big.}{% + The number of the first page cannot be larger than 9999. + }\fi +} +\define@key{ccsps}{copyholder}[\default@copyholder]{\gdef\@copyholdername{#1}} +\def\default@copyholder{% + \ifKV@ccsps@openaccess The Author(s) + \else Springer Basel AG\fi} +\define@key{ccsps}{doisuffix}[????-?]{% + % Is the doi always 10.1007/s00037-threedigityear-suffix? + \cc@fixelendef50\@doiinfo{\@journalnumber}% + \xdef\@doiinfo{% + 10.1007/s\@doiinfo-% + \noexpand\cc@fixelen30{\noexpand\@ccyear}-% + #1}} +\define@key{ccsps}{doi}{\gdef\@doiinfo{#1}} +\define@key{ccsps}{onlinedate}[??dd Month yyyy??]{\gdef\@onlinedate{#1}} +\define@key{ccsps}{onlinefirstyear}[\the\year]{\gdef\@ccyear{#1}} +\define@key{ccsps}{coveryear}[\@ccyear]{\gdef\@coveryear{#1}} +\define@boolkey{ccsps}{pdfpage}[true]{% + % \ifKV@ccsps@pdfpage\@pdfpagetrue\else\@pdfpagefalse\fi% +} +\define@boolkey{ccsps}{xlink}[true]{} +\setkeys{ccsps}{ + sps=false, + journal={cc}, journalnumber=37, + grid=false, + TYPESET=false, + DISK=false, + LE=false, + CP=false, + DOImsnr, + openaccess=false, + revisionstage=false, + helperstrip=false, + issuestage=false, + copyholder, + year,volume,issue,firstpage, + onlinefirstyear,coveryear,doisuffix,onlinedate, + draftcopy +} +\newcommand{\ccsps}[1]{% + \if@cctextarea\else\ClassError{cc}{Wrong textarea chosen} + {Remove any textarea or noccpublish option from documentclass.}\fi + \global\@ccpublishtrue + \global\@abstractoptionalfalse% Abstract required + \global\@keywordsoptionalfalse% Keywords required + \global\@subjectoptionalfalse% Subject class. required + \global\@ccackfalse% Acknowledgements required + \global\@ccheadtrue + \global\@autotitletrue + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%% Now scan the key, key=value list: + \setkeys{ccsps}{sps,#1} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %\gdef\@cctxt{cc \textbf{\@ccvolume}(\@ccissue)}% MN2011/07/27: Shouldn't it be this? + \gdef\@cctxt{cc \textbf{\@ccvolume} (\@ccyear)}% + %%% \global\@twosidefalse + %%% MN2011/07/26 Note that the following makes it necessary that + %%% \ccsps is used only once! + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%% During revisionstage line numbers, a helper strip and a + %%% watermark shall be added. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \RequirePackage[mathlines]{lineno}[2005/11/02] + \ifKV@ccsps@pdfpage + \setkeys{ccsps}{helperstrip=false}% + %%% This case should turn off draftcopy but cannot do this + %%% since draftcopy is badly written. + %%% Consequently, this makes a double use of ccsps impossible. + \nolinenumbers + \else + \setkeys{ccsps}{helperstrip=true}% + \RequirePackage[conditional,draft]{draftcopy} + \draftcopyPageTransform{155 75 translate 65 rotate} + \draftcopyName{\cc@watermarktext}{75} + %%% Scaling by a factor 75 is fine for a text like "Uncorrected proof". + \linenumbers + \fi + %%% With the option xlink the final pdf shall have bookmarks and + %%% blue links. Otherwise there are no bookmarks and black links. + \RequirePackage[dvips, + bookmarks=\ifKV@ccsps@xlink true\else false\fi, + breaklinks=true, + colorlinks=\ifKV@ccsps@xlink true\else false\fi, + linkcolor=\ifKV@ccsps@xlink blue\else black\fi, + unicode]{hyperref}% + %%% \RequirePackage{xcolor}% + \RequirePackage{breakurl}% + \def\l@title##1{\@dottedtocline{-1}{0pt}{0pt}{{\large\textbf{##1}}}}% + \let\l@title\l@part + %%% + %\ExecuteOptions{nonatbib} + %\usepackage[comma,square]{modnatbib}% + %%% The package natbib was modified only marginally. On the one + %%% hand, spacing after superscripted references was modified, which + %%% is irrelevant to \cc{}. On the other hand the references were + %%% also added to the table of contents. This is superfluous since + %%% \Lclass{cc} redefines \Lenv{thebibliography} and adds that entry + %%% there. Further punctuation was modified but that is set by + %%% \Lclass{cc} anyways. + %%% + %\usepackage{hypernat}% + %%% The package \Lpackage{hypernat} would at most be needed if cc + %%% articles would combine natbib options number and + %%% sort&compress. However, number is deprecated and sort&compress + %%% is not used in the journal versions. + %%% + \ifKV@ccsps@xlink% + \def\@urlcolor{blue} + \def\@citecolor{blue} + \def\externalref##1##2{\hyperimage{##1}{##2}}% + \def\DOIexternalref##1##2{\hyperimage{##1}{##2}}%%%% + \InputIfFileExists{bookmarkgreeks.tex}{}{}% + \else + \def\@urlcolor{black}% + \def\@citecolor{black} + \def\externalref##1##2{##2}% + \def\DOIexternalref##1##2{##2}% + \fi% + %%% The option grid produces a grid to check or align the page and + %%% column boundarys. + \ifKV@ccsps@grid + \overfullrule=6pt + \let\twidth\textwidth + \let\theight\textheight +%%% \let\orgGd@draw\Gd@draw +%%% \def\Gd@draw##1{% +%%% \newGd@draw{##1}% +%%% \orgGd@draw{##1}% + %%% define Gd@draw (and rename later) + %%% \renewcommand{\twidth}{119mm}% + %%% \renewcommand{\theight}{45.5pc}% 19.46cm + \else\overfullrule=0pt\fi + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%% JS_info (MN2011/07/27: What's this?) + \InputIfFileExists{JS_info.tex}{}{}% +} \def\printed@issn{1016-3328}% \def\electronic@issn{1420-8954}% \newcommand{\printed}{\let\issn\printed@issn} \newcommand{\electronic}{\let\issn\electronic@issn} \printed \@onlypreamble\ccpublish +\@onlypreamble\ccsps \@onlypreamble\electronic \@onlypreamble\printed \def\extractnamesfr@m@author{% @@ -305,6 +539,7 @@ \newif\if@oddaffil \def\odd@sep{&}% \def\even@sep{\end{tabular}\par\begin{tabular}{@{}ll@{}}}% +\if@twocolumnendtitle \newenvironment{@ffiliation} {% \minipage[t]{.48\hsize} @@ -313,7 +548,22 @@ \def\\{\unskip\par}% } {\strut\par\medskip\endminipage} -\if@cctextarea +\else +\def\affilpre{\par} +\def\affilpost{\par} +\def\affilsep{\par} +\newenvironment{@ffiliation} + {% + \minipage[t]{\hsize}\footnotesize + \dimen@\hsize \advance\dimen@ -1.5em + \everypar{\parshape 2 \z@ \hsize 1.5em \dimen@}% + \def\\{\unskip\par}% + } + {\endminipage\bigskip} +\fi +\@abstrwidth0.85\textwidth +\ifcase\@textareaversion +\or% version 1, used until June 2011 \textwidth=141mm \@abstrwidth=120mm \textheight=200mm @@ -323,33 +573,63 @@ \marginparwidth=25mm \headheight=1.25\headheight \ifnum\@marginmode<\z@\@marginmode\z@\fi -\else -\@abstrwidth0.85\textwidth +\or% version 2, used since July 2011 +\special{papersize=155mm,235mm}% Springer's papersize +\paperwidth=155mm +\paperheight=235mm +\topmargin=-9.6mm%% MN2011/07/25 this is from ccspsmacros but should + %% be rethought!!! Use \voffset, \hoffset instead... +\textheight=45.5pc +\textwidth=119mm +\@abstrwidth=\textwidth +\oddsidemargin=-7.6mm% should be 18mm, will be calculated acc.to \@marginmode +\evensidemargin=-7.6mm% should be 18mm, will be calculated acc.to \@marginmode +\marginparwidth=10mm% will be adapted below +\headheight=1.25\headheight +\ifnum\@marginmode<\z@\@marginmode\tw@\fi% use balanced margins +\else% version negative or larger than max: emptypage +\newdimen\allsidemargin \allsidemargin=.5in +%% LARGE width +\textwidth=\paperwidth +\advance\textwidth-2\allsidemargin% margin left/right +\marginparsep=1pt +%% LARGE height +\topmargin-1in +\advance\topmargin\allsidemargin +\textheight=\paperheight +\advance\textheight-\allsidemargin +\advance\textheight-\headheight +\advance\textheight-\headsep +\advance\textheight-\footskip +%%% \advance\textheight-\headheight% assuming as much space for foot as head. +\advance\textheight-\allsidemargin +\@marginmode\tw@ +\sloppy \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 +\newdimen\cc@topmargin \cc@topmargin\topmargin +\newdimen\cc@textwidth \cc@textwidth\textwidth +\newdimen\cc@textheight \cc@textheight\textheight \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 + {\if@ccpublish + \@tempswafalse + \ifnum\@textareaversion>0 + \ifdim\topmargin=\cc@topmargin\relax\else\@tempswatrue\fi + \ifdim\textwidth=\cc@textwidth\relax\else\@tempswatrue\fi + \ifdim\textheight=\cc@textheight\relax\else\@tempswatrue\fi + \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}{}% + \aftergroup\endinput + \fi + \fi}% } \typeout{Now adjusting margins.} \ifcase\@marginmode @@ -374,19 +654,35 @@ \evensidemargin\oddsidemargin} \fi \AtEndOfClass{% -\marginparwidth1in -\advance\marginparwidth-5mm -\advance\marginparwidth-2\marginparsep -\ifdim\evensidemargin<\oddsidemargin -\advance\marginparwidth\evensidemargin -\else -\advance\marginparwidth\oddsidemargin -\fi + \marginparwidth1in + \advance\marginparwidth-5mm + \advance\marginparwidth-2\marginparsep + \ifdim\evensidemargin<\oddsidemargin + \advance\marginparwidth\evensidemargin + \else + \advance\marginparwidth\oddsidemargin + \fi } \newskip\headerindent \headerindent=10mm \newdimen\headrulewidth \headrulewidth.4pt \def\ps@cc{\let\@mkboth\markboth - \def\@oddhead{\vbox{\hbox to\textwidth{\reset@font\strut + \let\@oddfoot\@empty + \let\@evenfoot\@empty + \let\@oddhead\@empty + \let\@evenhead\@empty + \if@ccpublish + \ps@ccfirst + \def\@oddfoot{% + \ifKV@ccsps@helperstrip% + \begin{picture}(0,0)% + \put(340,3){{\stripbox}}% + \end{picture}% + \fi + }% + \let\@evenfoot\@oddfoot + \fi + \expandafter\def\expandafter\@oddhead\expandafter{\@oddhead + \vbox{\hbox to\textwidth{\reset@font\strut {\small\@cctxt}% \hfil {\small @@ -406,8 +702,8 @@ \vskip\z@ }% }% - \def\@oddfoot{} - \def\@evenhead{\vbox{\hbox to\textwidth{\reset@font\strut + \expandafter\def\expandafter\@evenhead\expandafter{\@evenhead + \vbox{\hbox to\textwidth{\reset@font\strut \hbox to\headerindent{\thepage\hfil}% {\small\@authorhead}% \hfil @@ -421,28 +717,189 @@ \vskip\z@ }% }% - \let\@evenfoot\@oddfoot } +\RequirePackage{graphicx} +\RequirePackage{xcolor}% +\IfFileExists{Birkh_logo_2010_sps.eps}{% + \def\birklogo{\bgroup\includegraphics{Birkh_logo_2010_sps.eps}\egroup} +}{% + \def\birklogo{{\ixpt Birkh{\"{a}}user}} +} +\IfFileExists{dummy_sps.eps}{% + \def\spslogo{\bgroup\includegraphics{dummy_sps.eps}\egroup} +}{% + \def\spslogo{{\ixpt Springer Publishing}} +} +\def\ps@ccfirst{% + \def\@oddfoot{% + \if@ccpublish + \ifKV@ccsps@revisionstage% + \begin{picture}(0,0)% + \put(0,15){{\smash{\raisebox{-2.25pt}{\spslogo}}}}% + \end{picture}% + \fi% + \ifKV@ccsps@sps + \begin{picture}(0,0)% + \put(289.5,15){{\birklogo}}% + \end{picture}% + \fi + \ifKV@ccsps@helperstrip% + \begin{picture}(0,0)% + \put(340,3){{\stripbox}}% + \end{picture}% + \fi + \fi}% + \let\@evenfoot\@oddfoot + \def\@oddhead{% + \ifKV@ccsps@grid + \hbox to\z@{\vbox to\z@{% + \hsize\twidth + \vskip\headsep + \fboxrule=.25pt + \fboxsep=-.25pt + \textcolor{lightgray}{% + \fbox{\vbox to\theight{\hbox to\twidth{\hss}\vss}}% + }% + }% + \hss + }% + \fi + \hss + }% + \let\@evenhead\@oddhead +} \AtEndOfClass{\pagestyle{cc}} \AtEndOfClass{% \AtBeginDocument{\@onlypreamble{\author{\if@autotitle\maketitle\fi}}} %\AtBeginDocument{\if@autotitle\maketitle\fi} \AtEndDocument{\if@autotitle\makeendtitle\fi} - } -\def\fourdigits#1{\ifnum#1<10\relax000#1\else - \ifnum#1<100\relax00#1\else - \ifnum#1<1000\relax0#1\else - #1\fi\fi\fi} -\def\twodigits#1{\ifnum#1<10\relax0#1\else - \ifnum#1<100\relax#1\else - #1\fi\fi} +} +\def\stripbox{\kern -11.7cm% + {}{% + \raisebox{.8mm}{% + \tiny + \fboxsep1mm\framebox{% + Journal: {\bf \@journalname}\enspace + Article No.: {\bf \@DOImsnr}\enspace + \fboxsep.2mm\fbox{% + \ifx Y\TYPESET{$\checkmark$}\else{\phantom{$\checkmark$}}\fi + }~TYPESET\enspace + \fbox{% + \ifx Y\DISK{$\checkmark$}\else{\phantom{$\checkmark$}}\fi + }~DISK\enspace + \fbox{% + \ifx Y\LE{$\checkmark$}\else{\phantom{$\checkmark$}}\fi + }~LE\enspace + \fbox{% + \ifx Y\CP{$\checkmark$}\else{\phantom{$\checkmark$}}\fi + }~CP\enspace + Disp.: \textbf{\the\year/\the\month/\the\day}\enspace + Pages: \textbf{\@ccnumberofpages} + }% + }% + }% +} %% \def\vertrulea{\rule[-7.583pt]{0pt}{7.583pt}} \def\vertruleb{\rule{2.25pt}{10.2pt}} \newtoks\cite@hook +\newcommand{\maketitleheadA}{% version before 2011 (Birkhäuser) + \hbox to\textwidth{% + \vbox to\z@{\vss + \baselineskip=12pt% + \halign{\ixpt##\hfil\cr + comput. complex.~\textbf{\@ccvolume}~(\@ccyear), + \thepage\ -- \@cclast\cr + \issn/\expandafter\@gobbletwo\@ccyear% + %% use + instead --? + /\cc@fixelen20\@ccissue\relax + \cc@fixelen40\@ccfirst\relax + --\@ccnumberofpages\ + \$ 1.50+0.20/0\cr}}\hss + \vbox to\z@{\vss + \offinterlineskip% + \halign{##&##\hfil\cr + \vertrulea&\ixpt + \copyright{} Birkh{\"{a}}user Verlag, Basel \@ccyear\cr + \noalign{\hrule} + \vertruleb\hskip1mm&% + \vbox to\z@{\vbox to\z@{\vss + \hbox{\xptsfbx computational complexity}}\vss}% + \cr}}}\vskip47.333pt +} +\newcommand{\maketitleheadB}{% version since 2011 (Springer) + \hbox to\textwidth{% + \vbox to\z@{\vss + \baselineskip=12pt% + \halign{\ixpt##\hfil\cr + comput. complex.~\textbf{\@ccvolume}~(\@ccyear), + \thepage\ -- \@cclast\cr + \issn/\expandafter\@gobbletwo\@ccyear% + %% use + instead --? + /\cc@fixelen20\@ccissue\relax + \cc@fixelen40\@ccfirst\relax + --\@ccnumberofpages\ + \$ 1.50+0.20/0\cr}}\hss + \vbox to\z@{\vss + \offinterlineskip% + \halign{##&##\hfil\cr + \vertrulea&\ixpt + \copyright{} Birkh{\"{a}}user Verlag, Basel \@ccyear\cr + \noalign{\hrule} + \vertruleb\hskip1mm&% + \vbox to\z@{\vbox to\z@{\vss + \hbox{\xptsfbx computational complexity}}\vss}% + \cr}}}\vskip47.333pt +} +\newcommand{\maketitleheadSPS}{% version since 2011 (Springer) + \hbox to\textwidth{% + \vbox to\z@{\vss + \baselineskip=12pt% + \halign{% + \ixpt##\hfil\cr + comput. complex.% + \ifKV@ccsps@issuestage% + ~\textbf{\@ccvolume}~(\@ccyear),~\@ccfirst\ -- \@cclast +%%% {% No coloring on this pageref. +%%% \def\Hy@colorlink##1{\begingroup\color{black}}% +%%% \def\Hy@endcolorlink{\endgroup}% +%%% \pageref{ccenddocument}% +%%% %%% \def\Hy@colorlink##1{\begingroup\color{##1}}% +%%% %%% \def\Hy@endcolorlink{\endgroup}% +%%% }% + \fi\cr + \ifKV@ccsps@openaccess + \copyright{} \@copyholdername\ \@ccyear. + This article is published\cr with open access + at Springerlink.com\cr + \else\copyright{} \@copyholdername\ \@ccyear\cr\fi + \ifKV@ccsps@issuestage + {\printed@issn/\cc@fixelen20\@coveryear/% + \cc@fixelen20\@ccissue% + \cc@fixelen50\@ccfirst% + -% MN2011/07/27: use + instead? + \@ccnumberofpages}\cr + {{\it published online}\ \@onlinedate}\cr + \else\relax\fi + DOI \@doiinfo\cr} + }\hss + \vbox to\z@{\vss + \offinterlineskip% + \halign{##&##\hfil\cr + \vertrulea&\ixpt\cr + %%\copyright{} Birkh{\"{a}}user Verlag, Basel \@ccyear\cr + \noalign{\hrule} + \vertruleb\hskip1mm&% + \vbox to\z@{\vbox to\z@{\vss + \hbox{\xptsfbx computational complexity}}\vss}% + \cr}}}\vskip47.333pt +} +\def\l@title#1#2{}% Usually ignore title entries. +\def\@@today{\today}% for comparison \renewcommand{\maketitle}{% \global\@topnum\z@ % Prevents figures from going at top of page. \cite@hook{}% \if@cchead + \ifnum\@textareaversion=\tw@\vspace*{15pt}\fi \vbox to\z@{\vss \@ifundefined{r@ccenddocument}{\@tempcnta\z@}{% \@tempcnta\@ne @@ -456,30 +913,17 @@ \advance\@tempcnta\@tempa% }% \setcounter{page}{\@ccfirst}% - \hbox to\textwidth{% - \vbox to\z@{\vss - \baselineskip=12pt% - \halign{\ixpt##\hfil\cr - comput. complex.~\textbf{\@ccvolume}~(\@ccyear), - \thepage\ -- \pageref{ccenddocument}\cr - \issn/\expandafter\@gobbletwo\@ccyear% - %% use + instead --? - /\twodigits{\@ccnumber}\fourdigits{\thepage}--\the\@tempcnta\ - \$ 1.50+0.20/0\cr}}\hss - \vbox to\z@{\vss - \offinterlineskip% - \halign{##&##\hfil\cr - \vertrulea&\ixpt - \copyright{} Birkh{\"{a}}user Verlag, Basel \@ccyear\cr - \noalign{\hrule} - \vertruleb\hskip1mm&% - \vbox to\z@{\vbox to\z@{\vss - \hbox{\xptsfbx computational complexity}}\vss}% - \cr}}}\vskip47.333pt} + \ifcase\@textareaversion\maketitleheadA + \or\maketitleheadA + \or\maketitleheadSPS + \else\maketitleheadA + \fi + }% \fi \hrule\@height\z@ \vskip2.2ex% 4.0mm \relax + \thispagestyle{ccfirst} \begin{center} \if@ccpublish \renewcommand{\footnote}[1]{\protect\ClassWarningNoLine{cc}{% @@ -502,11 +946,13 @@ \Large\bfseries \def\\{\penalty-\@M}% \expandafter\MakeUppercase\expandafter{\@title}% + \addcontentsline{toc}{title}{\@title}% \par }% \@ifundefined{@subtitle}{}{{% \large\itshape \@subtitle + %%\if!\@subtitle!\relax\else\addcontentsline{toc}{subtitle}{\@subtitle}\fi% \par }} \@ifundefined{@version}{}{{% @@ -522,8 +968,8 @@ \extractnamesfr@m@author \par }% - \if@ccpublish - \ifx\@date\today\else + \ifKV@ccsps@sps%\if@ccpublish + \ifx\@date\@@today\else \ClassWarningNoLine{cc}{Date ignored! (\@date)}% \fi \else{% @@ -541,7 +987,8 @@ \protect\begin{abstract} ... \protect\end{abstract}.}% \fi \else - \@tempa\leavevmode\unvbox\@abstract\par + \addcontentsline{toc}{section}{\ccabstractname}% + \@tempa\leavevmode\unvbox\@abstract\par \fi }{% \ifvoid\@abstract\else @@ -552,6 +999,7 @@ \@abstr{\ccabstractname} \the\@abstract@toks \end@abstr + \addcontentsline{toc}{section}{\ccabstractname}% \@tempa\leavevmode\unvbox\@abstract\par } \ifvoid\@keywords @@ -579,7 +1027,6 @@ \@thanks \ifx\@tempa\relax\vskip3ex\fi \end{center} - \thispagestyle{empty} \setcounter{footnote}{0}% \global\let\maketitle\relax \global\let\thanks\@gobble diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty index 81d6f9061eb..bee3f7dfa6d 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccproof,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty index 762192ce1f7..340cc41d614 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccqed,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty new file mode 100644 index 00000000000..086d5fc48b4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty @@ -0,0 +1,62 @@ +%% +%% This is file `ccref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% cc.dtx (with options: `ccref,chartab') +%% +%% Copyright 2000-2011 +%% Michael N"usken, Joachim von zur Gathen, computational complexity +%% +%% IMPORTANT NOTICE: +%% +%% This is a generated file. It is part of the +%% computational complexity macro package +%% derived from cc.dtx by 'tex cc.ins'. +%% See cc.dtx for license information. +%% +%% \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 \~} +\RequirePackage{relabel}[1998/09/07 v1.01] +\let\nref\ref +\babel\def\partname{Part}[german=Teil,french=\protect\@Fpt partie] +\defprefix{part}{\partname~} +\babel\def\chaptername{Chapter}[german=Kapitel,french=Chapitre] +\defprefix{chapter}{\chaptername~} +\babel\def\sectionname{Section}[german=Abschnitt,french=Section] +\defprefix{section}{\sectionname~} +\babel\def\subsectionname{Section}[german=Abschnitt,french=Section] +\defprefix{subsection}{\subsectionname~} +\babel\def\subsubsectionname{Section}[german=Abschnitt,french=Section] +\defprefix{subsubsection}{\subsubsectionname~} +\let\ccorg@appendix\appendix +\babel\def\appendixname{Appendix}[german=Anhang,french=Annexe] +\def\appendix{% + \defprefix{section}{\appendixname~}% + \defprefix{subsection}{\appendixname~}% + \defprefix{subsubsection}{\appendixname~}% + \ccorg@appendix} +\defprefix{equation}#1{(#1)} +\babel\def\figurename{Figure}[german=Figur,french={\scshape Figure}] +\defprefix{figure}{\figurename~} +\babel\def\tablename{Table}[german=Tafel,french={\scshape Table}] +\defprefix{table}{\tablename~} +\numberallwithin{section} +\AtBeginDocument{\@adjustnumbering} +\endinput +%% +%% End of file `ccref.sty'. diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty index dbedd7867d5..d415b82005b 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccreltx,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty index f0e5c2ac46b..b17db0421b1 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccthm,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -58,15 +58,15 @@ \def\theenumi{\@roman\c@enumi}% \def\labelenumi{(\theenumi)}% \defprefix{enumi}##1{% - %%\Iflabelchanged{#1}{\uselabel{#1}}% + %\Iflabelchanged{#1}{\uselabel{#1}}% \protect\protect\protect\@@conduselabel {{\protect\csname the#1\endcsname}}% {\@thm@bare@currentlabel}{\@thm@currentlabel}% (##1)}% - %%\def\theenumii{\@alph\c@enumii}% - %%\def\labelenumii{(\theenumii)}% + %\def\theenumii{\@alph\c@enumii}% + %\def\labelenumii{(\theenumii)}% \defprefix{enumii}##1{% - %%\Iflabelchanged{#1}{\uselabel{#1}}% + %\Iflabelchanged{#1}{\uselabel{#1}}% \protect\protect\protect\@@conduselabel {{\protect\csname the#1\endcsname}}% {\@thm@bare@currentlabel}{\@thm@currentlabel}% @@ -74,15 +74,15 @@ \def\theenumiii{\@arabic\c@enumiii}% \def\labelenumiii{(\theenumiii)}% \defprefix{enumiii}##1{% - %%\Iflabelchanged{#1}{\uselabel{#1}}% + %\Iflabelchanged{#1}{\uselabel{#1}}% \protect\protect\protect\@@conduselabel {{\protect\csname the#1\endcsname}}% {\@thm@bare@currentlabel}{\@thm@currentlabel}% (\theenumi.\theenumii.##1)}% - %%\def\theenumiv{\@Alph\c@enumiv}% - %%\def\labelenumiv{\theenumiv.}% + %\def\theenumiv{\@Alph\c@enumiv}% + %\def\labelenumiv{\theenumiv.}% \defprefix{enumiv}##1{% - %%\Iflabelchanged{#1}{\uselabel{#1}}% + %\Iflabelchanged{#1}{\uselabel{#1}}% \protect\protect\protect\@@conduselabel {{\protect\csname the#1\endcsname}}% {\@thm@bare@currentlabel}{\@thm@currentlabel}% @@ -93,14 +93,14 @@ \def\theenumi{\@roman\c@enumi}% \def\labelenumi{(\theenumi)}% \defprefix{enumi}##1{(##1)}% - %%\def\theenumii{\@alph\c@enumii}% - %%\def\labelenumii{(\theenumii)}% + %\def\theenumii{\@alph\c@enumii}% + %\def\labelenumii{(\theenumii)}% \defprefix{enumii}##1{(\theenumi.##1)}% \def\theenumiii{\@arabic\c@enumiii}% \def\labelenumiii{(\theenumiii)}% \defprefix{enumiii}##1{(\theenumi.\theenumii.##1)}% - %%\def\theenumiv{\@Alph\c@enumiv}% - %%\def\labelenumiv{\theenumiv.}% + %\def\theenumiv{\@Alph\c@enumiv}% + %\def\labelenumiv{\theenumiv.}% \defprefix{enumiv}##1{(\theenumi.\theenumii.\theenumiii##1)} } \fi @@ -170,7 +170,6 @@ \newtheorem{thesis*}[namedth@@r@m*]{\Thesis}% \babel\def\Warning{Warning}[german=Warnung,french=Alerte] \newtheorem{warning*}[namedth@@r@m*]{\Warning}% -%%\newtheorem{example*}[namedth@@r@m*]{Example}% \babel\def\Example{Example}[german=Beispiel,french=Exemple] \newenvironment{example*}[1][]{% \cc@ifempty{#1} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty b/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty index cbbb2b63778..cccba2a27c3 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `relabel,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty index fe89c1c1a1a..907c8a627a7 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `thcc,chartab') %% -%% Copyright 2000-2010 +%% Copyright 2000-2011 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -36,10 +36,16 @@ computational complexity, theorem layouts. Michael Nuesken, Bonn.] \RequirePackage{theorem}[1995/11/23] -\expandafter\xdef\csname ver@amsthm.sty\endcsname -{2000/02/29 Forbidden by cc.cls/thcc.sty. Not loaded!} -\expandafter\xdef\csname ver@apthm.sty\endcsname -{2000/02/29 Forbidden by cc.cls/thcc.sty. Not loaded!} +\def\cc@forbiddenpackage{2010/10/26 Forbidden by cc.cls/thcc.sty. Not loaded!} +\expandafter\global\expandafter\let\csname ver@amsthm.sty\endcsname\cc@forbiddenpackage +\expandafter\global\expandafter\let\csname ver@apthm.sty\endcsname\cc@forbiddenpackage +\let\orig@ifpackageloaded\@ifpackageloaded +\def\@ifpackageloaded#1{% + \expandafter\ifx\csname ver@#1.\@pkgextension\endcsname\cc@forbiddenpackage + \expandafter\@secondoftwo% consider it as not loaded + \else + \gdef\cc@reserved{\orig@ifpackageloaded{#1}}\expandafter\cc@reserved% + \fi} \def\activate@shortcite{} \AtBeginDocument{% \@ifpackageloaded{cccite}{% -- cgit v1.2.3