summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
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 /Master/texmf-dist/tex/latex
parent3a4f76b867a45eb994cf92a02f45d54ebb3cbb34 (diff)
pkuthss (1mar17)
git-svn-id: svn://tug.org/texlive/trunk@43374 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-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
5 files changed, 47 insertions, 54 deletions
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