erdc 1.1 (24jul09)

git-svn-id: svn://tug.org/texlive/trunk@14460 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 210 insertions, 63 deletions

diff --git a/Master/texmf-dist/tex/latex/erdc/erdc.cls b/Master/texmf-dist/tex/latex/erdc/erdc.cls
index c819f5e5c2f..a9fe2de8192 100644
--- a/Master/texmf-dist/tex/latex/erdc/erdc.cls
+++ b/Master/texmf-dist/tex/latex/erdc/erdc.cls
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{erdc}
-[2009/03/20 v0.1 Typesetting Technical Information Reports of
+[2009/07/22 v1.1 Typesetting Technical Information Reports of
 the Engineer Research and Development Center (ERDC),
 US Army Corps of Engineers]
 \long\def\erdc@size@warning#1{%
@@ -52,15 +52,67 @@ US Army Corps of Engineers]
 \ProcessOptions\relax
 \LoadClass[12pt,twoside]{report}
 \RequirePackage{graphicx,color,caption,longtable}
-\usepackage{mathptmx}
-\usepackage[scaled]{helvet}
+\RequirePackage{dcolumn}
+\RequirePackage{natbib}
+\renewcommand{\bibfont}{\fontsize{10pt}{12pt}\selectfont}
+\setlength{\bibhang}{0.5in}
+\setlength{\bibsep}{12pt}
+\RequirePackage{amsmath}
+\RequirePackage[originalcommands]{ragged2e}
+\setlength\RaggedRightParindent{\parindent}
+\RaggedRight
+\renewcommand\normalsize{%
+   \@setfontsize\normalsize\@xiipt{16}%
+   \abovedisplayskip 16\p@ \@plus3\p@ \@minus7\p@
+   \abovedisplayshortskip \z@ \@plus3\p@
+   \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@
+   \belowdisplayskip \abovedisplayskip
+   \let\@listi\@listI}
+\normalsize
+\usepackage{mathgifg}
 \usepackage{courier}
