xecjk (13dec12)

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

5 files changed, 44 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/README b/Master/texmf-dist/doc/xelatex/xecjk/README
index 94a9f709aab..721c1572864 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/README
+++ b/Master/texmf-dist/doc/xelatex/xecjk/README
@@ -14,6 +14,7 @@ This package consists of the file  xeCJK.dtx
                                    xeCJK.sty,
                                    xeCJK.cfg,
                                    xeCJK.ins,
+                                   xeCJKfntef.sty,
                                    xeCJK-example-autofake.tex,
                                    xeCJK-example-fallback.tex,
                                    xeCJK-example-subCJKblock.tex,
@@ -47,8 +48,7 @@ The package requires LaTeX3 support as provided in the l3kernel and
 l3packages bundles and the fontspec package. All of these are available
 on CTAN as ready-to-install zip files. Suitable versions are available
 in the latest version of MiKTeX and TeX Live (updating the relevant
-packages online may be necessary). Both of xpatch and etoolbox packages
-are required. They are also available on CTAN.
+packages online may be necessary).
 
 To compile the documentation without error, you will need some specific
 CJK scripts fonts (TrueType or OpenType).
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
index 700f3d0d3a6..0e0e39b5033 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
@@ -9,22 +9,47 @@
 \documentclass{article}
 \usepackage{xeCJK}
 \usepackage{xcolor}
-\usepackage{CJKfntef}
-\setCJKmainfont{SimSun}
+\usepackage{xeCJKfntef}
+\xeCJKDeclareSubCJKBlock{test}{ `殆 , `已 }
+\setCJKmainfont[test=SimHei]{SimSun}
 
-\begin{document}
-
-\CJKunderline{汉字}\CJKunderline{加下划线加下划线加下划线加下划线
-加下划线加下划线加下划线加下划线加下划线加下划线加下划线}
+\def\showtext{%
+  庄子曰：“吾生也有涯，而知也无涯。以有涯随无涯，殆已！已而为知者，殆而已矣！%
+  为善无近名，为恶无近刑，缘督以为经，可以保身，可以全生，可以养亲，可以尽年。”}
+\newcommand\CJKfntef[1]{%
+  \csname#1\endcsname{\showtext}\par
+  \csname#1\endcsname*{\showtext}\par
+  \CJKunderdot{\showtext\csname#1\endcsname{\showtext}}\par
+  \CJKunderdot{\showtext\csname#1\endcsname*{\showtext}}\par
+  \csname#1\endcsname{\showtext\CJKunderdot{\showtext}}\par
+  \csname#1\endcsname*{\showtext\CJKunderdot{\showtext}}\par\bigskip}
 
-\CJKunderwave{波浪线}
+\begin{document}
 
+\CJKunderline{汉 字}\CJKunderline{加下划线}
+\varCJKunderline{汉字}\varCJKunderline{加下划线}
 \CJKunderanyline{0.5em}{\sixly \kern-.021em\char58 \kern-.021em}{自定义下划线}
-
 \CJKunderanyline{0.2em}{\kern-.03em\vtop{\kern.2ex\hrule width.2em\kern 0.11em
   \hrule height 0.1em}\kern-.03em}{自定义下划线}
 
-\CJKunderanysymbol{0.5em}{$\cdot$}{汉字加点}
+\CJKunderanyline{0.5em}{-}{\showtext}
+
+\CJKunderanysymbol{0.2em}{-}{\showtext}
+
+\CJKunderdot{\showtext}
+
+\begin{CJKfilltwosides}{40mm}
+两端分散对齐\\
+分散对齐\\
+\CJKunderdot{汉字可加点}\\
+\CJKunderline{汉字可加下划线}
+\end{CJKfilltwosides}
+
+\CJKfntef{CJKunderline}
+\CJKfntef{CJKunderwave}
+\CJKfntef{CJKunderdblline}
+\CJKfntef{CJKsout}
+\CJKfntef{CJKxout}
 
 \end{document}
 %% 
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-checksingle.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-checksingle.tex
index 16f4a034420..3735d4a76e7 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-checksingle.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-checksingle.tex
@@ -13,6 +13,8 @@
 \def。{．}
 \def\foo{一}
 \long\def\showtext{一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十。
+\[x^2+y^2\]
+一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十\foo
 $$x^2+y^2$$
 一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十\foo
 \begin{equation}
@@ -28,6 +30,11 @@ x^2+y^2
 
 \xeCJKsetup{CheckSingle}
 \showtext
+
+\hrulefill\bigskip
+
+\xeCJKsetup{PlainEquation}
+\showtext
 \end{document}
 %% 
 %%
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-fallback.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-fallback.tex
index 53e64190a31..473abf793cb 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-fallback.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-fallback.tex
@@ -8,7 +8,7 @@
 %% 
 \documentclass{article}
 \usepackage[AutoFallBack]{xeCJK}
-\usepackage{CJKfntef}
+\usepackage{xeCJKfntef}
 \usepackage{array}
 \setCJKmainfont[AutoFakeBold,AutoFakeSlant]{KaiTi_GB2312}
 \setCJKfallbackfamilyfont{\CJKrmdefault}[BoldFont=SimHei]
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index 39ed5e3552e..2a30603cac8 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf