pkuthss (11apr14)

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

4 files changed, 14 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
index 0515be72cfb..af883b6a544 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
@@ -24,7 +24,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{pkuthss-extra}
-	[2013/12/26 v1.4-rc4 Common extra settings for the pkuthss document class]
+	[2014/04/12 v1.5.0 Common extra settings for the pkuthss document class]
 
 % Check the dependency of pkuthss.
 \@ifclassloaded{pkuthss}{}{
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index d98f7b75b41..6659d83a81a 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -23,7 +23,7 @@
 %   pkuthss-extra.sty
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2013/12/26 v1.4-rc4 Labels and captions in GBK encoding
+	[2014/04/12 v1.5.0 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 4d2e7067f81..83a72d13be9 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -23,7 +23,7 @@
 %   pkuthss-extra.sty
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2013/12/26 v1.4-rc4 Labels and captions in UTF-8 encoding
+	[2014/04/12 v1.5.0 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 0df8967a097..be0aa6cddde 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -3,7 +3,7 @@
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2013 Casper Ti. Vector
+% Copyright (c) 2010-2014 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
@@ -24,7 +24,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2013/12/26 v1.4-rc4 Peking University dissertation document class]
+	[2014/04/12 v1.5.0 Peking University dissertation document class]
 
 % Process the encoding options.
 \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
@@ -110,9 +110,7 @@
 		\if@twoside
 			\fancyhead[LE]{\small\normalfont\pkuthss@int@setcase{\leftmark}}
 			\fancyhead[RO]{\small\normalfont\pkuthss@int@setcase{\rightmark}}
-			\fancyhead[LO,RE]{%
-				\small\normalfont\pkuthss@int@setcase{\cuniversity\cthesisname}%
-			}
+			\fancyhead[LO,RE]{\small\normalfont\cuniversity\cthesisname}
 			\fancyfoot[RO,LE]{\small\normalfont --~\thepage~--}
 		\else
 			\fancyhead[L]{\small\normalfont\pkuthss@int@setcase{\leftmark}}
@@ -129,7 +127,14 @@
 	\def\pkuthss@int@setcase#1{#1}
 	\pkuthss@int@setpagestyle
 \else
-	\def\pkuthss@int@setcase#1{\nouppercase{#1}}
+	% Code copied from fancyhdr's `\nouppercase', with the redefinition of
+	% `\uppercase' dropped to avoid disrupting CJKutf8.
+	% cf. <https://code.google.com/p/ctex-kit/issues/detail?id=147>.
+	\def\pkuthss@int@setcase#1{%
+		\let\MakeUppercase\relax%
+		\expandafter\let\csname MakeUppercase \endcsname\relax%
+		#1%
+	}
 	\pkuthss@int@setpagestyle
 \fi