pkuthss (17mar16)

git-svn-id: svn://tug.org/texlive/trunk@40057 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 18 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index a7ebc04112c..3b4dd573723 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index f508af5c57a..252a85ca3bd 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -1,5 +1,3 @@
-% vim:ft=tex:ts=2:sw=2
-%
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
@@ -24,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2015/12/16 v1.7.0 Labels and captions in GBK encoding
+	[2016/03/17 v1.7.1 Labels and captions in GBK encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{ÌâÄ¿£º}
@@ -47,3 +45,4 @@
 \def\eabstractname{ABSTRACT}
 
 \endinput
+% vim:ft=tex:ts=2:sw=2
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
index 62a7674aba7..d58631f072b 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -1,5 +1,3 @@
-% vim:ft=tex:ts=2:sw=2
-%
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
@@ -24,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2015/12/16 v1.7.0 Labels and captions in UTF-8 encoding
+	[2016/03/17 v1.7.1 Labels and captions in UTF-8 encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{题目：}
@@ -47,3 +45,4 @@
 \def\eabstractname{ABSTRACT}
 
 \endinput
+% vim:ft=tex:ts=2:sw=2
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
index 01f249063f3..2106e51464e 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -1,9 +1,7 @@
-% vim:ft=tex:ts=2:sw=2
-%
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2015 Casper Ti. Vector
+% Copyright (c) 2010-2016 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
@@ -25,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2015/12/16 v1.7.0 Peking University dissertation document class]
+	[2016/03/17 v1.7.1 Peking University dissertation document class]
 
 % eg. `\pkuthss@int@boolopt{spacing}{true}' will expand to:
 %   \newif\ifpkuthss@opt@spacing \pkuthss@opt@spacingtrue
@@ -69,6 +67,8 @@
 % CJKfntef provides `\CJKunderline' used in `\maketitle'.
 % fancyhdr provides utilities for setting up headers and footers.
 \LoadClass[hyperref, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11]
+% ctex 2.x no longer loads ifpdf and ifxetex by itself.
+\RequirePackage{ifpdf, ifxetex}
 % Provides support for `key = val' grammar.
 \RequirePackage{keyval}
 % Graphics support.
@@ -168,15 +168,6 @@
 	\setlist{nolistsep}
 \fi
 
-\ifpkuthss@opt@pdftoc
-	% Add PDF bookmark for table of contents.
-	\let\pkuthss@tmp@tableofcontents\tableofcontents
-	\renewcommand{\tableofcontents}{%
-		\pkuthss@int@pdfmark{\contentsname}{contents}
-		\pkuthss@tmp@tableofcontents%
-	}
-\fi
-
 \ifpkuthss@opt@spechap
 	% This command is used to start a chapter without numbering, and correctly set
 	% up the headers and footers in the chapter.
@@ -199,6 +190,15 @@
 		}%
 	\fi
 
+	\ifpkuthss@opt@pdftoc
+		% Add PDF bookmark for table of contents.
+		\let\pkuthss@tmp@tableofcontents\tableofcontents
+		\renewcommand{\tableofcontents}{%
+			\pkuthss@int@pdfmark{\contentsname}{contents}
+			\pkuthss@tmp@tableofcontents%
+		}
+	\fi
+
 	\ifpkuthss@opt@pdfprop
 		% Automatically generate properties for generated PDF.
 		% Use English properties to avoid problems with character encodings.
@@ -423,3 +423,4 @@
 }
 
 \endinput
+% vim:ft=tex:ts=2:sw=2
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index 596356cef75..8a2a87f13e5 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf