ctex 0.95 update (20oct09)

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

15 files changed, 15 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 406d92e2f81..25c6045e0f7 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/09/13 v0.94 ctexartutf8
+  [2009/10/20 v0.95 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 1c2d037d2bb..383fb5b9623 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/09/13 v0.94 ctexbookutf8
+  [2009/10/20 v0.95 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 a3fdabd8d8f..1c60f1018ca 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/09/13 v0.94 ctexcaputf8
+  [2009/10/20 v0.95 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 1f2cbf5046a..dd4391d2fa1 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/09/13 v0.94 ctexreputf8
+  [2009/10/20 v0.95 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 6057b96e9a6..8252e2050b6 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/09/13 v0.94 ctexutf8
+  [2009/10/20 v0.95 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 044644c2ac2..12e848b2b03 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/09/13 v0.94 ctex
+  [2009/10/20 v0.95 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 ce70777fe94..a4bdcf734c3 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/09/13 v0.94 ctexart
+  [2009/10/20 v0.95 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 53b037e5ab6..6d387dbcaf6 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/09/13 v0.94 ctexbook
+  [2009/10/20 v0.95 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 7ab3b831253..79d21b10b69 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/09/13 v0.94 ctexcap
+  [2009/10/20 v0.95 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 93203ed3596..731c6f55309 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/09/13 v0.94 ctexrep
+  [2009/10/20 v0.95 ctexrep
    document class]
 
 \def\CTEX@classtoload{report}
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 5f3168726b4..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
@@ -47,13 +47,11 @@
   \renewcommand*\CTEX@sf@family{gbsn}
   \renewcommand*\CTEX@tt@family{gbsn}
 \else
-  \ifCTEX@cjkfonts
-    \input{ctex-cjk-cjkfonts.def}
-  \else\ifCTEX@winfonts
+  \ifCTEX@winfonts
     \input{ctex-cjk-winfonts.def}
   \else\ifCTEX@adobefonts
     \input{ctex-cjk-adobefonts.def}
-  \fi\fi\fi
+  \fi\fi
 \fi
 
 \let\CTEX@save@rmfamily\rmfamily
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 ac937ccd9bd..8051db417ae 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
@@ -13,13 +13,11 @@
 \input{ctex-cjk-common.def}
 
 \ifCTEX@nofonts\else
-  \ifCTEX@cjkfonts
-    \input{ctex-xecjk-cjkfonts.def}
-  \else\ifCTEX@winfonts
+  \ifCTEX@winfonts
     \input{ctex-xecjk-winfonts.def}
   \else\ifCTEX@adobefonts
     \input{ctex-xecjk-adobefonts.def}
-  \fi\fi\fi
+  \fi\fi
 \fi
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def
deleted file mode 100644
index 7441c883f56..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def
+++ /dev/null
@@ -1,11 +0,0 @@
-% ctex-cjk-cjkfonts.def: CJKfonts 的 CJK 字体设置，文鼎的两套字体
-% vim:ft=tex
-
-\renewcommand*\CTEX@rm@family{gbsn}
-\renewcommand*\CTEX@sf@family{gbsn}
-\renewcommand*\CTEX@tt@family{gbsn}
-
-\newcommand*{\songti}{\CJKfamily{gbsn}} % 宋体
-\newcommand*{\kaishu}{\CJKfamily{gkai}} % 楷书
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def
deleted file mode 100644
index e1c67b5714f..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def
+++ /dev/null
@@ -1,7 +0,0 @@
-% ctex-xecjk-cjkfonts.def: CJKfonts 的 xeCJK 字体设置，文鼎的两套字体
-% vim:ft=tex
-
-% 暂缺
-\input{ctex-xecjk-adobefonts.def}
-
-\endinput
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 19612418d52..f9c52572bfd 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
@@ -8,23 +8,15 @@
 
 % fonts
 \newif\ifCTEX@nofonts \CTEX@nofontsfalse
-\newif\ifCTEX@cjkfonts \CTEX@cjkfontstrue
-\newif\ifCTEX@winfonts \CTEX@winfontsfalse
+\newif\ifCTEX@winfonts \CTEX@winfontstrue
 \newif\ifCTEX@adobefonts \CTEX@adobefontsfalse
 \DeclareOption{nofonts}{\CTEX@nofontstrue
-  \CTEX@cjkfontsfalse
-  \CTEX@winfontsfalse
-  \CTEX@adobefontsfalse}
-\DeclareOption{cjkfonts}{\CTEX@cjkfontstrue
-  \CTEX@nofontsfalse
   \CTEX@winfontsfalse
   \CTEX@adobefontsfalse}
 \DeclareOption{winfonts}{\CTEX@winfontstrue
-  \CTEX@cjkfontsfalse
   \CTEX@nofontsfalse
   \CTEX@adobefontsfalse}
 \DeclareOption{adobefonts}{\CTEX@adobefontstrue
-  \CTEX@cjkfontsfalse
   \CTEX@nofontsfalse
   \CTEX@winfontsfalse}