thuthesis (17may18)

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

7 files changed, 122 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/thuthesis/README.md b/Master/texmf-dist/doc/latex/thuthesis/README.md
index 4043e1bb381..0b9ee7bdf7c 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/README.md
+++ b/Master/texmf-dist/doc/latex/thuthesis/README.md
@@ -1,8 +1,9 @@
 [![Build Status](https://travis-ci.org/xueruini/thuthesis.svg?branch=master)](https://travis-ci.org/xueruini/thuthesis) [![Join the chat at https://gitter.im/thuthesis/Lobby](https://badges.gitter.im/thuthesis/Lobby.svg)](https://gitter.im/thuthesis/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # What's ThuThesis?
+ThuThesis is an abbreviation of <b>T</b>sing<b>h</b>ua <b>U</b>niversity <b>Thesis</b> LaTeX Template.
 
-ThuThesis is a LaTeX thesis template package for Tsinghua University supporting from bachelor, master, doctor dissertations to post-doc report. Since the users of this package are supposed to be Chinese or those understand Chinese, the following of this file and all other documents are written in Chinese only.
+This package establishes a simple and easy-to-use LaTeX template for Tsinghua dissertations, including general undergraduate research papers, masters theses, doctoral theses, doctoral dissertations, and post-doc reports. Additional support for other formats (what else is there?) will be added continuously. An English translation of this README follows the Chinese below.
 
 # ThuThesis是什么？
 ThuThesis为 <b>T</b>sing<b>h</b>ua <b>U</b>niversity <b>Thesis</b> LaTeX Template之缩写。
@@ -16,7 +17,6 @@ ThuThesis为 <b>T</b>sing<b>h</b>ua <b>U</b>niversity <b>Thesis</b> LaTeX Templa
 * 示例文档 (main.pdf)
 
 # 下载
-
 * 发行版：[CTAN](http://www.ctan.org/pkg/thuthesis)
 * 开发版：[GitHub](https://github.com/xueruini/thuthesis)
 
@@ -61,3 +61,54 @@ make [{all|thesis|shuji|doc|clean|cleanall|distclean}] \
   * METHOD=latexmk  表示使用 latexmk 的方式生成 pdf（使用 xelatex）。
   * METHOD=xelatex  表示使用 xelatex 引擎编译生成 pdf；
   * METHOD=pdflatex 表示使用 pdflatex 引擎编译生成 pdf。
+
+# Documentation
+Download and unzip the template. Specific usage documentation and examples can be found in the files below. At present, these documents are <b>only available in Chinese</b>:
+* Template usage (thuthesis.pdf)
+* Template example (main.pdf)
+
+# Downloads
+* Published version: [CTAN](http://www.ctan.org/pkg/thuthesis)
+* Developer version: [GitHub](https://github.com/xueruini/thuthesis)
+
+# Updates
+## Automatic
+Get the most up-to-date published version of the TeX tools from [CTAN](http://www.ctan.org/pkg/thuthesis).
+
+## Manual
+Download the package from [GitHub](https://github.com/xueruini/thuthesis) to the root directory of your thesis, then execute the command (Windows users `Shift + right click` white area in the file window and click "Open command line window here from the popup menu"):
+
+    latex thuthesis.ins
+
+You'll get `thuthesis.cls` and `thuthesis.cfg` along with other template files.
+
+# Reporting Issues
+Please follow the procedure below:
+
+* Check the  [FAQ](https://github.com/xueruini/thuthesis/wiki/FAQ)
+* [Github Issues](http://github.com/xueruini/thuthesis/issues)
+* [TeX@newsmth](http://www.newsmth.net/nForum/#!board/TeX)
+* [ThuThesis@Google Groups](http://groups.google.com/group/thuthesis)
+
+# Makefile Usage
+
+```shell
+make [{all|thesis|shuji|doc|clean|cleanall|distclean}] \
+     [METHOD={latexmk|xelatex|pdflatex}]
+```
+
+## Targets
+* `make all`       same as `make thesis && make shuji && make doc`;
+* `make cls`       generate template file;
+* `make thesis`    generate thesis main.pdf;
+* `make shuji`     generate book spine for printing shuji.pdf;
+* `make doc`       generate documentation thuthesis.pdf;
+* `make clean`     delete all examples' files (excluding main.pdf);
+* `make cleanall`  delete all examples' files and main.pdf;
+* `make distclean` delete all examples' and templates' files and PDFs.
+
+## Parameters
+* **METHOD**：define the method used to generate the pdfs, the default is `latexmk`.
+*  `METHOD=latexmk` use latexmk to generate pdfs (uses xelatex).
+* `METHOD=xelatex` use xelatex engine to compile and build pdfs;
+* `METHOD=pdflatex` use pdflatex engine to compile and build pdfs.
diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
index b72800b8dbf..f03eb9da6c5 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/main.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
diff --git a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
index ca0d88fac2c..ce89f85aa4a 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
index f94eac21441..c5e44331462 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
diff --git a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
index 1fa40eab89e..b1e0dd0b123 100644
--- a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
+++ b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
@@ -16,7 +16,7 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{thuthesis.dtx}[2018/04/24 5.4.4 Tsinghua University Thesis Template]
+\ProvidesFile{thuthesis.dtx}[2018/05/17 5.4.5 Tsinghua University Thesis Template]
 \documentclass{ltxdoc}
 \usepackage{dtx-style}
 
@@ -1116,7 +1116,7 @@
 %<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<cls>\ProvidesClass{thuthesis}
 %<cfg>\ProvidesFile{thuthesis.cfg}
-%<cls|cfg>[2018/04/24 5.4.4 Tsinghua University Thesis Template]
+%<cls|cfg>[2018/05/17 5.4.5 Tsinghua University Thesis Template]
 %    \end{macrocode}
 %
 % \subsection{定义选项}
@@ -1135,7 +1135,7 @@
 %<*cls>
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.4.4}
+\def\version{5.4.5}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -1182,11 +1182,6 @@
 \DeclareBoolOption{tocarialchapterpage}
 %    \end{macrocode}
 %
-% 在 Windows Vista 或之后系统下时，默认使用微软雅黑，这可能会导致审查不合格。
-% 下面设置默认不使用微软雅黑，同时保持跨平台兼容性。
-%    \begin{macrocode}
-\IfFileExists{/dev/null}{}{\PassOptionsToClass{fontset=windowsold}{ctexbook}}
-%    \end{macrocode}
 %
 % \option{raggedbottom} 选项（默认打开）
 % \changes{v4.8}{2013/03/05}{增加 noraggedbottom 选项。}
@@ -1488,14 +1483,48 @@
 %
 % \subsubsection{字体}
 % \label{sec:font}
+% 在使用 Windows Vista 或之后版本的系统时，\pkg{ctex} 宏包会默认使用微软雅黑字体，
+% 这可能会导致审查不合格。 下面设置适合印刷的黑体，同时保持跨平台兼容性。
+%    \begin{macrocode}
+%<*cls>
+\newcommand\thu@fontset{\csname g__ctex_fontset_tl\endcsname}
+\ifthenelse{\equal{\thu@fontset}{windows}}{
+  \ifxetex
+    \setCJKsansfont{SimHei}
+  \else
+    \setCJKsansfont{simhei.ttf}
+    \csname ctex_punct_map_family:nn\endcsname{\CJKsfdefault}{zhhei}
+  \fi
+}{}
+%    \end{macrocode}
+%
+% 类似地，\pkg{ctex} 2.4.14 开始在 macOS 下自动调用苹方黑体，所以必进行调整。
+%    \begin{macrocode}
+\ifthenelse{\equal{\thu@fontset}{mac}}{
+  \setCJKmainfont[
+         UprightFont = * Light,
+            BoldFont = * Bold,
+          ItalicFont = Kaiti SC,
+      BoldItalicFont = Kaiti SC Bold
+    ]{Songti SC}
+  \setCJKsansfont{Heiti SC}
+  \setCJKfamilyfont{zhsong}[
+         UprightFont = * Light,
+            BoldFont = * Bold,
+    ]{Songti SC}
+  \setCJKfamilyfont{zhhei}{Heiti SC}
+  \setCJKfamilyfont{zhkai}{Kaiti SC}
+}{}
+%    \end{macrocode}
+%
 % \begin{macro}{\normalsize}
 % 正文小四号 (12bp) 字，行距为固定值 20 bp。
+% \changes{v5.4.5}{2018/05/17}{调整公式和正文间距。}
 %    \begin{macrocode}
-%<*cls>
 \renewcommand\normalsize{%
   \@setfontsize\normalsize{12bp}{20bp}%
-  \abovedisplayskip=20bp \@plus 2bp \@minus 2bp
-  \abovedisplayshortskip=20bp \@plus 2bp \@minus 2bp
+  \abovedisplayskip=12bp \@plus 2bp \@minus 2bp
+  \abovedisplayshortskip=12bp \@plus 2bp \@minus 2bp
   \belowdisplayskip=\abovedisplayskip
   \belowdisplayshortskip=\abovedisplayshortskip}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index 75268fc2877..dd230e3a7ad 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
@@ -22,7 +22,7 @@
 %% 
 
 \ProvidesFile{thuthesis.cfg}
-[2018/04/24 5.4.4 Tsinghua University Thesis Template]
+[2018/05/17 5.4.5 Tsinghua University Thesis Template]
 \theorembodyfont{\normalfont}
 \theoremheaderfont{\normalfont\heiti}
 \theoremsymbol{\ensuremath{\square}}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index ea6884052d8..ed86f329ec2 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -24,10 +24,10 @@
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{thuthesis}
-[2018/04/24 5.4.4 Tsinghua University Thesis Template]
+[2018/05/17 5.4.5 Tsinghua University Thesis Template]
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.4.4}
+\def\version{5.4.5}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -58,7 +58,6 @@
 \DeclareBoolOption{tocarialchapter}
 \DeclareBoolOption{tocarialchapterentry}
 \DeclareBoolOption{tocarialchapterpage}
-\IfFileExists{/dev/null}{}{\PassOptionsToClass{fontset=windowsold}{ctexbook}}
 \DeclareBoolOption{raggedbottom}
 \DeclareBoolOption{pifootnote}
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
@@ -167,10 +166,34 @@
 \renewcommand\backmatter{%
   \if@openright\cleardoublepage\else\clearpage\fi
   \@mainmattertrue}
+\newcommand\thu@fontset{\csname g__ctex_fontset_tl\endcsname}
+\ifthenelse{\equal{\thu@fontset}{windows}}{
+  \ifxetex
+    \setCJKsansfont{SimHei}
+  \else
+    \setCJKsansfont{simhei.ttf}
+    \csname ctex_punct_map_family:nn\endcsname{\CJKsfdefault}{zhhei}
+  \fi
+}{}
+\ifthenelse{\equal{\thu@fontset}{mac}}{
+  \setCJKmainfont[
+         UprightFont = * Light,
+            BoldFont = * Bold,
+          ItalicFont = Kaiti SC,
+      BoldItalicFont = Kaiti SC Bold
+    ]{Songti SC}
+  \setCJKsansfont{Heiti SC}
+  \setCJKfamilyfont{zhsong}[
+         UprightFont = * Light,
+            BoldFont = * Bold,
+    ]{Songti SC}
+  \setCJKfamilyfont{zhhei}{Heiti SC}
+  \setCJKfamilyfont{zhkai}{Kaiti SC}
+}{}
 \renewcommand\normalsize{%
   \@setfontsize\normalsize{12bp}{20bp}%
-  \abovedisplayskip=20bp \@plus 2bp \@minus 2bp
-  \abovedisplayshortskip=20bp \@plus 2bp \@minus 2bp
+  \abovedisplayskip=12bp \@plus 2bp \@minus 2bp
+  \abovedisplayshortskip=12bp \@plus 2bp \@minus 2bp
   \belowdisplayskip=\abovedisplayskip
   \belowdisplayshortskip=\abovedisplayshortskip}
 \def\thu@def@fontsize#1#2{%