estcpmm 0.4 (4mar10)

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

1 files changed, 34 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/estcpmm/estcpmm.cls b/Master/texmf-dist/tex/latex/estcpmm/estcpmm.cls
index 7d32d592793..f4b7c9a4619 100644
--- a/Master/texmf-dist/tex/latex/estcpmm/estcpmm.cls
+++ b/Master/texmf-dist/tex/latex/estcpmm/estcpmm.cls
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{estcpmm}
-[2008/12/09 v0.2 Typesetting reports for ESTCP MM Reports]
+[2010/03/02 v0.4 Typesetting reports for ESTCP MM Reports]
 \long\def\estcpmm@size@warning#1{%
   \ClassWarning{estcpmm}{Size-changing option #1 will not be
     honored}}%
@@ -50,6 +50,9 @@
 \ProcessOptions\relax
 \LoadClass[12pt]{book}
 \RequirePackage{graphicx}
+\RequirePackage{caption}
+\captionsetup[table]{position=top}
+\captionsetup{justification=centering,font=bf}
 \usepackage{mathptmx}
 \usepackage[scaled]{helvet}
 \usepackage{courier}
@@ -63,7 +66,9 @@
 \lhead{}
 \rhead{}
 \chead{}
-\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}}
 \newcommand{\logo}[2][]{\gdef\@logo{\includegraphics[#1]{#2}}}%
@@ -103,21 +108,30 @@
      \egroup
   \end{flushright}%
   \clearpage}
-\renewcommand \thesection {\@arabic\c@section}
+\def\texorpdfstring{%
+     \expandafter\@firstoftwo}
+\let\phantomsection\@empty
+\def\@sectionprefix{}
+\def\@sectionsuffix{}
+\renewcommand \thesection {\@arabic\c@section.0}
+\renewcommand \thesubsection{\@arabic\c@section.\@arabic\c@subsection}
 \renewcommand\section{\par\cleardoublepage
   \addpenalty\@secpenalty\nobreak
   \secdef\@section\@ssection}
 \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%
@@ -125,6 +139,7 @@
    \@afterheading
    \nobreak\par}}
 \def\@ssection#1{%
+  \phantomsection
   \addcontentsline{toc}{section}{#1}%
   {\noindent\raggedright\interlinepenalty\@M
    \large\bfseries
@@ -138,26 +153,35 @@
 \def\@subsection[#1]#2{%
   \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}}
 \def\@ssubsection#1{%
+  \phantomsection
   \addcontentsline{toc}{subsection}{#1}%
   {\noindent\raggedright\interlinepenalty\@M
    \normalsize\bfseries
-   \MakeUppercase{#1}%
+    #1%
    \@afterheading
    \nobreak\par}}
+\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{:}}
 \def\specialsection#1{%
   \par\cleardoublepage
   \addpenalty\@secpenalty\nobreak