-\RequirePackage[letterpaper, top=1in, bottom=1in,
+\def\@laboratoryfont{%
+  \sffamily\bfseries\fontsize{22pt}{25pt}\selectfont}
+\def\@reportnumfont{%
+  \sffamily\bfseries\fontsize{18pt}{22pt}\selectfont}
+\def\@programfont{%
+  \sffamily\fontseries{k}\itshape\normalsize\selectfont}
+\def\@titlefont{%
+  \sffamily\fontseries{h}\fontsize{20pt}{25pt}\selectfont}
+\def\@distributionfont{%
+  \sffamily\fontseries{k}\fontsize{9pt}{11pt}\selectfont}
+\def\@eqtagfont{\sffamily\bfseries\footnotesize}
+\RequirePackage[letterpaper, top=1in, bottom=0.7in,
   left=1.5in, right=1.5in]{geometry}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{\baselineskip}
+\setlength\labelwidth{1em}
+\setlength\leftmargini\z@
+\addtolength\leftmargini\labelwidth
+\addtolength\leftmargini\labelsep
+\def\itemize{%
+  \ifnum \@itemdepth >\thr@@\@toodeep\else
+    \advance\@itemdepth\@ne
+    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+    \expandafter
+    \list
+      \csname\@itemitem\endcsname
+      {\def\makelabel##1{##1}}%
+  \fi}
+\def\enumerate{%
+  \ifnum \@enumdepth >\thr@@\@toodeep\else
+    \advance\@enumdepth\@ne
+    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
+      \expandafter
+      \list
+        \csname label\@enumctr\endcsname
+        {\usecounter\@enumctr\def\makelabel##1{##1}}%
+      \fi}
+\widowpenalty=10000
+\clubpenalty=10000
+\raggedbottom
 \RequirePackage{fancyhdr}
-\renewcommand{\headrulewidth}{0.1pt}
+\renewcommand{\headrulewidth}{0.5pt}
 \renewcommand{\footrulewidth}{0pt}
 \fancyhfoffset{35pt}
 \pagestyle{fancy}
@@ -90,7 +142,6 @@ US Army Corps of Engineers]
   \@addtoreset{table}{chapter}%
   \@addtoreset{equation}{chapter}%
   \@addtoreset{figure}{chapter}%
-  \@addtoreset{section}{chapter}%
   \setcounter{chapter}{0}%
   \setcounter{section}{0}%
   \gdef\@chapapp{\appendixname}%
@@ -156,7 +207,7 @@ US Army Corps of Engineers]
 \newcommand{\coverart}[2][]{%
   \def\@tempa{#1}%
   \ifx\@empty\@tempa
-     \gdef\@coverart{\includegraphics[width=450\p@]{#2}}\else
+     \gdef\@coverart{\includegraphics[width=435\p@]{#2}}\else
      \gdef\@coverart{\includegraphics[#1]{#2}}\fi}
 \def\@coverart{}%
 \def\reporttype#1{\gdef\@reporttype{#1}}
@@ -178,7 +229,7 @@ US Army Corps of Engineers]
     \list{}{\labelwidth\z@
       \leftmargin\z@ \rightmargin\leftmargin
       \listparindent\z@ \itemindent\z@
-      \parsep\z@ \topsep\z@
+      \parsep16\p@ \topsep\z@
       \let\fullwidthdisplay\relax
     }%
     \item[\hskip\labelsep\bfseries Abstract:]%
@@ -196,7 +247,7 @@ Army position unless so designated by other authorized documents.
 \textbf{DESTROY THIS REPORT WHEN NO LONGER NEEDED. DO NOT RETURN IT
 TO THE ORIGINATOR.}}
 \newenvironment{@coverlist}{\begin{list}{}{%
-      \leftmargin40\p@\rightmargin-100\p@%
+      \leftmargin40\p@\rightmargin-85\p@%
       \topsep\z@\partopsep\z@\labelwidth\z@\labelsep\z@}\item{}}{%
     \end{list}}
 \newenvironment{@titlelist}{\begin{list}{}{%
@@ -211,7 +262,7 @@ TO THE ORIGINATOR.}}
 \newcommand*{\@titleblocklabel}[1]{\hfill\small#1}
 \def\maketitle{%
   \thispagestyle{empty}%
-  \enlargethispage{0.54in}%
+  \enlargethispage{0.34in}%
   \vspace*{-0.95in}
      \makebox[0cm][r]{%
        \raisebox{-720\p@}[\z@][\z@]{%
@@ -219,14 +270,14 @@ TO THE ORIGINATOR.}}
              \colorbox{red}{\color{white}\parbox{720\p@}{%
                  \rule{0\p@}{85\p@}%
                  \hspace{28\p@}\raisebox{40\p@}{%
-                   \parbox[c]{300\p@}{\LARGE\sffamily\@laboratory}%
-                   \hspace{60\p@}%
-                   \parbox[c]{300\p@}{\hfill\Large\sffamily\@reportnum}}}}}}}%
+                   \parbox[c]{350\p@}{\@laboratoryfont\@laboratory}%
+                   \hspace{10\p@}%
+                   \parbox[c]{300\p@}{\hfill\@reportnumfont\@reportnum}}}}}}}%
      \hspace*{-14\p@}}%
      \makebox[0cm][r]{\raisebox{-720\p@}[\z@][\z@]{\rule{8\p@}{726\p@}%
-       \hspace{-24\p@}}}%
+       \hspace{-26.75\p@}}}%
    \begin{@coverlist}%
-     \sffamily
+     \sffamily\fontseries{k}\selectfont%
      \hfill\parbox{145\p@}{
        \includegraphics[width=65\p@]{red_corps_castle2}\\
        {\bfseries
@@ -235,50 +286,57 @@ TO THE ORIGINATOR.}}
        Engineering Research and\\
        Development Center}\par
      \vspace{0.5cm}%
-     {\sffamily\itshape\@program\par}%
+     {\@programfont\@program\par}%
      \vspace{0.3cm}%
