summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-02 23:41:44 +0000
committerKarl Berry <karl@freefriends.org>2017-01-02 23:41:44 +0000
commitfaf45c3efb9312734c1b5db387bdfdda7e1f23c2 (patch)
tree2bd05bce385d168debddc7d32fa3c9930f42a469 /Master/texmf-dist/source
parent35cabb19007619d5b58a655d5388e264a043265b (diff)
xecjk (2jan17)
git-svn-id: svn://tug.org/texlive/trunk@42831 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx31
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins8
2 files changed, 22 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 0c03b340466..00313927b69 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -26,8 +26,8 @@ Copyright and Licence
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2016 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2016 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2009--2017 by Leo Liu <leoliu.pku@gmail.com>
+ Copyright (C) 2012--2017 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -92,8 +92,8 @@ Copyright and Licence
\preamble
Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2016 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2016 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2009--2017 by Leo Liu <leoliu.pku@gmail.com>
+ Copyright (C) 2012--2017 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -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 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +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.4}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.4.5}{\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{10164}
+% \CheckSum{10163}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -4675,8 +4675,8 @@ Copyright and Licence
MiddlePunct- .code:n = { \@@_sub_special_punct:nn { middle } {#1} } ,
PunctWidth .tl_gset:N = \g_@@_punct_width_tl ,
PunctBoundWidth .tl_gset:N = \g_@@_punct_bound_width_tl ,
- PunctWidth .value_required: ,
- PunctBoundWidth .value_required: ,
+ PunctWidth .value_required:n = true ,
+ PunctBoundWidth .value_required:n = true ,
RubberPunctSkip .choice: ,
RubberPunctSkip .default:n = { true } ,
RubberPunctSkip / true .code:n =
@@ -7494,6 +7494,8 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.4.5}{2017/01/02}{更新 \hologo{LaTeX3} 的过时用法。}
+%
% \begin{macro}[internal]{\(,\),\math,\endmath,\ensuremath,\@@_math_robust:N}
% \changes{v3.2.5}{2013/07/25}
% {解决汉字后紧跟 \tn{(}\texttt{...}\tn{)} 形式的行内数学公式时,不能加入间距的问题。}
@@ -7516,7 +7518,10 @@ Copyright and Licence
% 的定义并不完全正确,没有考虑 \TeX 不会略去控制符号后面的空格的情况。
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_math_robust:N #1
- { \exp_args:NNc \@@_math_robust_aux:NN #1 { \cs_to_str:N #1 ~ } }
+ {
+ \group_begin: \exp_args:NcNc \group_end:
+ { @@_math_robust_aux:NN } #1 { \cs_to_str:N #1 ~ }
+ }
\cs_new_protected_nopar:Npn \@@_math_robust_aux:NN #1#2
{
\exp_args:Nx \str_case:nnTF { \token_get_replacement_spec:N #1 }
@@ -7534,13 +7539,13 @@ Copyright and Licence
\exp_args:No \tl_if_head_eq_meaning:nNTF {#2} \scan_stop:
{
\cs_gset_protected_nopar:Npx #1
- { \scan_align_safe_stop: \tl_tail:N #2 }
+ { \tl_tail:N #2 }
}
{
\cs_if_eq:NNTF #1 \ensuremath
{
\cs_gset_protected_nopar:Npx #1
- { \scan_align_safe_stop: \exp_not:o {#2} }
+ { \exp_not:o {#2} }
}
{
\@@_warning:nxx { robust-failure }
@@ -13036,7 +13041,7 @@ int main()
{
\int_gincr:N \g_@@_symbol_int
\use_none:n #1 &
- \scan_align_safe_stop:
+ \scan_stop:
\reverse_if:N \etex_iffontchar:D \tex_font:D #1 \exp_stop_f: \falllbackfont \fi:
\tex_char:D #1 \exp_stop_f: &
\tl_set:Nn \l_tmpa_clist {#2}
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
index 057f01d3ab1..38ee6490a5c 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `install')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
-%% Copyright (C) 2009--2016 by Leo Liu <leoliu.pku@gmail.com>
-%% Copyright (C) 2012--2016 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2009--2017 by Leo Liu <leoliu.pku@gmail.com>
+%% Copyright (C) 2012--2017 by Qing Lee <sobenlee@gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -33,8 +33,8 @@
\preamble
Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2016 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2016 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2009--2017 by Leo Liu <leoliu.pku@gmail.com>
+ Copyright (C) 2012--2017 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the