ctex 0.97 (22jan10)

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

14 files changed, 43 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 25c6045e0f7..bf6eb50a46c 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}
-  [2009/10/20 v0.95 ctexartutf8
+  [2010/01/22 v0.97 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 383fb5b9623..8dbaaf91f7d 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}
-  [2009/10/20 v0.95 ctexbookutf8
+  [2010/01/22 v0.97 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 1c60f1018ca..4b1da35e782 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}
-  [2009/10/20 v0.95 ctexcaputf8
+  [2010/01/22 v0.97 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 dd4391d2fa1..ccb79252161 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}
-  [2009/10/20 v0.95 ctexreputf8
+  [2010/01/22 v0.97 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 8252e2050b6..ca99a6cdab1 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}
-  [2009/10/20 v0.95 ctexutf8
+  [2010/01/22 v0.97 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 12e848b2b03..de88408e311 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}
-  [2009/10/20 v0.95 ctex
+  [2010/01/22 v0.97 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 a4bdcf734c3..ab653ce7352 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}
-  [2009/10/20 v0.95 ctexart
+  [2010/01/22 v0.97 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 6d387dbcaf6..cf0cc439685 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}
-  [2009/10/20 v0.95 ctexbook
+  [2010/01/22 v0.97 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 79d21b10b69..89356aa8784 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}
-  [2009/10/20 v0.95 ctexcap
+  [2010/01/22 v0.97 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 731c6f55309..a759416b6c1 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}
-  [2009/10/20 v0.95 ctexrep
+  [2010/01/22 v0.97 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 cbb98c21269..9d230ed038d 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
@@ -11,7 +11,7 @@
 \RequirePackage{ifxetex}
 
 \ifxetex
-\CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding
+  \CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding
 \fi
 
 \RequirePackage{keyval}[1999/03/16]
@@ -22,26 +22,6 @@
 \ifCTEX@fancyhdr
   \RequirePackage{fancyhdr}
 \fi
-\ifCTEX@hyperref
-  \ifxetex
-    \RequirePackage[xetex]{hyperref}
-  \else
-    \ifpdf % pdftex
-      \RequirePackage[pdftex]{hyperref}
-    \else % dvipdfmx
-      \ifCTEX@GBK
-        \AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
-      \fi
-      \RequirePackage[dvipdfmx]{hyperref}
-    \fi
-    \ifCTEX@GBK
-      \hypersetup{CJKbookmarks=true}
-    \else
-      \hypersetup{unicode=true}
-    \fi
-  \fi
-  \hypersetup{colorlinks=true}
-\fi
 
 % Useful definitions
 
@@ -384,7 +364,7 @@
 
 \ifCTEX@caption
   \let\CTEX@save@refstepcounter\refstepcounter
-  \def\refstepcounter#1{\stepcounter{#1}%
+  \def\refstepcounter#1{\CTEX@save@refstepcounter{#1}%
     \protected@edef\@currentlabel
       {\csname p@#1\endcsname%
        \@ifundefined{CTEX@the#1}%
@@ -407,5 +387,28 @@
        Available today format are "old", "small", and "big".}}
     {\renewcommand*\today{\csname CTEX@today#1\endcsname}}}
 
+% Put hyperref as bottom as possible, otherwise there may be page
+% count issues
+\ifCTEX@hyperref
+  \ifxetex
+    \RequirePackage{hyperref}
+  \else
+    \ifpdf % pdftex
+      \RequirePackage[pdftex]{hyperref}
+    \else % dvipdfmx
+      \ifCTEX@GBK
+        \AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
+      \fi
+      \RequirePackage[dvipdfmx]{hyperref}
+    \fi
+    \ifCTEX@GBK
+      \hypersetup{CJKbookmarks=true}
+    \else
+      \hypersetup{unicode=true}
+    \fi
+  \fi
+  \hypersetup{colorlinks=true}
+\fi
+
 \endinput
 
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 1a53956c9b4..3cb76fdf1c6 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
@@ -1,7 +1,9 @@
 % ctex-cjk-winfonts.def: Windows 的 CJK 字体设置，默认为 CTeX 套装的六种字体
 % vim:ft=tex
 
-\input zhwinfonts
+\ifCTEX@zhmap
+  \input zhwinfonts
+\fi
 
 \renewcommand*\CTEX@rm@family{rm}
 \renewcommand*\CTEX@sf@family{sf}
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def
index 6f479854736..13f50f3a075 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def
@@ -3,15 +3,13 @@
 
 \setCJKmainfont[BoldFont={SimHei},ItalicFont={[simkai.ttf]}]
   {SimSun}
-\setCJKsansfont{YouYuan}
+\setCJKsansfont{SimHei}
 \setCJKmonofont{[simfang.ttf]}
 
 \setCJKfamilyfont{zhsong}{SimSun}
 \setCJKfamilyfont{zhhei}{SimHei}
 \setCJKfamilyfont{zhkai}{[simkai.ttf]}
 \setCJKfamilyfont{zhfs}{[simfang.ttf]}
-\setCJKfamilyfont{zhli}{LiSu}
-\setCJKfamilyfont{zhyou}{YouYuan}
 
 \newcommand*{\songti}{\CJKfamily{zhsong}} % 宋体
 \newcommand*{\heiti}{\CJKfamily{zhhei}}   % 黑体
diff --git a/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def b/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def
index f9c52572bfd..612935da8b6 100644
--- a/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def
+++ b/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def
@@ -20,6 +20,10 @@
   \CTEX@nofontsfalse
   \CTEX@winfontsfalse}
 
+\newif\ifCTEX@zhmap \CTEX@zhmaptrue
+\DeclareOption{zhmap}{\CTEX@zhmaptrue}
+\DeclareOption{nozhmap}{\CTEX@zhmapfalse}
+
 \newif\ifCTEX@cct \CTEX@cctfalse
 \DeclareOption{CCT}{\CTEX@ccttrue}