xecjk for ctex 2.4.2 (12jun11)

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

9 files changed, 36 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex
index 407594d5d50..bdbab434fdf 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-CJKchecksingle')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -19,7 +19,7 @@
 %%  version 2005/12/01 or later.
 %% 
 \documentclass{article}
-\usepackage[boldfont,slantfont,CJKaddspaces,CJKchecksingle]{xeCJK}
+\usepackage[CJKchecksingle]{xeCJK}
 \setCJKmainfont{AR PLBaosong2GBK Light}
 \textwidth 120mm
 \oddsidemargin 0pt
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex
index c337e344b61..28c15d4a334 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-CJKfntef')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -24,7 +24,7 @@
 \textwidth 150mm
 \oddsidemargin 0pt
 \evensidemargin 0pt
-\usepackage[slantfont,boldfont]{xeCJK}
+\usepackage[boldfont]{xeCJK}
 \usepackage{xcolor}
 \usepackage{CJKfntef}
 
@@ -40,7 +40,7 @@
 标点。
 \end{verbatim}
 
-\CJKunderline{汉字}\CJKunderline{加下划线加下划线加下划线加下划线%
+\CJKunderline{汉字}\CJKunderline{加下划线加下划线加下划线加下划线
 加下划线加下划线加下划线加下划线加下划线加下划线加下划线}
 
 \CJKunderwave{波浪线}
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex
index c47d73ac3bf..b3ea256baed 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-addspaces')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -50,6 +50,16 @@ This is an example. 这是一个例子
 \verb+\CJKsetecglue{ }+
 \sometexts
 
+{\verb+\CJKspace+
+
+\CJKspace
+这 是 一行 文字。}
+
+{\verb+\CJKnospace+
+
+\CJKnospace
+这 是 一行 文字。}
+
 \end{document}
 
 \endinput
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-fallback.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-fallback.tex
index b9491022652..10db8cfa187 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example-fallback.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example-fallback.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-fallback')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -22,7 +22,7 @@
 \usepackage[fallback]{xeCJK}
 \usepackage{CJKfntef}
 \setCJKmainfont{SimSun}
-\setCJKfallbackfamilyfont{rm}{SimSun-ExtB}
+\setCJKfallbackfamilyfont{\CJKrmdefault}{SimSun-ExtB}
 \begin{document}
 
 漢字源𣴑考
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKchecksingle.tex b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKchecksingle.tex
index 407594d5d50..bdbab434fdf 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKchecksingle.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKchecksingle.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-CJKchecksingle')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -19,7 +19,7 @@
 %%  version 2005/12/01 or later.
 %% 
 \documentclass{article}
-\usepackage[boldfont,slantfont,CJKaddspaces,CJKchecksingle]{xeCJK}
+\usepackage[CJKchecksingle]{xeCJK}
 \setCJKmainfont{AR PLBaosong2GBK Light}
 \textwidth 120mm
 \oddsidemargin 0pt
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKfntef.tex b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKfntef.tex
index c337e344b61..28c15d4a334 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKfntef.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKfntef.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-CJKfntef')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -24,7 +24,7 @@
 \textwidth 150mm
 \oddsidemargin 0pt
 \evensidemargin 0pt
-\usepackage[slantfont,boldfont]{xeCJK}
+\usepackage[boldfont]{xeCJK}
 \usepackage{xcolor}
 \usepackage{CJKfntef}
 
@@ -40,7 +40,7 @@
 标点。
 \end{verbatim}
 
-\CJKunderline{汉字}\CJKunderline{加下划线加下划线加下划线加下划线%
+\CJKunderline{汉字}\CJKunderline{加下划线加下划线加下划线加下划线
 加下划线加下划线加下划线加下划线加下划线加下划线加下划线}
 
 \CJKunderwave{波浪线}
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-addspaces.tex b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-addspaces.tex
index c47d73ac3bf..b3ea256baed 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-addspaces.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-addspaces.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-addspaces')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -50,6 +50,16 @@ This is an example. 这是一个例子
 \verb+\CJKsetecglue{ }+
 \sometexts
 
+{\verb+\CJKspace+
+
+\CJKspace
+这 是 一行 文字。}
+
+{\verb+\CJKnospace+
+
+\CJKnospace
+这 是 一行 文字。}
+
 \end{document}
 
 \endinput
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-fallback.tex b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-fallback.tex
index b9491022652..10db8cfa187 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/examples/example-fallback.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/examples/example-fallback.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `example-fallback')
 %% 
-%%  Version 2.3.19 (01-May-2011)
+%%  Version 2.4.2 (12-June-2011)
 %% 
 %%  Copyright (C) Wenchang Sun <sunwch@hotmail.com>
 %% 
@@ -22,7 +22,7 @@
 \usepackage[fallback]{xeCJK}
 \usepackage{CJKfntef}
 \setCJKmainfont{SimSun}
-\setCJKfallbackfamilyfont{rm}{SimSun-ExtB}
+\setCJKfallbackfamilyfont{\CJKrmdefault}{SimSun-ExtB}
 \begin{document}
 
 漢字源𣴑考
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index 9c5d1b97441..8a37f1129ba 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf