summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-01 22:31:29 +0000
committerKarl Berry <karl@freefriends.org>2017-03-01 22:31:29 +0000
commit1927ebbe0621fbca8bf2c12796dc99cfeafdeb25 (patch)
tree2732ad6aa37f979c0a0edca07155461d65730cc8
parent3a4f76b867a45eb994cf92a02f45d54ebb3cbb34 (diff)
pkuthss (1mar17)
git-svn-id: svn://tug.org/texlive/trunk@43374 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/example.pdfbin95190 -> 91904 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex4
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex6
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def2
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme.pdfbin402855 -> 399718 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt17
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex6
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex19
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex4
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib14
-rw-r--r--Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex9
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdfbin3641 -> 3641 bytes
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def2
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def2
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls97
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuword.pdfbin6392 -> 6392 bytes
17 files changed, 93 insertions, 91 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
index 2fe6104c540..ce9feee2439 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex
index 47d55d533f7..6e0f2781c5e 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2017 Casper Ti. Vector
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
否则一旦引起有碍作者著作权之问题,将可能承担法律责任。
% 若需排版二维码,请将二维码图片重命名为“barcode”,
-% 转为合适的图片格式,并放在当前目录下,然后去掉下面 3 行的注释。
+% 转为合适的图片格式,并放在当前目录下,然后去掉下面 2 行的注释。
%\vfill\noindent
%\includegraphics[height = 5em]{barcode}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex
index c0c62d42a8b..db9f7354982 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2017 Casper Ti. Vector
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,9 @@
% SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
- \CTEXsetup[
+ \ctexset{section = {
format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
- ]{section}
+ }}
% 学校书面要求本页面不要页码,但在给出的 Word 模版中又有页码且编入了目录。
% 此处以 Word 模版为实际标准进行设定。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def
index 8ca79f75ba5..2febb6122d5 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def
@@ -1,6 +1,6 @@
\ProvidesExplFile{\ExplFileName}{}{}{}
-\pdftex_if_engine:TF
+\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
{
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
index 0f348112b26..3ca347843b9 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
index cc9e535e3f6..e29c893068a 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
@@ -1,3 +1,20 @@
+2017-03-01, v1.7.4
+
+ * API changes:
+ - pkuthss.cls: provide undocumented option for uglification.
+
+ * Changes to example template:
+ - ctex-fontset-pkuthss.def: follow LaTeX3 change.
+ - copyright.tex: fix now inaccurate comment.
+
+ * Changes to package code:
+ - Remove support for ctex < v2.x.
+ - Replace CJKfntef's `\CJKunderline' with ulem's `\uline'.
+ - pkuthss.cls: tweak newtxmath setup.
+
+ * Misc:
+ - Minor fixes and cosmetics.
+
2016-05-24, v1.7.3
* Changes to package code:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex
index c0c62d42a8b..db9f7354982 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2017 Casper Ti. Vector
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,9 @@
% SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
- \CTEXsetup[
+ \ctexset{section = {
format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
- ]{section}
+ }}
% 学校书面要求本页面不要页码,但在给出的 Word 模版中又有页码且编入了目录。
% 此处以 Word 模版为实际标准进行设定。
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 e49f1fc040f..71d44beb6e3 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
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2017 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
@@ -261,22 +261,15 @@
\section{从其它文档类和宏包继承的功能}\label{sec:thirdparty}
pkuthss 文档类建立在 ctexbook\supercite{ctex} 文档类之上,
-并调用了 CJKfntef、hyperref\supercite{hyperref}、%
-geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr}
-和 graphicx\supercite{graphicx} 等几个宏包;
-使用 \hologo{pdfLaTeX} 方式编译 GBK 编码的源文件时还会调用
-xCJK2uni\supercite{xCJK2uni} 宏包\footnote{%
- ctex 2.x 会自行调用 xCJK2uni 宏包,
- 不用在 pkuthss 文档类中重复调用;
- 这里调用 xCJK2un 是为了兼容 ctex 1.x 而进行的设定,
- 该设定将在 2017 年被去除。%
-}。
+并调用了 geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr}、%
+hyperref\supercite{hyperref}、graphicx\supercite{graphicx}
+和 ulem\supercite{ulem} 等几个宏包。
因此,ctexbook 文档类和这些宏包所提供的功能均可以使用。
例如,用户如果想将目录的标题改为“目{\quad\quad}录”,
-则可以使用 ctexbook 文档类提供的 \verb|\CTEXoptions| 命令:
+则可以使用 ctexbook 文档类提供的 \verb|\ctexset| 命令:
\begin{Verbatim}[frame = single]
-\CTEXoptions[contentsname = {目{\quad\quad}录}]
+\ctexset[contentsname = {目{\quad\quad}录}]
\end{Verbatim}
在默认的配置下,%
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 bef65cd4f69..6ed6273abde 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
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2015 Casper Ti. Vector
+% Copyright (c) 2010-2017 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
@@ -55,7 +55,7 @@ Windows 的“记事本”程序在查看 LF(\texttt{\string\n})
\section{上游宏包可能引起的问题}
biblatex\supercite{biblatex} 宏包会自行设定 \verb|\bibname|,
-故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。
+故会覆盖通过 \verb|\ctexset| 设定的参考文献列表标题。
使用 biblatex 的用户可以使用 \verb|\printbibliography| 的
\verb|title| 选项来手动设定参考文献列表的标题,例如:
\begin{Verbatim}[frame = single]
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
index e602963a8c9..b646a1cb3a7 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
@@ -31,7 +31,7 @@
版权所有 \copyright\ 2008--2009 solvethis
\par
-版权所有 \copyright\ 2010--2016 Casper Ti. Vector
+版权所有 \copyright\ 2010--2017 Casper Ti. Vector
\vskip 1em
pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
index 3b5ba98fe3e..bf6a9f3b2f5 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
@@ -158,14 +158,14 @@
language = {english},
}
-@online{xCJK2uni,
- author = {李清},
- title = {xCJK2uni 宏包(v0.1)},
+@online{ulem,
+ author = {Arseneau, Donald},
+ title = {The ulem package: underlining for emphasis},
type = {M/OL},
- date = {2013-08-17},
- url = {http://mirror.ctan.org/macros/latex/contrib/xcjk2uni/},
- urldate = {2014-05-10},
- language = {chinese},
+ date = {2011-03-18},
+ url = {http://mirror.ctan.org/macros/latex/contrib/ulem/},
+ urldate = {2016-06-22},
+ language = {english},
}
@online{dypang,
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
index d3ad431ace5..e1396306b73 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
@@ -27,10 +27,9 @@
% chap/pkuthss-acknowledge.tex
\documentclass[UTF8]{pkuthss}
-
\usepackage[
- backend = biber, style = caspervector, utf8, sorting = ecnty,
- giveninits = true, sortgiveninits = true
+ backend = biber, style = caspervector, utf8,
+ sorting = ecnty, giveninits = true, sortgiveninits = true
]{biblatex}
\usepackage{fancyvrb}
\usepackage{hologo}
@@ -43,7 +42,7 @@
\hypersetup{colorlinks = true, allcolors = blue}
\newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
\newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}}
-\newcommand{\docversion}{v1.7.3}
+\newcommand{\docversion}{v1.7.4}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
@@ -55,7 +54,7 @@
cauthor = {盖茨波·钛·维克托},
eauthor = {Casper Ti.\ Vector},
studentid = {00910???},
- date = {二〇一六年五月},
+ date = {二〇一七年三月},
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 66d19bf67ba..1b67cd82a6a 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index 9c792297518..11d201e22b6 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}
- [2016/05/24 v1.7.3 Labels and captions in GBK encoding
+ [2017/03/01 v1.7.4 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 593e5b345e0..c56160cb52a 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}
- [2016/05/24 v1.7.3 Labels and captions in UTF-8 encoding
+ [2017/03/01 v1.7.4 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 6d2789cac3f..d449071a4bc 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -1,7 +1,7 @@
% Peking University dissertation document class
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2017 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
@@ -23,7 +23,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2016/05/24 v1.7.3 Peking University dissertation document class]
+ [2017/03/01 v1.7.4 Peking University dissertation document class]
% eg. `\pkuthss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifpkuthss@opt@spacing \pkuthss@opt@spacingtrue
@@ -56,6 +56,8 @@
% Whether to automatically set up properties for generated PDF from user
% defined document information (author, title, etc.).
\pkuthss@int@boolopt{pdfprop}{true}
+% Whether to disable some infractions intended to make the style less ugly.
+\pkuthss@int@boolopt{ugly}{false}
% Pass all other options to `ctexbook' document class.
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
% Process all class options now.
@@ -64,9 +66,7 @@
% Prevent fontspec (loaded by xeCJK) from interfering with newtxmath.
\ifpkuthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
% pkuthss is based on ctexbook; we use `xiao 4' as default font size.
-% CJKfntef provides `\CJKunderline' used in `\maketitle'.
-% fancyhdr provides utilities for setting up headers and footers.
-\LoadClass[hyperref, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11]
+\LoadClass[zihao = -4]{ctexbook}[2014/03/06]
% ctex 2.x no longer loads ifpdf and ifxetex by itself.
\RequirePackage{ifpdf, ifxetex}
% Provides support for `key = val' grammar.
@@ -75,9 +75,10 @@
\RequirePackage{graphicx}[1999/02/16]
% Provides utilities for setting up page layout.
\RequirePackage{geometry}
-% `hyperref', `fntef', `fancyhdr' and `cs4size' are deprecated in ctex 2.x.
-% hyperref now does not make citation hyperlinks if not explicitly loaded.
-% All compatibility support for ctex 1.x is scheduled for removal in 2017.
+% fancyhdr provides utilities for setting up headers and footers.
+\RequirePackage{fancyhdr}
+% Provides `\uline' used in `\maketitle'.
+\RequirePackage{ulem}
% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace.
\AtEndOfClass{\RequirePackage{hyperref}}
@@ -91,12 +92,7 @@
XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak
Therefore please use UTF-8 encoding for the LaTeX code.%
}
- \else\ifpdf
- % Fix garbled text in bookmarks for pdfLaTeX compilation in GBK.
- % Compatibility settings for ctex 1.x, to be removed in 2017; ctex 2.x
- % loads xCJK2uni by itself when necessary.
- \RequirePackage{xCJK2uni}
- \fi\fi
+ \fi
\else
\input{pkuthss-utf8.def}
\fi
@@ -105,7 +101,7 @@
% Use Times New Roman / Arial according to school regulation.
% Option used to prevent newtxtext from manipulating footnote marks.
\RequirePackage[defaultsups]{newtxtext}
- \RequirePackage{newtxmath}
+ \RequirePackage[cmintegrals, varg]{newtxmath}
\else
% Provides `\Box' for originauth.tex if newtx is absent.
\RequirePackage{latexsym}
@@ -157,10 +153,6 @@
\fi
\ifpkuthss@opt@spacing
- % Automatically ignore spaces between CJK characters, or otherwise preserve
- % spaces. XeCJK itself will handle this issue, therefore we do not use
- % `CJKspace' when using XeLaTeX.
- \unless\ifxetex\RequirePackage{CJKspace}\fi
% Make spacing nicer in some situations (eg. footnotes and verbatims).
\RequirePackage{setspace}
% Lists often appear to be too sparse when items are just one or two lines
@@ -267,36 +259,37 @@
\setlength{\belowdisplayskip}{6bp plus 1.5bp minus 3.5bp}
% Set up chapter/section/... captions.
-% The alternative settings in comments can be used in case the infractions
-% (intended to make the style less ugly) get caught; note that the `*skip'
-% values are not supposed to be modified: the actual style of the school's
-% guide and Word template seem to be different from the written specification
-% (when applied verbatim in LaTeX), and here the actual style is used.
-\CTEXsetup[
- nameformat = {\zihao{-2}\bfseries},
- titleformat = {\zihao{-2}\bfseries},
- %nameformat = {\zihao{3}\bfseries},
- %titleformat = {\zihao{3}\bfseries},
- beforeskip = {0bp}, afterskip = {18bp}
-]{chapter}
-\CTEXsetup[
- format = {\zihao{-3}\bfseries},
- %format = {\zihao{4}\bfseries},
- beforeskip = {20bp plus 1ex minus 0.2ex},
- afterskip = {6bp plus 0.2ex}
-]{section}
-\CTEXsetup[
- format = {\zihao{4}\bfseries},
- %format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries},
- beforeskip = {12bp plus 1ex minus 0.2ex},
- afterskip = {6bp plus 0.2ex}
-]{subsection}
-\CTEXsetup[
- format = {\bfseries},
- %format = {\zihao{-4}\bfseries},
- beforeskip = {12bp plus 1ex minus 0.2ex},
- afterskip = {6bp plus 0.2ex}
-]{subsubsection}
+% The `*skip' values are not supposed to be modified by the `ugly' option:
+% the actual style of the school's guide and Word template seem to be different
+% from the written specification (when applied verbatim in LaTeX), and here the
+% actual style is used.
+\ctexset{
+ chapter = {beforeskip = {0bp}, afterskip = {18bp}},
+ section =
+ {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+ subsection =
+ {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+ subsubsection =
+ {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}
+}
+\ifpkuthss@opt@ugly
+ \ctexset{
+ chapter =
+ {nameformat = {\zihao{3}\bfseries}, titleformat = {\zihao{3}\bfseries}},
+ section = {format = {\zihao{4}\bfseries}},
+ subsection =
+ {format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries}},
+ subsubsection = {format = {\zihao{-4}\bfseries}}
+ }
+\else
+ \ctexset{
+ chapter =
+ {nameformat = {\zihao{-2}\bfseries}, titleformat = {\zihao{-2}\bfseries}},
+ section = {format = {\zihao{-3}\bfseries}},
+ subsection = {format = {\zihao{4}\bfseries}},
+ subsubsection = {format = {\bfseries}}
+ }
+\fi
% Internal command to set up headers and footers.
\def\pkuthss@int@setpagestyle{
@@ -349,11 +342,11 @@
\loop\ifnum\pkuthss@tmp@linecount>0
% Fill specified space with underline on the bottom line. `\underline'
% draws line on the baseline (not the bottom line), and this is why
- % `\CJKunderline' is used here instead.
+ % `\uline' is used here instead.
\ifnum\pkuthss@tmp@linecount=1
- \CJKunderline{\makebox[#2]{}}
+ \uline{\makebox[#2]{}}
\else
- \CJKunderline{\makebox[#2]{}}\\
+ \uline{\makebox[#2]{}}\\
\fi
\advance\pkuthss@tmp@linecount by -1\relax
\repeat%
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index 603efdc2ab5..c32ce0de7cd 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
Binary files differ