diff options
Diffstat (limited to 'Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx')
-rw-r--r-- | Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx index 41df67d7c94..0c03b340466 100644 --- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx +++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx @@ -194,7 +194,7 @@ Copyright and Licence %<*package|config|fntef|listings|xunicode|xunextra> %<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e} %<!(config|xunextra)>\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: xeCJK.dtx f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+!driver>\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $ %<package> {Typesetting CJK scripts with XeLaTeX} %<config> {Configuration file for xeCJK package} %<fntef> {xeCJK font effect} @@ -207,7 +207,7 @@ Copyright and Licence %<listings>\ProvidesExplPackage{xeCJK-listings} %<xunicode>\ProvidesExplPackage{xunicode-addon} %<xunextra>\ProvidesExplFile{xunicode-extra.def} -%<!driver> {\ExplFileDate}{3.4.3}{\ExplFileDescription} +%<!driver> {\ExplFileDate}{3.4.4}{\ExplFileDescription} %</package|config|fntef|listings|xunicode|xunextra> %<*driver> \documentclass{ctxdoc} @@ -275,7 +275,7 @@ Copyright and Licence % \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。} % \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。} % -% \CheckSum{10153} +% \CheckSum{10164} % \GetFileId{xeCJK.sty} % % \title{\bfseries\pkg{xeCJK} 宏包} @@ -3643,8 +3643,9 @@ Copyright and Licence { \@@_punct_kern:n { - \@@_use_punct_dim:nnn { offset } {#1} {#2} } } \cs_new_protected_nopar:Npn \@@_punct_kern:n #1 { - \dim_compare:nNnF {#1} = \c_zero_dim - { \tex_kern:D #1 \exp_stop_f: } + \dim_set:Nn \l_@@_tmp_dim {#1} + \dim_compare:nNnF \l_@@_tmp_dim = \c_zero_dim + { \tex_kern:D \l_@@_tmp_dim } } % \end{macrocode} % \end{macro} @@ -5132,7 +5133,10 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% \changes{v3.4.4}{2016/11/30}{不压缩长标点与其他标点的间距。} +% % \begin{macro}[internal]{\xeCJK_punct_kerning_process:NN} +% 当标点之一为长标点时,不必进行压缩。 % \begin{macrocode} \cs_new_protected_nopar:Npn \xeCJK_punct_kerning_process:NN #1#2 { @@ -5140,14 +5144,21 @@ Copyright and Licence { \@@_original_kerning_margin:NN {#1} {#2} } \dim_set:Nn \l_@@_minimum_bound_dim { \@@_punct_min_bound:NN {#1} {#2} } + \@@_punct_if_long:NTF {#1} + { \bool_set_false:N \l_@@_enabled_kerning_bool } + { + \@@_punct_if_long:NT {#2} + { \bool_set_false:N \l_@@_enabled_kerning_bool } + } \dim_set:Nn \l_@@_kerning_margin_dim { - \bool_if:nTF + \bool_if:NTF \l_@@_enabled_global_setting_bool { - \l_@@_enabled_global_setting_bool && - \tl_if_exist_p:c { g_@@_punct/kern/#1/#2/tl } + \cs_if_exist_use:cTF { g_@@_punct/kern/#1/#2/tl } + { \use_none:n } + { \use:n } } - { \use:c { g_@@_punct/kern/#1/#2/tl } } + { \use:n } { \bool_if:NTF \l_@@_enabled_kerning_bool { \@@_calc_kerning_margin:NN {#1} {#2} } |