mcmthesis (20jan24)

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

1 files changed, 42 insertions, 31 deletions

diff --git a/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx b/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
index 83b3cbae275..048757784b4 100644
--- a/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
+++ b/Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx
@@ -3,7 +3,7 @@
 % This is file `mcmthesis.dtx'.
 %
 % Copyright (C)
-%     2010 -- 2015 by Zhaoli Wang
+%     2010 -- 2015 by latexstudio
 %     2014 -- 2019 by Liam Huang
 %     2019 -- present by latexstudio.net
 % -----------------------------------
@@ -36,7 +36,7 @@
 This is a generated file.
 
 Copyright (C)
-      2010 -- 2015 by Zhaoli Wang
+      2010 -- 2015 by latexstudio
       2014 -- 2019 by Liam Huang
       2019 -- present by latexstudio.net
 
@@ -104,15 +104,14 @@ and the derived files             \jobname.cls,
 %</internal>
 %<*driver>
 \ProvidesFile{mcmthesis.dtx}
-  [2021/01/05 v6.3.1 The Thesis Template Designed For MCM/ICM]
+  [2024/01/15 v6.3.2 The Thesis Template Designed For MCM/ICM]
 \documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
-\usepackage[UTF8, fntef, hyperref]{ctexcap}
+\usepackage[UTF8, fntef]{ctexcap}
 \usepackage{hologo}
-\usepackage{xcolor}
-\usepackage{tabu}
+\usepackage{xcolor} 
 \usepackage{longtable}
 \usepackage{booktabs}
 \usepackage{listings}
@@ -140,6 +139,7 @@ and the derived files             \jobname.cls,
 \newcommand{\file}[1]{\textsf{#1}}
 \newcommand{\path}[1]{\textsf{#1}}
 \newcommand{\mopt}{\textsf}
+\usepackage{hyperref}
 \begin{document}
   \DocInput{\jobname.dtx}
 \end{document}
@@ -164,7 +164,7 @@ and the derived files             \jobname.cls,
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \changes{v6.3.1}{2021/01/05}{更新版面尺寸，细节格式。}
+% \changes{v6.3.2}{2024/01/19}{更新版面尺寸，细节格式。}
 %
 % \GetFileInfo{\jobname.dtx}
 %
@@ -189,7 +189,7 @@ and the derived files             \jobname.cls,
 %
 % \section{模板介绍}
 %
-% 这份模板最早由王昭礼设计，并在往年参赛者的建议下不断改进。2014 年年初，黄晨成接手模板，
+% 这份模板最早由 latexstudio 设计，并在往年参赛者的建议下不断改进。2014 年年初，黄晨成接手模板，
 % 用 key-value 语法重构了文档选项，并修复了一些 bug。2015 年年初，黄晨成将模板使用
 % \pkg{DocStrip} 的语法重构，并上传至 CTAN。
 %
@@ -242,7 +242,7 @@ xelatex mcmthesis-demo.tex
 % \subsection{依赖}
 % \pkg{mcmthesis} 依赖于以下宏包，这些宏包在常见的 \TeX{} 发行版中都已包含，
 % 在安装使用之前，请确认你的 \TeX{} 发行版中正确安装了这些宏包。
-% \begin{longtabu}{cccc}
+% \begin{longtable}{cccc}
 %   \toprule
 %   \pkg{xkeyval} & \pkg{etoolbox} & \pkg{fancyhdr} & \pkg{fancybox} \\
 %   \pkg{ifthen} & \pkg{lastpage} & \pkg{listings} & \pkg{appendix} \\
@@ -257,7 +257,7 @@ xelatex mcmthesis-demo.tex
 %   \pkg{graphicx} & \pkg{epstopdf} & \pkg{bmpsize} & \pkg{xcolor}\\
 %   \pkg{longtable} & \pkg{tabu} & \pkg{hologo} & \pkg{palatino}\\
 %   \bottomrule
-% \end{longtabu}
+% \end{longtable}
 % 如果你尚未安装这些宏包，可以启动你的 \TeX{} 发行版的宏包管理器
 % 来安装；或者到 \url{http://www.ctan.org} 上搜索下载并安装。
 %
@@ -280,6 +280,7 @@ xelatex mcmthesis-demo.tex
 % \fi
 \begin{lstlisting}[language={[LaTeX]TeX}]
 \documentclass{mcmthesis}
+%\documentclass[CTeX = true]{mcmthesis}  % 当使用 CTeX 套装时使用该行设置
 \mcmsetup{tcn = 12345, problem = B, titlepage = false}
 \end{lstlisting}
 % \iffalse
@@ -399,6 +400,7 @@ xelatex mcmthesis-demo.tex
 %   \item [6.2.1] 将默认字号由 |11pt| 修改为 |12pt|。
 %   \item [6.3] 修改summary的版面样式。
 %   \item [6.3.1] 将默认的版面尺寸由 |a4paper| 修改为 |letterpaper|。
+%   \item [6.3.2] 修复了一些版式异常和兼容性问题。
 % \end{description}
 %
 % \title{\hypertarget{English}{%
@@ -420,7 +422,7 @@ xelatex mcmthesis-demo.tex
 %
 % \section{Introduction}
 %
-% This template was designed by Zhaoli Wang first, and was improved by him
+% This template was designed by latexstudio first, and was improved by him
 % following the suggestions from contest takers. In the beginning of the year
 % 2014, Liam Huang redesigned it, by using key-value syntax, and fixed known
 % bugs. Liam reimplemented it at the begining of the year 2015,
@@ -481,7 +483,7 @@ xelatex mcmthesis-demo.tex
 % These packages has been installed in common \TeX{} distribution.
 % Before installation, please make sure that you have installed these
 % packages correctly.
-% \begin{longtabu}{cccc}
+% \begin{longtable}{cccc}
 %   \toprule
 %   \pkg{xkeyval} & \pkg{etoolbox} & \pkg{fancyhdr} & \pkg{fancybox} \\
 %   \pkg{ifthen} & \pkg{lastpage} & \pkg{listings} & \pkg{appendix} \\
@@ -496,7 +498,7 @@ xelatex mcmthesis-demo.tex
 %   \pkg{graphicx} & \pkg{epstopdf} & \pkg{bmpsize} & \pkg{xcolor}\\
 %   \pkg{longtable} & \pkg{tabu} & \pkg{hologo} & \pkg{palatino}\\
 %   \bottomrule
-% \end{longtabu}
+% \end{longtable}
 % If you haven't install these packages, you could execute the package
 % manager of your distribution and install them; you could also download
 % them from \url{http://www.ctan.org}.
@@ -519,7 +521,7 @@ xelatex mcmthesis-demo.tex
 %<*internal>
 % \fi
 \begin{lstlisting}[language={[LaTeX]TeX}]
-\documentclass{mcmthesis}
+\documentclass{mcmthesis} 
 \mcmsetup{tcn = 12345, problem = B, titlepage = false}
 \end{lstlisting}
 % \iffalse
@@ -635,6 +637,7 @@ xelatex mcmthesis-demo.tex
 %   \item [6.2.1] Change default fontsize, from |11pt| to |12pt|.
 %   \item [6.3] Change summary sheet layout and demo code.
 %   \item [6.3.1] Change the default papersize, frome |a4paper| to |letterpaper|.
+%   \item [6.3.2] fixed some bugs and ctex compatibility.
 % \end{description}
 %
 % \StopEventually{}
@@ -644,9 +647,9 @@ xelatex mcmthesis-demo.tex
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{mcmthesis}
-  [2021/01/05 v6.3.1 The Thesis Template Designed For MCM/ICM]
+  [2024/01/19 v6.3.2 The Thesis Template Designed For MCM/ICM]
 \typeout{The Thesis Template Designed For MCM/ICM}
-\def\MCMversion{v6.3.1}
+\def\MCMversion{v6.3.2}
 %    \end{macrocode}
 % \subsection{Options}
 %
@@ -823,19 +826,18 @@ xelatex mcmthesis-demo.tex
 % sheet and titlepage should be printed.
 %    \begin{macrocode}
 \def\maketitle{%
-  \let\saved@thepage\thepage
-  \let\thepage\relax
+  %\let\saved@thepage\thepage
+  %\let\thepage\relax
   \ifMCM@opt@sheet
   \makesheet
   \fi
   \newpage
+  \setcounter{page}{1}
+  \pagestyle{fancy}
   \ifMCM@opt@titlepage
     \MCM@maketitle
   \fi
   \newpage
-  \let\thepage\saved@thepage
-  \setcounter{page}{1}
-  \pagestyle{fancy}
 }
 %    \end{macrocode}
 %
@@ -903,7 +905,7 @@ xelatex mcmthesis-demo.tex
 %    \begin{macrocode}
 \newcommand{\problem}[1]{\mcmsetup{problem = #1}}
 \def\makesheet{%
-  \pagestyle{empty}%
+  \thispagestyle{empty}%
   \null%
   \vspace*{-5pc}%
   \begin{center}
@@ -912,7 +914,7 @@ xelatex mcmthesis-demo.tex
      \begin{minipage}[t]{0.33\linewidth}
       \centering%
       \textbf{Problem Chosen}\\[0.7pc]
-      {\fontsize{20pt}{\baselineskip}\selectfont{\MCM@opt@problem}}\\[2.8pc]
+      {\Large\textcolor{red}{\MCM@opt@problem}}\\[2.8pc]
      \end{minipage}%
      \begin{minipage}[t]{0.33\linewidth}
       \centering%
@@ -921,7 +923,7 @@ xelatex mcmthesis-demo.tex
      \begin{minipage}[t]{0.33\linewidth}
       \centering%
       \textbf{Team Control Number}\\[0.7pc]
-      {\fontsize{20pt}{\baselineskip}\selectfont{\MCM@opt@tcn}}\\[2.8pc]
+      {\Large\textcolor{red}{\MCM@opt@tcn}}\\[2.8pc]
      \end{minipage}\par
   \rule{\linewidth}{1.5pt} 
   \endgroup
@@ -941,8 +943,11 @@ xelatex mcmthesis-demo.tex
 % Defining the \cs{MCM@maketitle}
 %    \begin{macrocode}
 \newcommand{\MCM@maketitle}{%
+  %\let\thepage\saved@thepage
+  %\setcounter{page}{1}
   \begin{center}%
-  \let \footnote \thanks
+  \let \footnote \thanks%
+  \pagestyle{fancy}%
     {\LARGE \@title \par}%
     \vskip 1.5em%
     {\large
@@ -983,7 +988,7 @@ xelatex mcmthesis-demo.tex
 % Now, we could define the |memo| environment.
 %    \begin{macrocode}
 \newenvironment{memo}[1][Memorandum]{%
-  \pagestyle{plain}%
+  \pagestyle{fancy}%
   \ifthenelse{\equal{\MCM@memologo}{\relax}}{%
     % without logo specified.
   }{%
@@ -1097,7 +1102,7 @@ xelatex mcmthesis-demo.tex
 %% This is a generated file.
 %%
 %% Copyright (C)
-%%       2010 -- 2015 by Zhaoli Wang
+%%       2010 -- 2015 by latexstudio
 %%       2014 -- 2019 by Liam Huang
 %%       2019 -- present by latexstudio.net
 %%
@@ -1111,14 +1116,20 @@ xelatex mcmthesis-demo.tex
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Liam Huang.
+%% The Current Maintainer of this work is latexstudio.net.
 %%
 \documentclass{mcmthesis}
-\mcmsetup{CTeX = false,   % 使用 CTeX 套装时，设置为 true
+ %\documentclass[CTeX = true]{mcmthesis}  % 当使用 CTeX 套装时请注释上一行使用该行的设置
+\mcmsetup{
         tcn = 0000, problem = A,
         sheet = true, titleinsheet = true, keywordsinsheet = true,
-        titlepage = true, abstract = true}
-\usepackage{newtxtext}%\usepackage{palatino}
+        titlepage = false, abstract = true}
+
+ %三款字体可以选择
+\usepackage{times}
+ %\usepackage{newtxtext}
+ %\usepackage{palatino}
+
 \usepackage{lipsum}
 \title{The \LaTeX{} Template for MCM Version \MCMversion}
 \author{\small \href{https://www.latexstudio.net/}