From 810911ffbccd763c25ba40a592c2ed71358188e1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Jul 2009 21:52:16 +0000 Subject: erdc 1.1 (24jul09) git-svn-id: svn://tug.org/texlive/trunk@14460 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/erdc/README | 12 +- Master/texmf-dist/doc/latex/erdc/erdc.bib | 40 ++ Master/texmf-dist/doc/latex/erdc/erdc.pdf | Bin 254221 -> 284292 bytes Master/texmf-dist/doc/latex/erdc/nola.pdf | Bin 11053 -> 11053 bytes .../doc/latex/erdc/red_corps_castle2.pdf | Bin 4581 -> 4581 bytes Master/texmf-dist/doc/latex/erdc/sample.pdf | Bin 156746 -> 361035 bytes Master/texmf-dist/doc/latex/erdc/sample.tex | 68 ++- Master/texmf-dist/source/latex/erdc/erdc.dtx | 648 +++++++++++++++++---- Master/texmf-dist/tex/latex/erdc/erdc.cls | 273 +++++++-- 9 files changed, 853 insertions(+), 188 deletions(-) diff --git a/Master/texmf-dist/doc/latex/erdc/README b/Master/texmf-dist/doc/latex/erdc/README index 8c3daab8ed5..852d56c605c 100644 --- a/Master/texmf-dist/doc/latex/erdc/README +++ b/Master/texmf-dist/doc/latex/erdc/README @@ -1,7 +1,7 @@ LaTeX Style For Technical Information Reports of the Engineer Research and Development Center US Army Corps of Engineers - 2009/03/20 v0.1 + 2009/07/22 v1.1 This package provides class for typesetting Technical Information Reports of the Engineer Research and Development Center, US Army Corps @@ -10,3 +10,13 @@ of Engineers. The class was commissioned and paid for by US Army Corps of Engineers, Engineer Research and Development Center, 3909 Halls Ferry Road, Vicksburg, MS 39180-6199. + +I am grateful to Gordon L. Cohen, ERDC-ITL-IL for the detailed +explanations of the ERDC guidelines, to Christopher E. Kees, +ERDC-CHL-MS and Ryan E. North, ERDC-GSL-MS, for the formatting +suggestions and the patient recompilation of the reports with each new +version of the style. + + +Version 1.1: This version uses Georgia and Franklin Gothic for text + and math. It conforms to the latest guidelines of USACE. diff --git a/Master/texmf-dist/doc/latex/erdc/erdc.bib b/Master/texmf-dist/doc/latex/erdc/erdc.bib index 89c02e36f09..1d8565f77fe 100644 --- a/Master/texmf-dist/doc/latex/erdc/erdc.bib +++ b/Master/texmf-dist/doc/latex/erdc/erdc.bib @@ -101,3 +101,43 @@ year = 2004, note = {\url{http://www.ctan.org/tex-archive/macros/latex/required/tools}} } + +@Manual{Schroeder03:Ragged2e, + title = {The \textsf{ragged2e} Package}, + author = {Martin Schr\"oder}, + month = {March}, + year = 2003, + note = {\url{http://ctan.tug.org/tex-archive/macros/latex/contrib/ms}}, +} + +@Manual{classes, + author = {Leslie Lamport and Frank Mittelbach and Johannes Braams}, + title = {Standard Document Classes for {\LaTeX{}} version 2e}, + note = {\url{http://ctan.tug.org/tex-archive/macros/latex/base}}, + year = 1997 +} + +@Manual{Carlisle01:Dcolumn, + title = {The \textsf{dcolumn} Package}, + author = {David Carlisle}, + month = {May}, + year = 2001, + note = {\url{http://ctan.tug.org/tex-archive/macros/required/tools}} +} + +@Manual{amsldoc, + title = {User's Guide for the \textsf{amsmath} Package (Version~2.0)}, + organization = {American Mathematical Society}, + year = 2002, + month = {February}, + note = {\url{http://ctan.tug.org/tex-archive/macros/latex/required/amslatex/math/amsldoc.pdf}} +} + +@Manual{Mathgifg, + title = {{\LaTeX} Support for {M}icrosoft {G}eorgia + and {ITC} {F}ranklin {G}othic In Text and Math}, + author = {Boris Veytsman}, + month = {July}, + year = 2009, + note = {\url{http://ctan.tug.org/tex-archive/fonts/mathgifg/}} +} diff --git a/Master/texmf-dist/doc/latex/erdc/erdc.pdf b/Master/texmf-dist/doc/latex/erdc/erdc.pdf index e68c81a6ac2..fdcb08d9e23 100644 Binary files a/Master/texmf-dist/doc/latex/erdc/erdc.pdf and b/Master/texmf-dist/doc/latex/erdc/erdc.pdf differ diff --git a/Master/texmf-dist/doc/latex/erdc/nola.pdf b/Master/texmf-dist/doc/latex/erdc/nola.pdf index 94fe1a55fa1..67f1f732ad2 100644 Binary files a/Master/texmf-dist/doc/latex/erdc/nola.pdf and b/Master/texmf-dist/doc/latex/erdc/nola.pdf differ diff --git a/Master/texmf-dist/doc/latex/erdc/red_corps_castle2.pdf b/Master/texmf-dist/doc/latex/erdc/red_corps_castle2.pdf index b83f2155607..f4c0c397f63 100644 Binary files a/Master/texmf-dist/doc/latex/erdc/red_corps_castle2.pdf and b/Master/texmf-dist/doc/latex/erdc/red_corps_castle2.pdf differ diff --git a/Master/texmf-dist/doc/latex/erdc/sample.pdf b/Master/texmf-dist/doc/latex/erdc/sample.pdf index 5913b58b16d..19f2bfb9277 100644 Binary files a/Master/texmf-dist/doc/latex/erdc/sample.pdf and b/Master/texmf-dist/doc/latex/erdc/sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/erdc/sample.tex b/Master/texmf-dist/doc/latex/erdc/sample.tex index 34545875bef..4dc1afe8095 100644 --- a/Master/texmf-dist/doc/latex/erdc/sample.tex +++ b/Master/texmf-dist/doc/latex/erdc/sample.tex @@ -13,7 +13,7 @@ \title{Donec Felis Erat, Congue Non, Volutpat At, Tincidunt Tristique, Libero} -\subtitle{Nam feugiat lacus vel est\\Version~1.0} +\subtitle{Nam feugiat lacus vel est, Version~1.0} \date{March 2009\\Revised November 2010} @@ -42,7 +42,7 @@ \additionalinfo{Supersedes ERDC/CREL AF-01-23} \begin{abstract} - \lipsum[12] + \lipsum[12-13] \end{abstract} %\disclaimer{Some other disclaimer} @@ -69,11 +69,13 @@ \chapter{Unit Conversion Factors} {\footnotesize\sffamily\centering - \begin{longtable}{|l|l|l|} - \hline - \bfseries Multiply & \bfseries By & \bfseries To Obtain + \begin{longtable}{||l|l|l||} + \hline\hline + \bfseries Multiply & \bfseries By & \bfseries To Obtain\\ + \hline\hline \endhead - \hline + \hline\hline + \endfoot acres & 4,046.873 & square meters\\ \hline acre-feet & 1,233.5 & cubic meters\\ @@ -192,8 +194,10 @@ yards & 0.9144 & meters\\ \chapter{Duis ante felis, dignissim id, blandit in, suscipit vel, dolor} -\section{Duis ante felis} -\subsection{Nunc non magna} +\section{Duis ante felis: duis sagittis massa, dignissim id, blandit + in, suscipit vel, dolor, nunc non magna} +\subsection{Nunc non magna: duis ante felis: duis sagittis massa, + dignissim id, blandit in, vel dolor} \lipsum[6] \begin{equation} @@ -203,10 +207,25 @@ yards & 0.9144 & meters\\ \subsection{Duis sagittis massa} -\lipsum[7] +\lipsum[7-9] \section{Suscipit vel} +\lipsum[23] + +\begin{enumerate} +\item Pellentesque laoreet velit nec justo. +\item Fusce consectetuer. Proin tellus est, luctus vitae, + molestie a, mattis et, mauris. Donec tempor. Pellentesque habitant + morbi tristique senectus et netus et malesuada fames ac turpis + egestas. Duis ante felis, dignissim id, blandit in, suscipit vel, + dolor. Pellentesque tincidunt cursus felis. +\item Proin rhoncus semper + nulla. Ut et est. Vivamus ipsum erat, gravida in, venenatis ac, + fringilla in, quam. Nunc ac augue. Fusce pede erat, ultrices non, + consequat et, semper sit amet, urna. +\end{enumerate} + \lipsum[17-18] \begin{table} @@ -214,19 +233,22 @@ yards & 0.9144 & meters\\ \caption{Yearly Dividens} \label{tab:dividends} \footnotesize\sffamily - \begin{tabular}{|l|r|} + \begin{tabular}{||l|D{.}{.}{2.2}||} + \hline\hline + \textbf{Year} & \multicolumn{1}{|c||}{\textbf{Dividends, \%}}\\ + \hline\hline + $1880$ & 2.50 \\ \hline - \bfseries Year & \bfseries Dividends, \%\\ - \hline - 1880 & 2.5 \\ - \hline - 1881 & 2.1 \\ - \hline - 1882 & 2.6 \\ + $1881$ & 12.1 \\ \hline + $1882$ & 2.6 \\ + \hline\hline \end{tabular} \end{table} +\subsection{Sagittis massa} + +\lipsum[24] \begin{figure} \centering @@ -246,6 +268,17 @@ yards & 0.9144 & meters\\ \int P\,dx =1 \end{equation} +\begin{itemize} +\item Fusce adipiscing justo nec ante. Nullam in enim. + Pellentesque felis orci, sagittis ac, malesuada et, facilisis in, + ligula. Nunc non magna sit amet mi aliquam dictum. In mi. +\item Curabitur + sollicitudin justo sed quam. Aenean imperdiet. Vestibulum ante ipsum + primis in faucibus orci luctus et ultrices posuere cubilia Curae; + Donec lacinia nonummy lectus. Proin vel urna. Fusce sit amet orci ac + magna iaculis pharetra. Duis sagittis massa in tellus. +\end{itemize} + \section{Fusce consectetuer} \lipsum[10] @@ -335,6 +368,7 @@ yards & 0.9144 & meters\\ \label{eq:U} S = -kT\ln\Xi \end{equation} +See equation~(\ref{eq:C}) and equation~\eqref{eq:D}. \begin{figure} \centering diff --git a/Master/texmf-dist/source/latex/erdc/erdc.dtx b/Master/texmf-dist/source/latex/erdc/erdc.dtx index 39ce67b3ba4..d27dc6f14f1 100644 --- a/Master/texmf-dist/source/latex/erdc/erdc.dtx +++ b/Master/texmf-dist/source/latex/erdc/erdc.dtx @@ -1,5 +1,5 @@ % \iffalse -% $Id: erdc.dtx,v 1.17 2009-03-20 20:13:31 boris Exp $ +% $Id: erdc.dtx,v 1.31 2009-07-24 19:46:11 boris Exp $ % % Copyright 2008, Boris Veytsman % This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ % derived file erdc.cls % % \fi -% \CheckSum{984} +% \CheckSum{1374} % % %% \CharacterTable @@ -83,6 +83,8 @@ % % \clearpage % \changes{v0.1}{2009/03/20}{First fully functional version} +% \changes{v1.0}{2009/07/22}{Bug fixes} +% \changes{v1.1}{2009/07/22}{Documentation Update} % %\section{Introduction} %\label{sec:intro} @@ -113,14 +115,19 @@ % present in any up-to-date distribution. If you do not have them, % you can download them using the links below prior to using the class. % -% You will need \progname{PSFNSS}~\cite{Schmidt04:PSNFSS9.2}: the -% \LaTeX{} package providing the access to common PostScript fonts. +% You will need \progname{mathgifg}~\cite{Mathgifg}: the +% \LaTeX{} package providing the access to Microsoft Georgia and ITC +% Franklin Gothic. % Of course you will need the fonts themselves. You will also need % \progname{graphics} bundle~\cite{Carlisle05:Graphics}, packages % \progname{geometry}~\cite{Umeki08:Geometry}, % \progname{caption}~\cite{Sommerfeldt07:Caption}, -% \progname{longtable}~\cite{Carlisle04:Longtable} and -% \progname{fancyhdr}~\cite{Oostrum04:Fancyhdr}. +% \progname{ragged2e}~\cite{Schroeder03:Ragged2e}, +% \progname{longtable}~\cite{Carlisle04:Longtable}, +% \progname{dcolumn}~\cite{Carlisle01:Dcolumn}. +% \progname{fancyhdr}~\cite{Oostrum04:Fancyhdr}, +% \progname{natbib}~\cite{Daly07:Natbib} and +% \progname{amsmath}~\cite{amsldoc}. % % % The installation of the class follows the usual @@ -428,16 +435,16 @@ % \caption{Yearly Dividens} % \label{tab:dividends} % \footnotesize\sffamily -% \begin{tabular}{|l|r|} +% \begin{tabular}{||l|D{.}{.}{2.2}||} +% \hline\hline +% \textbf{Year} & \multicolumn{1}{|c||}{\textbf{Dividends, \%}}\\ +% \hline\hline +% $1880$ & 2.50 \\ % \hline -% \bfseries Year & \bfseries Dividends, \%\\ -% \hline -% 1880 & 2.5 \\ -% \hline -% 1881 & 2.1 \\ -% \hline -% 1882 & 2.6 \\ +% $1881$ & 12.1 \\ % \hline +% $1882$ & 2.6 \\ +% \hline\hline % \end{tabular} % \end{table} % \end{verbatim} @@ -450,6 +457,15 @@ % serif entries in the tables itself. The class does \emph{not} do % this automatically: the users should put |\footnotesize\sffamily| % before |\begin{tabular}|, as shown in the example above. +% +% The guidelines require the centering of numerical columns on decimal +% point. The class automatically loads \progname{dcolumn} package, so +% to get aligned columns use the special column designator +% |D{.}{.}|\marg{n.m} where $n$ and $m$ are the numbers of decimal +% points before and after the dot correspondingly. It is possible to +% achieve other effects with this package like centering on the +% multiplication sign; see the +% documentation~\cite{Carlisle01:Dcolumn} for further information. % % \DescribeMacro{\fbox} % The guidelines~\cite{ERDC_Guide} require the graphics to be @@ -464,6 +480,13 @@ % \end{figure} % \end{verbatim} % +% The guidelines~\cite{ERDC_Guide} require equations to be +% individually centered. +% This probably precludes the use of |eqnarray| environment and such +% \progname{amsmath} constructions as |align|, |aligned|, |alignedat| +% etc. +% +% % %\subsection{Back Matter} %\label{sec:ug_backmatter} @@ -475,16 +498,26 @@ % according to the rules~\cite{ERDC_Guide}. It should be issued after % the bibliography, but before the appendices. % -% The guidelines~\cite{ERDC_Guide} do not formally specify all details -% of bibliographies. The authors are encouraged to use Bib\TeX{} -% and \progname{natbib}~\cite{Daly07:Natbib} package for the creation -% of professional-looking bibliographies. % % The reports should contain Form~298 (see, for example, % \url{http://www.ntis.gov/pdf/rdpform.pdf}). This form should be % typeset separately. % %\StopEventually{% +% +%\subsection{Acknowledgements} +%\label{sec:ack} +% +% The class was commissioned and paid for by US Army Corps of +% Engineers, Engineer Research and Development Center, 3909 Halls +% Ferry Road, Vicksburg, MS 39180-6199. +% +% I am grateful to Gordon L. Cohen, ERDC-ITL-IL for the detailed +% explanations of the ERDC guidelines, to Christopher E. Kees, +% ERDC-CHL-MS and Ryan E. North, ERDC-GSL-MS, for the formatting +% suggestions and the patient +% recompilation of the reports with each new version of the style. +% % \clearpage % \bibliography{erdc} % \bibliographystyle{unsrt}} @@ -504,7 +537,7 @@ \ProvidesFile{erdc.dtx} % %\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] % \end{macrocode} @@ -562,25 +595,134 @@ US Army Corps of Engineers] \RequirePackage{graphicx,color,caption,longtable} % \end{macrocode} % +% +% \changes{v0.2}{2009/07/07}{Added dcolumn} +% We use \progname{dcolumn} for dot-centered columns: +% \begin{macrocode} +\RequirePackage{dcolumn} +% \end{macrocode} +% +% \changes{v0.3}{2009/07/18}{Added natbib} +% We use \progname{natbib}~\cite{Daly07:Natbib} for bibliography +% formatting: +% \begin{macrocode} +\RequirePackage{natbib} +\renewcommand{\bibfont}{\fontsize{10pt}{12pt}\selectfont} +\setlength{\bibhang}{0.5in} +\setlength{\bibsep}{12pt} +% \end{macrocode} +% +% \changes{v0.3}{2009/07/18}{Added amsmath} +% We load \progname{amsmath} since we want to change the equation +% numbering scheme: \progname{amsmath} redefines it. +% \begin{macrocode} +\RequirePackage{amsmath} +% \end{macrocode} +% +% \changes{v0.2}{2009/07/07}{Added ragged2e} +% We do not want the option |document| with \progname{ragged2e}: this +% calls \progname{footmisc}, while we want our own footnotes: +% \begin{macrocode} +\RequirePackage[originalcommands]{ragged2e} +\setlength\RaggedRightParindent{\parindent} +\RaggedRight +% \end{macrocode} +% %\subsection{Fonts} %\label{sec:fonts} % -% We use Times for the main font, matching Helvetica for +%\begin{macro}{\normalsize} +% \changes{v0.2}{2009/07/07}{Changed line spacing} +% The size is basically from~\cite{classes}, but with some changes +% according to our fonts: +% \begin{macrocode} +\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 +% \end{macrocode} +%\end{macro} +% +% +% \changes{v0.2}{2009/07/07}{Changed fonts} +% +% We use Georgia for the main font, matching Franklin Gothic for % the sans serifed font, and Courier for the monospaced font: % \begin{macrocode} -\usepackage{mathptmx} -\usepackage[scaled]{helvet} +\usepackage{mathgifg} \usepackage{courier} % \end{macrocode} % +% \begin{macro}{\@laboratoryfont} +% \changes{v0.2}{2009/07/07}{Introduced the macro} +% Font to typeset the laboratory on the cover +% \begin{macrocode} +\def\@laboratoryfont{% + \sffamily\bfseries\fontsize{22pt}{25pt}\selectfont} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@reportnumfont} +% \changes{v0.2}{2009/07/07}{Introduced the macro} +% Font to typeset the report number on the cover +% \begin{macrocode} +\def\@reportnumfont{% + \sffamily\bfseries\fontsize{18pt}{22pt}\selectfont} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\@programfont} +% \changes{v0.2}{2009/07/07}{Introduced the macro} +% \changes{v0.3}{2009/07/18}{Changhed weight to Book} +% Font to typeset the program on the cover +% \begin{macrocode} +\def\@programfont{% + \sffamily\fontseries{k}\itshape\normalsize\selectfont} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@titlefont} +% \changes{v0.2}{2009/07/07}{Introduced the macro} +% Font to typeset the title on the cover \emph{and} chapter numbers +% \begin{macrocode} +\def\@titlefont{% + \sffamily\fontseries{h}\fontsize{20pt}{25pt}\selectfont} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@distributionfont} +% \changes{v0.3}{2009/07/18}{Introduced the macro} +% Font to typeset the distribution statement +% \begin{macrocode} +\def\@distributionfont{% + \sffamily\fontseries{k}\fontsize{9pt}{11pt}\selectfont} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\@eqtagfont} +% \changes{v0.3}{2009/07/18}{Introduced the macro} +% The font for the equations +% \begin{macrocode} +\def\@eqtagfont{\sffamily\bfseries\footnotesize} +% \end{macrocode} +% +% \end{macro} +% %\subsection{Page Dimensions and Paragraphing} %\label{sec:page} % +% \changes{v1.1}{2009/07/22}{Changed bottom margin to 0.7''} % -% The requirements are 1.25'' (top), 1'' (bottom), 1.5'' (left), and +% The requirements are 1.25'' (top), 0.7'' (bottom), 1.5'' (left), and % 1.5'' (right). However, we need to add for the headers. % \begin{macrocode} -\RequirePackage[letterpaper, top=1in, bottom=1in, +\RequirePackage[letterpaper, top=1in, bottom=0.7in, left=1.5in, right=1.5in]{geometry} % \end{macrocode} % @@ -599,6 +741,76 @@ US Army Corps of Engineers] % \end{macrocode} % \end{macro} % +% \begin{macro}{\labelwidth} +% \changes{v1.1}{2009/07/22}{Changed defaults} +% The width of label for enumerate and itemize environments +% \begin{macrocode} +\setlength\labelwidth{1em} +% \end{macrocode} +% +% \end{macro} +% +% +% \begin{macro}{\leftmargini} +% \changes{v1.1}{2009/07/22}{Changed defaults} +% We align lists with the body +% \begin{macrocode} +\setlength\leftmargini\z@ +\addtolength\leftmargini\labelwidth +\addtolength\leftmargini\labelsep +% \end{macrocode} +% +% \end{macro} +% +% \begin{macro}{\itemize} +% \changes{v1.1}{2009/07/22}{Changed defaults} +% We want left-aligned bullets: +% \begin{macrocode} +\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} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\enumerate} +% \changes{v1.1}{2009/07/22}{Changed defaults} +% We left-align numbers +% \begin{macrocode} +\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} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\widowpenalty} +% \begin{macro}{\clubpenalty} +% \changes{v1.1}{2009/07/22}{Changed settings} +% We forbid widows and clubs. To prevent too extended pages we use +% |\raggedbottom|: +% \begin{macrocode} +\widowpenalty=10000 +\clubpenalty=10000 +\raggedbottom +% \end{macrocode} +% +% \end{macro} +% \end{macro} +% +% %\subsection{Headers and Footers} %\label{sec:headers} % @@ -609,10 +821,11 @@ US Army Corps of Engineers] % % % \begin{macro}{\headrulewidth} +% \changes{v0.3}{2009/07/18}{Chaneged thickness} % \begin{macro}{\footrulewidth} % Decorative rules: % \begin{macrocode} -\renewcommand{\headrulewidth}{0.1pt} +\renewcommand{\headrulewidth}{0.5pt} \renewcommand{\footrulewidth}{0pt} % \end{macrocode} % \end{macro} @@ -695,7 +908,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}% @@ -873,13 +1085,14 @@ US Army Corps of Engineers] % \end{macro} % % \begin{macro}{\coverart} +% \changes{v0.2}{2009/07/08}{Changed the width of cover art} % The |\logo| command has the same format as |\includegraphics|. It % actually sets up |\includegraphics| in |\maketitle|. % \begin{macrocode} \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{}% % \end{macrocode} @@ -937,6 +1150,7 @@ US Army Corps of Engineers] % % % \begin{macro}{\abstract} +% \changes{v0.4}{2009/07/20}{Increased parsep} % We save abstract till later. Again, this is uses code % from~\cite{Downes04:amsart}. % \begin{macrocode} @@ -947,7 +1161,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:]% @@ -976,11 +1190,12 @@ TO THE ORIGINATOR.}} % % % \begin{macro}{@coverlist} +% \changes{v0.2}{2009/07/08}{Made slightly thinner} % The title page consists of boxes, which are extended beyond the % margins. Here we define the margins % \begin{macrocode} \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}} % \end{macrocode} @@ -1023,6 +1238,18 @@ TO THE ORIGINATOR.}} % \end{macro} % % \begin{macro}{\maketitle} +% \changes{v0.2}{2009/07/07}{Changed fonts} +% \changes{v0.2}{2009/07/08}{Made slightly thinner} +% \changes{v0.3}{2009/07/18}{Increased box for the laboratory} +% \changes{v0.3}{2009/07/18}{Changhed weight to Book} +% \changes{v0.3}{2009/07/18}{Aligned the distribution line} +% \changes{v0.3}{2009/07/18}{Changed font sizes} +% \changes{v0.3}{2009/07/18}{Changed disclaimer width} +% \changes{v0.4}{2009/07/20}{Made the gap between red and black +% stripes on the cover exactly 4.5pt (added 2.75pt)} +% \changes{v0.4}{2009/07/20}{Moved boxes around} +% \changes{v1.1}{2009/07/22}{Added drop between authors and addresses} +% \changes{v1.1}{2009/07/22}{Compensated for top margin change} % The |\maketitle| macro performs all the work of typesetting the % information above. % @@ -1030,7 +1257,7 @@ TO THE ORIGINATOR.}} % \begin{macrocode} \def\maketitle{% \thispagestyle{empty}% - \enlargethispage{0.54in}% + \enlargethispage{0.34in}% \vspace*{-0.95in} \makebox[0cm][r]{% \raisebox{-720\p@}[\z@][\z@]{% @@ -1038,14 +1265,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 @@ -1054,24 +1281,24 @@ 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 % \end{macrocode} % % @@ -1080,18 +1307,22 @@ TO THE ORIGINATOR.}} % \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 % \end{macrocode} % % @@ -1100,15 +1331,18 @@ TO THE ORIGINATOR.}} \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 @@ -1142,9 +1376,10 @@ 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} % \end{macrocode} @@ -1156,18 +1391,25 @@ TO THE ORIGINATOR.}} % %\subsection{Sectioning} %\label{sec:sectioning} +% \changes{v0.5}{2009/07/22}{Changed numbering of sections} % % \begin{macro}{\cl@chapter} -% We do \emph{not} reset any counters when stepping chapters, except +% We do \emph{not} reset equation counters when stepping chapters, except % in appendices: % \begin{macrocode} \def\cl@chapter{} % \end{macrocode} -% % \end{macro} -% +% However, we do reset section and subsection counters +% \begin{macrocode} +\@addtoreset{section}{chapter}% +\@addtoreset{subsection}{chapter}% +\@addtoreset{subsection}{section}% +% \end{macrocode} +% % % \begin{macro}{\chapter} +% \changes{v0.2}{2009/07/07}{Changed font} % We redefine |\chapter| to suppress empty page style on chapter % opening: % \begin{macrocode} @@ -1180,6 +1422,7 @@ TO THE ORIGINATOR.}} % \end{macro} % % \begin{macro}{\@chapter} +% \changes{v1.1}{2009/07/22}{Changed wrapping} % Non-starred chapter: % \begin{macrocode} \def\@chapter[#1]#2{% @@ -1196,7 +1439,7 @@ 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} @@ -1209,63 +1452,67 @@ TO THE ORIGINATOR.}} \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} % \end{macrocode} % \end{macro} % % -% \begin{macro}{\makechapterhead} +% \begin{macro}{\@makechapterhead} +% \changes{v1.1}{2009/07/22}{Changed wrapping} % This is the macro that actually prints the chapter: % \begin{macrocode} \def\@makechapterhead#1{% - \vspace*{15\p@}% - {\hskip-35\p@\parbox{\textwidth}{% + \vspace*{5\p@}% + {\hskip-35\p@% \parindent\z@\raggedright \interlinepenalty\@M - \LARGE \bfseries\sffamily #1\par}\par\nobreak + \@titlefont #1\par\nobreak \vspace*{10\p@}% }} % \end{macrocode} % \end{macro} % -% \begin{macro}{\theequation} -% We do not use chapter number in equations, except in appendices: +% \begin{macro}{\@makeschapterhead} +% \changes{v1.1}{2009/07/22}{Wrote the macro} +% This is like |\makechapterhead|, but does not create hanging +% indent: % \begin{macrocode} -\renewcommand \theequation {\@arabic\c@equation} +\def\@makeschapterhead#1{% + \vspace*{5\p@}% + {% + \parindent\z@\raggedright + \interlinepenalty\@M + \leftskip-35\p@\@titlefont #1\par\nobreak + \vspace*{10\p@}% + }} % \end{macrocode} % % \end{macro} % -% -% \begin{macro}{\thesection} -% We do not use chapter numbers in sections: +% \begin{macro}{\theequation} +% We do not use chapter number in equations, except in appendices: % \begin{macrocode} -\renewcommand \thesection {\@arabic\c@section} +\renewcommand \theequation {\@arabic\c@equation} % \end{macrocode} +% % \end{macro} % -% \begin{macro}{secnumdepth} -% We number only chapters and sections: -% \begin{macrocode} -\setcounter{secnumdepth}{1} -% \end{macrocode} -% \end{macro} +% % % \begin{macro}{tocdepth} % Only chapters, sections, subsections are in TOC: % \begin{macrocode} \setcounter{tocdepth}{2} % \end{macrocode} -% % \end{macro} % % \begin{macro}{\section} -% Sections are in 12\,pt bold. +% Sections are in 14\,pt bold. % \begin{macrocode} \renewcommand\section{% \addpenalty\@secpenalty\nobreak @@ -1274,20 +1521,35 @@ TO THE ORIGINATOR.}} % \end{macro} % % \begin{macro}{\@section} +% \changes{v0.4}{2009/07/20}{Made sections numbered} +% \changes{v1.1}{2009/07/22}{Changed wrapping} % This is for numbered sections: % \begin{macrocode} \def\@section[#1]#2{% - \addcontentsline{toc}{section}{#1}% - \hskip-35\p@\parbox{\textwidth}{\noindent\raggedright\interlinepenalty\@M - \large\sffamily\bfseries#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} % \end{macrocode} % \end{macro} % \begin{macro}{\@ssection} -% Unnumbered subsections are here only for compatibility +% \changes{v0.4}{2009/07/20}{Wrote the macro} +% \changes{v1.1}{2009/07/22}{Changed wrapping} +% Unnumbered sections: % \begin{macrocode} -\def\@ssection#1{\@section[#1]{#1}} +\def\@ssection#1{ + \addcontentsline{toc}{section}{#1}% + {\raggedright\interlinepenalty\@M + \large\sffamily\bfseries\leftskip-35\p@#1\nobreak\par} + \@afterheading + \nobreak\par} % \end{macrocode} % \end{macro} % @@ -1302,19 +1564,32 @@ TO THE ORIGINATOR.}} % \end{macro} % % \begin{macro}{\@subsection} +% \changes{v0.4}{2009/07/20}{Made subsections numbered} % Numbered subsections: % \begin{macrocode} \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} + \normalsize\sffamily\bfseries + \ifnum2>\c@secnumdepth\else\thesubsection\hspace{1em}\fi#2}\nobreak\par} % \end{macrocode} % \end{macro} % % \begin{macro}{\@ssubsection} -% Unnumbered subsections are here for compatibility only +% \changes{v0.4}{2009/07/20}{Wrote the macro} +% Unnumbered subsections % \begin{macrocode} -\def\@ssubsection#1{\@subsection[#1]{#1}} +\def\@ssubsection#1{% + \addcontentsline{toc}{subsection}{\itshape\fontsize{9}{12}\selectfont#1}% + {\noindent\raggedright\interlinepenalty\@M + \normalsize\sffamily\bfseries#1}\nobreak\par} % \end{macrocode} % \end{macro} % @@ -1333,7 +1608,7 @@ TO THE ORIGINATOR.}} \clearpage \global\@topnum\z@ \@afterindentfalse - \@makechapterhead{#1}\par + \@makeschapterhead{#1}\par \@afterheading} % \end{macrocode} % \end{macro} @@ -1356,29 +1631,132 @@ TO THE ORIGINATOR.}} % % % \begin{macro}{\l@chapter} -% Here we define chapter entry in TOC +% \changes{v0.3}{2009/07/18}{Deleted leaders} +% \changes{v0.4}{2009/07/20}{Added leaders} +% \changes{v1.1}{2009/07/22}{Changed wrapping} +% Here we define chapter entry in TOC. Note the leaders to the end: % \begin{macrocode} \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} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@dottedtocline} +% \changes{v0.4}{2009/07/20}{Redefined} +% \changes{v0.4}{2009/07/21}{Deleted hanging indent} +% \changes{v1.1}{2009/07/22}{Changed wrapping} +% We redefine the standard macro to allow page number font to be +% right and to continue leaders to the end: +% \begin{macrocode} +\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} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@dottedtoclineLF} +% \changes{v0.4}{2009/07/21}{Wrote macro} +% This is the version of |\@dottedtocline| used in LOT and LOF +% \begin{macrocode} +\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} % \end{macrocode} -% % \end{macro} % % -% +% \begin{macro}{\l@section} +% \changes{v0.4}{2009/07/20}{Changed defaults} +% \changes{v1.1}{2009/07/22}{Changed wrapping} +% Section formatting in TOC +% \begin{macrocode} +\renewcommand*\l@section{\@dottedtocline{1}{2em}{2.5em}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\l@subsection} +% \changes{v0.4}{2009/07/20}{Changed defaults} +% \changes{v1.1}{2009/07/22}{Changed wrapping} +% Subsection formatting in TOC +% \begin{macrocode} +\renewcommand*\l@subsection{\@dottedtocline{2}{4.7em}{3em}} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\l@figure} +% \changes{v0.4}{2009/07/21}{Redefined} +% Figure in lot +% \begin{macrocode} +\renewcommand*\l@figure{\@dottedtoclineLF{1}{0em}{2.3em}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\l@table} +% \changes{v0.4}{2009/07/21}{Redefined} +% Table in lot +% \begin{macrocode} +\let\l@table\l@figure +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\contentsname} +% \changes{v0.4}{2009/07/20}{Changed defaults} +% Contents... +% \begin{macrocode} +\renewcommand\contentsname{Table of Contents} +% \end{macrocode} +% +% \end{macro} +% % % \begin{macro}{\tableofcontents} % TOC: @@ -1386,7 +1764,8 @@ TO THE ORIGINATOR.}} \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}}} % \end{macrocode} % \end{macro} % \begin{macro}{\listoffigures} @@ -1395,7 +1774,8 @@ TO THE ORIGINATOR.}} \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}}} % \end{macrocode} % \end{macro} % \begin{macro}{\listoftables} @@ -1404,7 +1784,8 @@ TO THE ORIGINATOR.}} \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}}} % \end{macrocode} % \end{macro} % @@ -1417,16 +1798,21 @@ TO THE ORIGINATOR.}} % \end{macro} % % \begin{macro}{\listoffiguresandtables} +% \changes{v0.3}{2009/07/18}{Added some vertical space} % And the combined LOF and TOC % \begin{macrocode} \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}}} % \end{macrocode} % \end{macro} % @@ -1435,15 +1821,24 @@ TO THE ORIGINATOR.}} % \begin{macrocode} \renewcommand\bibname{References} % \end{macrocode} -% % \end{macro} % % % +% % %\subsection{Figures and Tables} %\label{sec:floats} % +% \begin{macro}{\@fptop} +% \changes{v0.5}{2009/07/21}{Redefined} +% We want the figures on figures-only page to be vertically +% top-aligned rather than centered: +% \begin{macrocode} +\setlength{\@fptop}{0pt}% +% \end{macrocode} +% \end{macro} +% % % \begin{macro}{\thefigure} % We do not use chapter numbers in figures, except in appendix: @@ -1460,10 +1855,11 @@ TO THE ORIGINATOR.}} % \end{macro} % % +% \changes{v0.2}{2009/07/07}{Changed caption skips} % Setting up captions: % \begin{macrocode} \captionsetup{justification=centering,font={footnotesize,sf,bf}, -labelsep=period} +labelsep=period,aboveskip=3pt} \captionsetup[table]{position=top} % \end{macrocode} % @@ -1477,6 +1873,44 @@ labelsep=period} % \end{macro} % % +% +% +% +% +% \subsection{Equation Numbering} +% \label{sec:eqnum} +% +% \begin{macro}{\maketag@@@} +% \changes{v0.3}{2009/07/18}{Introduced the macro} +% We change the \progname{amsmath} definition: +% \begin{macrocode} +\let\maketag@@@@\maketag@@@ +\def\maketag@@@#1{\hbox{\m@th\@eqtagfont#1}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\eqref} +% \changes{v0.3}{2009/07/18}{Introduced the macro} +% We also change |\eqref|, otherwise the references will be in the +% wrong font: +% \begin{macrocode} +\renewcommand{\eqref}[1]{\textup{\tagform@@{\ref{#1}}}} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\tagform@@} +% \changes{v0.3}{2009/07/18}{Introduced the macro} +% This is the original \progname{amsmath} version: +% \begin{macrocode} +\def\tagform@@#1{\maketag@@@@{(\ignorespaces#1\unskip\@@italiccorr)}} +% \end{macrocode} +% \end{macro} +% +% +% +% +% % \subsection{The final word} %\label{sec:final} % 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'. -- cgit v1.2.3