mcmthesis (23apr15)

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

4 files changed, 24 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf
index 26116dc756b..ca5d2ca3e0e 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf
+++ b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf
index 56d95aa9db1..25370d2651d 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf
+++ b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf
diff --git a/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx b/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
index 4f289eb6e91..38ecfe47a8c 100644
--- a/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
+++ b/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
@@ -20,8 +20,8 @@
 %
 %<*internal>
 \begingroup
-  \def\temp{LaTeX2e}
-\expandafter\endgroup\ifx\temp\fmtname\else
+  \def\LaTeXeName{LaTeX2e}
+\expandafter\endgroup\ifx\LaTeXeName\fmtname\else
 \csname fi\endcsname
 %</internal>
 %<*install>
@@ -101,7 +101,7 @@ and the derived files             \jobname.cls,
 %</internal>
 %<*driver>
 \ProvidesFile{mcmthesis.dtx}
-  [2015/02/07 v5.1.0e The Thesis Template Designed For MCM/ICM]
+  [2015/04/21 v5.1.0f The Thesis Template Designed For MCM/ICM]
 \documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
@@ -131,7 +131,7 @@ and the derived files             \jobname.cls,
 %</driver>
 % \fi
 %
-% \CheckSum{352}
+% \CheckSum{340}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -156,7 +156,8 @@ and the derived files             \jobname.cls,
 % \DoNotIndex{\test}
 %
 % \title{\hypertarget{Chinese}{%
-%   \textsf{\jobname} 文档类\thanks{这份文档是 \textsf{\jobname}~\fileversion
+%   \textsf{\jobname} 文档类 \fileversion
+%     \thanks{这份文档是 \textsf{\jobname}~\fileversion
 %   的说明文档，更新日期 \filedate。}}%
 %   \makebox[0pt][l]{\hspace{1.5cm}\hyperlink{English}%
 %     {\large$ \to $ English Version}}
@@ -357,10 +358,11 @@ xelatex mcmthesis-demo.tex
 %     修复标题、摘要和关键字过长时分行、分页的问题。
 %   \item [5.1.0e] 重新定义摘要页顶部的表格，以符合赛事主办方 COMAP 的最新版的
 %     摘要页。
+%   \item [5.1.0f] 取消 TCN 和选题的红色标记。
 % \end{description}
 %
 % \title{\hypertarget{English}{%
-%   The \textsf{\jobname} class\thanks{This Document
+%   The \textsf{\jobname} class \fileversion\thanks{This Document
 %   corresponds to \textsf{\jobname}~\fileversion, dated \filedate.}}%
 %   \makebox[0pt][l]{\hspace{1.5cm}\hyperlink{Chinese}{\large$ \to $ 中文版}}
 % }
@@ -551,6 +553,8 @@ xelatex mcmthesis-demo.tex
 %     bug of page number and fix the bug of title, abstract and keywords.
 %   \item [5.1.0e] Redefine the table at the top of the summary sheet to
 %     match the latest summary sheet from COMAP, the maker of the contest.
+%   \item [5.1.0f] Cancle the red emphasizing of tcn and problem mark in the
+%     table at the topo of the summary sheet.
 % \end{description}
 %
 % \StopEventually{}
@@ -560,9 +564,9 @@ xelatex mcmthesis-demo.tex
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{mcmthesis}
-  [2015/02/07 v5.1.0e The Thesis Template Designed For MCM/ICM]
+  [2015/04/21 v5.1.0f The Thesis Template Designed For MCM/ICM]
 \typeout{The Thesis Template Designed For MCM/ICM}
-\def\MCMversion{v5.1.0e}
+\def\MCMversion{v5.1.0f}
 %    \end{macrocode}
 % \subsection{Options}
 %
@@ -732,7 +736,7 @@ xelatex mcmthesis-demo.tex
   \fi
   \newpage
   \ifMCM@opt@titlepage
-  \MCM@maketitle
+    \MCM@maketitle
   \fi
   \let\thepage\saved@thepage
   \setcounter{page}{0}
@@ -750,7 +754,6 @@ xelatex mcmthesis-demo.tex
     \textbf{\abstractname}
   \end{center}
   \@abstract\par
-  \let\@abstract\relax
 }
 %    \end{macrocode}
 %
@@ -761,7 +764,6 @@ xelatex mcmthesis-demo.tex
 \def\make@keywords{%
   \par\noindent\textbf{\keywordsname}:
   \@keywords\par
-  \let\@keywords\relax
 }
 %    \end{macrocode}
 %
@@ -775,7 +777,6 @@ xelatex mcmthesis-demo.tex
   \begin{center}
   \begingroup
   \setlength{\parindent}{0pt}
-  \fontfamily{fvs}\fontseries{m}\selectfont%
      \begin{minipage}{0.28\linewidth}
       For office use only\\[4pt]
       \makebox[0.15\linewidth][l]{T1}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
@@ -786,9 +787,9 @@ xelatex mcmthesis-demo.tex
      \begin{minipage}{0.44\linewidth}
       \centering
       Team Control Number\\[0.7pc]
-      {\LARGE\textbf{\textcolor{red}{\MCM@opt@tcn}}}\\[1.8pc]
+      {\LARGE\textbf{\MCM@opt@tcn}}\\[1.8pc]
       Problem Chosen\\[0.7pc]
-      {\Huge\textbf{\textcolor{red}{\MCM@opt@problem}}}
+      {\Huge\textbf{\MCM@opt@problem}}
      \end{minipage}%
      \begin{minipage}{0.28\linewidth}
       For office use only\\[4pt]
@@ -798,7 +799,6 @@ xelatex mcmthesis-demo.tex
       \makebox[0.15\linewidth][l]{F4}\rule[-2pt]{0.85\linewidth}{0.5pt}
      \end{minipage}\par
   \rule{\linewidth}{0.5pt}\par
-  \vskip 10pt%
   \textbf{{\Large\the\year}\\%
   Mathematical Contest in Modeling (MCM/ICM) Summary Sheet}%
   \par
@@ -834,8 +834,8 @@ xelatex mcmthesis-demo.tex
   \par
   \vskip 1.5em%
   \ifMCM@opt@abstract%
-  \make@abstract
-  \make@keywords
+    \make@abstract
+    \make@keywords
   \fi%
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls b/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
index bf1c9cb9310..79f1d2f9329 100644
--- a/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
+++ b/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
@@ -28,9 +28,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{mcmthesis}
-  [2015/02/07 v5.1.0e The Thesis Template Designed For MCM/ICM]
+  [2015/04/21 v5.1.0f The Thesis Template Designed For MCM/ICM]
 \typeout{The Thesis Template Designed For MCM/ICM}
-\def\MCMversion{v5.1.0e}
+\def\MCMversion{v5.1.0f}
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{family=MCM, prefix=MCM@opt@, setkeys=\kvsetkeys}
@@ -124,7 +124,7 @@
   \fi
   \newpage
   \ifMCM@opt@titlepage
-  \MCM@maketitle
+    \MCM@maketitle
   \fi
   \let\thepage\saved@thepage
   \setcounter{page}{0}
@@ -138,14 +138,12 @@
     \textbf{\abstractname}
   \end{center}
   \@abstract\par
-  \let\@abstract\relax
 }
 \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{%
@@ -155,7 +153,6 @@
   \begin{center}
   \begingroup
   \setlength{\parindent}{0pt}
-  \fontfamily{fvs}\fontseries{m}\selectfont%
      \begin{minipage}{0.28\linewidth}
       For office use only\\[4pt]
       \makebox[0.15\linewidth][l]{T1}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
@@ -166,9 +163,9 @@
      \begin{minipage}{0.44\linewidth}
       \centering
       Team Control Number\\[0.7pc]
-      {\LARGE\textbf{\textcolor{red}{\MCM@opt@tcn}}}\\[1.8pc]
+      {\LARGE\textbf{\MCM@opt@tcn}}\\[1.8pc]
       Problem Chosen\\[0.7pc]
-      {\Huge\textbf{\textcolor{red}{\MCM@opt@problem}}}
+      {\Huge\textbf{\MCM@opt@problem}}
      \end{minipage}%
      \begin{minipage}{0.28\linewidth}
       For office use only\\[4pt]
@@ -178,7 +175,6 @@
       \makebox[0.15\linewidth][l]{F4}\rule[-2pt]{0.85\linewidth}{0.5pt}
      \end{minipage}\par
   \rule{\linewidth}{0.5pt}\par
-  \vskip 10pt%
   \textbf{{\Large\the\year}\\%
   Mathematical Contest in Modeling (MCM/ICM) Summary Sheet}%
   \par
@@ -210,8 +206,8 @@
   \par
   \vskip 1.5em%
   \ifMCM@opt@abstract%
-  \make@abstract
-  \make@keywords
+    \make@abstract
+    \make@keywords
   \fi%
 }
 \newtheorem{Theorem}{Theorem}[section]