summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-20 21:08:16 +0000
committerKarl Berry <karl@freefriends.org>2024-01-20 21:08:16 +0000
commitc349b6556099d91a2dee04b7efb5573e54ac6629 (patch)
tree01eafb18c3a190f80efba120d2da1d9968e78b22
parenta8c780c3a68a007f347bab71ff7f0d22a59e9fee (diff)
mcmthesis (20jan24)
git-svn-id: svn://tug.org/texlive/trunk@69509 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/mcmthesis/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/mcmthesis/README.md20
-rw-r--r--Master/texmf-dist/doc/latex/mcmthesis/code/mcmthesis-sudoku.cpp2
-rw-r--r--Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdfbin294120 -> 176282 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.tex18
-rw-r--r--Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdfbin187437 -> 208261 bytes
-rw-r--r--Master/texmf-dist/source/latex/mcmthesis/mcmthesis.dtx73
-rw-r--r--Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls28
8 files changed, 74 insertions, 69 deletions
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/LICENSE b/Master/texmf-dist/doc/latex/mcmthesis/LICENSE
index 5022b3e860a..d6bcbd34ae9 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/LICENSE
+++ b/Master/texmf-dist/doc/latex/mcmthesis/LICENSE
@@ -2,4 +2,4 @@ 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).
+[latexstudi](latexstudio@qq.com).
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/README.md b/Master/texmf-dist/doc/latex/mcmthesis/README.md
index 6d021b4fb9f..634ff30bcc4 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/README.md
+++ b/Master/texmf-dist/doc/latex/mcmthesis/README.md
@@ -1,19 +1,5 @@
-# 美国数学建模 LaTeX 模板
-
-不少用户直接 clone 或者下载我们的库文件, 使用之前请认真阅读说明文档 mcmthesis.pdf 内容.
-
-一, 如果你要获取示例代码, 请执行 `xetex mcmthesis.dtx` 自动解包出来代码.
-
-二, 如果你想直接获取例子代码. 可以到 [release页面](https://github.com/latexstudio-org/mcmthesis/releases) 获取 mcmthesis-demo.zip 文件即可.
-
-
-针对美国建模, 这里做了视频说明: [2020 美国数学建模 LaTeX 模板更新说明](https://www.bilibili.com/video/av85259525)
-
-
-我们整理了学习资料包, 关注如下公众号回复: **建模2020** 即可获取.
-
-<img src="https://pics.latexstudio.net/wp-content/themes/dux/img/gongzhonghao5.jpg" alt="" width="350px">
-
+# The `mcmthesis` Class
+
This class is designed for the MCM/ICM.
This work is released under the [LaTeX Project Public
@@ -45,7 +31,7 @@ To install this class, you should
## Authors
-* [latexstudio][latexstudio]: 343083553@qq.com
+* [latexstudio][latexstudio]: latexstudio@qq.com
* [Liam Huang][liam-ctan]: liamhuang0205+mcmthesis@gmail.com
## Project Page
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/code/mcmthesis-sudoku.cpp b/Master/texmf-dist/doc/latex/mcmthesis/code/mcmthesis-sudoku.cpp
index 74cbb408572..70df271e20a 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/code/mcmthesis-sudoku.cpp
+++ b/Master/texmf-dist/doc/latex/mcmthesis/code/mcmthesis-sudoku.cpp
@@ -1,6 +1,6 @@
//============================================================================
// Name : Sudoku.cpp
-// Author : wzlf11
+// Author : lst
// Version : a.0
// Copyright : Your copyright notice
// Description : Sudoku in C++.
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf
index 1446f01d373..853b9490691 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf
+++ b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.tex b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.tex
index d65ae95cf4a..f3fc4173e7b 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.tex
+++ b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis-demo.tex
@@ -11,7 +11,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
%%
@@ -40,7 +40,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
%%
@@ -54,14 +54,20 @@
%%
%% 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, % ^^e4^^bd^^bf^^e7^^94^^a8 CTeX ^^e5^^a5^^97^^e8^^a3^^85^^e6^^97^^b6^^ef^^bc^^8c^^e8^^ae^^be^^e7^^bd^^ae^^e4^^b8^^ba true
+ %\documentclass[CTeX = true]{mcmthesis} % ^^e5^^bd^^93^^e4^^bd^^bf^^e7^^94^^a8 CTeX ^^e5^^a5^^97^^e8^^a3^^85^^e6^^97^^b6^^e8^^af^^b7^^e6^^b3^^a8^^e9^^87^^8a^^e4^^b8^^8a^^e4^^b8^^80^^e8^^a1^^8c^^e4^^bd^^bf^^e7^^94^^a8^^e8^^af^^a5^^e8^^a1^^8c^^e7^^9a^^84^^e8^^ae^^be^^e7^^bd^^ae
+\mcmsetup{
tcn = 0000, problem = A,
sheet = true, titleinsheet = true, keywordsinsheet = true,
- titlepage = true, abstract = true}
-\usepackage{newtxtext}%\usepackage{palatino}
+ titlepage = false, abstract = true}
+
+ %^^e4^^b8^^89^^e6^^ac^^be^^e5^^ad^^97^^e4^^bd^^93^^e5^^8f^^af^^e4^^bb^^a5^^e9^^80^^89^^e6^^8b^^a9
+\usepackage{times}
+ %\usepackage{newtxtext}
+ %\usepackage{palatino}
+
\usepackage{lipsum}
\title{The \LaTeX{} Template for MCM Version \MCMversion}
\author{\small \href{https://www.latexstudio.net/}
diff --git a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf
index cc44fda3251..a225536e455 100644
--- a/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf
+++ b/Master/texmf-dist/doc/latex/mcmthesis/mcmthesis.pdf
Binary files differ
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/}
diff --git a/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls b/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
index f18a7a69204..6cf5f3220f6 100644
--- a/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
+++ b/Master/texmf-dist/tex/latex/mcmthesis/mcmthesis.cls
@@ -11,7 +11,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
%%
@@ -29,9 +29,9 @@
%%
\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}
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\define@boolkey{MCM}[MCM@opt@]{CTeX}[false]{}
@@ -130,19 +130,18 @@
\graphicspath{{./}{./img/}{./fig/}{./image/}{./figure/}{./picture/}
{./imgs/}{./figs/}{./images/}{./figures/}{./pictures/}}
\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}
}
\def\abstractname{Summary}
\ifMCM@opt@CTeX
@@ -192,7 +191,7 @@
\newcommand{\headset}{{\the\year}\\MCM/ICM\\Summary Sheet}
\newcommand{\problem}[1]{\mcmsetup{problem = #1}}
\def\makesheet{%
- \pagestyle{empty}%
+ \thispagestyle{empty}%
\null%
\vspace*{-5pc}%
\begin{center}
@@ -201,7 +200,7 @@
\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%
@@ -210,7 +209,7 @@
\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
@@ -226,8 +225,11 @@
\make@abstract
\fi}
\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
@@ -258,7 +260,7 @@
\def\@letterheadaddress{\relax}
\newcommand{\lhaddress}[1]{\gdef\@letterheadaddress{#1}}
\newenvironment{memo}[1][Memorandum]{%
- \pagestyle{plain}%
+ \pagestyle{fancy}%
\ifthenelse{\equal{\MCM@memologo}{\relax}}{%
% without logo specified.
}{%