summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-04-07 00:59:19 +0000
committerKarl Berry <karl@freefriends.org>2009-04-07 00:59:19 +0000
commitd2ab3388772bff7934dd89578c096e3ef0e0c580 (patch)
tree4ddda1ca36a83dd4b384d0f239863af35bbe8744
parent48628f0ebe292d07d4e4e8d423593ce285e7c803 (diff)
IEEEconf 1.4 (5apr09)
git-svn-id: svn://tug.org/texlive/trunk@12644 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/IEEEconf/IEEEconf.pdfbin232155 -> 211672 bytes
-rw-r--r--Master/texmf-dist/doc/latex/IEEEconf/README6
-rw-r--r--Master/texmf-dist/source/latex/IEEEconf/IEEEconf.dtx299
-rw-r--r--Master/texmf-dist/source/latex/IEEEconf/IEEEconf.ins4
-rw-r--r--Master/texmf-dist/tex/latex/IEEEconf/IEEEconf.cls77
5 files changed, 252 insertions, 134 deletions
diff --git a/Master/texmf-dist/doc/latex/IEEEconf/IEEEconf.pdf b/Master/texmf-dist/doc/latex/IEEEconf/IEEEconf.pdf
index a4c1fee55c0..daa7995bd6d 100644
--- a/Master/texmf-dist/doc/latex/IEEEconf/IEEEconf.pdf
+++ b/Master/texmf-dist/doc/latex/IEEEconf/IEEEconf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/IEEEconf/README b/Master/texmf-dist/doc/latex/IEEEconf/README
index 3fdfc3e6a0f..1d96c3765c9 100644
--- a/Master/texmf-dist/doc/latex/IEEEconf/README
+++ b/Master/texmf-dist/doc/latex/IEEEconf/README
@@ -1,6 +1,6 @@
+---------------------------------------+
| THE IEEECONF CLASS |
- | By Scott Pakin, scott+iecnf@pakin.org |
+ | By Scott Pakin, scott+iecnf@pakin.org |
+---------------------------------------+
Description
@@ -8,7 +8,7 @@ Description
The IEEEconf class implements the formatting dictated by the IEEE
Computer Society Press for conference proceedings
-(ftp://pubftp.computer.org/press/outgoing/proceedings/instruct.pdf).
+(ftp://pubftp.computer.org/press/outgoing/proceedings/instruct8.5x11.pdf).
IEEEconf.cls replaces latex8.sty and is compatible with any BibTeX
style, not just latex8.bst. The goal was to produce a more faithful
implementation of the formatting rules and to do so with cleaner LaTeX
@@ -38,7 +38,7 @@ scratch, the procedure is as follows:
License
=======
-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
diff --git a/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.dtx b/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.dtx
index a7b35421542..c70b2e29811 100644
--- a/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.dtx
+++ b/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2007 by Scott Pakin <scott+iecnf@pakin.org>
+% Copyright (C) 2009 by Scott Pakin <scott+iecnf@pakin.org>
% ---------------------------------------------------------
%
% This file may be distributed and/or modified under the conditions of
@@ -22,13 +22,14 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{IEEEconf}
%<*class>
- [2007/01/15 v1.3b IEEE Computer Society 8.5x11" conference proceedings]
+ [2009/04/05 v1.4 IEEE Computer Society 8.5x11" conference proceedings]
%</class>
%
%<*driver>
\documentclass{ltxdoc}
\usepackage{textcomp}
-\usepackage[hyperindex=false]{hyperref}
+\usepackage{needspace}
+\usepackage[hyperindex=false,bookmarksopen=true]{hyperref}
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -38,7 +39,7 @@
%</driver>
% \fi
%
-% \CheckSum{330}
+% \CheckSum{360}
%
% \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
@@ -66,14 +67,14 @@
% \GetFileInfo{IEEEconf.dtx}
%
% \DoNotIndex{\.,\@arabic,\@beginparpenalty,\@clubpenalty,\@empty}
-% \DoNotIndex{\@endparpenalty,\@lowpenalty,\@M,\@m,\@minipagefalse}
+% \DoNotIndex{\@endparpenalty,\@gobble,\@lowpenalty,\@M,\@m,\@minipagefalse}
% \DoNotIndex{\@mkboth,\@noitemerr,\@openbib@code,\@plus,\@tempboxa}
% \DoNotIndex{\advance,\baselineskip,\begin,\bfseries,\box,\c@enumiv}
% \DoNotIndex{\centering,\clubpenalty,\crcr,\CurrentOption,\def,\else}
% \DoNotIndex{\end,\endieee@thebibitemlist,\endlist,\endquotation}
% \DoNotIndex{\endthebibitemlist,\endtitlepage,\fi,\fontsize,\footnote}
-% \DoNotIndex{\global,\hb@xt@,\hfil,\hsize,\hskip,\ifdim,\itshape,\let}
-% \DoNotIndex{\list,\long,\mdseries,\newcommand,\newenvironment}
+% \DoNotIndex{\global,\hb@xt@,\hfil,\hsize,\hskip,\ifdim,\ifx,\itshape,\let}
+% \DoNotIndex{\list,\long,\mdseries,\newcommand,\newenvironment,\newif}
% \DoNotIndex{\newlength,\newpage,\next,\null,\p@enumiv,\par,\ProcessOptions}
% \DoNotIndex{\quotation,\refname,\relax,\renewcommand,\renewenvironment}
% \DoNotIndex{\rmfamily,\rule,\sbox,\setlength,\settowidth,\sfcode}
@@ -124,25 +125,28 @@
%
% \begin{itemize}
% \item \iecnf{} is written as a class, which makes more sense than
-% implementing it as a style file.
-%
-% \item \iecnf{} uses the \pkgname{geometry} package to construct the
-% page layout rather than setting \LaTeX{} registers directly.
-%
-% \item \iecnf{} selects fonts using the \LaTeXe{} font commands
-% instead of \TeX{} primitives. This lets an author redefine
-% |\rmdefault|, |\sfdefault|, and |\ttdefault| and have those changes
-% honored by \iecnf.
+% implementing it as a style file.
%
% \item \iecnf{} uses the \pkgname{titlesec} package to redefine
-% |\section|, |\subsection|, and |\subsubsection| as dictated by the
-% guidelines. \pkgname{latex8} required that authors use |\Section|,
-% which internally called |\section| then backspaced to add the
-% required period after the section number. Yuck!
+% |\section|, |\subsection|, and |\subsubsection| as dictated by the
+% guidelines. \pkgname{latex8} requires that authors use
+% |\Section|, which internally calls |\section| then backspaces to
+% add the required period after the section number. Yuck! By using
+% proper sectioning, \iecnf{} is compatible with the
+% \pkgname{hyperref} package. (Examine the PDF bookmarks produced
+% when using \pkgname{latex8} with \pkgname{hyperref}.)
%
% \item \iecnf{} changes bibliography formatting by redefining the
-% |thebibliography| environment instead of by requiring the author to
-% use a particular \BibTeX{} style file.
+% |thebibliography| environment instead of by requiring the author to
+% use a particular \BibTeX{} style file.
+%
+% \item \iecnf{} selects fonts using the \LaTeXe{} font commands
+% instead of \TeX{} primitives. This lets an author redefine
+% |\rmdefault|, |\sfdefault|, and |\ttdefault| and have those changes
+% honored by \iecnf.
+%
+% \item \iecnf{} uses the \pkgname{geometry} package to construct the
+% page layout rather than setting \LaTeX{} registers directly.
% \end{itemize}
%
% Note that \iecnf{} is intended specifically for preparing manuscripts
@@ -157,12 +161,12 @@
% guidelines are outside of \iecnf's scope. See
% Section~\ref{sec:limitations} for details. Third, the \ICSP{}
% occasionally changes their guidelines; \iecnf~\fileversion{}
-% implements the guidelines which were current on~\filedate. In fact,
+% implements the guidelines that were current on~2007/01/15. In fact,
% the \ICSP{} Web site provides two sets of guidelines:
%
% \begin{itemize}
% \item
-% \url{ftp://pubftp.computer.org/press/outgoing/proceedings/instruct.pdf}.
+% \url{ftp://pubftp.computer.org/press/outgoing/proceedings/instruct8.5x11.pdf}.
% \iecnf{} relies on this document for its primary set of
% guidelines.
%
@@ -186,14 +190,24 @@
% case of any conflict.
%
% This document contains an additional section about illustrations
-% which says not to use color figures unless instructed to do so and
+% that says not to use color figures unless instructed to do so and
% presents a few prehistoric guidelines about penciling in page
% numbers and how to use rub-on symbols.
% \end{itemize}
%
+% Pages on the IEEE Computer Society Web site are frequently moved
+% and/or renamed. You may need to search a bit to find the latest
+% versions of the documents described above.
+%
%
% \section{Usage}
%
+% Unlike \pkgname{latex8}, \iecnf\ is a proper \LaTeXe\ class. Also
+% unlike \pkgname{latex8}, it automatically loads the packages it needs
+% and sets all of the correct formatting options by default.
+%
+% \subsection{Class options}
+%
% \DescribeMacro{\documentclass}
% Begin your document by loading the \iecnf{} class:
%
@@ -202,15 +216,28 @@
% \end{verbatim}
%
% \noindent
-% Although \iecnf{} is derived from \textsf{article} and accepts the
+% Although \iecnf\ is derived from \textsf{article} and accepts the
% same class options, you should not, in general, pass any extra options
-% to |\documentclass|. \iecnf{} will automatically set two-column mode
-% and a 10\,pt.\ Times Roman font. As of version~1.3a, \iecnf{} honors
-% the user's default paper size because the \ICSP{} now allows both
-% U.S.~Letter- and A4-sized paper. The paper size can be overridden by the
+% to |\documentclass|. \iecnf\ will automatically set two-column mode
+% and a 10\,pt.\ Times Roman font. \iecnf\ honors the user's default
+% paper size because the \ICSP\ now allows both U.S.~Letter- and
+% A4-sized paper. The default paper size can be overridden by the
% |letterpaper| or |a4paper| class options if a conference dictates a
% particular paper size.
%
+% \iecnf\ introduces one class option of its own: |latex8|. The
+% |latex8| option instructs \iecnf\ to violate the \ICSP\ guidelines in
+% the same manner that the \pkgname{latex8} package provided by the
+% \ICSP\ violates them. The advantage of using the |latex8| option is
+% that \pkgname{latex8}'s incorrect formatting provides a larger text
+% block (27\,pt.\ wider) than the guidelines allow. Hence, if you need
+% to squeeze a little extra text into your paper, the |latex8| option
+% lets you do that without violating the rules any more than the
+% \pkgname{latex8} package does.
+%
+%
+% \subsection{User commands}
+%
% \DescribeMacro{\title}
% The |\title| command behaves identically to the one in the
% \textsf{article} class. Just remember to follow what the guidelines
@@ -221,7 +248,7 @@
% \DescribeMacro{\email}
% The guidelines specify different formatting for an author's name and
% for an author's affiliation and e-mail address. For convenience,
-% \iecnf{} provides an |affiliation| environment for
+% \iecnf\ provides an |affiliation| environment for
% typesetting affiliations and an |\email| macro for typesetting e-mail
% addresses. The following examples show how to format an author list:
%
@@ -255,7 +282,7 @@
% }
% \end{verbatim}
%
-% There is not currently any special support in \iecnf{} for typesetting
+% There is not currently any special support in \iecnf\ for typesetting
% multiple affiliations per author.
%
% \DescribeMacro{\date}
@@ -263,7 +290,7 @@
%
% \DescribeMacro{\callout}
% A \emph{callout} is a piece of text referring to a figure or table.
-% When the \ICSP{} re-typesets a document they supposedly want the ``See
+% When the \ICSP\ re-typesets a document they supposedly want the ``See
% Figure\dots'' and ``See Table\dots'' text to stand out to help the
% typesetter ensure that figures and tables are placed as close as
% possible to their references. The |\callout| macro simply typesets
@@ -274,22 +301,23 @@
% when producing camera-ready copy.
%
% \DescribeMacro{\dobeforekey}
-% The \ICSP{} guidelines say, ``If the last page of your paper is only
+% The \ICSP\ guidelines say, ``If the last page of your paper is only
% partially filled, arrange the columns so that they are evenly balanced
-% if possible, rather than having one long column.'' This is a fairly
-% tricky requirement in the general case for \LaTeXe\@. Because the
-% last page typically contains only references, \iecnf{} provides a
-% simple command, |\dobeforekey|, to help with that specific case.
-% |\dobeforekey| takes two arguments: a bibliography key (i.e.,~a string
-% passed to the |\cite| command) and a command to execute before
-% typesetting the corresponding bibliography entry. When preparing the
-% final version of your paper, put
+% if possible, rather than having one long column.'' While the
+% \pkgname{balance} and \pkgname{multicol} packages may help, this is a
+% fairly tricky requirement in the general case for \LaTeXe\@. Because
+% the last page of a conference paper typically contains only
+% references, \iecnf\ provides a simple command, |\dobeforekey|, to help
+% with that specific case. |\dobeforekey| takes two arguments: a
+% bibliography key (i.e.,~a string passed to the |\cite| command) and a
+% command to execute before typesetting the corresponding bibliography
+% entry. When preparing the final version of your paper, put
% ``|\dobeforekey{|\meta{key}|}{\newpage}|'' anywhere before the
-% |\bibliography| command and use trial-and-error to find the key
-% which best balances the columns on the last page of the paper.
+% |\bibliography| command and use trial-and-error to find the key that
+% best balances the columns on the last page of the paper.
%
% \paragraph{Reference lists}
-% The \ICSP{} provides little guidance about typesetting reference
+% The \ICSP\ provides little guidance about typesetting reference
% lists. Apparently, the author is granted some flexibility. \iecnf{}
% uses the specified font but leaves the rest of the formatting
% decisions to the author's chosen bibliography style. As the \ICSP's
@@ -303,16 +331,16 @@
% prefer to typeset their reference lists manually.
%
% \DescribeMacro{\extrareflistcode}
-% Previous versions of the \ICSP{} guidelines stated that bibliographic
-% references must be single-spaced and that's how \iecnf{} formats the
-% references list. The current guidelines say nothing about
+% Previous versions of the \ICSP\ guidelines stated that bibliographic
+% references must be single-spaced, and that's how \iecnf\ formats the
+% list of references. The current guidelines say nothing about
% inter-reference spacing but their two sample references are in fact
% separated by a blank line. To provide the author with both
-% alternatives, \iecnf{} provides a ``hook'' macro called
-% |\extrareflistcode| which enables one to alter the line spacing---or
+% alternatives, \iecnf\ provides a ``hook'' macro called
+% |\extrareflistcode| that enables one to alter the line spacing---or
% any other aspect of reference-list spacing.
-%
-% As in most \LaTeXe{} classes, references are typeset within a \LaTeX{}
+%
+% As in most \LaTeXe\ classes, references are typeset within a \LaTeX{}
% |list| environment. The |\extrareflistcode| macro specifies extra
% code to execute as part of the second argument to |\begin{list}| when
% typesetting the document's References section. |\extrareflistcode| is
@@ -329,7 +357,7 @@
% \label{sec:limitations}
%
% There are some requirements in the Computer Society's guidelines that
-% \iecnf{} is unable to enforce:
+% \iecnf\ is unable to enforce:
%
% \begin{itemize}
% \item ``All manuscripts must be in English.''
@@ -358,14 +386,14 @@
%
% \begin{itemize}
% \item ``The abstract is to be\dots up to 150~words in length.''
-% \iecnf{} currently allows abstracts of any length.
+% \iecnf\ currently allows abstracts of any length.
%
% \item In the author list, ``[m]ultiple authors may be shown in a
% two- or three-column format''. Like \textsf{article}, \iecnf{}
% packs as many authors as possible onto a line.
%
% \item ``Initially capitalize only the first word of each figure
-% caption and table title \dots\ Figure captions are to be centered
+% caption and table title~\dots\ Figure captions are to be centered
% below the figures. Table titles are to be centered above the
% tables.'' Consider using the \pkgname{topcapt} package to help with
% this captioning requirement.
@@ -379,7 +407,7 @@
%
% \noindent
% Some of the above shortcomings may be fixed in a future release of
-% \iecnf{} if I figure out a good way to do so.
+% \iecnf\ if I figure out a good way to do so.
%
% Also note that currently, only $8\mbox{\textonehalf} \times 11''$
% proceedings are supported, not $6 \times 9''$ proceedings.
@@ -388,12 +416,12 @@
% \StopEventually{%
% \section{License}
%
-% Copyright \textcopyright{} 2007 by Scott Pakin
+% Copyright \textcopyright\ 2009 by Scott Pakin
%
% \bigskip
%
% This file may be distributed and/or modified under the conditions of
-% the \LaTeX{} Project Public License, either version~1.3c of this
+% the \LaTeX\ Project Public License, either version~1.3c of this
% license or (at your option) any later version. The latest version of
% this license is in:
%
@@ -405,7 +433,14 @@
% and version~1.3c or later is part of all distributions of \LaTeX{}
% version 2006/05/20 or later.
%
+% \needspace{3cm}
+% \phantomsection
+% \addcontentsline{toc}{section}{Change History}
% \PrintChanges
+%
+% \needspace{3cm}
+% \phantomsection
+% \addcontentsline{toc}{section}{Index}
% \PrintIndex
% }
%
@@ -413,19 +448,56 @@
% \section{Implementation}
%
% This section contains the complete source code to \iecnf.
-% If you're not a \LaTeX{} hacker you probably won't find it
+% If you're not a \LaTeX\ hacker you probably won't find it
% particularly interesting or useful. However, if you're comfortable
-% reading \TeX{} and \LaTeX{} code, you can see exactly what
-% \iecnf{} is doing and how.
+% reading \TeX\ and \LaTeX\ code, you can see exactly what
+% \iecnf\ is doing and how.
%
% \subsection{Initialization}
%
+% \changes{v1.4}{2009/03/21}{Introduced a \texttt{onecolumn} class option
+% in case a document needs to use the \pkgname{multicol} package}
+% \begin{macro}{\ieee@column@spec}
+% The guidelines require that all text be in a two-column format.
+% However, there may be some special cases in which a single-column
+% format is desirable, for example if the \pkgname{multicol} package is
+% needed anywhere in the document. We therefore provide a |onecolumn|
+% option to suppress the default two-column formatting.
+% \begin{macrocode}
+\def\ieee@column@spec{twocolumn}
+\DeclareOption{onecolumn}{\def\ieee@column@spec{onecolumn}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\if@ieee@correct@geometry@}
+% \begin{macro}{\@ieee@correct@geometry@true}
+% \begin{macro}{\@ieee@correct@geometry@false}
+% \iecnf\ lays out the page geometry according to the \ICSP\ guidelines.
+% However, as \iecnf\ is not yet recognized by the IEEE Computer
+% Society, virtually all IEEE Computer Society conferences point authors
+% wanting to use \LaTeX\ to the old, broken \pkgname{latex8} package,
+% which fails to honor the \ICSP's formatting guidelines. However,
+% because of its incorrectness, \pkgname{latex8} actually gives authors
+% a little more space for text. \iecnf\ therefore provides a |latex8|
+% option to give authors the extra space provided by the
+% \pkgname{latex8} package without sacrificing compatibility with other
+% \LaTeXe\ packages and flexibility as would using the \pkgname{latex8}
+% package directly.
+% \begin{macrocode}
+\newif\if@ieee@correct@geometry@
+\@ieee@correct@geometry@true
+\DeclareOption{latex8}{\@ieee@correct@geometry@false}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% For simplicity, we'll derive everything from the standard |article|
-% class but force the |twocolumn| and |10pt| options.
+% class but force the |10pt| and, unless overridden, |twocolumn| options.
% \begin{macrocode}
-\PassOptionsToClass{twocolumn,10pt}{article}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
+\PassOptionsToClass{\ieee@column@spec,10pt}{article}
\LoadClass{article}
% \end{macrocode}
%
@@ -445,7 +517,7 @@
%
% ``All paragraphs should be indented 1/4~inch (approximately 0.5\,cm).''
% \changes{v1.3}{2005/08/28}{Updated the paragraph indentation to match
-% the new \ICSP{} specifications.}
+% the new \ICSP\ specifications.}
% \begin{macrocode}
\setlength{\parindent}{0.25in}
% \end{macrocode}
@@ -478,15 +550,32 @@
% \mbox{1-5/8~inches} (4.13\,cm) from the bottom edge of the page.
% \end{quotation}
% \changes{v1.3}{2005/08/28}{Updated the page layout to match the new
-% \ICSP{} specifications.}
+% \ICSP\ specifications.}
+% \changes{v1.4}{2009/03/21}{Introduced a \texttt{latex8} class option
+% as per Oliver Kopp's suggestion}
% \begin{macrocode}
-\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
+% \end{macrocode}
+% The following was copied verbatim from |latex8.sty|:
+% \begin{macrocode}
+ \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
% \end{macrocode}
%
%
@@ -639,13 +728,13 @@
\let\and=\crcr
% \end{macrocode}
% We temporarily let-bind both |\thanks| and |\footnote| to |\@gobble|.
-% If we didn't, \iecnf{} would output each footnote twice: once when
+% If we didn't, \iecnf\ would output each footnote twice: once when
% calculating the width of the author blocks and once when typesetting
% them. Note that we use |\@gobble| instead of, say, |\footnotemark|
% because |\@ieee@old@maketitle| (a.k.a.\ the \pkgname{article} class's
% |\maketitle| macro) places footnote markers within an |\rlap| so they
% occupy no horizontal space.
-% \changes{v1.2a}{2005/05/20}{Fixed a bug which caused
+% \changes{v1.2a}{2005/05/20}{Fixed a bug that caused
% \texttt{\string\string\string\thanks} and
% \texttt{\string\string\string\footnote} to produce duplicate
% footnotes. Thanks to M. Rasit Eskicioglu for reporting the
@@ -661,24 +750,41 @@
% Typeset all author blocks with columns exactly of width
% |\ieee@author@width|.
% \begin{macrocode}
- \begin{tabular}[t]{@{}>{\centering}p{\ieee@author@width}@{}}%
+ \begin{tabular}[t]{@{}>{\hfil}p{\ieee@author@width}<{\hfil}@{}}%
\@author
\end{tabular}%
\end{center}%
% \end{macrocode}
% ``Author information should be followed by two 12-point blank lines.''
+% The old, broken \pkgname{latex8} package incorrectly follows the
+% author information with only \emph{one} 12-point blank line, so we do
+% likewise when the |latex8| package option is specified.
+% \changes{v1.4}{2009/03/22}{Corrected the spacing between the title block
+% and the document text}
% \begin{macrocode}
- \vskip 24pt%
+ \if@ieee@correct@geometry@
+ \vskip -\baselineskip
+ \vskip 24pt%
+ \else
+ \vspace*{0.5em}%
+ \vspace*{12pt}%
+ \fi
}
% \end{macrocode}
% \end{macro}
%
% \begin{environment}{affiliation}
% Affiliations are supposed to be in Times~12\,pt.\ italic type. We
-% define an environment to help out with that.
+% define an environment to help out with that. In \pkgname{latex8}
+% compatibility mode we introduce an extra, unnecessary half~em of
+% vertical space between the author name and affiliation.
% \begin{macrocode}
\newenvironment{affiliation}{%
\ieee@times@xii@italic
+ \if@ieee@correct@geometry@
+ \else
+ \rule[10pt]{0pt}{0.5em}%
+ \fi
\begin{tabular}[t]{c}%
}{%
\end{tabular}%
@@ -711,6 +817,11 @@
% \end{quotation}
%
% Most of the following code was taken verbatim from |classes.dtx|.
+% \changes{v1.4}{2009/03/21}{Modified the abstract-handling code to use
+% the same formatting in both one- and two-column mode}
+% \changes{v1.4}{2009/04/05}{Added \texttt{\char`\\par}
+% after the abstract title to force paragraph indentation in the
+% first paragraph of the abstract}
% \begin{macrocode}
\if@titlepage
\renewenvironment{abstract}{%
@@ -720,27 +831,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
% \end{macrocode}
% \end{environment}
@@ -784,11 +885,11 @@
% \end{macro}
%
% \begin{macro}{\callout}
-% When the \ICSP{} re-typesets a document they supposedly want the ``See
+% When the \ICSP\ re-typesets a document they supposedly want the ``See
% Figure'' and ``See Table'' callouts to stand out to help the
% typesetter ensure that figures and tables are placed as close as
% possible to their callouts. The |\callout| macro simply typesets its
-% argument in 9-point Helvetica as per the \ICSP{} guidelines.
+% argument in 9-point Helvetica as per the \ICSP\ guidelines.
% \changes{v1.3}{2005/08/28}{Introduced this macro. Thanks to Ming Kin Lai
% for finding out what a ``callout'' is.}
% \begin{macrocode}
@@ -856,7 +957,7 @@
% \subsection{References}
%
% \begin{environment}{thebibliography}
-% In order to make \iecnf{} play nicely with the \pkgname{tocbibind}
+% In order to make \iecnf\ play nicely with the \pkgname{tocbibind}
% package we need to separate the code that outputs the word
% ``References'' (or whatever |\refname| is defined as) from the code
% that typesets the bibliography in a list. Hence, our
@@ -923,7 +1024,7 @@
% \begin{macro}{\ieee@pre@bibitem@key}
% \begin{macro}{\ieee@pre@bibitem@cmd}
% The commands defined by the user in |\ieee@pre@bibitem@cmd| are
-% executed before \iecnf{} typesets a bibliographic entry with key
+% executed before \iecnf\ typesets a bibliographic entry with key
% |\ieee@pre@bibitem@key|.
% \begin{macrocode}
\newcommand{\ieee@pre@bibitem@key}{IEEEconf}
diff --git a/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.ins b/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.ins
index dcdf58a942e..e2b46666771 100644
--- a/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.ins
+++ b/Master/texmf-dist/source/latex/IEEEconf/IEEEconf.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2007 by Scott Pakin <scott+iecnf@pakin.org>
+%% Copyright (C) 2009 by Scott Pakin <scott+iecnf@pakin.org>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2007 by Scott Pakin <scott+iecnf@pakin.org>
+Copyright (C) 2009 by Scott Pakin <scott+iecnf@pakin.org>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3c of this license
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 <scott+iecnf@pakin.org>
+%% Copyright (C) 2009 by Scott Pakin <scott+iecnf@pakin.org>
%%
%% 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