summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-31 23:46:22 +0000
committerKarl Berry <karl@freefriends.org>2013-03-31 23:46:22 +0000
commitaf9ad07fe06204dc0fba8b3e8a28d888746648d4 (patch)
tree93adb06280875edc70e297cec5a81f165e3354ae /Master/texmf-dist/tex
parentc678daad3989ec4722af1cd83da7b1676e4f3ecf (diff)
pkuthss (30mar13)
git-svn-id: svn://tug.org/texlive/trunk@29580 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty5
-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.cls30
4 files changed, 6 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
index a2d40ebaba5..aadc1945d5c 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/01/10 v1.4-rc1 Common extra settings for the pkuthss document class]
+ [2013/03/30 v1.4-rc2 Common extra settings for the pkuthss document class]
% Check the dependency of pkuthss.
\@ifclassloaded{pkuthss}{}{
@@ -47,8 +47,7 @@
\pkuthssextra@int@boolopt{spacing}{true}
% Whether to use list environments that are tighter than LaTeX defaults.
\pkuthssextra@int@boolopt{tightlist}{true}
-% Whether to use some common settings about table of contents, bibliography and
-% indexes.
+% Add PDF bookmark for table of contents.
\pkuthssextra@int@boolopt{pdftoc}{true}
% Whether to enable `\Uppercase' (works problematically) in heading marks.
\pkuthssextra@int@boolopt{uppermark}{false}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index d6c0e41a99c..c20c97a1835 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/01/10 v1.4-rc1 Labels and captions in GBK encoding
+ [2013/03/30 v1.4-rc2 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 db040732fd6..391fe54b5a0 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/01/10 v1.4-rc1 Labels and captions in UTF-8 encoding
+ [2013/03/30 v1.4-rc2 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 be6a7f28955..e06ec19150b 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2013/01/10 v1.4-rc1 Peking University dissertation document class]
+ [2013/03/30 v1.4-rc2 Peking University dissertation document class]
% Process the encoding options.
\newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
@@ -59,16 +59,13 @@
% pkuthss is based on ctexbook; We use A4 paper, and `xiao 4' as default font size.
% CJKfntef provides \CJKunderline used in \maketitle.
% fancyhdr provides utilities for setting headers and footers.
-\LoadClass[fntef,a4paper,fancyhdr,cs4size]{ctexbook}[2009/10/20]
+\LoadClass[hyperref, a4paper, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11]
% Provide support for `key = val' grammar.
\RequirePackage{keyval}
% Graphics support.
\RequirePackage{graphicx}[1999/02/16]
% Provide utilities for setting page layout.
\RequirePackage{geometry}
-% Provide \AtEndPreamble used later.
-% To be removed by summer in 2013, see the fix of `\hypersetup' below.
-\RequirePackage{etoolbox}
% Whether to enable the default extra settings.
\ifpkuthss@opt@extra\RequirePackage{pkuthss-extra}\fi
@@ -87,29 +84,6 @@
\ifpkuthss@opt@gbk\input{pkuthss-gbk.def}
\else\input{pkuthss-utf8.def}
\fi
-
- % Automatically generate hyperlinks and bookmarks for table of contents,
- % citations and index.
- % Code copied with minor modifications from ctex-common.def in `ctex' package.
- % Not directly using the `hyperref' option of `ctex' package in order to avoid
- % the conflicts caused by loading of `hyperref' before `setspace' in `ctex'
- % package older than 1.02c.
- % This piece of code will be removed by summer in 2013, and we will use the
- % `hyperref' option of `ctex' package instead, considering most people
- % will be using newer versions of `ctex' package at that time.
- \providecommand\hypersetup[1]{\PassOptionsToPackage{#1}{hyperref}}
- \AtEndPreamble{\RequirePackage{hyperref}}
- \ifpkuthss@opt@gbk
- \unless\ifxetex
- \hypersetup{CJKbookmarks}
- \unless\ifpdf
- \AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
- \fi
- \fi
- \else
- \hypersetup{unicode}
- \fi
- \hypersetup{driverfallback = dvipdfmx}
}
% Set page layout.