diff options
author | Karl Berry <karl@freefriends.org> | 2016-02-12 00:26:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-02-12 00:26:43 +0000 |
commit | be5bf6a52f48b97cb795ff0fa128da79cc5d9f66 (patch) | |
tree | 90b790d725c654e8828f015047b9554b1d4a4c2b /Master/texmf-dist/source/xelatex | |
parent | 07d426b145a3c2e39a7a85b56dc211f9fbd0a0df (diff) |
xecjk (10feb16)
git-svn-id: svn://tug.org/texlive/trunk@39685 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
-rw-r--r-- | Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx index 605160b3509..af634c8171e 100644 --- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx +++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx @@ -268,7 +268,7 @@ CJK scripts fonts (TrueType or OpenType). %<fntef> {xeCJKfntef} %<listings> {xeCJK-listings} %<xunicode> {xunicode-addon} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\ExplFileDescription} %<xunextra>\ExplSyntaxOff %<*driver> \let\xeCJKrevnum\ExplFileVersion @@ -453,7 +453,7 @@ CJK scripts fonts (TrueType or OpenType). % \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。} % \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。} % -% \CheckSum{9814} +% \CheckSum{9822} % \GetFileInfo{\jobname.dtx} % % \title{\bfseries\pkg{xeCJK} 宏包} @@ -2365,15 +2365,26 @@ CJK scripts fonts (TrueType or OpenType). % \end{center} % % \changes{v3.3.3}{2016/01/20}{兼容 \LaTeXe{} 2016/02/01 的字符类设置。} +% \changes{v3.3.4}{2016/02/07}{兼容 \XeTeX{} 0.99994 的边界字符类。} % \begin{macro}[internal]{Default,CJK,FullLeft,FullRight,Boundary} +% \begin{macrocode} +\xeCJK_save_class:nn { Default } { \c_zero } +% \end{macrocode} +% \XeTeX{} 0.99994 将字符类总数扩大到 $4096$^^A +% \footnote{\url{http://tug.org/pipermail/xetex/2016-February/026363.html}}。 +% \begin{macrocode} +\tl_set:Nx \l_@@_tmp_tl + { \int_use:N \xetex_XeTeXversion:D \xetex_XeTeXrevision:D } +\fp_compare:nNnTF { \l_@@_tmp_tl } > { 0.99993 } + { \xeCJK_save_class:nn { Boundary } { 4095 } } + { \xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five } } +% \end{macrocode} % \LaTeXe{} 2016/02/01 不再预设置 CJK 字符类。 % \begin{macrocode} -\xeCJK_save_class:nn { Default } { \c_zero } -\xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five } \int_compare:nNnTF { \xetex_charclass:D "4E00 } = \c_one { - \xeCJK_save_class:nn { CJK } { \c_one } - \xeCJK_save_class:nn { FullLeft } { \c_two } + \xeCJK_save_class:nn { CJK } { \c_one } + \xeCJK_save_class:nn { FullLeft } { \c_two } \xeCJK_save_class:nn { FullRight } { \c_three } \int_const:Nn \c_@@_class_begin_int { \c_three } } @@ -7086,7 +7097,7 @@ CJK scripts fonts (TrueType or OpenType). % 半字线连接号\footnote{见\href{http://www.moe.gov.cn/ewebeditor/uploadfile/2015/01/13/20150113092346124.pdf} % {《夹用英文的中文文本的标点符号用法(草案)》5.13 节。}}应为半角宽度。 % \begin{macrocode} -\xeCJKsetwidth{^^^^2013}{0.5em} +\xeCJKsetwidth { ^^^^2013 } { 0.5 em } % \end{macrocode} % % 执行宏包选项,并载入 \pkg{fontspec} 宏包和 \pkg{xunicode-addon}。 @@ -12611,7 +12622,7 @@ int main() % \end{macrocode}\egroup % % \begin{macrocode} -\documentclass{article} +\documentclass[a4paper]{article} \usepackage[margin=2cm]{geometry} \usepackage{fontspec} \usepackage{xunicode-addon} |