summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-10-20 21:07:03 +0000
committerKarl Berry <karl@freefriends.org>2009-10-20 21:07:03 +0000
commit1ba0bab45d5f3bae5a855091a2f11485718e57a1 (patch)
treea137a70966b7a02bcbbbed54126548d8c4d5c4fa
parentb51869411c369af0d8f012ca4ebfa8c6950110c4 (diff)
xecjk 2.3.10 (20oct09)
git-svn-id: svn://tug.org/texlive/trunk@15853 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex2
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex13
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex2
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKchecksingle.tex2
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/examples/example-CJKfntef.tex13
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/examples/example-addspaces.tex2
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdfbin293569 -> 296020 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx68
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins4
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty44
10 files changed, 111 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-CJKchecksingle.tex
index cb95a60e93b..c90fed53b6c 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.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-CJKfntef.tex
index 54e885ae26a..9d3528ad8aa 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.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
@@ -45,13 +45,14 @@
\CJKunderwave{波浪线}
-\CJKunderanyline{0.5em}{\sixly \kern-.021em\char58 \kern-.021em}{自定义下划线}
+\ifcsname CJKunderanyline\endcsname
+ \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 .1em}\kern-.03em}{自定义下划线}
-
-\CJKunderanysymbol{0.2em}{$\cdot$}{汉字加点}
+ \CJKunderanyline{0.2em}{\kern-.03em\vtop{\kern.2ex\hrule width.2em\kern 0.11em
+ \hrule height .1em}\kern-.03em}{自定义下划线}
+ \CJKunderanysymbol{0.2em}{$\cdot$}{汉字加点}
+\fi
\end{document}
\endinput
%%
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex b/Master/texmf-dist/doc/xelatex/xecjk/example-addspaces.tex
index 004ae3f3a8c..4b62b0747cd 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.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
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 cb95a60e93b..c90fed53b6c 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.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
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 54e885ae26a..9d3528ad8aa 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.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
@@ -45,13 +45,14 @@
\CJKunderwave{波浪线}
-\CJKunderanyline{0.5em}{\sixly \kern-.021em\char58 \kern-.021em}{自定义下划线}
+\ifcsname CJKunderanyline\endcsname
+ \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 .1em}\kern-.03em}{自定义下划线}
-
-\CJKunderanysymbol{0.2em}{$\cdot$}{汉字加点}
+ \CJKunderanyline{0.2em}{\kern-.03em\vtop{\kern.2ex\hrule width.2em\kern 0.11em
+ \hrule height .1em}\kern-.03em}{自定义下划线}
+ \CJKunderanysymbol{0.2em}{$\cdot$}{汉字加点}
+\fi
\end{document}
\endinput
%%
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 004ae3f3a8c..4b62b0747cd 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.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index eafda729e16..3749e6aff65 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 5e09ae3d12e..dd6ecf2cf46 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -26,7 +26,7 @@ CJK scripts easily.
\keepsilent
\preamble
- Version 2.3.8 (12-Sept-2009)
+ Version 2.3.10 (30-Sept-2009)
Copyright (C) Wenchang Sun <sunwch@hotmail.com>
@@ -129,8 +129,8 @@ CJK scripts easily.
%</driver>
%
%<*xeCJK>
-\def\fileversion{2.3.8}
-\def\filedate{2009/09/12}
+\def\fileversion{2.3.10}
+\def\filedate{2009/09/30}
\ProvidesPackage{xeCJK}[\filedate\space\fileversion]
%</xeCJK>
%
@@ -373,8 +373,18 @@ CJK scripts easily.
%
% \verb+\xeCJKsetkern{:}{“}{0.3em}+
%
+% \begin{decl}
+% \defmacro{\normalspacedchars}\arg{char list}
+% \end{decl}
+% 在<char list>中出现的字符两端不自动添加空格.
%
%
+% \begin{decl}
+% \defmacro{\makexeCJKactive}\\
+% \defmacro{\makexeCJKinactive}
+% \end{decl}
+% 打开/关闭对中文的特殊处理.
+%
% \section{兼容性}
%
% \subsection{CJKfntef}
@@ -581,7 +591,13 @@ CJK scripts easily.
% \end{macrocode}
% 设置CJK字符类。
% \begin{macrocode}
-\XeTeXinterchartokenstate=1\relax
+\def\makexeCJKactive{
+ \XeTeXinterchartokenstate=1\relax}
+
+\def\makexeCJKinactive{
+ \XeTeXinterchartokenstate=0\relax}
+
+\makexeCJKactive
\def\xeCJKsetcharclass#1#2#3{
\@tempcnta=#1
@@ -631,6 +647,20 @@ CJK scripts easily.
\xeCJKsetcharclass{"2000}{"FFFF}{1}
+\def\CJK@stop{\CJK@stop}
+
+\def\normalspacedchars#1{
+ \xeCJK@setnormalspacedchar#1\CJK@stop}
+
+\def\xeCJK@setnormalspacedchar#1{
+ \ifx#1\CJK@stop
+ \else
+ \XeTeXcharclass`#1=6
+ \expandafter\xeCJK@setnormalspacedchar
+ \fi}
+
+\normalspacedchars{/}
+
% \end{macrocode}
%
% \section{字符输出规则}
@@ -679,6 +709,18 @@ CJK scripts easily.
\XeTeXinterchartoks 255 3{\xeCJK@cclv@iii}
\XeTeXinterchartoks 255 4{\xeCJK@cclv@iv}
+\XeTeXinterchartoks 1 6{\xeCJK@i@vi}
+\XeTeXinterchartoks 6 1{\xeCJK@vi@i}
+
+\def\xeCJK@vi@i{
+ \bgroup
+ \xeCJK@emptyCJKtoks
+ \xeCJK@setfont
+ \CJKsymbol}
+
+\def\xeCJK@i@vi{
+ \egroup}
+
\def\xeCJK@i@i{
\CJKglue
\CJKsymbol}
@@ -927,8 +969,6 @@ CJK scripts easily.
\global\expandafter\def\: {\futurelet\@let@token\xeCJK@@@checknext}
}
-\def\CJK@stop{\CJK@stop}
-
\def\xeCJK@@@checknext{
\ifx $\@let@token
\@sptoken%\CJKecglue
@@ -958,7 +998,7 @@ CJK scripts easily.
\futurelet\@let@token\xeCJK@@checksingle}
\def\xeCJK@@checksingle{
- \ifcat 。\@let@token
+ \ifcat 。\noexpand\@let@token
\expandafter\xeCJK@@@checksingle
\else
\expandafter\xeCJK@setcurrentchar@i
@@ -1710,14 +1750,14 @@ xeCJK 改进了中英文间距的处理, 并且还可以避免单个汉字独
\CJKunderwave{波浪线}
-\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 .1em}\kern-.03em}{自定义下划线}
-
-\CJKunderanysymbol{0.2em}{$\cdot$}{汉字加点}
+\ifcsname CJKunderanyline\endcsname
+ \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 .1em}\kern-.03em}{自定义下划线}
+ \CJKunderanysymbol{0.2em}{$\cdot$}{汉字加点}
+\fi
\end{document}
% \end{macrocode}
% \iffalse
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
index c88c4a5026b..a9faa771836 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `batchfile')
%%
-%% Version 2.3.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
@@ -22,7 +22,7 @@
\keepsilent
\preamble
- Version 2.3.8 (12-Sept-2009)
+ Version 2.3.10 (30-Sept-2009)
Copyright (C) Wenchang Sun <sunwch@hotmail.com>
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index 06a4d0cae47..ce72b7ce0ac 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `xeCJK')
%%
-%% Version 2.3.8 (12-Sept-2009)
+%% Version 2.3.10 (30-Sept-2009)
%%
%% Copyright (C) Wenchang Sun <sunwch@hotmail.com>
%%
@@ -18,8 +18,8 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-\def\fileversion{2.3.8}
-\def\filedate{2009/09/12}
+\def\fileversion{2.3.10}
+\def\filedate{2009/09/30}
\ProvidesPackage{xeCJK}[\filedate\space\fileversion]
\RequirePackage{ifxetex}
\RequireXeTeX
@@ -55,7 +55,13 @@
\RequirePackage{fontspec}
\relax
\endlinechar \m@ne
-\XeTeXinterchartokenstate=1\relax
+\def\makexeCJKactive{
+ \XeTeXinterchartokenstate=1\relax}
+
+\def\makexeCJKinactive{
+ \XeTeXinterchartokenstate=0\relax}
+
+\makexeCJKactive
\def\xeCJKsetcharclass#1#2#3{
\@tempcnta=#1
@@ -105,6 +111,20 @@
\xeCJKsetcharclass{"2000}{"FFFF}{1}
+\def\CJK@stop{\CJK@stop}
+
+\def\normalspacedchars#1{
+ \xeCJK@setnormalspacedchar#1\CJK@stop}
+
+\def\xeCJK@setnormalspacedchar#1{
+ \ifx#1\CJK@stop
+ \else
+ \XeTeXcharclass`#1=6
+ \expandafter\xeCJK@setnormalspacedchar
+ \fi}
+
+\normalspacedchars{/}
+
\XeTeXinterchartoks 1 0{\egroup\CJKecglue}
\XeTeXinterchartoks 1 1{\xeCJK@i@i}
\XeTeXinterchartoks 1 2{\xeCJK@i@ii}
@@ -149,6 +169,18 @@
\XeTeXinterchartoks 255 3{\xeCJK@cclv@iii}
\XeTeXinterchartoks 255 4{\xeCJK@cclv@iv}
+\XeTeXinterchartoks 1 6{\xeCJK@i@vi}
+\XeTeXinterchartoks 6 1{\xeCJK@vi@i}
+
+\def\xeCJK@vi@i{
+ \bgroup
+ \xeCJK@emptyCJKtoks
+ \xeCJK@setfont
+ \CJKsymbol}
+
+\def\xeCJK@i@vi{
+ \egroup}
+
\def\xeCJK@i@i{
\CJKglue
\CJKsymbol}
@@ -397,8 +429,6 @@
\global\expandafter\def\: {\futurelet\@let@token\xeCJK@@@checknext}
}
-\def\CJK@stop{\CJK@stop}
-
\def\xeCJK@@@checknext{
\ifx $\@let@token
\@sptoken%\CJKecglue
@@ -424,7 +454,7 @@
\futurelet\@let@token\xeCJK@@checksingle}
\def\xeCJK@@checksingle{
- \ifcat 。\@let@token
+ \ifcat 。\noexpand\@let@token
\expandafter\xeCJK@@@checksingle
\else
\expandafter\xeCJK@setcurrentchar@i