summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-15 21:37:15 +0000
committerKarl Berry <karl@freefriends.org>2019-11-15 21:37:15 +0000
commitad0cc2635a7a6ba53d891f339d362a41da71cacb (patch)
tree0b5256ee13ef2d73f9c23106761f9f34c769298a /Master/texmf-dist/tex
parentaf83420127315731ca4168d56cd4f95f748d49e7 (diff)
pkuthss (15nov19)
git-svn-id: svn://tug.org/texlive/trunk@52804 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-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.cls25
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuword.pdfbin6392 -> 6392 bytes
5 files changed, 16 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index 4d4fd3a58a5..629fab21e05 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 8c39301e69c..8ebb0f6ea20 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}
- [2018/07/02 v1.8.0 Labels and captions in GBK encoding
+ [2019/11/15 v1.8.1 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 b6996850e46..64cbcf129b5 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}
- [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
+ [2019/11/15 v1.8.1 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 9e68dc3585c..0e0c766eec1 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-2018 Casper Ti. Vector
+% 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
@@ -23,7 +23,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2018/07/02 v1.8.0 Peking University dissertation document class]
+ [2019/11/15 v1.8.1 Peking University dissertation document class]
% eg. `\thss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -65,6 +65,9 @@
% Prevent fontspec (loaded by xeCJK) from interfering with newtxmath.
\ifthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
+% Work around the `\lvert already defined' error.
+% cf. <https://github.com/CTeX-org/ctex-kit/issues/454>.
+\ifthss@opt@pkufont\RequirePackage{amsmath}\fi
% pkuthss is based on ctexbook; we use `xiao 4' as default font size.
\LoadClass[zihao = -4]{ctexbook}[2014/03/06]
% ctex 2.x no longer loads ifpdf and ifxetex by itself.
@@ -123,7 +126,7 @@
}
% Use circled numbers as footnote symbols. Does not affect title page, but
% footnote is rarely used in dissertation covers ;)
- \renewcommand\thefootnote%
+ \renewcommand*{\thefootnote}%
{\protect\thss@int@circled{\arabic{footnote}}}
% Provides utility to modify footnote spacing.
% Option used to make sure it does not render interleaf pages totally blank.
@@ -167,7 +170,7 @@
\ifthss@opt@spechap
% This command is used to start a chapter without numbering, and correctly set
% up the headers and footers in the chapter.
- \newcommand\specialchap[1]{%
+ \newcommand{\specialchap}[1]{%
\chapter*{#1}\addcontentsline{toc}{chapter}{#1}
\markboth{#1}{}\phantomsection%
}
@@ -201,7 +204,7 @@
\let\thss@tmp@maketitle\maketitle
% NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might
% not act as expected.
- \renewcommand\maketitle{\setpdfproperties\thss@tmp@maketitle}
+ \renewcommand{\maketitle}{\setpdfproperties\thss@tmp@maketitle}
\fi
}
@@ -244,7 +247,7 @@
% Set up page layout.
\geometry{
a4paper, hmargin = 2.6cm, top = 2.92cm, bottom = 3.03cm,
- headheight = 0.45cm, headsep = 0.55cm, footskip = 1.05cm
+ headheight = 0.45cm, headsep = 0.59cm, footskip = 1.05cm
}
% Set up chapter/section/... captions.
@@ -259,11 +262,11 @@
beforeskip = {0bp}, afterskip = {18bp plus 0.2ex},
nameformat = {}, titleformat = {}
}, section =
- {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+ {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
subsection =
- {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+ {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
subsubsection =
- {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}
+ {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}}
}
\ifthss@opt@ugly
\ctexset{
@@ -341,7 +344,7 @@
\renewcommand{\maketitle}{%
\thss@int@pdfmark{\titlepagename}{titlepage}
% Make the title page centered.
- \begin{titlepage}\begin{center}
+ \begin{titlepage}\begingroup\centering
% Emblem and inscription of the university, and type of thesis.
{%
\zihao{1}%
@@ -379,7 +382,7 @@
\vfill
% Date.
{\zihao{-2}\@date}
- \end{center}\end{titlepage}%
+ \par\endgroup\end{titlepage}%
}
% Typeset the Chinese abstract.
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index d8bfa5fd174..e38fdcef3e1 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
Binary files differ