ctex 1.02 (19jan11)

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

16 files changed, 56 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 904e7940f0d..54910aea8fa 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/07/12 v0.99b ctexartutf8
+  [2010/10/17 v1.02 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 2afd29a341a..a220db13fd5 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/07/12 v0.99b ctexbookutf8
+  [2010/10/17 v1.02 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 1ebad1307bb..313c2ca9353 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/07/12 v0.99b ctexcaputf8
+  [2010/10/17 v1.02 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 9a57b15e999..6f8da36bc97 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/07/12 v0.99b ctexreputf8
+  [2010/10/17 v1.02 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 13169f45a81..b12facc942d 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/07/12 v0.99b ctexutf8
+  [2010/10/17 v1.02 ctexutf8
    macros package]
 
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctex}}
diff --git a/Master/texmf-dist/tex/latex/ctex/cfg/ctexcap.cfg b/Master/texmf-dist/tex/latex/ctex/cfg/ctexcap.cfg
index 842d54d2e84..a9c1b41f9f3 100644
--- a/Master/texmf-dist/tex/latex/ctex/cfg/ctexcap.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/cfg/ctexcap.cfg
@@ -63,19 +63,19 @@
 \def\CTEX@section@afterskip{2.3ex \@plus .2ex}
 \def\CTEX@section@indent{\z@}
 
-\def\CTEX@subsection@format{\large\bfseries\flushleft}
+\def\CTEX@subsection@format{\large\bfseries}
 \def\CTEX@subsection@aftername{\quad}
 \def\CTEX@subsection@beforeskip{-3.25ex \@plus -1ex \@minus -.2ex}
 \def\CTEX@subsection@afterskip{1.5ex \@plus .2ex}
 \def\CTEX@subsection@indent{\z@}
 
-\def\CTEX@subsubsection@format{\normalsize\bfseries\flushleft}
+\def\CTEX@subsubsection@format{\normalsize\bfseries}
 \def\CTEX@subsubsection@aftername{\quad}
 \def\CTEX@subsubsection@beforeskip{-3.25ex \@plus -1ex \@minus -.2ex}
 \def\CTEX@subsubsection@afterskip{1.5ex \@plus .2ex}
 \def\CTEX@subsubsection@indent{\z@}
 
-\def\CTEX@paragraph@format{\normalsize\bfseries\flushleft}
+\def\CTEX@paragraph@format{\normalsize\bfseries}
 \def\CTEX@paragraph@aftername{\quad}
 \ifnum\c@CTEX@sectiondepth>2
   \def\CTEX@paragraph@beforeskip{-3.25ex \@plus -1ex \@minus -.2ex}
@@ -86,7 +86,7 @@
 \fi
 \def\CTEX@paragraph@indent{\z@}
 
-\def\CTEX@subparagraph@format{\normalsize\bfseries\flushleft}
+\def\CTEX@subparagraph@format{\normalsize\bfseries}
 \def\CTEX@subparagraph@aftername{\quad}
 \ifnum\c@CTEX@sectiondepth>3
   \def\CTEX@subparagraph@beforeskip{-3.25ex \@plus -1ex \@minus -.2ex}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index 38d57cb11bc..8622086d3f6 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/07/12 v0.99b ctex
+  [2010/10/17 v1.02 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 f19e7a9153b..453d6656ebc 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/07/12 v0.99b ctexart
+  [2010/10/17 v1.02 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 8234a42c527..d642b723f1b 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/07/12 v0.99b ctexbook
+  [2010/10/17 v1.02 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 4cf4faa33c5..a9c5c9c4b24 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/07/12 v0.99b ctexcap
+  [2010/10/17 v1.02 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 6da6a213f81..a75abc7d631 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/07/12 v0.99b ctexrep
+  [2010/10/17 v1.02 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 88b0e26378d..3229c41c82d 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
@@ -7,9 +7,6 @@
 
 % Load some extra packages
 
-\IfFileExists{expl3.sty}{%
-  \RequirePackage{expl3}}{}
-
 \RequirePackage{ifpdf}
 \RequirePackage{ifxetex}
 
@@ -48,6 +45,18 @@
     \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.
 
@@ -72,7 +81,7 @@
 \newcommand*\CTEXindent{\CTEXsetfont\parindent2\ccwd}
 \newcommand*\CTEXnoindent{\parindent\z@}
 \ifCTEX@indent
-  \AtBeginDocument{\CTEXindent}
+  \CTEX@AtBeginDocument{\CTEXindent}
 \fi
 \def\CTEX@spaceChar{\hskip \f@size \p@}
 \def\baselinestretch{1.3}
@@ -342,7 +351,7 @@
     \expandafter\expandafter\expandafter\def%
     \expandafter\expandafter\csname cc@#1\endcsname%
     \expandafter{\reserved@a}}}
-\AtBeginDocument{%
+\CTEX@AtBeginDocument{%
   \makeatletter%
   \@ifundefined{CTEX@save@setcounter}{%
     \let\CTEX@save@setcounter\setcounter%
@@ -393,6 +402,7 @@
 
 % Put hyperref as bottom as possible, otherwise there may be page
 % count issues
+\AtEndOfPackage{%
 \ifCTEX@hyperref
   \ifxetex
     \RequirePackage{hyperref}
@@ -412,7 +422,7 @@
     \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 cd54033ed97..528a2b7c323 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
-  \AtBeginDocument{\CCTspace}
+  \CTEX@AtBeginDocument{\CCTspace}
 \else
-  \AtBeginDocument{\CCTnospace}
+  \CTEX@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 05634b7663b..d0ed28a8996 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,12 +29,14 @@
   \def\CTEX@endCJK{\clearpage\end{CJK*}}
 \fi
 
-\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}
+\def\@begindocumenthook{%
+  \CTEX@save@begindocumenthook%
+  \CTEX@begindocumenthook%
+  \CTEX@beginCJK}
+\def\@enddocumenthook{%
+  \CTEX@endCJK
+  \CTEX@enddocumenthook%
+  \CTEX@save@enddocumenthook}
 
 \input{ctex-cjk-common.def}
 
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def
index a9a2a952b65..ebc344e95a7 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def
@@ -1,8 +1,22 @@
 % ctex-xecjk-engine.def: for XeTeX engine with xeCJK
 % vim:ft=tex
 
+% compatibility with amssymb.sty etc and xunicode.sty v0.95+
+\RequirePackage{savesym}
+\def\CTEX@save@symlist{hbar,Finv,aleph,beth,gimel,daleth,Game}
+
+\@for \reversed@a:=\CTEX@save@symlist \do{%
+  \savesymbol{\reversed@a}}
+
 \RequirePackage[BoldFont,normalindentfirst]{xeCJK}
-\defaultfontfeatures{Mapping=tex-text}
+\defaultfontfeatures{Ligatures=TeX}
+
+\@for \reversed@a:=\CTEX@save@symlist \do{%
+  \restoresymbol{UTF}{\reversed@a}%
+  \expandafter\ifx \csname\reversed@a\endcsname \relax
+    \expandafter\let \csname\reversed@a\endcsname \CTEX@undefined
+  \fi}
+\let\CTEX@save@symlist\CTEX@undefined
 
 \ifCTEX@punct
   \punctstyle{quanjiao}
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def
index 3cb76fdf1c6..e79a250b42c 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def
@@ -2,7 +2,7 @@
 % vim:ft=tex
 
 \ifCTEX@zhmap
-  \input zhwinfonts
+  \AtBeginDvi{\input{zhwinfonts}}
 \fi
 
 \renewcommand*\CTEX@rm@family{rm}