summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex
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 /Master/texmf-dist/tex/xelatex
parentb51869411c369af0d8f012ca4ebfa8c6950110c4 (diff)
xecjk 2.3.10 (20oct09)
git-svn-id: svn://tug.org/texlive/trunk@15853 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty44
1 files changed, 37 insertions, 7 deletions
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