From 868233e6288b5e35a7d7aabd79bf8e56a802bc12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Aug 2011 00:46:17 +0000 Subject: computational-complexity 2.20 (29jul11) git-svn-id: svn://tug.org/texlive/trunk@23291 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/computational-complexity/cc.cls | 10 +- .../tex/latex/computational-complexity/cc2cite.sty | 2 +- .../latex/computational-complexity/cc4amsart.sty | 3 +- .../latex/computational-complexity/cc4elsart.sty | 3 +- .../tex/latex/computational-complexity/cc4jT.sty | 3 +- .../latex/computational-complexity/cc4llncs.sty | 3 +- .../latex/computational-complexity/cc4siamltex.sty | 3 +- .../latex/computational-complexity/cc4svjour.sty | 3 +- .../tex/latex/computational-complexity/ccalgo.sty | 14 +- .../latex/computational-complexity/cclayout.sty | 255 ++++++--------------- .../tex/latex/computational-complexity/ccproof.sty | 2 +- .../tex/latex/computational-complexity/ccqed.sty | 2 - .../tex/latex/computational-complexity/ccreltx.sty | 1 - .../tex/latex/computational-complexity/ccthm.sty | 12 - .../tex/latex/computational-complexity/relabel.sty | 1 - .../tex/latex/computational-complexity/thcc.sty | 2 +- 16 files changed, 82 insertions(+), 237 deletions(-) (limited to 'Master/texmf-dist/tex/latex/computational-complexity') diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index 44ee5d1c057..86de8ee3527 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 -2011/07/28 v2.19 +2011/07/28 v2.20 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} @@ -103,7 +103,7 @@ computational complexity \DeclareOption{standardprefixes}{% old \PassOptionsToPackage{notheoremitemprefixes}{ccthm}} \DeclareOption{ccpublish}{\@ccpublishtrue} -\DeclareOption{noccpublish}{\@ccpublishfalse} +\DeclareOption{noccpublish}{\@ccpublishfalse\ExecuteOptions{textarea=none}} \DeclareOption{textarea=full}{\@textareaversion\m@ne} \DeclareOption{textarea=none}{\@textareaversion\z@} \DeclareOption{textarea=cc1}{\@textareaversion\@ne} @@ -187,10 +187,10 @@ computational complexity \@pass@ptions\@pkgextension{}{german} \global\expandafter\let\csname ver@german.\@pkgextension\endcsname\@empty \if@babel -\RequirePackage{babel} +\RequirePackage{babel}[2008/07/06 v3.8l] \fi \if@latin -\RequirePackage[latin1]{inputenc}[1998/03/05 v0.97] +\RequirePackage[latin1]{inputenc}[2008/03/30 v1.1d] \fi \if@ams \RequirePackage{amsmath}[2000/01/15 v2.05]% 1997/03/20 v1.2d @@ -212,7 +212,7 @@ computational complexity \def\square{{\fboxsep.3em{\vbox{\hbox{\fbox{}}\vskip0pt}}}}% \let\text\mbox \fi -\RequirePackage{url}[1999/03/02 ver 1.4] +\RequirePackage{url}[2006/04/12 ver 3.3] \expandafter\def\expandafter\UrlSpecials\expandafter{% \UrlSpecials\do\%{}} \providecommand{\email}{\begingroup\urlstyle{tt}\Url} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty index f964133b38b..7e13bd5bf34 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty @@ -33,7 +33,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{cc2cite}[2000/02/29 v2.05 cc2 cite helper package] -\RequirePackage{natbib} +\RequirePackage{natbib}[2010/09/13 8.31b] \bibpunct{(}{)}{;}{a}{}{,} \newcommand{\bibstyle@cc}{\bibpunct{(}{)}{;}{a}{}{,}} \expandafter\def\csname bibstyle@cc2\endcsname{% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty index 753809cbd12..f188e54f3a3 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty @@ -36,8 +36,7 @@ computational complexity, adaptions to amsart. Michael Nuesken, Bonn.] \RequirePackage{ccaux} -\RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's - % definitions. +\RequirePackage{ccreltx} \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \gdef\theorem@headerfont{\bfseries} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty index bbb965e9919..6818939fc7a 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty @@ -36,8 +36,7 @@ computational complexity, adaptions to elsart. Michael Nuesken, Bonn.] \RequirePackage{ccaux} -\RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's - % definitions. +\RequirePackage{ccreltx} \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \@longarticletrue diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty index af8f2d211b7..fb0f24c8dc5 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty @@ -36,8 +36,7 @@ computational complexity, adaptions to jT which uses amsart. Michael Nuesken, Bonn.] \RequirePackage{ccaux} -\RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's - % definitions. +\RequirePackage{ccreltx} \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \gdef\theorem@headerfont{\bfseries} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty index e41bff4367c..4c9d4fbcc79 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty @@ -64,8 +64,7 @@ \RequirePackage{amssymb}[1996/11/03 v2.2b] \RequirePackage{ccaux} \@longarticletrue -\RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's - % definitions. +\RequirePackage{ccreltx} \RequirePackage{ccref} \RequirePackage{ccthm,ccproof} \theoremheaderfont{\upshape\bfseries} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty index 552ea93db6c..c276629becf 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty @@ -53,8 +53,7 @@ \RequirePackage{amsfonts} \RequirePackage{amssymb} \RequirePackage{ccaux} -\RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's - % definitions. +\RequirePackage{ccreltx} \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 5c66f9daa43..6f22e844822 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty @@ -37,8 +37,7 @@ Michael Nuesken, Bonn.] \RequirePackage{ccaux} \RequirePackage{cc2cite} -\RequirePackage{ccreltx}% deactivate amsthm.sty and reactive LaTeX's - % definitions. +\RequirePackage{ccreltx} \PassOptionsToPackage{bare}{relabel} \RequirePackage{thcc} \gdef\theorem@headerfont{\bfseries} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty index 4252db4ab5e..ce81a0da1ce 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty @@ -106,11 +106,10 @@ Check if current package is valid} \fi} \RequirePackage{ccaux} -\RequirePackage{theorem} +\RequirePackage{theorem}[1995/11/23 v2.2c] \RequirePackage{thcc} \RequirePackage{relabel} \def\list@parshape{% - %\typeout{parshape 1 \the\@totalleftmargin+\the\linewidth}% \parshape \@ne \@totalleftmargin \linewidth} \newdimen\reinit@list@last \def\reinit@list#1{% @@ -123,7 +122,6 @@ \advance\itemindent-\reinit@list@last \advance\@totalleftmargin\reinit@list@last \advance\linewidth-\reinit@list@last - %\typeout{\the\@totalleftmargin + \the\linewidth}% \list@parshape} \def\reinit@list@label{% \reinit@list{\wd\@tempboxa}% @@ -196,9 +194,7 @@ } \newcommand{\algonumerate@makelabelnumber}[1]{% \hb@xt@\steplabelwidth{\hss - %\hb@xt@\steplabelwidth{\hfill #1% - %} }\hskip\algo@labelsep% } \newcommand{\algonumerate@postprocess}[1]{% @@ -291,9 +287,6 @@ \topsep\z@% \itemsep\z@% \parskip\z@% - %\leftmargin\z@ - %\algo@labelsep\labelsep - %\labelsep\z@ \leftmargin\labelsep \algo@labelsep\z@ \settowidth\steplabelwidth{\makealgolabel{99}}% @@ -330,11 +323,9 @@ \let\@tempa\relax \protected@edef\@tempa{% \csname r@\the\algorithmmasterkey-#1\endcsname}% - %\show\@tempa \let\@tempc\relax \protected@edef\@tempc{% \csname r@\the\algorithmmasterkey-#2\endcsname}% - %\show\@tempc \ifx\@tempa\@tempc\global\@trivialrangetrue \else\global\@trivialrangefalse\fi }% @@ -407,9 +398,6 @@ \@newlistfalse \vskip\topskip \par - %\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/cclayout.sty b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty index e1e9ced1ad2..c1f0d17b0e0 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty @@ -56,33 +56,36 @@ \newcommand{\authorhead}[1]{\gdef\@authorhead{#1}} \let\@authorlist\@undefined \newcommand{\authorlist}[1]{\gdef\@authorlist{#1}} -\newbox\@abstract \let\abstract\@undefined\let\endabstract\@undefined \babel\def\ccabstractname{Abstract}[% german=Zusammenfassung,french=R\'esum\'e] -\newenvironment{abstract} - {\global\setbox\@abstract\@abstr{\ccabstractname}} - {\end@abstr} -\newtoks\@abstract@toks -\newcommand{\Abstract}{\global\@abstract@toks} -\newbox\@keywords +\RequirePackage{environ}[2008/06/18] +\def\@abstract@macro{} +\long\def\for@cc@abstract#1{% + \gdef\@abstract@macro{\begin{@abstr}{\ccabstractname}#1\end{@abstr}}} +\newenvironment{abstract}{\Collect@Body\for@cc@abstract}{} +\newcommand{\Abstract}{\for@cc@abstract} \babel\def\cckeywordsname{Keywords}[% german=Stichworte,french=Mot-cl\'e] -\newenvironment{keywords} - {\global\setbox\@keywords\@abstr{\cckeywordsname}} - {\end@abstr} -\newbox\@subject +\def\@keywords@macro{} +\long\def\for@cc@keywords#1{% + \gdef\@keywords@macro{\begin{@abstr}{\cckeywordsname}#1\end{@abstr}}} +\newenvironment{keywords}{\Collect@Body\for@cc@keywords}{} \babel\def\ccsubjectclassificationname{Subject classification}[% german=Klassifizierung,french=Classification de suj\`et] -\newenvironment{subject} - {\global\setbox\@subject\@abstr{\ccsubjectclassificationname}} - {\end@abstr} +\def\@subject@macro{} +\long\def\for@cc@subject#1{% + \gdef\@subject@macro{\begin{@abstr}{\ccsubjectclassificationname} + #1 + \end{@abstr}}} +\newenvironment{subject}{\Collect@Body\for@cc@subject}{} \newdimen\@abstrwidth +\newbox\@abstr@box \newenvironment{@abstr}[1]{% - \vbox\bgroup - \hsize\textwidth + \setbox\@abstr@box\vbox\bgroup% \@parboxrestore - \leftmargin.5\textwidth \advance\leftmargin-.5\@abstrwidth + \ifdim\@abstrwidth>\hsize\@abstrwidth\hsize\fi + \leftmargin.5\hsize \advance\leftmargin-.5\@abstrwidth \rightmargin\leftmargin \@trivlist\@newlistfalse\global\@inlabeltrue \advance\linewidth -\rightmargin @@ -94,17 +97,21 @@ \topsep 2\p@ \@plus2\p@ \@minus1\p@ \parsep 1\p@ \itemsep \parsep}% - \let\@listii\@toodeep + \def\@listii{\leftmargin\leftmarginii + \labelwidth\leftmarginii + \advance\labelwidth-\labelsep + \topsep 0\p@ \@plus1\p@ + \parsep 1\p@ + \itemsep \parsep}% \let\@listiii\@toodeep \let\@listiv\@toodeep \let\@listv\@toodeep \let\@listvi\@toodeep \textbf{#1. }\ignorespaces} {% - %\strut \par - %\vskip\z@ \egroup + \leavevmode\unvbox\@abstr@box \ignorespacesafterend} \newif\if@abstractoptional \if@ccpublish\@abstractoptionalfalse\else\@abstractoptionaltrue\fi @@ -128,16 +135,13 @@ \def\@ccfirst{1}% \let\@cclast\@ccunknown% \let\@ccnumberofpages\@ccunknown% +\long\def\cc@secondoffive#1#2#3#4#5{#2} \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% + \protected@xdef\@cclast{\csname r@ccenddocument\endcsname}% + \xdef\@cclast{\expandafter\cc@secondoffive\@cclast{}{}{}{}{}}% \advance\@tempcnta\@cclast% \xdef\@ccnumberofpages{\the\@tempcnta}% }% @@ -151,7 +155,6 @@ \global\@subjectoptionaltrue% Subject class. optional \global\@ccheadfalse \gdef\@cctxt{#1}% - %\global\@twosidefalse } \newcommand{\ccpublish}[4]{% Deprecated since 2011/07/25 \global\@ccpublishtrue @@ -202,7 +205,6 @@ {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}} @@ -219,24 +221,16 @@ \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}% @@ -251,7 +245,6 @@ \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-% @@ -262,7 +255,6 @@ \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}{ @@ -293,68 +285,33 @@ \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}% + unicode]{hyperref}[2011/04/17 v6.82g]% + \RequirePackage{breakurl}[2009/01/24 v1.30]% \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}}%%%% + \def\DOIexternalref##1##2{\hyperimage{##1}{##2}}% \InputIfFileExists{bookmarkgreeks.tex}{}{}% \else \def\@urlcolor{black}% @@ -362,22 +319,11 @@ \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}% @@ -498,11 +444,8 @@ \def\extractaffilsfr@om@author{% \parindent\z@ \init@affils -%%% \begin{tabular}{@{}ll@{}}% \expandafter\extract@affils\@author\and\and\@nil \if@oddaffil\else\even@sep\even@post\fi -%%% \end{tabular} -%%% \par } \def\init@affils{% \let\and\relax @@ -523,22 +466,21 @@ \affilpost} \newcommand{\otheraddress}{\end{@ffiliation}\affilsep \begin{@ffiliation}} -\def\affilpre{\if@oddaffil\odd@pre\else\even@pre\fi} -\def\affilpost{\if@oddaffil\odd@post\global\@oddaffilfalse - \else\even@post\global\@oddaffiltrue\fi} \def\odd@pre{\par\begin{tabular}{@{}ll@{}}}% +\def\odd@sep{&}% \def\odd@post{&}% \def\even@pre{}% +\def\even@sep{\end{tabular}\par\begin{tabular}{@{}ll@{}}}% \def\even@post{\end{tabular}}% -%%% +\newif\if@oddaffil +\def\affilpre{\if@oddaffil\odd@pre\else\even@pre\fi} \def\affilsep{% \if@oddaffil\odd@sep\@oddaffilfalse \else\even@sep\@oddaffiltrue \fi } -\newif\if@oddaffil -\def\odd@sep{&}% -\def\even@sep{\end{tabular}\par\begin{tabular}{@{}ll@{}}}% +\def\affilpost{\if@oddaffil\odd@post\global\@oddaffilfalse + \else\even@post\global\@oddaffiltrue\fi} \if@twocolumnendtitle \newenvironment{@ffiliation} {% @@ -561,8 +503,8 @@ } {\endminipage\bigskip} \fi -\@abstrwidth0.85\textwidth \ifcase\@textareaversion +\@abstrwidth0.85\textwidth \or% version 1, used until June 2011 \textwidth=141mm \@abstrwidth=120mm @@ -574,11 +516,9 @@ \headheight=1.25\headheight \ifnum\@marginmode<\z@\@marginmode\z@\fi \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... +\topmargin=-9.6mm \textheight=45.5pc \textwidth=119mm \@abstrwidth=\textwidth @@ -589,11 +529,9 @@ \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 @@ -601,10 +539,10 @@ \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 +\@abstrwidth0.85\textwidth \fi \newdimen\cc@topmargin \cc@topmargin\topmargin \newdimen\cc@textwidth \cc@textwidth\textwidth @@ -718,8 +656,8 @@ }% }% } -\RequirePackage{graphicx} -\RequirePackage{xcolor}% +\RequirePackage{graphics}[2009/02/05 v1.0o] +\RequirePackage{xcolor}[2007/01/21 v2.11]% \IfFileExists{Birkh_logo_2010_sps.eps}{% \def\birklogo{\bgroup\includegraphics{Birkh_logo_2010_sps.eps}\egroup} }{% @@ -752,7 +690,8 @@ \let\@evenfoot\@oddfoot \def\@oddhead{% \ifKV@ccsps@grid - \hbox to\z@{\vbox to\z@{% + \hbox to\z@{% + \vbox to\z@{% \hsize\twidth \vskip\headsep \fboxrule=.25pt @@ -760,6 +699,7 @@ \textcolor{lightgray}{% \fbox{\vbox to\theight{\hbox to\twidth{\hss}\vss}}% }% + \vss }% \hss }% @@ -771,7 +711,6 @@ \AtEndOfClass{\pagestyle{cc}} \AtEndOfClass{% \AtBeginDocument{\@onlypreamble{\author{\if@autotitle\maketitle\fi}}} - %\AtBeginDocument{\if@autotitle\maketitle\fi} \AtEndDocument{\if@autotitle\makeendtitle\fi} } \def\stripbox{\kern -11.7cm% @@ -810,31 +749,6 @@ 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\ @@ -859,13 +773,6 @@ 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. @@ -875,7 +782,7 @@ \ifKV@ccsps@issuestage {\printed@issn/\cc@fixelen20\@coveryear/% \cc@fixelen20\@ccissue% - \cc@fixelen50\@ccfirst% + \cc@fixelen40\@ccfirst% -% MN2011/07/27: use + instead? \@ccnumberofpages}\cr {{\it published online}\ \@onlinedate}\cr @@ -886,7 +793,6 @@ \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 @@ -898,32 +804,21 @@ \renewcommand{\maketitle}{% \global\@topnum\z@ % Prevents figures from going at top of page. \cite@hook{}% + \thispagestyle{ccfirst} \if@cchead \ifnum\@textareaversion=\tw@\vspace*{15pt}\fi \vbox to\z@{\vss - \@ifundefined{r@ccenddocument}{\@tempcnta\z@}{% - \@tempcnta\@ne - \advance\@tempcnta-\@ccfirst - \edef\@tempa{\csname r@ccenddocument\endcsname}% - \ifx\@secondoffive\@@@@undefined% hyperref launches this! - \edef\@tempa{\expandafter\@secondoftwo\@tempa{}{}{}{}{}}% - \else - \edef\@tempa{\expandafter\@secondoffive\@tempa{}{}{}{}{}}% - \fi% - \advance\@tempcnta\@tempa% - }% \setcounter{page}{\@ccfirst}% - \ifcase\@textareaversion\maketitleheadA + \ifcase\@textareaversion\maketitleheadSPS \or\maketitleheadA \or\maketitleheadSPS - \else\maketitleheadA + \else\maketitleheadSPS \fi }% \fi \hrule\@height\z@ \vskip2.2ex% 4.0mm \relax - \thispagestyle{ccfirst} \begin{center} \if@ccpublish \renewcommand{\footnote}[1]{\protect\ClassWarningNoLine{cc}{% @@ -935,7 +830,7 @@ \renewcommand{\footnote}[1]{\protect\ClassWarningNoLine{cc}{% In title or author \string\footnote\space does not work.\MessageBreak Avoid footnotes or use \string\thanks}}% - \renewcommand{\thefootnote}{\@fnsymbol\c@footnote}% + \def\thefootnote{\@fnsymbol\c@footnote}% \def\@makefnmark{% \rlap{\@textsuperscript{\normalfont\@thefnmark}}}% \long\def\@makefntext##1{\parindent 1em\noindent @@ -952,7 +847,6 @@ \@ifundefined{@subtitle}{}{{% \large\itshape \@subtitle - %%\if!\@subtitle!\relax\else\addcontentsline{toc}{subtitle}{\@subtitle}\fi% \par }} \@ifundefined{@version}{}{{% @@ -977,32 +871,18 @@ \large\@date\par }\fi \def\@tempa{\vskip5.5ex\let\@tempa\relax}% - \expandafter\cc@ifempty\expandafter{\the\@abstract@toks}{% - \ifvoid\@abstract - \if@abstractoptional - \ClassWarningNoLine{cc}{Missing abstract}% - \else - \ClassError{cc}{Missing abstract} - {Define an abstract in the preamble using - \protect\begin{abstract} ... \protect\end{abstract}.}% - \fi + \ifx\@abstract@macro\@empty + \if@abstractoptional + \ClassWarningNoLine{cc}{Missing abstract}% \else - \addcontentsline{toc}{section}{\ccabstractname}% - \@tempa\leavevmode\unvbox\@abstract\par - \fi - }{% - \ifvoid\@abstract\else - \ClassWarningNoLine{cc}{Two abstracts, - using the one defined by \protect\Abstract}% + \ClassError{cc}{Missing abstract} + {Define abstract in the preamble using + \protect\begin{abstract} ... \protect\end{abstract}.}% \fi - \global\setbox\@abstract - \@abstr{\ccabstractname} - \the\@abstract@toks - \end@abstr - \addcontentsline{toc}{section}{\ccabstractname}% - \@tempa\leavevmode\unvbox\@abstract\par - } - \ifvoid\@keywords + \else + \@tempa\@abstract@macro\par + \fi + \ifx\@keywords@macro\@empty \if@keywordsoptional \ClassWarningNoLine{cc}{Missing keywords}% \else @@ -1011,18 +891,18 @@ \protect\begin{keywords} ... \protect\end{keywords}.}% \fi \else - \@tempa\leavevmode\unvbox\@keywords\par + \@tempa\@keywords@macro\par \fi - \ifvoid\@subject + \ifx\@subject@macro\@empty \if@subjectoptional \ClassWarningNoLine{cc}{Missing subject classification}% \else - \ClassError{cc}{Missing subject classification} - {Define a subject classification in the preamble using + \ClassError{cc}{Missing subject} + {Define subject in the preamble using \protect\begin{subject} ... \protect\end{subject}.}% \fi \else - \@tempa\leavevmode\unvbox\@subject\par + \@tempa\@subject@macro\par \fi \@thanks \ifx\@tempa\relax\vskip3ex\fi @@ -1061,7 +941,6 @@ {\small \extractaffilsfr@om@author }% - %%\clearpage \gdef\makeendtitle{\ClassWarning{cc}{\protect\makeendtitle\space multiply used!}}% } diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty index bee3f7dfa6d..27bc74a01d6 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty @@ -33,7 +33,7 @@ %% Right brace \} Tilde \~} \ProvidesPackage{ccproof}[2000/02/29 v2.05 proof environments for cc. Michael Nuesken, Bonn.] -\RequirePackage{theorem} +\RequirePackage{theorem}[1995/11/23 v2.2c] \RequirePackage{thcc} \RequirePackage{ccqed} \newcommand{\Qed}{\@qedtrue\qed}% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty index 340cc41d614..a86a0cefdbd 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty @@ -85,13 +85,11 @@ \fi }% \def\page@pushright#1{% 18 Jan 1994 - %\unpenalty % ineffective \skip@\lastskip \ifdim\skip@>\z@ \unskip \else\skip@\z@\relax \fi - %\unpenalty % TeX won't let me do this \dimen@\baselineskip \advance\dimen@-\prevdepth \nobreak diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty index d415b82005b..5f0ac869108 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty @@ -35,7 +35,6 @@ \ProvidesPackage{ccreltx}[2002/05/22 v2.05 computational complexity, reactivate ltthm. Michael Nuesken, Bonn.] -%%% From File: ltthm.dtx \def\newtheorem#1{% \@ifnextchar[{\@othm{#1}}{\@nthm{#1}}} \def\@nthm#1#2{% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty index b17db0421b1..b370259845c 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty @@ -58,15 +58,11 @@ \def\theenumi{\@roman\c@enumi}% \def\labelenumi{(\theenumi)}% \defprefix{enumi}##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)}% \defprefix{enumii}##1{% - %\Iflabelchanged{#1}{\uselabel{#1}}% \protect\protect\protect\@@conduselabel {{\protect\csname the#1\endcsname}}% {\@thm@bare@currentlabel}{\@thm@currentlabel}% @@ -74,15 +70,11 @@ \def\theenumiii{\@arabic\c@enumiii}% \def\labelenumiii{(\theenumiii)}% \defprefix{enumiii}##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.}% \defprefix{enumiv}##1{% - %\Iflabelchanged{#1}{\uselabel{#1}}% \protect\protect\protect\@@conduselabel {{\protect\csname the#1\endcsname}}% {\@thm@bare@currentlabel}{\@thm@currentlabel}% @@ -93,14 +85,10 @@ \def\theenumi{\@roman\c@enumi}% \def\labelenumi{(\theenumi)}% \defprefix{enumi}##1{(##1)}% - %\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.}% \defprefix{enumiv}##1{(\theenumi.\theenumii.\theenumiii##1)} } \fi diff --git a/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty b/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty index cccba2a27c3..8bf37755e2c 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty @@ -31,7 +31,6 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -%%% File: relabel.sty %% Copyright (C) 1998 Michael N\"{u}sken, all rights reserved. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{relabel}[1998/09/07 v1.01 Relabel. MNuesken] diff --git a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty index 907c8a627a7..b0fe7be23a4 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty @@ -35,7 +35,7 @@ \ProvidesPackage{thcc}[2008/03/18 v2.08 computational complexity, theorem layouts. Michael Nuesken, Bonn.] -\RequirePackage{theorem}[1995/11/23] +\RequirePackage{theorem}[1995/11/23 v2.2c] \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 -- cgit v1.2.3