-     {\raggedright\LARGE\bfseries\@title\par
+     {\raggedright\@titlefont\@title\par
        \vspace{0.3cm}%
        \normalsize\bfseries\@subtitle\par}%
      \vspace{0.3cm}%
      \begin{minipage}[t]{300\p@}\raggedright
        \nxandlist{\unskip, }{\unskip{} \@@and~}{\unskip{} \@@and~}\authors
        \authors\end{minipage}%
-     \begin{minipage}[t]{150\p@}\flushright\@date\end{minipage}\par
+     \begin{minipage}[t]{135\p@}\flushright\@date\end{minipage}\par
      \vspace{0.3cm}%
      \@coverart
    \end{@coverlist}%
    \vfill
    \begin{@coverlist}%
-     \sffamily\small\@distribution
+     \@distributionfont\@distribution
    \end{@coverlist}%
-   \hbox{}\newpage\thispagestyle{empty}\hbox{}\newpage
+   \newpage\thispagestyle{empty}\hbox{}\newpage
   \thispagestyle{empty}%
   \setcounter{page}{1}%
+  \vspace*{-1.5in}%
+  \vspace*{-\topmargin}%
   \begin{@titlelist}%
-    \sffamily
-      \begin{minipage}[t]{275\p@}%
-        \bfseries\@program
-      \end{minipage}%
-      \begin{minipage}[t]{175\p@}%
-        \bfseries\flushright\@reportnum\\\@date
-      \end{minipage}\par
+    \sffamily\fontseries{k}\selectfont
+    \begin{minipage}[t]{275\p@}%
+      \bfseries\@program
+    \end{minipage}%
+    \begin{minipage}[t]{175\p@}%
+      \bfseries\flushright\@reportnum\\\@date
+    \end{minipage}\rule[-0.5in]{\z@}{0.625in}\par
+    \begin{minipage}{\textwidth}
       \vspace*{1cm}%
-      {\bfseries\Large\@title\par}
-      {\bfseries\@subtitle\par}
-      \vspace*{0.3cm}%
+      {\@titlefont\raggedright\@title\par}
+      \vspace*{3\p@}%
+      \bfseries\@subtitle\par
+  \end{minipage}\rule[-0.7in]{\z@}{1in}\par
      \def\author##1{%
        \def\@tempa{##1}%
        \nxandlist{\unskip, }{\unskip{} \@@and~}{\unskip{} \@@and~}\@tempa
-       {\upshape\@tempa}\par}%
-     \textit{\addresses}\par
-     \vspace{0.3cm}%
-     \@reporttype\par
-     {\small\@distribution\par}%
-  \end{@titlelist}%
+       {\upshape\normalsize\@tempa}\par\vspace{6\p@}}%
+     \begin{minipage}{\textwidth}
+     \textit{\footnotesize\addresses}\par
+   \end{minipage}\rule[-2.7in]{\z@}{3.7in}\par
+   \begin{minipage}{\textwidth}
+     \@reporttype\par\vspace*{3\p@}%
+     {\@distributionfont\@distribution\par}%
+   \end{minipage}
+ \end{@titlelist}%
   \vfill
   \begin{@titlelist}%
-    \sffamily
+    \sffamily\normalsize\fontseries{k}\selectfont
     \ifx\@additionalinfo\@empty\else\@additionalinfo\par\fi
     \@titleblockfalse
     \ifx\@empty\@preparedfor\relax\else\@titleblocktrue\fi
@@ -307,12 +365,16 @@ TO THE ORIGINATOR.}}
   \vfill
   \bgroup
   \setlength{\fboxsep}{5\p@}%
-  \fbox{\parbox{\textwidth}{\fontsize{8.5\p@}{9.5\p@}\selectfont
-      \parskip\baselineskip
-      \textbf{Disclaimer:} \@disclaimer}}%
+  \makebox[\textwidth]{\fbox{\parbox{6.5in}{%
+        \fontsize{8.5\p@}{9.5\p@}\selectfont
+        \parskip\baselineskip
+        \textbf{Disclaimer:} \@disclaimer}}}%
   \egroup
   \clearpage}
 \def\cl@chapter{}
