texlive[45885] Master/texmf-dist: xecjk (22nov17)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 22 23:42:40 CET 2017
Revision: 45885
http://tug.org/svn/texlive?view=revision&revision=45885
Author: karl
Date: 2017-11-22 23:42:40 +0100 (Wed, 22 Nov 2017)
Log Message:
-----------
xecjk (22nov17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2017-11-22 22:42:40 UTC (rev 45885)
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
%<package> {Typesetting CJK scripts with XeLaTeX}
%<config> {Configuration file for xeCJK package}
%<fntef> {xeCJK font effect}
@@ -207,7 +207,7 @@
%<listings>\ProvidesExplPackage{xeCJK-listings}
%<xunicode>\ProvidesExplPackage{xunicode-addon}
%<xunextra>\ProvidesExplFile{xunicode-extra.def}
-%<!driver> {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.5.1}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -278,7 +278,7 @@
% \changes{v3.5.0}{2017/07/22}{使用 \texttt{lazy} 函数对 Boolean 表达式
% 进行最小化运算（\hologo{LaTeX3} 2017/07/19）。}
%
-% \CheckSum{10170}
+% \CheckSum{10190}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -5523,15 +5523,34 @@
\xeCJK_glyph_if_exist:NTF {#1}
{ \@@_fallback_save_CJKsymbol:N {#1} }
{
- \xeCJK_class_group_begin:
- \tl_set_eq:NN \l_@@_fallback_family_tl \l_xeCJK_family_tl
- \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack }
- \xeCJK_class_group_end:
+ \group_begin:
+ \xeCJK_aftergroup_reset_Boundary:N {#1}
+ \tl_set_eq:NN \l_@@_fallback_family_tl \l_xeCJK_family_tl
+ \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack }
+ \group_end:
}
}
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.5.1}{2017/11/16}{修正 fallback 字体后无法忽略空格的错误。}
+%
+% \begin{macro}[internal]{\xeCJK_aftergroup_reset_Boundary:N}
+% 在分组中暂时清空 |#1| 与边界的 toks，分组后恢复。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \xeCJK_aftergroup_reset_Boundary:N #1
+ {
+ \tl_set:Nx \l_@@_tmp_tl
+ { \tex_the:D \xetex_charclass:D `#1 ~ \xeCJK_class_num:n { Boundary } }
+ \tl_gset:Nx \g_@@_aftergroup_Boundary_tl
+ { \tex_the:D \xetex_interchartoks:D \l_@@_tmp_tl }
+ \xetex_interchartoks:D \l_@@_tmp_tl = { \prg_do_nothing: }
+ \group_insert_after:N \g_@@_aftergroup_Boundary_tl
+ }
+\tl_new:N \g_@@_aftergroup_Boundary_tl
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v3.2.12}{2014/05/12}{更新 \cs{int_to_Hex:n}。}
%
% \begin{macro}[internal]{\xeCJK_fallback_loop:Nn}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2017-11-22 22:42:40 UTC (rev 45885)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.5.1}{\ExplFileDescription}
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2017-11-22 22:42:40 UTC (rev 45885)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.5.1}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2017-11-22 22:42:40 UTC (rev 45885)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.5.1}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -2479,12 +2479,23 @@
\xeCJK_glyph_if_exist:NTF {#1}
{ \__xeCJK_fallback_save_CJKsymbol:N {#1} }
{
- \xeCJK_class_group_begin:
- \tl_set_eq:NN \l__xeCJK_fallback_family_tl \l_xeCJK_family_tl
- \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack }
- \xeCJK_class_group_end:
+ \group_begin:
+ \xeCJK_aftergroup_reset_Boundary:N {#1}
+ \tl_set_eq:NN \l__xeCJK_fallback_family_tl \l_xeCJK_family_tl
+ \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack }
+ \group_end:
}
}
+\cs_new_protected_nopar:Npn \xeCJK_aftergroup_reset_Boundary:N #1
+ {
+ \tl_set:Nx \l__xeCJK_tmp_tl
+ { \tex_the:D \xetex_charclass:D `#1 ~ \xeCJK_class_num:n { Boundary } }
+ \tl_gset:Nx \g__xeCJK_aftergroup_Boundary_tl
+ { \tex_the:D \xetex_interchartoks:D \l__xeCJK_tmp_tl }
+ \xetex_interchartoks:D \l__xeCJK_tmp_tl = { \prg_do_nothing: }
+ \group_insert_after:N \g__xeCJK_aftergroup_Boundary_tl
+ }
+\tl_new:N \g__xeCJK_aftergroup_Boundary_tl
\cs_new_protected_nopar:Npn \xeCJK_fallback_loop:Nn #1#2
{
\xeCJK_family_if_exist:xTF {#2}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2017-11-22 22:42:40 UTC (rev 45885)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.5.1}{\ExplFileDescription}
\PassOptionsToPackage { normalem } { ulem }
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
\ProcessOptions \scan_stop:
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2017-11-22 22:42:40 UTC (rev 45885)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.5.1}{\ExplFileDescription}
\bool_lazy_or:nnF
{ \sys_if_engine_xetex_p: }
{ \sys_if_engine_luatex_p: }
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2017-11-22 22:42:23 UTC (rev 45884)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2017-11-22 22:42:40 UTC (rev 45885)
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.5.1}{\ExplFileDescription}
\DeclareUTFComposite\textsuperscript
\DeclareUTFComposite\textsubscript
\DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF}
More information about the tex-live-commits
mailing list