summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-25 21:03:25 +0000
committerKarl Berry <karl@freefriends.org>2020-09-25 21:03:25 +0000
commit50859156930dc3bdb992419a66d208e078f1b602 (patch)
treee0b4c49f56ea819a75f243d29a19d1864a96aa41
parent24bd07691b3bb714be21c38c94767ab430886b29 (diff)
thucoursework (25sep20)
git-svn-id: svn://tug.org/texlive/trunk@56435 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/thucoursework/thucoursework.pdfbin224213 -> 242755 bytes
-rw-r--r--Master/texmf-dist/source/latex/thucoursework/thucoursework.dtx18
-rw-r--r--Master/texmf-dist/tex/latex/thucoursework/iidef.sty9
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
4 files changed, 20 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/thucoursework/thucoursework.pdf b/Master/texmf-dist/doc/latex/thucoursework/thucoursework.pdf
index ea6c3ddde00..5eacb1b5fe2 100644
--- a/Master/texmf-dist/doc/latex/thucoursework/thucoursework.pdf
+++ b/Master/texmf-dist/doc/latex/thucoursework/thucoursework.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/thucoursework/thucoursework.dtx b/Master/texmf-dist/source/latex/thucoursework/thucoursework.dtx
index 7aa62a8bf5f..2ba0a5433e6 100644
--- a/Master/texmf-dist/source/latex/thucoursework/thucoursework.dtx
+++ b/Master/texmf-dist/source/latex/thucoursework/thucoursework.dtx
@@ -56,7 +56,7 @@ through LaTeX.
\endgroup
%</internal>
%<*driver>
-\ProvidesFile{thucoursework.dtx}[2020/02/23 2.5.1 Tsinghua University Coursework Template]
+\ProvidesFile{thucoursework.dtx}[2020/09/09 2.6 Tsinghua University Coursework Template]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -247,8 +247,8 @@ through LaTeX.
% 按照优先级推荐提问的位置如下:
%
% \begin{itemize}
-% \item \href{http://github.com/zhaofeng-shu33/thucoursework/issues}{Github Issues}
-% \item \href{http://bbs.ctex.org/nForum/#!board/TeX}{ctex 论坛}
+% \item \href{https://github.com/zhaofeng-shu33/thucoursework/issues}{Github Issues}
+% \item \href{https://github.com/CTeX-org/forum/issues}{ctex 论坛}
% \end{itemize}
%
% \subsection{示例文件}
@@ -396,17 +396,18 @@ through LaTeX.
% \section{实现细节}
%
% \subsection{基本信息}
-% \begin{macrocode}
% \changes{v2.0}{2018/03/22}{[\zhaofeng] Make it a latex package(.sty)}
+% \begin{macrocode}
%<*sty>
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{iidef}
-[2020/02/23 2.5.1 Tsinghua University Coursework Template]
+[2020/09/09 2.6 Tsinghua University Coursework Template]
% \end{macrocode}
% \subsection{装载宏包}
% \label{sec:loadpackage}
%
% 引用的宏包和相应的定义。
+% \changes{v2.6}{2020/09/09}{[\zhaofeng] support \texttt{exam} document class}
% \begin{macrocode}
%% configuration of nested enumerate env
\RequirePackage{enumitem}
@@ -415,7 +416,8 @@ through LaTeX.
%% required by macro DeclareMathOperator
\RequirePackage{amsmath}
%% Set up page headers using with fancyhdr
-\RequirePackage{fancyhdr}
+\@ifundefined{lhead}{\RequirePackage{fancyhdr}}
+{\def\@thulhead{thulhead}}
%define the solution env with amsthm proof
\RequirePackage{amsthm}
% \end{macrocode}
@@ -465,6 +467,7 @@ through LaTeX.
\underline{\bf \@hwname\;\thehwcnt} \\
\end{center}
}
+\@ifundefined{@thulhead}{
\fancypagestyle{runningpage}
{
\fancyhead[L]{\small\@coursename}
@@ -472,6 +475,7 @@ through LaTeX.
}
%% use runningpage style from second page on
\pagestyle{runningpage}
+}{}
%% *********************************************************************************************
% \end{macrocode}
%
@@ -509,6 +513,7 @@ through LaTeX.
\def\@slname{Solution}
\def\slname#1{\renewcommand\@slname{#1}}
+\@ifundefined{solution}{
\newenvironment{solution}
{
\proof[\@slname]
@@ -518,6 +523,7 @@ through LaTeX.
\renewcommand{\qedsymbol}{}
\endproof
}
+}{}
%%******************************
% \end{macrocode}
% \subsection{常用数学符号}
diff --git a/Master/texmf-dist/tex/latex/thucoursework/iidef.sty b/Master/texmf-dist/tex/latex/thucoursework/iidef.sty
index 2c1aea9b79d..4772cca36a1 100644
--- a/Master/texmf-dist/tex/latex/thucoursework/iidef.sty
+++ b/Master/texmf-dist/tex/latex/thucoursework/iidef.sty
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{iidef}
-[2020/02/23 2.5.1 Tsinghua University Coursework Template]
+[2020/09/09 2.6 Tsinghua University Coursework Template]
%% configuration of nested enumerate env
\RequirePackage{enumitem}
%% set hwcount key-value option
@@ -32,7 +32,8 @@
%% required by macro DeclareMathOperator
\RequirePackage{amsmath}
%% Set up page headers using with fancyhdr
-\RequirePackage{fancyhdr}
+\@ifundefined{lhead}{\RequirePackage{fancyhdr}}
+{\def\@thulhead{thulhead}}
\RequirePackage{amsthm}
%% semester
\def\@term{term}
@@ -67,6 +68,7 @@
\underline{\bf \@hwname\;\thehwcnt} \\
\end{center}
}
+\@ifundefined{@thulhead}{
\fancypagestyle{runningpage}
{
\fancyhead[L]{\small\@coursename}
@@ -74,6 +76,7 @@
}
%% use runningpage style from second page on
\pagestyle{runningpage}
+}{}
%% *********************************************************************************************
%%name command macro
%%*************************
@@ -98,6 +101,7 @@
\def\@slname{Solution}
\def\slname#1{\renewcommand\@slname{#1}}
+\@ifundefined{solution}{
\newenvironment{solution}
{
\proof[\@slname]
@@ -107,6 +111,7 @@
\renewcommand{\qedsymbol}{}
\endproof
}
+}{}
%%******************************
%%common math symbols go here
%%*************************************************
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0ab113d5567..9305073bdf3 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2921,7 +2921,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'yathesis' => 'pdftex',
);
$standardinsrunner = "latex";
-$standardinsrunner_opt = "-interaction=nonstopmode";
+$standardinsrunner_opt = "";
%specialinsrunner_opt = (); # not yet
# We separate the (non)interaction option from the command name