summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/estcpmm
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-06 01:06:33 +0000
committerKarl Berry <karl@freefriends.org>2010-03-06 01:06:33 +0000
commit5213760b1531c996df6f85667642726485168754 (patch)
tree67868733d49cf1039daacbf63b98bc095c93f45e /Master/texmf-dist/source/latex/estcpmm
parent234872ca368f7e9b20b71cb472263e21e9daaee5 (diff)
estcpmm 0.4 (4mar10)
git-svn-id: svn://tug.org/texlive/trunk@17335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/estcpmm')
-rw-r--r--Master/texmf-dist/source/latex/estcpmm/Makefile8
-rw-r--r--Master/texmf-dist/source/latex/estcpmm/estcpmm.dtx141
2 files changed, 128 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/estcpmm/Makefile b/Master/texmf-dist/source/latex/estcpmm/Makefile
index 376a4f827c7..60415451c11 100644
--- a/Master/texmf-dist/source/latex/estcpmm/Makefile
+++ b/Master/texmf-dist/source/latex/estcpmm/Makefile
@@ -3,12 +3,13 @@
#
# This file is in public domain
#
-# $Id: Makefile,v 1.2 2009-07-02 16:00:12 boris Exp $
+# $Id: Makefile,v 1.5 2010-03-04 20:59:00 boris Exp $
#
PACKAGE=estcpmm
-SAMPLES = sample.tex
+SAMPLES = sample.tex
+
WD = $(shell pwd)
CURRDIR = $(notdir ${WD})
@@ -70,6 +71,7 @@ archive: all clean
zip: all clean
cd ..; \
zip -r $(PACKAGE).zip $(CURRDIR) \
- -x 'debug*' -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*'; \
+ -x 'debug*' -x '*~' -x '*.tgz' -x '*.zip' -x $(PACKAGE)/CVS \
+ -x $(PACKAGE)/'CVS/*'; \
mv $(PACKAGE).zip $(CURRDIR); \
cd $(CURRDIR)
diff --git a/Master/texmf-dist/source/latex/estcpmm/estcpmm.dtx b/Master/texmf-dist/source/latex/estcpmm/estcpmm.dtx
index 8db0a9dfa73..2c7544cc2fe 100644
--- a/Master/texmf-dist/source/latex/estcpmm/estcpmm.dtx
+++ b/Master/texmf-dist/source/latex/estcpmm/estcpmm.dtx
@@ -1,7 +1,7 @@
% \iffalse
-% $Id: estcpmm.dtx,v 1.5 2008-12-09 21:14:39 boris Exp $
+% $Id: estcpmm.dtx,v 1.9 2010-03-02 22:28:29 boris Exp $
%
-% Copyright 2008, Boris Veytsman
+% Copyright 2008, 2010 Boris Veytsman
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
% version 1.3 of this license or (at your option) any
@@ -20,7 +20,7 @@
% derived file estcpmm.cls
%
% \fi
-% \CheckSum{0}
+% \CheckSum{473}
%
%
%% \CharacterTable
@@ -77,6 +77,7 @@
% Environmental Security Technology Certification Program.
% \end{abstract}
% \changes{v0.2}{2008/12/09}{First fully functional version}
+% \changes{v0.4}{2010/03/01}{Documentation update}
% \tableofcontents
%
% \clearpage
@@ -97,6 +98,8 @@
% Engineers, Engineer Research and Development Center, 3909 Halls
% Ferry Road, Vicksburg, MS 39180-6199.
%
+% I am grateful to Ryan E. North, RPG for his help in testing the
+% package and preparing the sample files.
%
%\section{User Guide}
%\label{sec:user_guide}
@@ -114,7 +117,8 @@
% \LaTeX{} package providing the access to common PostScript fonts.
% Of course you will need the fonts themselves. You will also need
% \progname{graphics} bundle~\cite{Carlisle05:Graphics}, packages
-% \progname{geometry}~\cite{Umeki08:Geometry} and
+% \progname{geometry}~\cite{Umeki08:Geometry},
+% \progname{caption}~\cite{Sommerfeldt07:Caption} and
% \progname{fancyhdr}~\cite{Oostrum04:Fancyhdr}.
%
%
@@ -262,6 +266,11 @@
% All familiar \LaTeX{} commands and packages should work without
% problems.
%
+% Note that the class assumes that the captions of tables are put
+% above the tables (this is the usual practice; the behavior of the
+% standard \LaTeX{}, which expects them below the tables, is rather
+% odd).
+%
% \DescribeMacro{\specialsection}
% Unlike standard \LaTeX, this class includes in the table of contents
% both numbered and unnumbered sections. If you need to have a
@@ -269,6 +278,19 @@
% |\specialsection|\marg{Title} command.
%
%
+%
+%\subsection{Appendices}
+%\label{sec:app}
+%
+%
+%
+% \DescribeMacro{\appendix}
+% The command |\appendix| starts appendices. Each individual appendix
+% after this command should
+% be entered as either a |\section| or |\section*|. The
+% numbered sections will be called 'Appendix~A', 'Appendix~B',
+% etc. (so do not use the word 'Appendix' in your titles).
+%
%\StopEventually{%
% \clearpage
% \bibliography{estcpmm}
@@ -289,7 +311,7 @@
\ProvidesFile{estcpmm.dtx}
%</gobble>
%<class>\ProvidesClass{estcpmm}
-[2008/12/09 v0.2 Typesetting reports for ESTCP MM Reports]
+[2010/03/02 v0.4 Typesetting reports for ESTCP MM Reports]
% \end{macrocode}
%
% And the driver code:
@@ -339,10 +361,13 @@
%\subsection{Loading Class and Packages}
%\label{sec:loading}
%
-% We start with the base class and \progname{graphicx} package
+% We start with the base class and packages
% \begin{macrocode}
\LoadClass[12pt]{book}
\RequirePackage{graphicx}
+\RequirePackage{caption}
+\captionsetup[table]{position=top}
+\captionsetup{justification=centering,font=bf}
% \end{macrocode}
%
%\subsection{Fonts}
@@ -356,6 +381,8 @@
\usepackage[scaled]{helvet}
\usepackage{courier}
% \end{macrocode}
+%
+%
%
%\subsection{Page Dimensions and Paragraphing}
%\label{sec:page}
@@ -383,6 +410,7 @@
% \end{macrocode}
% \end{macro}
%
+%
%\subsection{Headers and Footers}
%\label{sec:headers}
%
@@ -411,9 +439,12 @@
\chead{}
% \end{macrocode}
%
+% \changes{v0.3}{2010/02/28}{Bottom-aligned footers}
% And we put title and date in the footers:
% \begin{macrocode}
-\lfoot{\textit{\small\@shorttitle}}
+\lfoot{\parbox[b]{\headwidth}{\setlength{\parskip}{0pt}\raggedright
+ \itshape\fontsize{\@xipt}{\@xipt}\selectfont
+ \@shorttitle}}
\cfoot{{\small\thepage}}
\rfoot{\textit{\small\@date}}
% \end{macrocode}
@@ -533,13 +564,58 @@
%\subsection{Sectioning}
%\label{sec:sectioning}
%
+% \begin{macro}{\texorpdfstring}
+% \changes{v0.3}{2010/02/28}{Added macro}
+% The package \progname{hyperref} defines this macro. We provide it
+% to enable compatibility with it
+% \begin{macrocode}
+\def\texorpdfstring{%
+ \expandafter\@firstoftwo}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\phantomsection}
+% \changes{v0.3}{2010/02/28}{Added macro}
+% Another hyperref-compatibility thing
+% \begin{macrocode}
+\let\phantomsection\@empty
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@sectionprefix}
+% \changes{v0.3}{2010/02/28}{Added macro}
+% \changes{v0.4}{2010/03/01}{Moved from subsection to section}
+% This is empty, but |\appendix| redefines it to |Appendix~|. Used
+% in formatting numbered sections.
+% \begin{macrocode}
+\def\@sectionprefix{}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@sectionsuffix}
+% \changes{v0.4}{2010/03/01}{Moved from subsection to section}
+% \changes{v0.3}{2010/02/28}{Added macro}
+% Another feature of section formatting. This is empty, but
+% |\appendix| redefines it to |:|.
+% \begin{macrocode}
+\def\@sectionsuffix{}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\thesection}
-% We do not use chapter numbers in sections:
+% \changes{v0.3}{2010/02/28}{Added decimal dot and zero after
+% section number}
+% We do not use chapter numbers in sections, and add .0 to the section
+% numbers. This is not too typographically sound, but it is
+% how it is done in the Army\dots
+% \begin{macrocode}
+\renewcommand \thesection {\@arabic\c@section.0}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\thesubsection}
+% \changes{v0.3}{2010/02/28}{Added macro}
+% Since we changed |\thesection|, we need to redefine this.
% \begin{macrocode}
-\renewcommand \thesection {\@arabic\c@section}
-% \end{macrocode}
-%
+\renewcommand \thesubsection{\@arabic\c@section.\@arabic\c@subsection}
+% \end{macrocode}
% \end{macro}
%
%
@@ -560,14 +636,17 @@
\def\@section[#1]#2{%
\ifnum\c@secnumdepth>0\relax
\refstepcounter{section}%
- \addcontentsline{toc}{section}{\thesection\quad #1}%
+ \addcontentsline{toc}{section}{%
+ \@sectionprefix\thesection\@sectionsuffix
+ \texorpdfstring{\quad}{ }#1}%
\else
\addcontentsline{toc}{section}{#1}%
\fi
{\noindent\raggedright\interlinepenalty\@M
\large\bfseries
\ifnum\c@secnumdepth>0\relax
- \thesection\quad\MakeUppercase{#2}%
+ \@sectionprefix\thesection\@sectionsuffix
+ \quad\MakeUppercase{#2}%
\else
\MakeUppercase{#2}%
\fi%
@@ -581,6 +660,7 @@
% sections go into TOC
% \begin{macrocode}
\def\@ssection#1{%
+ \phantomsection
\addcontentsline{toc}{section}{#1}%
{\noindent\raggedright\interlinepenalty\@M
\large\bfseries
@@ -605,18 +685,20 @@
% Numbered subsections:
% \begin{macrocode}
\def\@subsection[#1]#2{%
+% \changes{v0.3}{2010/02/28}{Deleted |\MakeUppercase|}
\ifnum\c@secnumdepth>1\relax
\refstepcounter{subsection}%
- \addcontentsline{toc}{subsection}{\thesubsection\quad #1}%
+ \addcontentsline{toc}{subsection}{%
+ \thesubsection\texorpdfstring{\quad}{ }#1}%
\else
\addcontentsline{toc}{subsection}{#1}%
\fi
{\noindent\raggedright\interlinepenalty\@M
\normalsize\bfseries
\ifnum\c@secnumdepth>0\relax
- \thesubsection\quad\MakeUppercase{#2}%
- \else
- \MakeUppercase{#2}%
+ \thesubsection\quad#2%
+ \else%
+ #2%
\fi%
\@afterheading
\nobreak\par}}
@@ -624,19 +706,42 @@
% \end{macro}
%
% \begin{macro}{\@ssubsection}
+% \changes{v0.3}{2010/02/28}{Deleted |\MakeUppercase|}
% Unnumbered subsections:
% \begin{macrocode}
\def\@ssubsection#1{%
+ \phantomsection
\addcontentsline{toc}{subsection}{#1}%
{\noindent\raggedright\interlinepenalty\@M
\normalsize\bfseries
- \MakeUppercase{#1}%
+ #1%
\@afterheading
\nobreak\par}}
% \end{macrocode}
% \end{macro}
%
%
+%\subsection{Appendix}
+%\label{sec:appendix}
+%
+% \begin{macro}{\appendix}
+% \changes{v0.4}{2010/03/01}{Changed appendices to be sections rather
+% than subsections}
+% \changes{v0.3}{2010/02/28}{Added macro}
+% \changes{v0.4}{2010/03/02}{Typo corrected}
+% Appendix changes the numbering
+% of sections and the formatting of section entries.
+% \begin{macrocode}
+\renewcommand\appendix{%
+ \setcounter{chapter}{0}%
+ \setcounter{section}{0}%
+ \renewcommand \thesection{\@Alph\c@section}%
+ \renewcommand \thesubsection{\@Alph\c@section.\@arabic\c@subsection}%
+ \def\@sectionprefix{Appendix~}%
+ \def\@sectionsuffix{:}}
+% \end{macrocode}
+%
+% \end{macro}
%
%\subsection{Special Sections}
%\label{sec:special}