pkuthss (2nov20)

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

22 files changed, 78 insertions, 63 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
index b996c5d1b99..ea1a631bda0 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile
deleted file mode 100644
index 7437115a332..00000000000
--- a/Master/texmf-dist/doc/latex/pkuthss/example/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2008-2009 solvethis
-# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
-# Public domain.
-
-# 被编译的主文件的文件名，不包括扩展名。
-JOB = thesis
-# 这个变量的值可以为 latex、pdflatex 或 xelatex。
-LATEX = latex
-BIBTEX = biber -l zh__pinyin --output-safechars
-DVIPDF = dvipdfmx
-
-# 如果用 LaTeX 编译，则使用 dvipdfmx 将 dvi 转成 pdf。
-ifeq ($(LATEX), latex)
-	DODVIPDF = $(DVIPDF) $(JOB)
-endif
-
-# 区分是 Windows 环境还是类 UNIX 环境。
-# 如果是后者，则 GNU make 将可以检测到已经定义 PATH 环境变量。
-ifdef PATH
-	MAKE = make
-	RM = rm -f
-else
-	MAKE = mingw32-make
-	RM = del
-endif
-
-doc:
-	$(LATEX) $(JOB)
-	$(BIBTEX) $(JOB)
-	$(LATEX) $(JOB)
-	$(LATEX) $(JOB)
-	$(DODVIPDF)
-
-clean:
-	$(RM) $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi \
-		$(JOB).lof $(JOB).log $(JOB).lot $(JOB).run.xml $(JOB).toc \
-		$(JOB).out $(JOB).out.bak missfont.log texput.log chap/*.aux
-
-distclean: clean
-	$(RM) $(JOB).pdf
-
-# vim:ts=4:sw=4
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
index b503fc729aa..4b8d75c4f8c 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
@@ -22,7 +22,7 @@
         \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
       }
       {
-        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
+        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { windows }
         \ctex_punct_set:n { windows }
         \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
         \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
index 97a7442140b..837e5264559 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
index 820daecd54f..aaf026bf9f1 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
@@ -1,3 +1,21 @@
+2020-11-02, v1.8.3
+
+	* Changes to example template:
+	- ctex-fontset-pkuthss.def: update `\ctex_load_zhmap' usage.
+	- Remove Makefile.
+
+	* Changes to package code:
+	- pkuthss.cls: do not let ulem mess with `\emph'.
+	- pkuthss.cls: make `ugly' title page more compliant.
+
+	* Changes to documentation:
+	- pkuthss-chap[12].tex: `须'/`需' typo.
+	- Remove space around `\zhdigits' in date.
+	- Add pkuthss.bib to copyright lines.
+
+	* Misc:
+	- Minor fixes and cosmetics.
+
 2019-11-17, v1.8.2
 
 	* Misc:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
index 5dc80d52856..453d56bb690 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
index 0fd606b7b0f..2859463747f 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
index 2e5152ece51..232f4275588 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
@@ -55,7 +56,7 @@
 	我们建议用户使用最新、完全版的 \hologo{TeX} 系统和各宏包。%
 }
 
-中文字体须要用户自行获得。\myemph{%
+中文字体需要用户自行获得。\myemph{%
 	注：一些中文字体的字库不全，只有 GB2312 字符集内字符的字体信息。
 	这种情况通常会造成编译生成的 pdf 文件中缺少部分字符，
 	其中一种典型症状是“〇”字显示不出来。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
index 4455b376b7e..c7c1c75c184 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
@@ -252,7 +253,7 @@
 \texttt{\bfseries\string\setpdfproperties} 命令
 用于根据用户设定的文档信息自动设定生成的 pdf 文档的属性。
 此命令会在用户调用 \verb|\maketitle| 命令时被自动调用，
-因此通常不须要用户自己使用；
+因此通常不需要用户自己使用；
 但用户有时可能不须要输出封面，从而不会调用 \verb|\maketitle| 命令，
 此时就须要在设定完文档信息之后调用 \verb|\setpdfproperties|。%
 \myemph{注意：须要启用 \texttt{pdfprop} 选项才能使用此命令。}
@@ -324,7 +325,7 @@ $TEXMFDIST/tex/latex/pkuthss/
 \end{Verbatim}
 
 如果的确须要修改 pkuthss 文档类的源文件，\myemph{%
-	建议用户将 \texttt{pkuthss.cls} 或其它需要修改的文件
+	建议用户将 \texttt{pkuthss.cls} 或其它须要修改的文件
 	复制到被编译的主文件所在的目录，
 	然后对此副本进行修改%
 }\footnote{%
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
index 77de4b04611..0fbd72bd473 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex
index 4d71382198b..93fb141f4c9 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
index 736ee4c2980..68d86f34dee 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
index f87f67472f0..e085ba1497e 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
index c5485c2a3fc..396f9fe6c30 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
index 67174bdfbc1..ee9cadcad27 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
@@ -100,12 +100,12 @@ index ac5b0c9..9d2ad60 100644
 -
  % vim:ts=4:sw=4
 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
-index 30e05de..4d6ee53 100644
+index 9c5f042..a54d01f 100644
 --- a/doc/example/thesis.tex
 +++ b/doc/example/thesis.tex
-@@ -16,54 +16,44 @@
+@@ -12,54 +12,44 @@
+ \documentclass[UTF8]{pkuthss}
  % 如果的确须要使脚注按页编号的话，可以去掉后面 footmisc 包的注释。
- % 注意：在启用此设定的情况下，可能要多编译一次以产生正确的脚注编号。
  %\usepackage[perpage]{footmisc}
 -
 -% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex-caspervector 的文档）。
@@ -182,11 +182,11 @@ index 30e05de..4d6ee53 100644
  	% 以下为正文之前的部分，默认不进行章节编号。
  	\frontmatter
 diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index b699685..e4e58b6 100644
+index 9bc6000..7650e53 100644
 --- a/tex/pkuthss-utf8.def
 +++ b/tex/pkuthss-utf8.def
 @@ -25,13 +25,13 @@
- 	[2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
+ 	[2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding
  		for the pkuthss document class]
  
 -\def\label@ctitle{题目：}
@@ -207,10 +207,10 @@ index b699685..e4e58b6 100644
  \def\label@ckeywords{关键词：}
  \def\label@ekeywords{KEYWORDS:\ }
 diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index 9e68dc3..4b8cb00 100644
+index e34fe2d..477b3f4 100644
 --- a/tex/pkuthss.cls
 +++ b/tex/pkuthss.cls
-@@ -301,7 +301,7 @@
+@@ -304,7 +304,7 @@
  	\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
  	\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
  	\if@twoside
@@ -219,7 +219,7 @@ index 9e68dc3..4b8cb00 100644
  		\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
  	\else
  		\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -347,13 +347,13 @@
+@@ -350,13 +350,13 @@
  			\zihao{1}%
  			\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
  			\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
@@ -235,7 +235,7 @@ index 9e68dc3..4b8cb00 100644
  		}
  		\vfill
  		% Information about the author.
-@@ -361,19 +361,19 @@
+@@ -364,19 +364,19 @@
  			% Slightly adjust the line skip when using new font size.
  			\zihao{3}\linespread{1.75}\selectfont
  			\def\thss@tmp@len{0.56\textwidth}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
index a85359a66e1..3404e2a59a8 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
@@ -1,3 +1,32 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2019 Casper Ti. Vector
+%
+% 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
+%   https://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 Casper Ti. Vector.
+%
+% This work consists of the following files:
+%   pkuthss.tex
+%   pkuthss.bib
+%   chap/pkuthss-copy.tex
+%   chap/pkuthss-abs.tex
+%   chap/pkuthss-intro.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-concl.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-ack.tex
+
 @online{amsthm,
 	author = {{Publications Technical Group, American Mathematical Society}},
 	title = {Using the amsthm Package},
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
index 2e8b081f488..522ebd9d549 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
@@ -16,6 +16,7 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
+%   pkuthss.bib
 %   chap/pkuthss-copy.tex
 %   chap/pkuthss-abs.tex
 %   chap/pkuthss-intro.tex
@@ -49,7 +50,7 @@
 	tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
 }
 
-\newcommand*{\docversion}{v1.8.2}
+\newcommand*{\docversion}{v1.8.3}
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
 	ctitle = {北京大学学位论文模版\\pkuthss \docversion},
@@ -60,7 +61,7 @@
 	cauthor = {盖茨波·钛·维克托},
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {\zhdigits{2019} 年 \zhnumber{11} 月},
+	date = {\zhdigits{2020}年\zhnumber{11}月},
 	school = {化学与分子工程学院},
 	cmajor = {化学（？）}, emajor = {Chemistry ... ?},
 	direction = {据说 Casper 自己也不知道},
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index 0d70935c6ad..03850ac253a 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index 02e885da95c..caf9986940a 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -22,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2019/11/17 v1.8.2 Labels and captions in GBK encoding
+	[2020/11/02 v1.8.3 Labels and captions in GBK encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{��Ŀ��}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
index 9bc6000ac1a..a5f27221602 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -22,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding
+	[2020/11/02 v1.8.3 Labels and captions in UTF-8 encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{题目：}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
index 7f75114da4d..0a021b8bd75 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -23,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2019/11/17 v1.8.2 Peking University dissertation document class]
+	[2020/11/02 v1.8.3 Peking University dissertation document class]
 
 % eg. `\thss@int@boolopt{spacing}{true}' will expand to:
 %   \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -80,8 +80,8 @@
 \RequirePackage{geometry}
 % fancyhdr provides utilities for setting up headers and footers.
 \RequirePackage{fancyhdr}
-% Provides `\uline' used in `\maketitle'.
-\RequirePackage{ulem}
+% Provides `\uline' used in `\maketitle' (but do not mess with `\emph').
+\RequirePackage[normalem]{ulem}
 % `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace.
 \AtEndOfClass{\RequirePackage{hyperref}}
 
@@ -381,7 +381,7 @@
 		}
 		\vfill
 		% Date.
-		{\zihao{-2}\@date}
+		{\ifthss@opt@ugly\zihao{3}\else\zihao{-2}\fi\@date}
 	\par\endgroup\end{titlepage}%
 }
 
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index 762067f7597..5884b8efd3b 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf