From bae65b4503c39d25a32b48636d2859b38711ab0e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Oct 2006 22:32:53 +0000 Subject: computational-complexity update (15oct06) git-svn-id: svn://tug.org/texlive/trunk@2329 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/computational-complexity/cc.dtx | 130 ++++++++++++++------- 1 file changed, 86 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx index 5a7fa8ffdf3..339684336ff 100644 --- a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx +++ b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 2000, 2003, computational complexity, Michael Nüsken +% Copyright 2000, 2003, 2006, computational complexity, Michael Nüsken % % This file is part of computational complexity macro package. % @@ -939,7 +939,7 @@ D: \short\ref{rs-D}, \index{files:\levelchar{\protect\ttfamily#1}\encapchar usage}} \newcommand{\ccLINK}{% - \url{http://link.springer.de/link/service/journals/00037/}% + \url{http://www.linkspringer.com/?genre=article&issn=1016-3328}% \begingroup\urlstyle{tt}\Url} \newcommand{\cchomepage}{\url{http://www-math.upb.de/~aggathen/cc/}% \begingroup\urlstyle{tt}\Url} @@ -1178,7 +1178,7 @@ D: \short\ref{rs-D}, \author{% Michael N{\"{u}}sken\\ b-it (Bonn-Aachen International Center for Information Technology)\\ - Görresstr. 13\\ + Dahlmannstr. 2\\ 53113 Bonn, Germany\\ \email{nuesken@bit.uni-bonn.de}\\ @@ -1252,7 +1252,7 @@ the Editor-in-Chief. \begin{quotation}\obeylines% Joachim von zur Gathen b-it - Görresstr. 13 + Dahlmannstr. 2 D-53113 Bonn \textsc{Germany} Email: \email{gathen@bit.uni-bonn.de} @@ -2625,13 +2625,15 @@ multilingual,english]{cc} % \changes{v2.02}{2002/01/08}{Advanced version to 2.03} % \changes{v2.03}{2005/08/29}{Advanced version to 2.04, Michael % N{\"{u}}sken, now(!) Bonn} +% \changes{v2.04}{2006/03/08}{Advanced version to 2.05, Michael +% N{\"{u}}sken, Bonn} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \providecommand\ignorespacesafterend{\@ignoretrue} \newif\ifclass \ifx\@currext\@clsextension\classtrue\else\classfalse\fi \ifclass\expandafter\ProvidesClass\else\expandafter\ProvidesPackage\fi -{\ifclass cc\else cc-cls\fi}[2005/08/27 v2.04 +{\ifclass cc\else cc-cls\fi}[2006/10/13 v2.06 computational complexity \ifclass document class\else package\fi] % \end{macrocode} @@ -3089,14 +3091,29 @@ multilingual,english]{cc} % \begin{macro}{\subsubsection} % Subsection and subsubsection titles are |\bfseries| and embedded in % the text with 1~em distance. And these text embedded titles shall -% always terminate with a full stop. -% \begin{macrocode} +% always terminate with a full stop, unless they terminate with a +% full stop, question mark, or exlamantion mark. +% \changes{v2.06}{2006/10/13}{Made full stop in section and +% subsection headings optional.} +% \begin{macrocode} +\def\opt@fullstop#1{#1{\tracingall\has@fullstop#1.\@@@ +\if@tempswa\else +\has@exlamationmark#1!\@@@ +\if@tempswa\else +\has@questionmark#1?\@@@ +\if@tempswa\else +.\fi +\fi +\fi}} +\def\has@fullstop#1.#2\@@@{\@ifempty{#2}{\@tempswafalse}{\@tempswatrue}} +\def\has@exlamationmark#1!#2\@@@{\@ifempty{#2}{\@tempswafalse}{\@tempswatrue}} +\def\has@questionmark#1?#2\@@@{\@ifempty{#2}{\@tempswafalse}{\@tempswatrue}} \def\dot@sect#1#2#3#4#5#6[#7]#8{% \let\@sect\ccorg@sect\let\@ssect\ccorg@ssect - \@sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{#8.}} + \@sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{\opt@fullstop{#8}}} \def\dot@ssect#1#2#3#4#5{% \let\@sect\ccorg@sect\let\@ssect\ccorg@ssect - \@ssect{#1}{#2}{#3}{#4}{#5.}} + \@ssect{#1}{#2}{#3}{#4}{\opt@fullstop{#5}}} \def\add@dot{% \let\ccorg@sect\@sect\let\ccorg@ssect\@ssect \let\@sect\dot@sect\let\@ssect\dot@ssect} @@ -3355,7 +3372,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*ccaux> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{ccaux}[2005/08/27 v2.04 +\ProvidesPackage{ccaux}[2005/08/27 v2.05 computational complexity, auxiliaries. Michael Nuesken, Bonn.] % \end{macrocode} @@ -3492,6 +3509,8 @@ multilingual,english]{cc} % \changes{v2.03}{2004/06/21}{\cs{ccaddto} must not call % \cs{AtBeginDocument} when called inside the document (as for example % happens in algorithms...)} +% \changes{v2.04}{2005/11/03}{\cs{ccaddto}, \cs{ccaddtoINDOC}, +% \cs{ccaddtonow} now use only global defs.)} % \begin{macrocode} % \providecommand{\extdef}[2]{% % \ifx#1\@undefined\relax\def#1{}\fi% @@ -3508,11 +3527,11 @@ multilingual,english]{cc} % the document. (Hopefully not too late for the first selectlanguage!) \newcommand{\ccaddto}[3]{% \ifx#1\@undefined - \def#1{#2}% + \gdef#1{#2}% \AtBeginDocument{\expandafter\ccaddtonow\expandafter{#1}#3}% \else \ifx#1\relax - \def#1{#2}% + \gdef#1{#2}% \AtBeginDocument{\expandafter\ccaddtonow\expandafter{#1}#3}% \else {\toks@\expandafter{#1#2}% @@ -3522,10 +3541,10 @@ multilingual,english]{cc} } \newcommand{\ccaddtoINDOC}[3]{% \ifx#1\@undefined - \def#1{#2}% + \gdef#1{#2}% \else \ifx#1\relax - \def#1{#2}% + \gdef#1{#2}% \else {\toks@\expandafter{#1#2}% \xdef#1{\the\toks@}}% @@ -3535,10 +3554,10 @@ multilingual,english]{cc} \AtBeginDocument{\global\let\ccaddto\ccaddtoINDOC} \newcommand{\ccaddtonow}[2]{% \ifx#2\@undefined - \def#2{#1}% + \gdef#2{#1}% \else \ifx#2\relax - \def#2{#1}% + \gdef#2{#1}% \else {\toks@\expandafter{#2#1}% \xdef#2{\the\toks@}}% @@ -3776,17 +3795,27 @@ multilingual,english]{cc} % \begin{environment}{@abstr} % The environment \Lenv{@abstr} is for internal use only. It puts % the contents in a box, preceded by its argument as a title. +% \changes{v2.04}{2006/03/06}{Changed @abstr to allow for very +% long abstracts, MN, Bonn} % \begin{macrocode} \newdimen\@abstrwidth \newenvironment{@abstr}[1]{% \vbox\bgroup - \hsize\@abstrwidth + \hsize\textwidth \@parboxrestore + \leftmargin.5\textwidth \advance\leftmargin-.5\@abstrwidth + \rightmargin\leftmargin + \@trivlist\@newlistfalse\global\@inlabeltrue + \advance\linewidth -\rightmargin + \advance\linewidth -\leftmargin + \advance\@totalleftmargin \leftmargin + \parshape \@ne \@totalleftmargin \linewidth \small \textbf{#1. }\ignorespaces} {% - \strut\par - \vskip\z@ + %\strut + \par + %\vskip\z@ \egroup \ignorespacesafterend} % \end{macrocode} @@ -3833,6 +3862,10 @@ multilingual,english]{cc} % \changes{v2.03}{2005/08/27}{Changed label at end of document to % |!end!document!| to avoid a problem with \lpackage{hyperref}. % (\lpackage{hyperref} does not allow |@| as part of label names.)} +% \changes{v2.03}{2005/08/27}{Changed label at end of document to +% |ccenddocument | to avoid a problem with \lpackage{hyperref}. +% (\lpackage{hyperref} has also problems with |!| as part of label +% names.)} % \begin{macrocode} \def\@cctxt{} \newif\if@cchead @@ -3849,7 +3882,7 @@ multilingual,english]{cc} \gdef\@cctxt{cc \textbf{#2} (#1)}% \global\@autotitletrue \AtBeginDocument{\addtocounter{section}{-1}\refstepcounter{section}}% - \AtEndDocument{\label{!end!document!}}% + \AtEndDocument{\label{ccenddocument}}% } \newcommand{\noccpublish}[1]{% \global\@ccpublishfalse @@ -4315,6 +4348,9 @@ multilingual,english]{cc} % or warnings if abstract, keywords, or subject are missing. % \changes{v2.02}{2001/08/29}{Changed Abstract to quote. MN, Paderborn} % \changes{v2.03}{2005/08/27}{Changed Abstract to @abstr. MN, Bonn} +% \changes{v2.04}{2006/03/06}{Changed maketitle to allow for very +% long abstracts, MN, Bonn} +% \changes{v2.04}{2006/03/08}{Adapted maketitle due to hyperref, MN, Bonn} % \begin{macrocode} \def\fourdigits#1{\ifnum#1<10\relax000#1\else \ifnum#1<100\relax00#1\else @@ -4331,20 +4367,24 @@ multilingual,english]{cc} \cite@hook{}% \if@cchead \vbox to\z@{\vss - \@ifundefined{r@!end!document!}{\@tempcnta\z@}{% + \@ifundefined{r@ccenddocument}{\@tempcnta\z@}{% \@tempcnta\@ne \advance\@tempcnta-\@ccfirst - \edef\@tempa{% - \expandafter\@secondoftwo\csname r@!end!document!\endcsname}% + \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}% \hbox to\textwidth{% \vbox to\z@{\vss \baselineskip=12pt% \halign{\ixpt##\hfil\cr comput. complex.~\textbf{\@ccvolume}~(\@ccyear), - \thepage\ -- \pageref{!end!document!}\cr + \thepage\ -- \pageref{ccenddocument}\cr \issn/\expandafter\@gobbletwo\@ccyear% %% use + instead --? /\twodigits{\@ccnumber}\fourdigits{\thepage}--\the\@tempcnta\ @@ -4423,17 +4463,18 @@ multilingual,english]{cc} \protect\begin{abstract} ... \protect\end{abstract}.}% \fi \else - \@tempa\leavevmode\box\@abstract\par + \@tempa\leavevmode\unvbox\@abstract\par \fi }{% \ifvoid\@abstract\else \ClassWarningNoLine{cc}{Two abstracts, using the one defined by \protect\Abstract}% \fi - \@tempa\leavevmode + \global\setbox\@abstract \@abstr{\ccabstractname} \the\@abstract@toks \end@abstr + \@tempa\leavevmode\unvbox\@abstract\par } \ifvoid\@keywords \if@keywordsoptional @@ -4444,7 +4485,7 @@ multilingual,english]{cc} \protect\begin{keywords} ... \protect\end{keywords}.}% \fi \else - \@tempa\leavevmode\box\@keywords\par + \@tempa\leavevmode\unvbox\@keywords\par \fi \ifvoid\@subject \if@subjectoptional @@ -4455,9 +4496,10 @@ multilingual,english]{cc} \protect\begin{subject} ... \protect\end{subject}.}% \fi \else - \@tempa\leavevmode\box\@subject\par + \@tempa\leavevmode\unvbox\@subject\par \fi \@thanks + \ifx\@tempa\relax\vskip3ex\fi \end{center} \thispagestyle{empty} \setcounter{footnote}{0}% @@ -4767,7 +4809,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*thcc> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{thcc}[2000/02/29 v2.04 +\ProvidesPackage{thcc}[2000/02/29 v2.05 computational complexity, theorem layouts. Michael Nuesken, Bonn.] % \end{macrocode} @@ -4882,7 +4924,7 @@ multilingual,english]{cc} % revised \filedate. % \begin{macrocode} %<*ccthm> -\ProvidesPackage{ccthm}[2000/02/29 v2.04 +\ProvidesPackage{ccthm}[2000/02/29 v2.05 theorem environments for cc. Michael Nuesken, Bonn.] % \end{macrocode} % @@ -5337,7 +5379,7 @@ multilingual,english]{cc} % revised \filedate. % \begin{macrocode} %<*ccproof> -\ProvidesPackage{ccproof}[2000/02/29 v2.04 +\ProvidesPackage{ccproof}[2000/02/29 v2.05 proof environments for cc. Michael Nuesken, Bonn.] % \end{macrocode} % @@ -5438,7 +5480,7 @@ multilingual,english]{cc} % \changes{v0.91}{2000/02/29}{Advanced version to official 2.00} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{ccalgo}[2005/08/27 v2.04 +\ProvidesPackage{ccalgo}[2005/08/27 v2.05 algorithm environment for cc. Michael Nuesken, Bonn.] % \end{macrocode} % Next we undefine some macros in case of overloading. @@ -6425,7 +6467,7 @@ multilingual,english]{cc} % revised \filedate. % \begin{macrocode} %<*ccqed> -\ProvidesPackage{ccqed}[2000/02/29 v2.04 +\ProvidesPackage{ccqed}[2000/02/29 v2.05 right-justified end-of-proof mark, based on Paul Taylor's QED.sty of 24 June 1995] % \end{macrocode} @@ -7190,7 +7232,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc2cite> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc2cite}[2000/02/29 v2.04 cc2 cite helper package] +\ProvidesPackage{cc2cite}[2000/02/29 v2.05 cc2 cite helper package] % \end{macrocode} % We simply load \Lpackage{natbib} and make some small initializations. % \begin{macrocode} @@ -7249,7 +7291,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cccite> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cccite}[2000/02/29 v2.04 cc cite helper package] +\ProvidesPackage{cccite}[2000/02/29 v2.05 cc cite helper package] \PackageWarningNoLine{cccite}{% The package cccite is obsolete.\MessageBreak Better use cc2cite. @@ -7436,7 +7478,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*ccdbs> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{ccdbs}[2000/02/20 v2.04 bibliography helper package] +\ProvidesPackage{ccdbs}[2000/02/20 v2.05 bibliography helper package] % \end{macrocode} % % We manipulate |\bibliographystyle| and |\bibliography|. By default @@ -7582,7 +7624,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*ccreltx> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{ccreltx}[2002/05/22 v2.04 +\ProvidesPackage{ccreltx}[2002/05/22 v2.05 computational complexity, reactivate ltthm. Michael Nuesken, Bonn.] %%% From File: ltthm.dtx @@ -7646,7 +7688,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc4apjrnl> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc4apjrnl}[2002/01/08 v2.04 +\ProvidesPackage{cc4apjrnl}[2002/01/08 v2.05 computational complexity, adaptions to apjrnl. Michael Nuesken, Bonn.] % Forget this AP definition @@ -7695,7 +7737,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc4amsart> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc4amsart}[2002/01/08 v2.04 +\ProvidesPackage{cc4amsart}[2002/01/08 v2.05 computational complexity, adaptions to amsart. Michael Nuesken, Bonn.] \RequirePackage{ccaux} @@ -7737,7 +7779,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc4llncs> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc4llncs}[2002/10/01 v2.04 +\ProvidesPackage{cc4llncs}[2002/10/01 v2.05 computational complexity, adaptions to llncs. Michael Nuesken, Bonn.] % Forget these llncs definitions @@ -7814,7 +7856,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc4siamltex> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc4siamltex}[2002/05/22 v2.04 +\ProvidesPackage{cc4siamltex}[2002/05/22 v2.05 computational complexity, adaptions to siamltex. Michael Nuesken, Bonn.] @@ -7874,7 +7916,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc4jT> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc4jT}[2002/01/08 v2.04 +\ProvidesPackage{cc4jT}[2002/01/08 v2.05 computational complexity, adaptions to jT which uses amsart. Michael Nuesken, Bonn.] \RequirePackage{ccaux} @@ -7944,7 +7986,7 @@ multilingual,english]{cc} % \begin{macrocode} %<*cc4elsart> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{cc4elsart}[2003/08/28 v2.04 +\ProvidesPackage{cc4elsart}[2003/08/28 v2.05 computational complexity, adaptions to elsart. Michael Nuesken, Bonn.] \RequirePackage{ccaux} -- cgit v1.2.3