diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls')
| -rw-r--r-- | Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls index de448e91a81..6d2789cac3f 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} - [2016/03/22 v1.7.2 Peking University dissertation document class] + [2016/05/24 v1.7.3 Peking University dissertation document class] % eg. `\pkuthss@int@boolopt{spacing}{true}' will expand to: % \newif\ifpkuthss@opt@spacing \pkuthss@opt@spacingtrue @@ -78,7 +78,8 @@ % `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. -\RequirePackage{hyperref} +% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace. +\AtEndOfClass{\RequirePackage{hyperref}} \ifpkuthss@opt@gbk \input{pkuthss-gbk.def} @@ -139,17 +140,17 @@ \ifpkuthss@opt@pkuspace % lineskip / baselineskip = 20 bp / (12 bp * (6 / 5)). \linespread{1.39}\selectfont - % Quite harmless and frequently used package. Loaded together with `tocloft' - % plus a compatibility option to avoid package clash. - \RequirePackage{subfig} % Provides utilities for setting TOC format; `titles' applied to avoid % interfering with LaTeX's own title mechanism. - \RequirePackage[subfigure, titles]{tocloft} + \RequirePackage[titles]{tocloft} \setlength{\cftbeforechapskip}{6bp plus 1bp} \setlength{\cftsecindent}{\ccwd} \setlength{\cftsubsecindent}{2\ccwd} - % Modify font size and separator of captions. - \RequirePackage{caption} + % `caption' modifies font size and separator of captions. `subcaption' + % provides functions similar to `subfigure'/`subfig' but does not clash with + % `tocloft'; it clashes with `subfigure'/`subfig', but the error message will + % say they cannot be used simultaneously. + \RequirePackage{caption, subcaption} \DeclareCaptionFont{cfive}{\zihao{5}} \DeclareCaptionLabelSeparator{quad}{\quad} \captionsetup{font = cfive, labelsep = quad} @@ -266,23 +267,33 @@ \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} |