summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pkuthss
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-18 23:15:28 +0000
committerKarl Berry <karl@freefriends.org>2015-06-18 23:15:28 +0000
commitab0f0949de94da73efd246324ac40f0b47a60688 (patch)
tree47848ce56b1a0383e430998c8385847a49295fa0 /Master/texmf-dist/tex/latex/pkuthss
parentb898efe401e97205d56af3afd1d4c75bc5ef7f39 (diff)
pkuthss (18jun15)
git-svn-id: svn://tug.org/texlive/trunk@37599 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pkuthss')
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdfbin3641 -> 3641 bytes
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty20
-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.cls145
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuword.pdfbin6392 -> 6392 bytes
6 files changed, 85 insertions, 84 deletions
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index 44dda8154c8..5eab5a8443c 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-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
index 570f8c48bb0..2f10ec27956 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
@@ -26,7 +26,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{pkuthss-extra}
- [2015/04/28 v1.6.0 Common extra settings for the pkuthss document class]
+ [2015/06/18 v1.6.2 Common extra settings for the pkuthss document class]
% Check the dependency of pkuthss.
\@ifclassloaded{pkuthss}{}{
@@ -124,22 +124,18 @@
\ifpkuthssextra@opt@pdftoc
% Add PDF bookmark for table of contents.
\let\pkuthssextra@tmp@tableofcontents\tableofcontents
- \renewcommand{\tableofcontents}{
- % Make the `Contents' bookmark point correctly to the title of the table of
- % contents.
- \cleardoublepage
- % Actually add the PDF bookmark.
- \pdfbookmark[1]{\contentsname}{contents}
- \pkuthssextra@tmp@tableofcontents
+ \renewcommand{\tableofcontents}{%
+ \pkuthss@int@pdfmark{\contentsname}{contents}
+ \pkuthssextra@tmp@tableofcontents%
}
\fi
\ifpkuthssextra@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
+ \markboth{#1}{}\phantomsection%
}
\fi
@@ -159,11 +155,11 @@
\ifpkuthssextra@opt@pdfprop
% Automatically generate properties for generated PDF.
% Use English properties to avoid problems with character encodings.
- \newcommand*{\setpdfproperties}{
+ \newcommand*{\setpdfproperties}{%
\hypersetup{
pdfauthor = {\@eauthor}, pdftitle = {\@etitle},
pdfsubject = {\euniversity\ \ethesisname}, pdfkeywords = {\@ekeywords}
- }
+ }%
}
% Set up the properties when generating the title page because the document
% information should have been all defined before this.
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index 20e95a6644f..d9bc8899e7b 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -25,7 +25,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2015/04/28 v1.6.0 Labels and captions in GBK encoding
+ [2015/06/18 v1.6.2 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 f2b8c671b1e..215cad5de1c 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -25,7 +25,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2015/04/28 v1.6.0 Labels and captions in UTF-8 encoding
+ [2015/06/18 v1.6.2 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 cf9edac2f87..606bf2406a1 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -26,7 +26,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2015/04/28 v1.6.0 Peking University dissertation document class]
+ [2015/06/18 v1.6.2 Peking University dissertation document class]
% Process the encoding options.
\newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
@@ -86,8 +86,8 @@
}
\else\ifpdf
% Fix garbled text in bookmarks for pdfLaTeX compilation in GBK.
- % Temporary fix until release of ctex 2.x, which will by itself
- % load xCJK2uni when necessary.
+ % 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
@@ -99,6 +99,42 @@
\fi
}
+% eg. `\pkuthss@int@infoitema{ctitle}' will expand to:
+% \def\ctitle#1{\def\@ctitle{#1}}
+% \define@key{pkuthss@info}{ctitle}{\ctitle{#1}}
+\def\pkuthss@int@infoitema#1{
+ \@namedef{#1}##1{\@namedef{@#1}{##1}}
+ \define@key{pkuthss@info}{#1}{\@nameuse{#1}{##1}}
+}
+% eg. `\pkuthss@int@infoitemb{cuniversity}' will expand to:
+% \define@key{pkuthss@info}{cuniversity}{\def\cuniversity{#1}}
+\def\pkuthss@int@infoitemb#1{
+ \define@key{pkuthss@info}{#1}{\@namedef{#1}{##1}}
+}
+% Set up document information entries.
+\pkuthss@int@infoitema{ctitle}
+\pkuthss@int@infoitema{etitle}
+\pkuthss@int@infoitema{cauthor}
+\pkuthss@int@infoitema{eauthor}
+\pkuthss@int@infoitema{studentid}
+\pkuthss@int@infoitema{date}
+\pkuthss@int@infoitema{school}
+\pkuthss@int@infoitema{cmajor}
+\pkuthss@int@infoitema{emajor}
+\pkuthss@int@infoitema{direction}
+\pkuthss@int@infoitema{cmentor}
+\pkuthss@int@infoitema{ementor}
+\pkuthss@int@infoitema{ckeywords}
+\pkuthss@int@infoitema{ekeywords}
+\pkuthss@int@infoitemb{cuniversity}
+\pkuthss@int@infoitemb{euniversity}
+\pkuthss@int@infoitemb{cthesisname}
+\pkuthss@int@infoitemb{ethesisname}
+\pkuthss@int@infoitemb{cabstractname}
+\pkuthss@int@infoitemb{eabstractname}
+% Set up document information using the `key = value' grammar.
+\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}}
+
% Set up page layout.
\geometry{
a4paper, includefoot, hmargin = 2.6cm, top = 3cm, bottom = 2.5cm,
@@ -115,21 +151,21 @@
\CTEXsetup[
nameformat = {\zihao{-2}\bfseries},
titleformat = {\zihao{-2}\bfseries},
- beforeskip = {20bp}, afterskip = {18bp}
+ beforeskip = {0bp}, afterskip = {18bp}
]{chapter}
\CTEXsetup[
format = {\zihao{-3}\bfseries},
- beforeskip = {-20bp plus -1ex minus -0.2ex},
+ beforeskip = {20bp plus 1ex minus 0.2ex},
afterskip = {6bp plus 0.2ex}
]{section}
\CTEXsetup[
format = {\zihao{4}\bfseries},
- beforeskip = {-12bp plus -1ex minus -0.2ex},
+ beforeskip = {12bp plus 1ex minus 0.2ex},
afterskip = {6bp plus 0.2ex}
]{subsection}
\CTEXsetup[
format = {\bfseries},
- beforeskip = {-12bp plus -1ex minus -0.2ex},
+ beforeskip = {12bp plus 1ex minus 0.2ex},
afterskip = {6bp plus 0.2ex}
]{subsubsection}
@@ -167,44 +203,16 @@
\pkuthss@int@setpagestyle
\fi
-% eg. `\pkuthss@int@infoitema{ctitle}' will expand to:
-% \def\ctitle#1{\def\@ctitle{#1}}
-% \define@key{pkuthss@info}{ctitle}{\ctitle{#1}}
-\def\pkuthss@int@infoitema#1{
- \@namedef{#1}##1{\@namedef{@#1}{##1}}
- \define@key{pkuthss@info}{#1}{\@nameuse{#1}{##1}}
-}
-% eg. `\pkuthss@int@infoitemb{cuniversity}' will expand to:
-% \define@key{pkuthss@info}{cuniversity}{\def\cuniversity{#1}}
-\def\pkuthss@int@infoitemb#1{
- \define@key{pkuthss@info}{#1}{\@namedef{#1}{##1}}
+% This places a bookmark pointing to somewhere near the page header;
+% Result of simple `\chapter{...} \pdfbookmark{...}' does not look nice,
+% because the bookmark will point to somewhere below the chapter mark.
+\def\pkuthss@int@pdfmark#1#2{%
+ \if@openright\cleardoublepage\else\clearpage\fi
+ \pdfbookmark[1]{#1}{#2}%
}
-% Set up document information entries.
-\pkuthss@int@infoitema{ctitle}
-\pkuthss@int@infoitema{etitle}
-\pkuthss@int@infoitema{cauthor}
-\pkuthss@int@infoitema{eauthor}
-\pkuthss@int@infoitema{studentid}
-\pkuthss@int@infoitema{date}
-\pkuthss@int@infoitema{school}
-\pkuthss@int@infoitema{cmajor}
-\pkuthss@int@infoitema{emajor}
-\pkuthss@int@infoitema{direction}
-\pkuthss@int@infoitema{cmentor}
-\pkuthss@int@infoitema{ementor}
-\pkuthss@int@infoitema{ckeywords}
-\pkuthss@int@infoitema{ekeywords}
-\pkuthss@int@infoitemb{cuniversity}
-\pkuthss@int@infoitemb{euniversity}
-\pkuthss@int@infoitemb{cthesisname}
-\pkuthss@int@infoitemb{ethesisname}
-\pkuthss@int@infoitemb{cabstractname}
-\pkuthss@int@infoitemb{eabstractname}
-% Set up document information using the `key = value' grammar.
-\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}}
% Usage: \pkuthss@int@fillinblank{(number of lines)}{(line width)}{(contents)}
-\def\pkuthss@int@fillinblank#1#2#3{
+\def\pkuthss@int@fillinblank#1#2#3{%
\makebox[0pt][l]{\parbox[t]{#2}{\centering{#3}}}\mbox{}%
\parbox[t]{#2}{%
\newcount\pkuthss@tmp@linecount
@@ -222,71 +230,68 @@
\repeat%
}%
}
-% Set format of the title page (cover).
-\renewcommand{\maketitle}{
- \cleardoublepage
- % Add PDF bookmark for the title page.
- \pdfbookmark[1]{\titlepagename}{titlepage}
+
+% Set up format of the title page (cover).
+\renewcommand{\maketitle}{%
+ \pkuthss@int@pdfmark{\titlepagename}{titlepage}
\begin{titlepage}
% It will be nicer to use this line skip level in the title page.
\linespread{1.6}\selectfont
% Make the title page centered.
\begin{center}
% Emblem and inscription of the university, and type of thesis.
- {
+ {%
\zihao{1}%
\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
- {\bfseries{\cthesisname}}
+ {\bfseries{\cthesisname}}%
}
\vfill
% Title of the thesis.
- {
+ {%
\zihao{2}{\label@ctitle}%
- \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}
+ \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
}
\vfill
% Information about the author.
- {
+ {%
% Slightly adjust the line skip when using new font size.
\zihao{3}\linespread{1.75}\selectfont
\def\pkuthss@tmp@len{0.56\textwidth}
\begin{tabular}{l@{\extracolsep{0.2em}}c}
- {\heiti\label@cauthor} &
+ {\bfseries\label@cauthor} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cauthor} \\
- {\heiti\label@studentid} &
+ {\bfseries\label@studentid} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@studentid} \\
- {\heiti\label@school} &
+ {\bfseries\label@school} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@school} \\
- {\heiti\label@cmajor} &
+ {\bfseries\label@cmajor} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmajor} \\
- {\heiti\label@direction} &
+ {\bfseries\label@direction} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@direction} \\
- {\heiti\label@cmentor} &
+ {\bfseries\label@cmentor} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmentor} \\
- \end{tabular}
+ \end{tabular}%
}
\vfill
% Date.
{\zihao{-2}\@date}
\end{center}
- \end{titlepage}
+ \end{titlepage}%
}
% Typeset the Chinese abstract.
-\newenvironment{cabstract}{
- \cleardoublepage
- \pdfbookmark[1]{\cabstractname}{cabstract}
+\newenvironment{cabstract}{%
+ \pkuthss@int@pdfmark{\cabstractname}{cabstract}
\chapter*{\cabstractname}
- \markboth{\cabstractname}{}
+ \markboth{\cabstractname}{}%
}{% Keywords at the bottom of the page.
- \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords}
+ \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords}%
}
% Typeset the English abstract.
-\newenvironment{eabstract}{
- \cleardoublepage
- \pdfbookmark[1]{\eabstractname}{eabstract}
+\newenvironment{eabstract}{%
+ \pkuthss@int@pdfmark{\eabstractname}{eabstract}
\chapter*{\sffamily\@etitle}
\markboth{\eabstractname}{}
\begin{center}
@@ -294,9 +299,9 @@
{\label@ementor}{\@ementor}\\[2em]
\textbf{\sffamily\eabstractname}
\end{center}
- \par
+ \par%
}{% Keywords at the bottom of the page.
- \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}
+ \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}%
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index c6d5dfae2f6..02ad319a882 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
Binary files differ