summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/xelatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-02 21:31:20 +0000
committerKarl Berry <karl@freefriends.org>2015-01-02 21:31:20 +0000
commitb943cdf8beb44268e9ec30be3b91415d06a3609d (patch)
tree3d58ac9e2e40ae3489094cf0a5146c2a25217cfd /Master/texmf-dist/source/xelatex
parent240888f0238c457af999f29f8413ca20a392ef14 (diff)
xecjk (2jan15)
git-svn-id: svn://tug.org/texlive/trunk@35946 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx42
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins4
2 files changed, 30 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 7a79d3e99e8..d5fbd5ef710 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -95,7 +95,7 @@ CJK scripts fonts (TrueType or OpenType).
\askforoverwritefalse
\preamble
-$Id: xeCJK.dtx 742 2014-12-16 13:32:27Z sobenlee@gmail.com $
+$Id: xeCJK.dtx 750 2014-12-26 08:13:35Z sobenlee@gmail.com $
$URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
-----------------------------------------------------------------
Author:
@@ -201,7 +201,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
%</!config&!xunextra>
-\GetIdInfo$Id: xeCJK.dtx 742 2014-12-16 13:32:27Z sobenlee@gmail.com $
+\GetIdInfo$Id: xeCJK.dtx 750 2014-12-26 08:13:35Z sobenlee@gmail.com $
%<*driver|package>
{Typesetting CJK scripts with XeLaTeX}
%</driver|package>
@@ -223,7 +223,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%<fntef> {xeCJKfntef}
%<listings> {xeCJK-listings}
%<xunicode> {xunicode-addon}
- {\ExplFileDate}{3.2.16}{\ExplFileDescription}
+ {\ExplFileDate}{3.3.0}{\ExplFileDescription}
%<xunextra>\ExplSyntaxOff
%<*driver>
\let\xeCJKrevnum\ExplFileVersion
@@ -289,8 +289,9 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\CJKfontspec{Microsoft~YaHei}
\tl_clear:N \l_tmpa_tl
\int_zero:N \l_tmpa_int
- \int_set:Nn \l_tmpb_int { \clist_count:c { c__xeCJK_#2_chars_clist } }
- \clist_map_inline:cn { c__xeCJK_#2_chars_clist }
+ \tl_set:Nx \l_tmpb_tl { \tl_to_str:n { c__xeCJK_#2_chars_clist } }
+ \int_set:Nn \l_tmpb_int { \clist_count:c { \l_tmpb_tl } }
+ \clist_map_inline:cn { \l_tmpb_tl }
{
\int_incr:N \l_tmpa_int
\tl_put_right:Nx \l_tmpa_tl
@@ -401,7 +402,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \changes{v3.2.4}{2013/07/02}{遵循 \hologo{LaTeX3} 变量需要预先声明的原则。}
% \changes{v3.2.6}{2013/07/29}{\texttt{case} 类函数的用法与 \hologo{LaTeX3} 同步。}
%
-% \CheckSum{9714}
+% \CheckSum{9717}
% \GetFileInfo{\jobname.dtx}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -2353,11 +2354,12 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macro}
%
% \begin{macro}[var,internal]{\c_@@_PR_chars_clist}
+% \changes{v3.3.0}{2014/12/26}{不把 \texttt{U+20A9} 归入 CJK 的 PR 类。}
% Prefix Numeric (PR)
% \PrintPunctList{PR}{Prefix Numeric}
% \begin{macrocode}
\clist_const:Nn \c_@@_PR_chars_clist
- { "20A9 , "FE69 , "FF04 , "FFE1 , "FFE5 , "FFE6 }
+ { "FE69 , "FF04 , "FFE1 , "FFE5 , "FFE6 }
% \end{macrocode}
% \end{macro}
%
@@ -2388,15 +2390,24 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.3.0}{2014/12/26}{不把 NS 类中的一些有禁则的日文归入 FullRight 类。}
+%
% \begin{macro}[var,internal]{\c_@@_NS_chars_clist}
% Nonstarter (NS)
% \PrintPunctList{NS}{Nonstarter}
-% \begin{macrocode}
+% \noindent Hyphens (cl-03)
+% \PrintPunctList{hyphens}{Hyphens}
+% \noindent Iteration marks (cl-09)
+% \PrintPunctList{iteration_marks}{Iteration marks}
+% 根据 W3C 的资料\footnote{\url{http://www.w3.org/TR/jlreq/}},\texttt{cl-03} 和
+% \texttt{cl-09} 在非常松散的情况下可以没有禁则。我们就不把它们当成标点来处理禁则,
+% 避免间距错误。
+% \begin{macrocode}
+\clist_const:Nn \c_@@_hyphens_chars_clist { "301C , "30A0 }
+\clist_const:Nn \c_@@_iteration_marks_chars_clist
+ { "3005 , "303B , "309D , "309E , "30FD , "30FE }
\clist_const:Nn \c_@@_NS_chars_clist
- {
- "3005 , "301C , "303B , "303C , "309B , "309C , "309D , "309E , "30A0 , "30FB ,
- "30FD , "30FE , "A015 , "FE54 , "FE55 , "FF1A , "FF1B , "FF65 , "FF9E , "FF9F
- }
+ { "30FB , "FE54 , "FE55 , "FF1A , "FF1B , "FF65 }
% \end{macrocode}
% \end{macro}
%
@@ -2418,7 +2429,9 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macro}
%
% \begin{macro}[var,internal]{\c_@@_CJ_chars_clist}
-% Conditional Japanese Starter (CJ)
+% Conditional Japanese Starter (CJ)。这类字符的禁则是可选的^^A
+% \footnote{\url{https://code.google.com/p/ctex-kit/issues/detail?id=166}},
+% 为实现的简单计,我们把它们归入 CJK 类,即没有禁则。
% \PrintPunctList{CJ}{Conditional Japanese Starter}
% \begin{macrocode}
\clist_const:Nn \c_@@_CJ_chars_clist
@@ -2441,6 +2454,8 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.3.0}{2014/12/26}{不把小写日文假名归入 FullRight 类。}
+%
% \begin{macro}[var,internal]{\c_@@_FullRight_chars_clist}
% 以上六类标点符号出现在文字的右边,不应出现在行首位置。
% \begin{macrocode}
@@ -2450,7 +2465,6 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\c_@@_NS_chars_clist ,
\c_@@_EX_chars_clist ,
\c_@@_IS_chars_clist ,
- \c_@@_CJ_chars_clist ,
\c_@@_PO_chars_clist
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
index dc855cf0347..80c0f3f94b4 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: `install')
%%
-%% $Id: xeCJK.dtx 742 2014-12-16 13:32:27Z sobenlee@gmail.com $
+%% $Id: xeCJK.dtx 750 2014-12-26 08:13:35Z sobenlee@gmail.com $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -37,7 +37,7 @@
\askforoverwritefalse
\preamble
-$Id: xeCJK.dtx 742 2014-12-16 13:32:27Z sobenlee@gmail.com $
+$Id: xeCJK.dtx 750 2014-12-26 08:13:35Z sobenlee@gmail.com $
$URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
-----------------------------------------------------------------
Author: