summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-15 22:19:47 +0000
committerKarl Berry <karl@freefriends.org>2011-05-15 22:19:47 +0000
commit6727cd30ee7f5b0b96c45a110af7f11c1c50873f (patch)
tree400f9df70db6d4b2cf2f70687583f1b611e434df /Master/texmf-dist/tex/latex/ctex
parent953f11c8761fc6eee458f57c36974515bc365b3b (diff)
ctex 1.02c (14may11)
git-svn-id: svn://tug.org/texlive/trunk@22488 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexart.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexcap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexrep.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/def/ctex-common.def39
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def14
13 files changed, 36 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 54910aea8fa..8a309879c08 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexartutf8}
- [2010/10/17 v1.02 ctexartutf8
+ [2011/03/11 v1.02c ctexartutf8
document class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexart}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls
index a220db13fd5..b4cc20f292c 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexbookutf8}
- [2010/10/17 v1.02 ctexbookutf8
+ [2011/03/11 v1.02c ctexbookutf8
document class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty b/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty
index 313c2ca9353..f0f2234525b 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctexcaputf8}
- [2010/10/17 v1.02 ctexcaputf8
+ [2011/03/11 v1.02c ctexcaputf8
macros package]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctexcap}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls
index 6f8da36bc97..f7b25ef5d8c 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexreputf8}
- [2010/10/17 v1.02 ctexreputf8
+ [2011/03/11 v1.02c ctexreputf8
document class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexrep}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty b/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty
index b12facc942d..f4c3a829f62 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctexutf8}
- [2010/10/17 v1.02 ctexutf8
+ [2011/03/11 v1.02c ctexutf8
macros package]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctex}}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index 8622086d3f6..2fa7c4a90e8 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctex}
- [2010/10/17 v1.02 ctex
+ [2011/03/11 v1.02c ctex
macros package]
\input{ctex-common-opts.def}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
index 453d6656ebc..0665cb9bc04 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexart}
- [2010/10/17 v1.02 ctexart
+ [2011/03/11 v1.02c ctexart
document class]
\def\CTEX@classtoload{article}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
index d642b723f1b..89c54060ae5 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexbook}
- [2010/10/17 v1.02 ctexbook
+ [2011/03/11 v1.02c ctexbook
document class]
\def\CTEX@classtoload{book}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
index a9c5c9c4b24..b13556dff44 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctexcap}
- [2010/10/17 v1.02 ctexcap
+ [2011/03/11 v1.02c ctexcap
macros package]
\input{ctex-common-opts.def}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
index a75abc7d631..f627f861f5b 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexrep}
- [2010/10/17 v1.02 ctexrep
+ [2011/03/11 v1.02c ctexrep
document class]
\def\CTEX@classtoload{report}
diff --git a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
index 3229c41c82d..5b2f0857341 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
@@ -7,6 +7,10 @@
% Load some extra packages
+\IfFileExists{expl3.sty}{%
+ \RequirePackage{expl3}}{}
+
+\RequirePackage{etoolbox}
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
@@ -45,18 +49,6 @@
\csname #2#3\expandafter\endcsname
{\csname #1#3\endcsname}}
-% Set our hooks
-\let\CTEX@begindocumenthook\@empty
-\let\CTEX@enddocumenthook\@empty
-\let\CTEX@save@begindocumenthook\@begindocumenthook
-\let\CTEX@save@enddocumenthook\@enddocumenthook
-\def\@begindocumenthook{\CTEX@save@begindocumenthook\CTEX@begindocumenthook}
-\def\@enddocumenthook{\CTEX@enddocumenthook\CTEX@save@enddocumenthook}
-\def\AtBeginDocument{\g@addto@macro\CTEX@save@begindocumenthook}
-\def\AtEndDocument{\g@addto@macro\CTEX@save@enddocumenthook}
-\def\CTEX@AtBeginDocument{\g@addto@macro\CTEX@begindocumenthook}
-\def\CTEX@AtEndDocument{\g@addto@macro\CTEX@enddocumenthook}
-
% Select engine: xetex has the highest priority, if not,
% then try cct, otherwise we use traditional cjk.
@@ -81,7 +73,7 @@
\newcommand*\CTEXindent{\CTEXsetfont\parindent2\ccwd}
\newcommand*\CTEXnoindent{\parindent\z@}
\ifCTEX@indent
- \CTEX@AtBeginDocument{\CTEXindent}
+ \AtBeginDocument{\CTEXindent}
\fi
\def\CTEX@spaceChar{\hskip \f@size \p@}
\def\baselinestretch{1.3}
@@ -351,7 +343,7 @@
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\csname cc@#1\endcsname%
\expandafter{\reserved@a}}}
-\CTEX@AtBeginDocument{%
+\AtBeginDocument{%
\makeatletter%
\@ifundefined{CTEX@save@setcounter}{%
\let\CTEX@save@setcounter\setcounter%
@@ -402,27 +394,32 @@
% Put hyperref as bottom as possible, otherwise there may be page
% count issues
-\AtEndOfPackage{%
\ifCTEX@hyperref
+\providecommand\hypersetup[1]{%
+ \PassOptionsToPackage{#1}{hyperref}}
+\AtEndPreamble{%
+ \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}}
+\AtEndOfPackage{%
\ifxetex
- \RequirePackage{hyperref}
+ \hypersetup{xetex,unicode}
\else
\ifpdf % pdftex
- \RequirePackage[pdftex]{hyperref}
+ \hypersetup{pdftex}
\else % dvipdfmx
+ \hypersetup{dvipdfmx}
\ifCTEX@GBK
\AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
\fi
- \RequirePackage[dvipdfmx]{hyperref}
\fi
\ifCTEX@GBK
- \hypersetup{CJKbookmarks=true}
+ \hypersetup{CJKbookmarks}
\else
- \hypersetup{unicode=true}
+ \hypersetup{unicode}
\fi
\fi
\hypersetup{colorlinks=true}
-\fi}
+}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def
index 528a2b7c323..cd54033ed97 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def
@@ -16,9 +16,9 @@
\normalem
\fi
\ifCTEX@space
- \CTEX@AtBeginDocument{\CCTspace}
+ \AtBeginDocument{\CCTspace}
\else
- \CTEX@AtBeginDocument{\CCTnospace}
+ \AtBeginDocument{\CCTnospace}
\fi
\def\CTEXspace{\CCTspace}
\def\CTEXnospace{\CCTnospace}
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def
index d0ed28a8996..05634b7663b 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def
@@ -29,14 +29,12 @@
\def\CTEX@endCJK{\clearpage\end{CJK*}}
\fi
-\def\@begindocumenthook{%
- \CTEX@save@begindocumenthook%
- \CTEX@begindocumenthook%
- \CTEX@beginCJK}
-\def\@enddocumenthook{%
- \CTEX@endCJK
- \CTEX@enddocumenthook%
- \CTEX@save@enddocumenthook}
+\let\CTEX@begindocumenthook\@begindocumenthook
+\let\CTEX@enddocumenthook\@enddocumenthook
+\def\AtBeginDocument{\g@addto@macro\CTEX@begindocumenthook}
+\def\AtEndDocument{\g@addto@macro\CTEX@enddocumenthook}
+\def\@begindocumenthook{\CTEX@begindocumenthook\CTEX@beginCJK}
+\def\@enddocumenthook{\CTEX@endCJK\CTEX@enddocumenthook}
\input{ctex-cjk-common.def}