+\@addtoreset{section}{chapter}%
+\@addtoreset{subsection}{chapter}%
+\@addtoreset{subsection}{section}%
 \renewcommand\chapter{%
   \clearpage
   \global\@topnum\z@
@@ -332,99 +394,184 @@ TO THE ORIGINATOR.}}
       \else
          \addcontentsline{toc}{chapter}%
              {\protect\numberline{\thechapter}#1}%
-         \@makechapterhead{\thechapter\quad#2}%
+         \@makechapterhead{\makebox[35\p@]{\thechapter\hfill}#2}%
       \fi
   \fi
   \@afterheading}
 \def\@schapter#1{%
   \if@appendix
      \addcontentsline{toc}{chapter}{\@chapapp: #1}%
-     \@makechapterhead{\@chapapp: #1}%
+     \@makeschapterhead{\@chapapp: #1}%
   \else
     \addcontentsline{toc}{chapter}{#1}%
-    \@makechapterhead{#1}%
+    \@makeschapterhead{#1}%
   \fi
   \@afterheading}
 \def\@makechapterhead#1{%
-  \vspace*{15\p@}%
-  {\hskip-35\p@\parbox{\textwidth}{%
+  \vspace*{5\p@}%
+  {\hskip-35\p@%
+      \parindent\z@\raggedright
+      \interlinepenalty\@M
+      \@titlefont #1\par\nobreak
+    \vspace*{10\p@}%
+  }}
+\def\@makeschapterhead#1{%
+  \vspace*{5\p@}%
+  {%
       \parindent\z@\raggedright
       \interlinepenalty\@M
-      \LARGE \bfseries\sffamily #1\par}\par\nobreak
+      \leftskip-35\p@\@titlefont #1\par\nobreak
     \vspace*{10\p@}%
   }}
 \renewcommand \theequation {\@arabic\c@equation}
-\renewcommand \thesection {\@arabic\c@section}
-\setcounter{secnumdepth}{1}
 \setcounter{tocdepth}{2}
 \renewcommand\section{%
   \addpenalty\@secpenalty\nobreak
   \secdef\@section\@ssection}
 \def\@section[#1]#2{%
+  \ifnum1>\c@secnumdepth
+     \addcontentsline{toc}{section}{#1}%
+  \else
+    \refstepcounter{section}%
+     \addcontentsline{toc}{section}{\protect\numberline{\thesection}#1}%
+  \fi
+  {\hskip-35\p@\raggedright\interlinepenalty\@M
+   \large\sffamily\bfseries
+     \ifnum1>\c@secnumdepth\else\makebox[35\p@]{\thesection\hfill}\fi#2\nobreak\par}
+   \@afterheading
+   \nobreak\par}
+\def\@ssection#1{
   \addcontentsline{toc}{section}{#1}%
-  \hskip-35\p@\parbox{\textwidth}{\noindent\raggedright\interlinepenalty\@M
-   \large\sffamily\bfseries#2}
+  {\raggedright\interlinepenalty\@M
+   \large\sffamily\bfseries\leftskip-35\p@#1\nobreak\par}
    \@afterheading
    \nobreak\par}
-\def\@ssection#1{\@section[#1]{#1}}
 \renewcommand\subsection{\par
   \addpenalty\@secpenalty\nobreak
   \secdef\@subsection\@ssubsection}
 \def\@subsection[#1]#2{%
-  \addcontentsline{toc}{subsection}{\itshape#1}%
+  \ifnum2>\c@secnumdepth
+     \addcontentsline{toc}{subsection}{\itshape#1}%
+  \else
+    \refstepcounter{subsection}%
+    \addcontentsline{toc}{subsection}{\itshape\fontsize{9}{12}\selectfont
+      \protect\numberline{\thesubsection}%
+      #1}%
+  \fi
   {\noindent\raggedright\interlinepenalty\@M
-   \normalsize\sffamily\bfseries#2}\nobreak\par}
-\def\@ssubsection#1{\@subsection[#1]{#1}}
+   \normalsize\sffamily\bfseries
+   \ifnum2>\c@secnumdepth\else\thesubsection\hspace{1em}\fi#2}\nobreak\par}
+\def\@ssubsection#1{%
+  \addcontentsline{toc}{subsection}{\itshape\fontsize{9}{12}\selectfont#1}%
+  {\noindent\raggedright\interlinepenalty\@M
+   \normalsize\sffamily\bfseries#1}\nobreak\par}
 \def\specialchapter#1{%
   \clearpage
   \global\@topnum\z@
   \@afterindentfalse
-  \@makechapterhead{#1}\par
+  \@makeschapterhead{#1}\par
   \@afterheading}
 \def\@dotsep{0.5}
 \renewcommand\l@chapter[2]{%
+  \def\numberline##1{\makebox[1.9em]{##1\hfill}}%
   \addpenalty{-\@highpenalty}%
   \vskip5\p@
   \bgroup
     \parindent\z@\rightskip\@pnumwidth
     \parfillskip-\@pnumwidth
-    \advance\leftskip2em\relax
     \leavevmode\bfseries
+    \leftskip1.9em%
     \hskip-\leftskip
     #1\nobreak\leaders\hbox{$\m@th\mkern\@dotsep
       mu\hbox{.}\mkern\@dotsep
-      mu$}\hfill\nobreak\hb@xt@\@pnumwidth{\hfill#2}\par
+      mu$}\hfill\nobreak{\hfil\,#2}\par
     \vskip5\p@
       \penalty\@highpenalty
   \egroup}
+\def\@dottedtocline#1#2#3#4#5{%
+  \bgroup
+  \def\numberline##1{\makebox[#3]{##1\hfill}}%
+  \ifnum #1>\c@tocdepth \else
+    \vskip \z@ \@plus.2\p@
+    {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+     \parindent #2\relax\@afterindenttrue
+     \interlinepenalty\@M
+     \leavevmode
+     \@tempdima #3\relax
+     \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+     #4\nobreak
+     \leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     {\hfil \normalcolor \,#5}%
+     \par}%
+  \fi
+  \egroup}
+\def\@dottedtoclineLF#1#2#3#4#5{%
+  \bgroup
+  \ifnum #1>\c@tocdepth \else
+    \vskip \z@ \@plus.2\p@
+    {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+     \parindent #2\relax\@afterindenttrue
+     \interlinepenalty\@M
+     \leavevmode
+     \@tempdima #2\relax
+     \advance\leftskip \@tempdima \null\nobreak\hskip -\@tempdima
+     #4\nobreak
+     \leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     {\hfil \normalcolor \,#5}%
+     \par}%
+  \fi
+  \egroup}
+\renewcommand*\l@section{\@dottedtocline{1}{2em}{2.5em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{4.7em}{3em}}
+\renewcommand*\l@figure{\@dottedtoclineLF{1}{0em}{2.3em}}
+\let\l@table\l@figure
+\renewcommand\contentsname{Table of Contents}
 \renewcommand\tableofcontents{%
   \specialchapter{\contentsname}%
   \def\numberline##1{\hb@xt@\@pnumwidth{##1\hfill}}%
-  {\parskip2.5\p@\footnotesize\sffamily\@starttoc{toc}}}
+  {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright
+    \@starttoc{toc}}}
 \renewcommand\listoffigures{%
   \chapter{\listfigurename}%
   \def\numberline##1{Figure ##1. }%
-  {\parskip2.5\p@\footnotesize\sffamily\@starttoc{lof}}}
+  {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright
+    \@starttoc{lof}}}
 \renewcommand\listoftables{%
   \chapter{\listtablename}%
   \def\numberline##1{Table ##1. }%
-  {\parskip2.5\p@\footnotesize\sffamily\@starttoc{lot}}}
+  {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright
+    \@starttoc{lot}}}
 \def\listfiguretablename{Figures and Tables}
 \newcommand\listoffiguresandtables{%
   \chapter{\listfiguretablename}
   {\sffamily\bfseries\normalsize Figures\par}%
+  \vspace*{10pt}%
   \def\numberline##1{Figure ##1. }%
-  {\parskip2.5\p@\footnotesize\sffamily\@starttoc{lof}}%
+  {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright
+    \@starttoc{lof}}%
   {\sffamily\bfseries\normalsize Tables\par}%
+  \vspace*{10pt}%
   \def\numberline##1{Table ##1. }%
-  {\parskip2.5\p@\footnotesize\sffamily\@starttoc{lot}}}
+  {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright
+    \@starttoc{lot}}}
 \renewcommand\bibname{References}
+\setlength{\@fptop}{0pt}%
 \renewcommand \thefigure {\@arabic\c@figure}
 \renewcommand \thetable {\@arabic\c@table}
 \captionsetup{justification=centering,font={footnotesize,sf,bf},
-labelsep=period}
+labelsep=period,aboveskip=3pt}
 \captionsetup[table]{position=top}
 \def\arraystretch{1.3}
+\let\maketag@@@@\maketag@@@
+\def\maketag@@@#1{\hbox{\m@th\@eqtagfont#1}}
+\renewcommand{\eqref}[1]{\textup{\tagform@@{\ref{#1}}}}
+\def\tagform@@#1{\maketag@@@@{(\ignorespaces#1\unskip\@@italiccorr)}}
 \endinput
 %%
 %% End of file `erdc.cls'.