ctex r206 (14oct09)

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

7 files changed, 93 insertions, 86 deletions

diff --git a/Master/texmf-dist/tex/latex/ctex/def/ctex-gbk.def b/Master/texmf-dist/tex/latex/ctex/def/ctex-gbk.def
index bfc00a39bf8..8976f88fe7a 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-gbk.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-gbk.def
@@ -22,7 +22,10 @@
 
 \def\CTEX@todaysmall{~\the\year~年~\the\month~月~\the\day~日}
 \def\CTEX@todaybig{%
-  \CJKdigits{\the\year}年\CJKnumber{\the\month}月\CJKnumber{\the\day}日}
+  \CTEXdigits{\temp@year}{\the\year}%
+  \CTEXnumber{\temp@month}{\the\month}%
+  \CTEXnumber{\temp@day}{\the\day}%
+  \temp@year{}年\temp@month{}月\temp@day{}日}
 
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/ctex/def/ctex-utf8.def b/Master/texmf-dist/tex/latex/ctex/def/ctex-utf8.def
index 5b106be224d..10493a5b381 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-utf8.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-utf8.def
@@ -22,7 +22,10 @@
 
 \def\CTEX@todaysmall{~\the\year~骞磣\the\month~鏈垀\the\day~鏃
 \def\CTEX@todaybig{%
-  \CJKdigits{\the\year}骞碶CJKnumber{\the\month}鏈圽CJKnumber{\the\day}鏃
+  \CTEXdigits{\temp@year}{\the\year}%
+  \CTEXnumber{\temp@month}{\the\month}%
+  \CTEXnumber{\temp@day}{\the\day}%
+  \temp@year{}骞碶temp@month{}鏈圽temp@day{}鏃
 
 \endinput
 
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 ab3ebad6e3a..5f3168726b4 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
@@ -6,7 +6,6 @@
 \else
   \RequirePackage{CJKutf8}[2003/03/28]
 \fi
-\RequirePackage{CJKnumb}[2003/03/28]
 
 \ifCTEX@punct
   \RequirePackage{CJKpunct}[2009/05/06]
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 2d63b686a0b..ac937ccd9bd 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,7 +1,7 @@
 % ctex-xecjk-engine.def: for XeTeX engine with xeCJK
 % vim:ft=tex
 
-\RequirePackage[BoldFont,CJKnumber]{xeCJK}
+\RequirePackage[BoldFont]{xeCJK}
 \defaultfontfeatures{Mapping=tex-text}
 
 \ifCTEX@punct
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 12e956cf7cd..1a53956c9b4 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,78 +1,80 @@
 % ctex-cjk-winfonts.def: Windows 鐨� CJK 瀛椾綋璁剧疆锛岄粯璁や负 CTeX 濂楄鐨勫叚绉嶅瓧浣�
 % vim:ft=tex
 
+\input zhwinfonts
+
 \renewcommand*\CTEX@rm@family{rm}
 \renewcommand*\CTEX@sf@family{sf}
 \renewcommand*\CTEX@tt@family{tt}
 
 \ifCTEX@punct
 % see also: c19rm.fd
-  \CJKpunctmapfamily{C19}{rm}{m}{n}{song}
-  \CJKpunctmapfamily{C19}{rm}{b}{n}{hei}
-  \CJKpunctmapfamily{C19}{rm}{bx}{n}{hei}
-  \CJKpunctmapfamily{C19}{rm}{m}{sl}{song}
-  \CJKpunctmapfamily{C19}{rm}{b}{sl}{hei}
-  \CJKpunctmapfamily{C19}{rm}{bx}{sl}{hei}
-  \CJKpunctmapfamily{C19}{rm}{m}{it}{kai}
-  \CJKpunctmapfamily{C19}{rm}{b}{it}{kei}
-  \CJKpunctmapfamily{C19}{rm}{bx}{it}{kai}
+  \CJKpunctmapfamily{C19}{rm}{m}{n}{zhsong}
+  \CJKpunctmapfamily{C19}{rm}{b}{n}{zhhei}
+  \CJKpunctmapfamily{C19}{rm}{bx}{n}{zhhei}
+  \CJKpunctmapfamily{C19}{rm}{m}{sl}{zhsong}
+  \CJKpunctmapfamily{C19}{rm}{b}{sl}{zhhei}
+  \CJKpunctmapfamily{C19}{rm}{bx}{sl}{zhhei}
+  \CJKpunctmapfamily{C19}{rm}{m}{it}{zhkai}
+  \CJKpunctmapfamily{C19}{rm}{b}{it}{zhkei}
+  \CJKpunctmapfamily{C19}{rm}{bx}{it}{zhkai}
 % see also: c19sf.fd
-  \CJKpunctmapfamily{C19}{sf}{m}{n}{you}
-  \CJKpunctmapfamily{C19}{sf}{b}{n}{you}
-  \CJKpunctmapfamily{C19}{sf}{bx}{n}{you}
-  \CJKpunctmapfamily{C19}{sf}{m}{sl}{you}
-  \CJKpunctmapfamily{C19}{sf}{b}{sl}{you}
-  \CJKpunctmapfamily{C19}{sf}{bx}{sl}{you}
-  \CJKpunctmapfamily{C19}{sf}{m}{it}{you}
-  \CJKpunctmapfamily{C19}{sf}{b}{it}{you}
-  \CJKpunctmapfamily{C19}{sf}{bx}{it}{you}
+  \CJKpunctmapfamily{C19}{sf}{m}{n}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{b}{n}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{bx}{n}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{m}{sl}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{b}{sl}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{bx}{sl}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{m}{it}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{b}{it}{zhyou}
+  \CJKpunctmapfamily{C19}{sf}{bx}{it}{zhyou}
 % see also: c19tt.fd
-  \CJKpunctmapfamily{C19}{tt}{m}{n}{fs}
-  \CJKpunctmapfamily{C19}{tt}{b}{n}{fs}
-  \CJKpunctmapfamily{C19}{tt}{bx}{n}{fs}
-  \CJKpunctmapfamily{C19}{tt}{m}{sl}{fs}
-  \CJKpunctmapfamily{C19}{tt}{b}{sl}{fs}
-  \CJKpunctmapfamily{C19}{tt}{bx}{sl}{fs}
-  \CJKpunctmapfamily{C19}{tt}{m}{it}{fs}
-  \CJKpunctmapfamily{C19}{tt}{b}{it}{fs}
-  \CJKpunctmapfamily{C19}{tt}{bx}{it}{fs}
+  \CJKpunctmapfamily{C19}{tt}{m}{n}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{b}{n}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{bx}{n}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{m}{sl}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{b}{sl}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{bx}{sl}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{m}{it}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{b}{it}{zhfs}
+  \CJKpunctmapfamily{C19}{tt}{bx}{it}{zhfs}
 % see also: c70rm.fd
-  \CJKpunctmapfamily{C70}{rm}{m}{n}{song}
-  \CJKpunctmapfamily{C70}{rm}{b}{n}{hei}
-  \CJKpunctmapfamily{C70}{rm}{bx}{n}{hei}
-  \CJKpunctmapfamily{C70}{rm}{m}{sl}{song}
-  \CJKpunctmapfamily{C70}{rm}{b}{sl}{hei}
-  \CJKpunctmapfamily{C70}{rm}{bx}{sl}{hei}
-  \CJKpunctmapfamily{C70}{rm}{m}{it}{kai}
-  \CJKpunctmapfamily{C70}{rm}{b}{it}{kei}
-  \CJKpunctmapfamily{C70}{rm}{bx}{it}{kai}
+  \CJKpunctmapfamily{C70}{rm}{m}{n}{zhsong}
+  \CJKpunctmapfamily{C70}{rm}{b}{n}{zhhei}
+  \CJKpunctmapfamily{C70}{rm}{bx}{n}{zhhei}
+  \CJKpunctmapfamily{C70}{rm}{m}{sl}{zhsong}
+  \CJKpunctmapfamily{C70}{rm}{b}{sl}{zhhei}
+  \CJKpunctmapfamily{C70}{rm}{bx}{sl}{zhhei}
+  \CJKpunctmapfamily{C70}{rm}{m}{it}{zhkai}
+  \CJKpunctmapfamily{C70}{rm}{b}{it}{zhkei}
+  \CJKpunctmapfamily{C70}{rm}{bx}{it}{zhkai}
 % see also: c70sf.fd
-  \CJKpunctmapfamily{C70}{sf}{m}{n}{you}
-  \CJKpunctmapfamily{C70}{sf}{b}{n}{you}
-  \CJKpunctmapfamily{C70}{sf}{bx}{n}{you}
-  \CJKpunctmapfamily{C70}{sf}{m}{sl}{you}
-  \CJKpunctmapfamily{C70}{sf}{b}{sl}{you}
-  \CJKpunctmapfamily{C70}{sf}{bx}{sl}{you}
-  \CJKpunctmapfamily{C70}{sf}{m}{it}{you}
-  \CJKpunctmapfamily{C70}{sf}{b}{it}{you}
-  \CJKpunctmapfamily{C70}{sf}{bx}{it}{you}
+  \CJKpunctmapfamily{C70}{sf}{m}{n}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{b}{n}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{bx}{n}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{m}{sl}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{b}{sl}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{bx}{sl}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{m}{it}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{b}{it}{zhyou}
+  \CJKpunctmapfamily{C70}{sf}{bx}{it}{zhyou}
 % see also: c70tt.fd
-  \CJKpunctmapfamily{C70}{tt}{m}{n}{fs}
-  \CJKpunctmapfamily{C70}{tt}{b}{n}{fs}
-  \CJKpunctmapfamily{C70}{tt}{bx}{n}{fs}
-  \CJKpunctmapfamily{C70}{tt}{m}{sl}{fs}
-  \CJKpunctmapfamily{C70}{tt}{b}{sl}{fs}
-  \CJKpunctmapfamily{C70}{tt}{bx}{sl}{fs}
-  \CJKpunctmapfamily{C70}{tt}{m}{it}{fs}
-  \CJKpunctmapfamily{C70}{tt}{b}{it}{fs}
-  \CJKpunctmapfamily{C70}{tt}{bx}{it}{fs}
+  \CJKpunctmapfamily{C70}{tt}{m}{n}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{b}{n}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{bx}{n}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{m}{sl}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{b}{sl}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{bx}{sl}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{m}{it}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{b}{it}{zhfs}
+  \CJKpunctmapfamily{C70}{tt}{bx}{it}{zhfs}
 \fi
 
-\newcommand*{\songti}{\CJKfamily{song}} % 瀹嬩綋
-\newcommand*{\heiti}{\CJKfamily{hei}}   % 榛戜綋
-\newcommand*{\kaishu}{\CJKfamily{kai}}  % 妤蜂功
-\newcommand*{\fangsong}{\CJKfamily{fs}} % 浠垮畫
-\newcommand*{\lishu}{\CJKfamily{li}}    % 闅朵功
-\newcommand*{\youyuan}{\CJKfamily{you}} % 骞煎渾
+\newcommand*{\songti}{\CJKfamily{zhsong}} % 瀹嬩綋
+\newcommand*{\heiti}{\CJKfamily{zhhei}}   % 榛戜綋
+\newcommand*{\kaishu}{\CJKfamily{zhkai}}  % 妤蜂功
+\newcommand*{\fangsong}{\CJKfamily{zhfs}} % 浠垮畫
+\newcommand*{\lishu}{\CJKfamily{zhli}}    % 闅朵功
+\newcommand*{\youyuan}{\CJKfamily{zhyou}} % 骞煎渾
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
index 747f5601799..bb2a03bed92 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
@@ -6,16 +6,16 @@
 \setCJKsansfont{Adobe Heiti Std}
 \setCJKmonofont{Adobe Fangsong Std}
 
-\setCJKfamilyfont{song}{Adobe Song Std}
-\setCJKfamilyfont{hei}{Adobe Heiti Std}
-\setCJKfamilyfont{fs}{Adobe Fangsong Std}
-\setCJKfamilyfont{kai}{Adobe Kaiti Std}
+\setCJKfamilyfont{zhsong}{Adobe Song Std}
+\setCJKfamilyfont{zhhei}{Adobe Heiti Std}
+\setCJKfamilyfont{zhfs}{Adobe Fangsong Std}
+\setCJKfamilyfont{zhkai}{Adobe Kaiti Std}
 
-\newcommand*{\songti}{\CJKfamily{song}} % 瀹嬩綋
-\newcommand*{\heiti}{\CJKfamily{hei}}   % 榛戜綋
-\newcommand*{\kaishu}{\CJKfamily{kai}}  % 妤蜂功
-\newcommand*{\fangsong}{\CJKfamily{fs}} % 浠垮畫
-\newcommand*{\lishu}{\CJKfamily{li}}    % 闅朵功
-\newcommand*{\youyuan}{\CJKfamily{you}} % 骞煎渾
+\newcommand*{\songti}{\CJKfamily{zhsong}} % 瀹嬩綋
+\newcommand*{\heiti}{\CJKfamily{zhhei}}   % 榛戜綋
+\newcommand*{\kaishu}{\CJKfamily{zhkai}}  % 妤蜂功
+\newcommand*{\fangsong}{\CJKfamily{zhfs}} % 浠垮畫
+\newcommand*{\lishu}{\CJKfamily{zhli}}    % 闅朵功
+\newcommand*{\youyuan}{\CJKfamily{zhyou}} % 骞煎渾
 
 \endinput
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 638e23df611..6f479854736 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
@@ -6,18 +6,18 @@
 \setCJKsansfont{YouYuan}
 \setCJKmonofont{[simfang.ttf]}
 
-\setCJKfamilyfont{song}{SimSun}
-\setCJKfamilyfont{hei}{SimHei}
-\setCJKfamilyfont{kai}{[simkai.ttf]}
-\setCJKfamilyfont{fs}{[simfang.ttf]}
-\setCJKfamilyfont{li}{LiSu}
-\setCJKfamilyfont{you}{YouYuan}
+\setCJKfamilyfont{zhsong}{SimSun}
+\setCJKfamilyfont{zhhei}{SimHei}
+\setCJKfamilyfont{zhkai}{[simkai.ttf]}
+\setCJKfamilyfont{zhfs}{[simfang.ttf]}
+\setCJKfamilyfont{zhli}{LiSu}
+\setCJKfamilyfont{zhyou}{YouYuan}
 
-\newcommand*{\songti}{\CJKfamily{song}} % 瀹嬩綋
-\newcommand*{\heiti}{\CJKfamily{hei}}   % 榛戜綋
-\newcommand*{\kaishu}{\CJKfamily{kai}}  % 妤蜂功
-\newcommand*{\fangsong}{\CJKfamily{fs}} % 浠垮畫
-\newcommand*{\lishu}{\CJKfamily{li}}    % 闅朵功
-\newcommand*{\youyuan}{\CJKfamily{you}} % 骞煎渾
+\newcommand*{\songti}{\CJKfamily{zhsong}} % 瀹嬩綋
+\newcommand*{\heiti}{\CJKfamily{zhhei}}   % 榛戜綋
+\newcommand*{\kaishu}{\CJKfamily{zhkai}}  % 妤蜂功
+\newcommand*{\fangsong}{\CJKfamily{zhfs}} % 浠垮畫
+\newcommand*{\lishu}{\CJKfamily{zhli}}    % 闅朵功
+\newcommand*{\youyuan}{\CJKfamily{zhyou}} % 骞煎渾
 
 \endinput