texlive[56162] Master/texmf-dist: xecjk (23aug20)
commits+karl at tug.org
commits+karl at tug.org
Sun Aug 23 22:54:58 CEST 2020
Revision: 56162
http://tug.org/svn/texlive?view=revision&revision=56162
Author: karl
Date: 2020-08-23 22:54:58 +0200 (Sun, 23 Aug 2020)
Log Message:
-----------
xecjk (23aug20)
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 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2020-08-23 20:54:58 UTC (rev 56162)
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +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.8.4}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.8.5}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -287,7 +287,7 @@
% \changes{v3.8.0}{2020/02/09}{清理过时的兼容性补丁代码。}
% \changes{v3.8.3}{2020/04/07}{删除 \texttt{\_nopar}。}
%
-% \CheckSum{10884}
+% \CheckSum{10905}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -4139,10 +4139,11 @@
% \end{macro}
%
% \begin{macro}{\@@_bound_type_1_glue:Nn}
+% \changes{v3.8.5}{2020/06/26}{增加盒子高度判断。}
% $1$ 表示 hlist node，在这里用来判断是否位于段首。基于正常情况下，\TeX 会在段落开头插入宽度为
% \tn{parindent} 的水平盒子用于缩进。
% \begin{macrocode}
-\cs_new_protected:cpn { @@_bound_type_ 1 _glue:Nn } #1#2
+\cs_new_protected:cpn { @@_bound_type_ 1 _glue:Nn } #1
{
\box_set_to_last:N \l_@@_tmp_box
\int_compare:nNnTF \tex_lastnodetype:D = { -1 }
@@ -4149,10 +4150,16 @@
{
\dim_compare:nNnTF
{ \box_wd:N \l_@@_tmp_box } = \tex_parindent:D
- { \box_use_drop:N \l_@@_tmp_box }
- { \box_use_drop:N \l_@@_tmp_box #2 }
+ {
+ \dim_compare:nNnTF
+ { \box_ht:N \l_@@_tmp_box } = \c_zero_dim
+ { \use_i:nn }
+ { \use:nn }
+ }
+ { \use:nn }
}
- { \box_use_drop:N \l_@@_tmp_box #2 }
+ { \use:nn }
+ { \box_use_drop:N \l_@@_tmp_box }
}
% \end{macrocode}
% \end{macro}
@@ -6772,10 +6779,16 @@
\cs_new_protected:Npn \@@_font_initial:Nn #1#2
{
\group_begin:
+ \@@_font_initial_hook:
\@@_family_use:n {#2}
\xeCJK_font_gset_to_current:N #1
\group_end:
}
+\cs_new_protected:Npn \@@_font_initial_hook:
+ { \tl_use:N \g_@@_font_initial_hook_tl }
+\cs_new_protected:Npn \@@_gadd_font_initial_hook:n
+ { \tl_gput_right:Nn \g_@@_font_initial_hook_tl }
+\tl_new:N \g_@@_font_initial_hook_tl
% \end{macrocode}
% \end{macro}
%
@@ -8903,14 +8916,11 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.8.5}{2020/06/25}{进一步兼容 \pkg{microtype}。}
+%
% \begin{macro}{\@@_patch_microtype_get_slot:}
% 兼容 \pkg{microtype}。
% \begin{macrocode}
-\@@_package_hook:nn { microtype }
- {
- \cs_if_free:NF \MT at get@slot@
- { \@@_patch_microtype_get_slot: }
- }
\cs_new_protected:Npn \@@_patch_microtype_get_slot:
{
\cs_new_eq:NN \xeCJK at original@get at slot \MT at get@slot@
@@ -8929,6 +8939,14 @@
{ \MT at encoding - \tex_the:D \MT at toks } \l_@@_tmp_tl
{ \cs_set_eq:NN \MT at char \l_@@_tmp_tl }
}
+\cs_new_protected:Npn \xeCJK at microtype@restore at pickupfont
+ { \@@_gadd_font_initial_hook:n { \MT at ltx@pickupfont } }
+\@@_package_hook:nn { microtype }
+ {
+ \cs_if_free:NF \MT at get@slot@
+ { \@@_patch_microtype_get_slot: }
+ \MT at addto@setup { \xeCJK at microtype@restore at pickupfont }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -8942,7 +8960,7 @@
\xeCJK_cs_clear:N \@@_inactive_group_begin:
\xeCJK_cs_clear:N \@@_inactive_group_end:
\xeCJK_cs_clear:N \makexeCJKinactive
- \xeCJK_cs_clear:N \xeCJK at composite@patch
+ \xeCJK_cs_clear:N \xeCJK_text_composite_patch:
}
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2020-08-23 20:54:58 UTC (rev 56162)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.8.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.5}{\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 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2020-08-23 20:54:58 UTC (rev 56162)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.8.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.5}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2020-08-23 20:54:58 UTC (rev 56162)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.8.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.5}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -1446,7 +1446,7 @@
\tl_new:N \c__xeCJK_alignii_tl
\cs_new_protected:cpn { __xeCJK_bound_type_ -1 _glue:Nn } #1#2
{ \__xeCJK_zero_glue: }
-\cs_new_protected:cpn { __xeCJK_bound_type_ 1 _glue:Nn } #1#2
+\cs_new_protected:cpn { __xeCJK_bound_type_ 1 _glue:Nn } #1
{
\box_set_to_last:N \l__xeCJK_tmp_box
\int_compare:nNnTF \tex_lastnodetype:D = { -1 }
@@ -1453,10 +1453,16 @@
{
\dim_compare:nNnTF
{ \box_wd:N \l__xeCJK_tmp_box } = \tex_parindent:D
- { \box_use_drop:N \l__xeCJK_tmp_box }
- { \box_use_drop:N \l__xeCJK_tmp_box #2 }
+ {
+ \dim_compare:nNnTF
+ { \box_ht:N \l__xeCJK_tmp_box } = \c_zero_dim
+ { \use_i:nn }
+ { \use:nn }
+ }
+ { \use:nn }
}
- { \box_use_drop:N \l__xeCJK_tmp_box #2 }
+ { \use:nn }
+ { \box_use_drop:N \l__xeCJK_tmp_box }
}
\cs_new_protected:cpn { __xeCJK_bound_type_ 11 _glue:Nn } #1#2
{
@@ -3418,10 +3424,16 @@
\cs_new_protected:Npn \__xeCJK_font_initial:Nn #1#2
{
\group_begin:
+ \__xeCJK_font_initial_hook:
\__xeCJK_family_use:n {#2}
\xeCJK_font_gset_to_current:N #1
\group_end:
}
+\cs_new_protected:Npn \__xeCJK_font_initial_hook:
+ { \tl_use:N \g__xeCJK_font_initial_hook_tl }
+\cs_new_protected:Npn \__xeCJK_gadd_font_initial_hook:n
+ { \tl_gput_right:Nn \g__xeCJK_font_initial_hook_tl }
+\tl_new:N \g__xeCJK_font_initial_hook_tl
\cs_new_eq:NN \xeCJK_select_punct_font: \xeCJK_select_font:
\cs_new_protected:Npn \__xeCJK_select_punct_font_aux:
{
@@ -4921,11 +4933,6 @@
{ \tex_global:D \tex_Umathcodenum:D #1 = #2 ~ }
}
}
-\__xeCJK_package_hook:nn { microtype }
- {
- \cs_if_free:NF \MT at get@slot@
- { \__xeCJK_patch_microtype_get_slot: }
- }
\cs_new_protected:Npn \__xeCJK_patch_microtype_get_slot:
{
\cs_new_eq:NN \xeCJK at original@get at slot \MT at get@slot@
@@ -4944,6 +4951,14 @@
{ \MT at encoding - \tex_the:D \MT at toks } \l__xeCJK_tmp_tl
{ \cs_set_eq:NN \MT at char \l__xeCJK_tmp_tl }
}
+\cs_new_protected:Npn \xeCJK at microtype@restore at pickupfont
+ { \__xeCJK_gadd_font_initial_hook:n { \MT at ltx@pickupfont } }
+\__xeCJK_package_hook:nn { microtype }
+ {
+ \cs_if_free:NF \MT at get@slot@
+ { \__xeCJK_patch_microtype_get_slot: }
+ \MT at addto@setup { \xeCJK at microtype@restore at pickupfont }
+ }
\__xeCJK_package_hook:nn { hyperref }
{
\pdfstringdefDisableCommands
@@ -4952,7 +4967,7 @@
\xeCJK_cs_clear:N \__xeCJK_inactive_group_begin:
\xeCJK_cs_clear:N \__xeCJK_inactive_group_end:
\xeCJK_cs_clear:N \makexeCJKinactive
- \xeCJK_cs_clear:N \xeCJK at composite@patch
+ \xeCJK_cs_clear:N \xeCJK_text_composite_patch:
}
}
\__xeCJK_package_hook:nn { cprotect }
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2020-08-23 20:54:58 UTC (rev 56162)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.8.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.5}{\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 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2020-08-23 20:54:58 UTC (rev 56162)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.8.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.5}{\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 2020-08-23 20:53:47 UTC (rev 56161)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2020-08-23 20:54:58 UTC (rev 56162)
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 94baac7 2020-06-06 23:21:05 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.8.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.5}{\ExplFileDescription}
\DeclareUTFSymbol\texthyphenationpoint{"2027}
\DeclareUTFSymbol\texttwoemdash{"2E3A}
\DeclareUTFComposite\textsuperscript
More information about the tex-live-commits
mailing list.