mcmthesis (23jan20)

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

1 files changed, 130 insertions, 60 deletions

diff --git a/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx b/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
index 46818c3671c..e23d77dcf0f 100644
--- a/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
+++ b/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
@@ -3,8 +3,9 @@
 % This is file `mcmthesis.dtx'.
 %
 % Copyright (C)
-%     2010 -- 2015    by Zhaoli Wang
-%     2014 -- present by Liam Huang
+%     2010 -- 2015 by Zhaoli Wang
+%     2014 -- 2019 by Liam Huang
+%     2019 -- present by latexstudio.net
 % -----------------------------------
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -35,8 +36,9 @@
 This is a generated file.
 
 Copyright (C)
-    2010 -- 2015    by Zhaoli Wang
-    2014 -- present by Liam Huang
+      2010 -- 2015 by Zhaoli Wang
+      2014 -- 2019 by Liam Huang
+      2019 -- present by latexstudio.net
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -102,7 +104,7 @@ and the derived files             \jobname.cls,
 %</internal>
 %<*driver>
 \ProvidesFile{mcmthesis.dtx}
-  [2019/01/26 v6.2.2 The Thesis Template Designed For MCM/ICM]
+  [2020/01/22 v6.3 The Thesis Template Designed For MCM/ICM]
 \documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
@@ -175,7 +177,7 @@ and the derived files             \jobname.cls,
 %   \makebox[0pt][l]{\hspace{1.5cm}\hyperlink{English}%
 %     {\large$ \to $ English Version}}
 % }
-% \author{王昭礼 \\ \texttt{343083553@qq.com}\and 黄晨成 \\ \texttt{liamhuang0205+\jobname@gmail.com}}
+% \author{\LaTeX Studio \\ \texttt{latexstudio.net}\and 黄晨成 \\ \texttt{liamhuang0205+\jobname@gmail.com}}
 % \date{\filedate}
 %
 % \maketitle
@@ -191,7 +193,8 @@ and the derived files             \jobname.cls,
 % 用 key-value 语法重构了文档选项，并修复了一些 bug。2015 年年初，黄晨成将模板使用
 % \pkg{DocStrip} 的语法重构，并上传至 CTAN。
 %
-% 详细的使用说明，可以参考\href{https://liam.page/2016/01/27/how-to-use-mcmthesis/}{这里}。
+% 详细的使用说明，可以参考\href{https://liam.page/2016/01/27/how-to-use-mcmthesis/}{这里}。我们也会持续维护更新在这里，
+% 大家可以到这里下载 \url{https://www.latexstudio.net}。
 %
 % \section{手工安装说明}
 %
@@ -201,7 +204,8 @@ and the derived files             \jobname.cls,
 %
 % \begin{description}
 %   \item [CTAN] \url{http://www.ctan.org/pkg/mcmthesis}
-%   \item [GitHub] \url{https://github.com/Liam0205/mcmthesis}
+%   \item [GitHub] \url{https://github.com/latexstudio-org/mcmthesis}
+%   \item [\LaTeX Studio] \url{https://www.latexstudio.net}
 % \end{description}
 %
 % 此外，文档类也已上传至 CTAN，你可以在 \TeX{} Live 等发行版的宏包管理器中下载。
@@ -393,6 +397,7 @@ xelatex mcmthesis-demo.tex
 %   \item [6.1] 修复问题。
 %   \item [6.2] 可定制的 headset。
 %   \item [6.2.1] 将默认字号由 |11pt| 修改为 |12pt|。
+%   \item [6.3] 修改summary的版面样式。
 % \end{description}
 %
 % \title{\hypertarget{English}{%
@@ -400,7 +405,7 @@ xelatex mcmthesis-demo.tex
 %   corresponds to \textsf{\jobname}~\fileversion, dated \filedate.}}%
 %   \makebox[0pt][l]{\hspace{1.5cm}\hyperlink{Chinese}{\large$ \to $ 中文版}}
 % }
-% \author{Zhaoli Wang \\ \texttt{\texttt{343083553@qq.com}}\and Liam Huang \\ \texttt{liamhuang0205+\jobname@gmail.com}}
+% \author{\LaTeX{}Studio\\ \texttt{\texttt{latexstudio@qq.com}}\and Liam Huang \\ \texttt{liamhuang0205+\jobname@gmail.com}}
 % \date{\filedate}
 %
 % \maketitle
@@ -430,7 +435,8 @@ xelatex mcmthesis-demo.tex
 %
 % \begin{description}
 %   \item [CTAN] \url{http://www.ctan.org/pkg/mcmthesis}
-%   \item [GitHub] \url{https://github.com/Liam0205/mcmthesis}
+%   \item [GitHub] \url{https://github.com/latexstudio-org/mcmthesis}
+%   \item [\LaTeX Studio] \url{https://www.latexstudio.net}
 % \end{description}
 %
 % Moreover, this template had been uploaded to CTAN, so that it could
@@ -626,6 +632,7 @@ xelatex mcmthesis-demo.tex
 %   \item [6.1] Bugfix.
 %   \item [6.2] Making headset of the Summary Sheet modifible.
 %   \item [6.2.1] Change default fontsize, from |11pt| to |12pt|.
+%   \item [6.3] Change summary sheet layout and demo code.
 % \end{description}
 %
 % \StopEventually{}
@@ -635,9 +642,9 @@ xelatex mcmthesis-demo.tex
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{mcmthesis}
-  [2019/01/26 v6.2.2 The Thesis Template Designed For MCM/ICM]
+  [2020/01/18 v6.3 The Thesis Template Designed For MCM/ICM]
 \typeout{The Thesis Template Designed For MCM/ICM}
-\def\MCMversion{v6.2.2}
+\def\MCMversion{v6.3}
 %    \end{macrocode}
 % \subsection{Options}
 %
@@ -735,7 +742,7 @@ xelatex mcmthesis-demo.tex
     \RequirePackage{bmpsize}
   \fi
 \fi
-\RequirePackage{xcolor}
+\RequirePackage[svgnames]{xcolor}
 %    \end{macrocode}
 % \subsection{\pkg{hyperref} Settings}
 %    \begin{macrocode}
@@ -752,7 +759,7 @@ xelatex mcmthesis-demo.tex
 % \subsection{Page Layout}
 % Setting paper size and margin sep.
 %    \begin{macrocode}
-\geometry{a4paper, margin = 1.2in}
+\geometry{a4paper, margin = 1in}
 %    \end{macrocode}
 %
 % Making the footer and header.
@@ -853,6 +860,14 @@ xelatex mcmthesis-demo.tex
     \@abstract\par
   }
 \fi
+\newenvironment{letter}[1]{%
+      \par%
+      \bgroup\parindent0pt%
+      \begin{minipage}{5cm}
+      \flushleft #1%
+      \end{minipage}}
+      {\egroup\smallskip}
+
 %    \end{macrocode}
 %
 % Making the \env{keywords} environment.
@@ -878,7 +893,7 @@ xelatex mcmthesis-demo.tex
 % \begin{macro}{\headset}
 %
 %    \begin{macrocode}
-\newcommand{\headset}{{\Large\the\year}\\MCM/ICM\\Summary Sheet}
+\newcommand{\headset}{{\the\year}\\MCM/ICM\\Summary Sheet}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -892,30 +907,21 @@ xelatex mcmthesis-demo.tex
   \begin{center}
   \begingroup
   \setlength{\parindent}{0pt}
-     \begin{minipage}{0.28\linewidth}
-      For office use only\\[4pt]
-      \makebox[0.15\linewidth][l]{T1}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
-      \makebox[0.15\linewidth][l]{T2}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
-      \makebox[0.15\linewidth][l]{T3}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
-      \makebox[0.15\linewidth][l]{T4}\rule[-2pt]{0.85\linewidth}{0.5pt}
-     \end{minipage}%
-     \begin{minipage}{0.44\linewidth}
-      \centering
-      Team Control Number\\[0.7pc]
-      {\Huge\textbf{\MCM@opt@tcn}}\\[1.8pc]
+     \begin{minipage}[t]{0.33\linewidth}
+     \bfseries\centering%
       Problem Chosen\\[0.7pc]
-      {\Huge\textbf{\MCM@opt@problem}}
+      {\Huge\textbf{\MCM@opt@problem}}\\[2.8pc]
      \end{minipage}%
-     \begin{minipage}{0.28\linewidth}
-      For office use only\\[4pt]
-      \makebox[0.15\linewidth][l]{F1}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
-      \makebox[0.15\linewidth][l]{F2}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
-      \makebox[0.15\linewidth][l]{F3}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
-      \makebox[0.15\linewidth][l]{F4}\rule[-2pt]{0.85\linewidth}{0.5pt}
+     \begin{minipage}[t]{0.33\linewidth}
+      \centering%
+      \textbf{\headset}%
+     \end{minipage}%
+     \begin{minipage}[t]{0.33\linewidth}
+      \centering\bfseries%
+       Team Control Number\\[0.7pc]
+      {\Huge\textbf{\MCM@opt@tcn}}\\[2.8pc]
      \end{minipage}\par
-  \rule{\linewidth}{0.5pt}\par
-  \textbf{\headset}%
-  \par
+  \rule{\linewidth}{0.8pt}\par
   \endgroup
   \vskip 10pt%
   \ifMCM@opt@titleinsheet
@@ -1017,6 +1023,26 @@ xelatex mcmthesis-demo.tex
 \newtheorem{Example}[Theorem]{Example}
 %    \end{macrocode}
 %
+% define the section fonts and spaces.
+%    \begin{macrocode}
+\renewcommand\section{\@startsection{section}{1}{\z@}%
+  {-0pt\@plus -.2ex \@minus -.2ex}%
+  {1pt \@plus .2ex}%
+  {\rmfamily\Large\bfseries}}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+  {-0pt\@plus -.2ex \@minus -.2ex}%
+  {1pt \@plus .2ex}%
+  {\rmfamily\large\bfseries}}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+  {-.5ex\@plus -1ex \@minus -.2ex}%
+  {.25ex \@plus .2ex}%
+  {\rmfamily\normalsize\bfseries}}
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+  {1ex \@plus1ex \@minus.2ex}%
+  {-1em}%
+  {\rmfamily\normalsize}}
+%    \end{macrocode}
+
 % Other definitions.
 %    \begin{macrocode}
 \providecommand{\dif}{\mathop{}\!\mathrm{d}}
@@ -1025,6 +1051,8 @@ xelatex mcmthesis-demo.tex
 %    \end{macrocode}
 % \subsection{Listing Settings}
 %    \begin{macrocode}
+
+
 \definecolor{grey}{rgb}{0.8,0.8,0.8}
 \definecolor{darkgreen}{rgb}{0,0.3,0}
 \definecolor{darkblue}{rgb}{0,0,0.3}
@@ -1053,13 +1081,42 @@ xelatex mcmthesis-demo.tex
 %    \end{macrocode}
 % \iffalse
 %<*demo>
-%!TEX program = xelatex
+%!TEX program = pdflatex|xelatex
+%%
+%% This is file `mcmthesis-demo.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% mcmthesis.dtx  (with options: `demo')
+%%
+%% -----------------------------------
+%%
+%% This is a generated file.
+%%
+%% Copyright (C)
+%%       2010 -- 2015 by Zhaoli Wang
+%%       2014 -- 2019 by Liam Huang
+%%       2019 -- present by latexstudio.net
+%%
+%% 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 later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Liam Huang.
+%%
 \documentclass{mcmthesis}
 \mcmsetup{CTeX = false,   % 使用 CTeX 套装时，设置为 true
         tcn = 0000, problem = A,
         sheet = true, titleinsheet = true, keywordsinsheet = true,
         titlepage = true, abstract = true}
-\usepackage{palatino}
+\usepackage{newtxtext}%\usepackage{palatino}
 \usepackage{lipsum}
 \title{The \LaTeX{} Template for MCM Version \MCMversion}
 \author{\small \href{http://www.latexstudio.net/}
@@ -1088,20 +1145,23 @@ keyword1; keyword2
 %% \end{memo}
 %%
 \section{Introduction}
+\subsection{What's this all about? What's \LaTeX?}
+\LaTeX\ is a document preparation system which uses the \TeX\
+typesetting program. It enables you to produce
+publication-quality documents with great accuracy and
+consistency. \LaTeX\ works on any computer and produces
+industry-standard PDF. It is available both in free (open-source)
+and commercial implementations. \LaTeX\ can be used for any kind
+of document, but it is especially suited to those with complex
+structures, repetitive formatting, or notations like
+mathematics. Install the software from
+\url{www.tug.org/texlive/} or \url{https://www.latexstudio.net/archives/texsoftware}
+.
+\subsection{Creating and typesetting your document}
 
-\lipsum[2]
-\begin{itemize}
-\item minimizes the discomfort to the hands, or
-\item maximizes the outgoing velocity of the ball.
-\end{itemize}
-We focus exclusively on the second definition.
+\subsection{Syntax (how to type \LaTeX\ commands --- these
+  are the rules)}
 
-\begin{itemize}
-\item the initial velocity and rotation of the ball,
-\item the initial velocity and rotation of the bat,
-\item the relative position and orientation of the bat and ball, and
-\item the force over time that the hitter hands applies on the handle.
-\end{itemize}
 \lipsum[3]
 \begin{itemize}
 \item the angular velocity of the bat,
@@ -1136,8 +1196,8 @@ The proof of theorem.
 \begin{figure}[h]
 \small
 \centering
-\includegraphics[width=12cm]{mcmthesis-aaa.eps}
-\caption{aa} \label{fig:aa}
+\includegraphics[width=8cm]{example-image-a}
+\caption{The name of figure} \label{fig:aa}
 \end{figure}
 
 \lipsum[8] \eqref{aa}
@@ -1145,7 +1205,6 @@ The proof of theorem.
 a^2 \label{aa}
 \end{equation}
 
-
 \[
   \begin{pmatrix}{*{20}c}
   {a_{11} } & {a_{12} } & {a_{13} }  \\
@@ -1206,7 +1265,6 @@ human resources for the airline. \item \textbf{}
 \end{itemize}
 
 \begin{thebibliography}{99}
-%\addcontentsline{toc}{section}{References}
 \bibitem{1} D.~E. KNUTH   The \TeX{}book  the American
 Mathematical Society and Addison-Wesley
 Publishing Company , 1984-1986.
@@ -1220,8 +1278,21 @@ Addison-Wesley Publishing Company, 1986.
 
 \section{First appendix}
 
-\lipsum[13]
+In addition, your report must include a letter to the Chief Financial Officer (CFO) of the Goodgrant Foundation, Mr. Alpha Chiang, that describes the optimal investment strategy, your modeling approach and major results, and a brief discussion of your proposed concept of a return-on-investment (ROI). This letter should be no more than two pages in length.
 
+
+\begin{letter}{Dear, Mr. Alpha Chiang}
+
+\lipsum[1-2]
+
+
+\vspace{\parskip}
+
+Sincerely yours,
+
+Your friends
+
+\end{letter}
 Here are simulation programmes we used in our model as follow.\\
 
 \textbf{\textcolor[rgb]{0.98,0.00,0.00}{Input matlab source:}}
@@ -1234,7 +1305,6 @@ some more text \textcolor[rgb]{0.98,0.00,0.00}{\textbf{Input C++ source:}}
 
 \end{appendices}
 \end{document}
-
 %</demo>
 %<*readme>
 # The `mcmthesis` Class
@@ -1270,16 +1340,16 @@ To install this class, you should
 
 ## Authors
 
-* [Zhaoli Wang][zhaoli]: 343083553@qq.com
+* [latexstudio][latexstudio]: latexstudio@qq.com
 * [Liam Huang][liam-ctan]: liamhuang0205+mcmthesis@gmail.com
 
 ## Project Page
 
 If you are interested in the process of development you may observe
 
-<https://github.com/Liam0205/mcmthesis>
+<https://github.com/latexstudio-org/mcmthesis>
 
-[zhaoli]: http://www.latexstudio.net/
+[latexstudio]: http://www.latexstudio.net/
 [liam-ctan]: http://www.ctan.org/author/huang-l
 %</readme>
 %<*license>
@@ -1287,7 +1357,7 @@ Released under the [LaTeX Project Public License]
 (http://www.latex-project.org/lppl.txt), v1.3c or later.
 
 The package has status 'maintained': the current maintainer is
-[Liam Huang](liamhuang0205+mcmthesis@gmail.com).
+[latexstudio](latexstudio@qq.com).
 %</license>
 % \fi
 % \Finale