mcmthesis (4feb15)

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

1 files changed, 46 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls b/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
index 9573f02e6fa..c859d9f5edf 100644
--- a/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
+++ b/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
@@ -28,13 +28,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{mcmthesis}
-  [2015/01/29 v5.1.0c Thesis Template For MCM/ICM]
+  [2015/02/05 v5.1.0d Thesis Template For MCM/ICM]
 \typeout{Thesis Template For MCM/ICM}
-\def\MCMversion{v5.1.0c}
+\def\MCMversion{v5.1.0d}
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{family=MCM, prefix=MCM@opt@, setkeys=\kvsetkeys}
-\newcommand{\skv}[1]{\kvsetkeys{MCM}{#1}}
+\newcommand{\mcmsetup}[1]{\kvsetkeys{MCM}{#1}}
 \DeclareBoolOption[true]{sheet}
 \DeclareComplementaryOption{nosheet}{sheet}
 \DeclareBoolOption[false]{titleinsheet}
@@ -46,10 +46,10 @@
 \DeclareBoolOption[true]{abstract}
 \DeclareComplementaryOption{noabstract}{abstract}
 \DeclareStringOption[0000]{tcn}[0000]
+\DeclareStringOption[A]{problem}[A]
 \DeclareDefaultOption{\relax}
 \ProcessKeyvalOptions*\relax
 \LoadClass[a4paper, 11pt]{article}
-\newcommand{\control}{\MCM@opt@tcn}
 \newcommand{\team}{Team \#\ \MCM@opt@tcn}
 \RequirePackage{fancyhdr, fancybox}
 \RequirePackage{ifthen}
@@ -70,6 +70,7 @@
 \RequirePackage[scaled]{berasans}
 \RequirePackage{hyperref}
 \RequirePackage{ifpdf, ifxetex}
+\RequirePackage{environ}
 \ifpdf
   \RequirePackage{graphicx}
   \RequirePackage{epstopdf}
@@ -115,39 +116,43 @@
 \renewcommand{\tablename}{Table}
 \graphicspath{{./}{./img/}{./fig/}{./image/}{./figure/}{./picture/}
             {./imgs/}{./figs/}{./images/}{./figures/}{./pictures/}}
-\def\@maketitle{%
+\def\maketitle{%
+  \let\saved@thepage\thepage
+  \let\thepage\relax
   \ifMCM@opt@sheet
   \makesheet
   \fi
   \newpage
   \ifMCM@opt@titlepage
   \MCM@maketitle
-  \fi}
-\def\keywordsname{{\bfseries Keywords:}}
-\def\@abstract{}%
-\newbox\@abstract%
-\setbox\@abstract\hbox{}%
-\long\def\abstract{\bgroup\global\setbox\@abstract%
-  \vbox\bgroup\hsize\textwidth\leftskip1cm\rightskip1cm}%
-\def\endabstract{\egroup\egroup}
-\newbox\@keywords
-\setbox\@keywords\hbox{}
-\def\keywords{\bgroup\global\setbox\@keywords\vbox\bgroup\noindent\leftskip0cm}
-\def\endkeywords{\egroup\egroup}%
+  \fi
+  \let\thepage\saved@thepage
+  \setcounter{page}{0}
+  \clearpage
+  \pagestyle{fancy}
+}
+\def\abstractname{Summary}
+\RenewEnviron{abstract}{\xdef\@abstract{\expandonce\BODY}}
 \def\make@abstract{%
-\par%
-\centerline{\bfseries\abstractname}\vskip5pt\par%
-\noindent\usebox\@abstract\par%
-\noindent\hskip1cm\keywordsname\ \usebox\@keywords%
-\vskip10pt%
+  \begin{center}
+    \textbf{\abstractname}
+  \end{center}
+  \@abstract\par
+  \let\@abstract\relax
 }
-\newcommand{\@problem}[1]{}
-\newcommand{\problem}[1]{\gdef\@problem{#1}}
+\def\keywordsname{Keywords}
+\NewEnviron{keywords}{\xdef\@keywords{\expandonce\BODY}}
+\def\make@keywords{%
+  \par\noindent\textbf{\keywordsname}:
+  \@keywords\par
+  \let\@keywords\relax
+}
+\newcommand{\problem}[1]{\mcmsetup{problem = #1}}
 \def\makesheet{%
+  \pagestyle{empty}%
   \null%
-  \vskip 3em%
+  \vskip -3em%
   \begingroup\fontfamily{fvs}\fontseries{m}\selectfont%
-  \thispagestyle{empty}%
   \noindent\begin{tabularx}{0.3\textwidth}{lX}%
   \multicolumn{2}{l}{For office use only}\\
     T1&\rule{3cm}{0.5pt}\\
@@ -161,7 +166,8 @@
     {\fontsize{38pt}{25pt}\selectfont  \textbf{\MCM@opt@tcn} }%
       \normalsize\\[10pt]
     Problem Chosen\\[10pt]
-    {\fontsize{20pt}{\baselineskip}\selectfont \textbf{\@problem}}\normalsize\\
+    {\fontsize{20pt}{\baselineskip}\selectfont
+    \textbf{\MCM@opt@problem}}\normalsize\\
     \end{minipage}\hspace{\fill}
     \begin{tabularx}{0.28\textwidth}{lX}%
     \multicolumn{2}{l}{For office use only}\\
@@ -172,23 +178,24 @@
     \end{tabularx}\par
 \noindent\rule{\textwidth}{0.5pt}\par
 \begin{center}
-  \textbf{\the\year\ Mathematical Contest in Modeling (MCM) Summary Sheet}\\
-(Attach a copy of this page to each copy of your solution paper.)
+  \textbf{{\Large\the\year}\\%
+  Mathematical Contest in Modeling (MCM/ICM) Summary Sheet}%
+  \par
+  \vskip 1.5ex%
+  \begingroup
+  \ifMCM@opt@titleinsheet
+    \normalfont \LARGE \@title \par
+  \fi
+  \endgroup
 \end{center}
-\ifMCM@opt@titleinsheet
-  \centerline{\normalfont \LARGE \@title}
-\fi
-\vskip 1.5em%
 \ifMCM@opt@keywordsinsheet
   \make@abstract
+  \make@keywords
 \else
-  \centerline{\large\bfseries\abstractname}
-  \noindent\usebox\@abstract
+  \make@abstract
 \fi
 \endgroup}
 \newcommand{\MCM@maketitle}{%
-  \null
-  \vskip 2em%
   \begin{center}%
   \let \footnote \thanks
     {\LARGE \@title \par}%
@@ -204,7 +211,8 @@
   \par
   \vskip 1.5em%
   \ifMCM@opt@abstract%
-  \make@abstract%
+  \make@abstract
+  \make@keywords
   \fi%
 }
 \newtheorem{Theorem}{Theorem}[section]