From d2ab3388772bff7934dd89578c096e3ef0e0c580 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 7 Apr 2009 00:59:19 +0000 Subject: IEEEconf 1.4 (5apr09) git-svn-id: svn://tug.org/texlive/trunk@12644 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/IEEEconf/IEEEconf.cls | 77 ++++++++++++++--------- 1 file changed, 47 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex/latex/IEEEconf') diff --git a/Master/texmf-dist/tex/latex/IEEEconf/IEEEconf.cls b/Master/texmf-dist/tex/latex/IEEEconf/IEEEconf.cls index fcd96ceb049..52d7227c790 100644 --- a/Master/texmf-dist/tex/latex/IEEEconf/IEEEconf.cls +++ b/Master/texmf-dist/tex/latex/IEEEconf/IEEEconf.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007 by Scott Pakin +%% Copyright (C) 2009 by Scott Pakin %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license @@ -22,10 +22,15 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{IEEEconf} - [2007/01/15 v1.3b IEEE Computer Society 8.5x11" conference proceedings] -\PassOptionsToClass{twocolumn,10pt}{article} + [2009/04/05 v1.4 IEEE Computer Society 8.5x11" conference proceedings] +\def\ieee@column@spec{twocolumn} +\DeclareOption{onecolumn}{\def\ieee@column@spec{onecolumn}} +\newif\if@ieee@correct@geometry@ +\@ieee@correct@geometry@true +\DeclareOption{latex8}{\@ieee@correct@geometry@false} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \ProcessOptions\relax +\PassOptionsToClass{\ieee@column@spec,10pt}{article} \LoadClass{article} \let\ieee@old@maketitle=\maketitle \renewcommand{\maketitle}{% @@ -34,13 +39,25 @@ } \pagestyle{empty} \setlength{\parindent}{0.25in} -\RequirePackage[% - noheadfoot, - textwidth=6.5in, - textheight=8.875in, - tmargin=1in -]{geometry} -\setlength{\columnsep}{0.375in} +\if@ieee@correct@geometry@ + \RequirePackage[% + noheadfoot, + textwidth=6.5in, + textheight=8.875in, + tmargin=1in + ]{geometry} + \setlength{\columnsep}{0.375in} +\else + \setlength{\textheight}{8.875in} + \setlength{\textwidth}{6.875in} + \setlength{\columnsep}{0.3125in} + \setlength{\topmargin}{0in} + \setlength{\headheight}{0in} + \setlength{\headsep}{0in} + \setlength{\parindent}{1pc} + \setlength{\oddsidemargin}{-.304in} + \setlength{\evensidemargin}{-.304in} +\fi \RequirePackage{mathptmx} \RequirePackage{helvet} \RequirePackage{courier} @@ -87,14 +104,24 @@ \@author \end{tabular}% }% - \begin{tabular}[t]{@{}>{\centering}p{\ieee@author@width}@{}}% + \begin{tabular}[t]{@{}>{\hfil}p{\ieee@author@width}<{\hfil}@{}}% \@author \end{tabular}% \end{center}% - \vskip 24pt% + \if@ieee@correct@geometry@ + \vskip -\baselineskip + \vskip 24pt% + \else + \vspace*{0.5em}% + \vspace*{12pt}% + \fi } \newenvironment{affiliation}{% \ieee@times@xii@italic + \if@ieee@correct@geometry@ + \else + \rule[10pt]{0pt}{0.5em}% + \fi \begin{tabular}[t]{c}% }{% \end{tabular}% @@ -109,27 +136,17 @@ \begin{center}% \bfseries \abstractname \@endparpenalty\@M - \end{center}}% + \end{center}% + \par}% {\par\vfil\null\endtitlepage} \else \renewenvironment{abstract}{% - \if@twocolumn - \begin{center}% - \ieee@times@xii@bold \abstractname - \end{center} - \itshape - \else - \small - \begin{center}% - {\bfseries \abstractname\vspace{-.5em}\vspace{\z@}}% - \end{center}% - \quotation - \fi} - {\if@twocolumn - \vspace*{\baselineskip}% - \else - \endquotation - \fi} + \begin{center}% + \ieee@times@xii@bold \abstractname + \end{center}% + \par + \itshape}% + {\vspace*{\baselineskip}}% \fi \long\def\@makecaption#1#2{% \vskip\abovecaptionskip -- cgit v1.2.3