texlive[56711] Master/texmf-dist: xecjk (19oct20)
commits+karl at tug.org
commits+karl at tug.org
Mon Oct 19 23:12:08 CEST 2020
Revision: 56711
http://tug.org/svn/texlive?view=revision&revision=56711
Author: karl
Date: 2020-10-19 23:12:08 +0200 (Mon, 19 Oct 2020)
Log Message:
-----------
xecjk (19oct20)
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-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2020-10-19 21:12:08 UTC (rev 56711)
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +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.5}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.8.6}{\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{10905}
+% \CheckSum{10926}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -380,8 +380,8 @@
% \end{ctexexam}
% \end{function}
%
-% 有些选项或命令后面带有 \exptarget\expstar 号，这表示这
-% 个选项或命令只能在导言区中使用，而 \rexptarget\rexpstar
+% 有些选项或命令后面带有 \exptarget\expstar{} 号，这表示这
+% 个选项或命令只能在导言区中使用，而 \rexptarget\rexpstar{}
% 号则表示这个选项或命令只能在导言区使用，并且只影响随后定义的 CJK 字体。其余不带特殊标记的
% 选项或命令，如果没有特别说明，可以在导言区或正文中使用。%
% 使用粗体来表示 \pkg{xeCJK} 的默认设置。
@@ -4296,6 +4296,7 @@
% \changes{v3.6.0}{2018/01/23}{解决标点中间被隔开的禁则与压缩问题。}
% \changes{v3.7.3}{2019/04/15}{修复 penalty 数值错误。}
% \changes{v3.8.3}{2020/04/27}{修复 \opt{xCJKecglue} 选项。}
+% \changes{v3.8.6}{2020/10/18}{正确还原标点符号后的 penalty 状态。}
%
% \begin{macro}{\xeCJK_if_last_punct:TF}
% \changes{v3.6.1}{2018/02/25}{细化判断。}
@@ -4362,8 +4363,14 @@
\int_compare:nNnTF \tex_lastnodetype:D = { 11 }
{ \@@_if_last_punct_glue:TF { \use_i:nn } }
{ \use:n }
- { \tex_penalty:D \l_@@_last_penalty_int \use_ii:nn }
+ { \@@_last_punct_penalty_false:nn }
}
+\cs_new_protected:Npn \@@_last_punct_penalty_false:nn #1#2
+ {
+ \bool_set_false:N \l_@@_last_penalty_bool
+ \tex_penalty:D \l_@@_last_penalty_int
+ #2
+ }
\cs_new_protected:Npn \@@_if_last_punct_auxi:TF
{
\tex_unpenalty:D
@@ -8469,6 +8476,8 @@
% \changes{v3.1.1}{2012/12/13}{对于与 \pkg{xltxtra} 的冲突给出错误警告。}
% \changes{v3.8.0}{2020/02/09}{删除 \pkg{realscripts} 补丁。}
%
+% \changes{v3.8.6}{2020/10/17}{兼容 \LaTeX\ 2020/10/01 的 \pkg{NFSS} 钩子机制。}
+%
% \begin{macro}[int]{\fontfamily}
% \begin{macro}[int]{\xeCJK at fontfamily,\xeCJK at family}
% \changes{v3.1.1}{2012/12/06}{修改主要 \texttt{CJK} 字体族的自动更新方式。}
@@ -8477,41 +8486,52 @@
% {将族名参数完全展开，以解决与 \pkg{fontspec} 2017/01/24 v2.5d 的兼容问题。}
% 对于 \LaTeXe\ 2020/02/02 之前的版本，修改 \tn{fontfamily}，
% 使主要 |CJK| 字体族能随西文主要字体更新，之后的版本可以使用 \tn{@rmfamilyhook} 等新钩子处理。
+% \LaTeXe\ 2020/10/01 提供了新的的 \pkg{NFSS} 钩子。
% \begin{macrocode}
-\cs_if_exist:NTF \@rmfamilyhook
+\@ifl at t@r \fmtversion { 2020/10/01 }
{
\cs_set_eq:NN \xeCJK at family \xeCJK_switch_family:x
- \g at addto@macro \@rmfamilyhook { \xeCJK at family { \CJKrmdefault } }
- \g at addto@macro \@sffamilyhook { \xeCJK at family { \CJKsfdefault } }
- \g at addto@macro \@ttfamilyhook { \xeCJK at family { \CJKttdefault } }
- \exp_args:Nc \g at addto@macro
- {
- \cs_if_exist:NTF \@defaultfamilyhook
- { @defaultfamilyhook } { normalfont ~ }
- }
- { \xeCJK at family { \CJKfamilydefault } }
+ \AddToHook { rmfamily } { \xeCJK at family { \CJKrmdefault } }
+ \AddToHook { sffamily } { \xeCJK at family { \CJKsfdefault } }
+ \AddToHook { ttfamily } { \xeCJK at family { \CJKttdefault } }
+ \AddToHook { normalfont } { \xeCJK at family { \CJKfamilydefault } }
}
{
- \RenewDocumentCommand \fontfamily { m }
+ \cs_if_exist:NTF \@rmfamilyhook
{
- \tl_set:Nx \f at family {#1}
- \xeCJK at fontfamily {#1}
+ \cs_set_eq:NN \xeCJK at family \xeCJK_switch_family:x
+ \g at addto@macro \@rmfamilyhook { \xeCJK at family { \CJKrmdefault } }
+ \g at addto@macro \@sffamilyhook { \xeCJK at family { \CJKsfdefault } }
+ \g at addto@macro \@ttfamilyhook { \xeCJK at family { \CJKttdefault } }
+ \exp_args:Nc \g at addto@macro
+ {
+ \cs_if_exist:NTF \@defaultfamilyhook
+ { @defaultfamilyhook } { normalfont ~ }
+ }
+ { \xeCJK at family { \CJKfamilydefault } }
}
- \cs_new_protected:Npn \xeCJK at fontfamily #1
{
- \str_if_eq:nnTF {#1} { \familydefault }
- { \xeCJK_switch_family:x { \CJKfamilydefault } }
- { \@@_update_family_aux: }
- }
- \cs_new_protected:Npn \@@_update_family_aux:
- {
- \str_case_e:nn { \f at family }
+ \RenewDocumentCommand \fontfamily { m }
{
- { \rmdefault } { \xeCJK_switch_family:x { \CJKrmdefault } }
- { \sfdefault } { \xeCJK_switch_family:x { \CJKsfdefault } }
- { \ttdefault } { \xeCJK_switch_family:x { \CJKttdefault } }
- { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ \tl_set:Nx \f at family {#1}
+ \xeCJK at fontfamily {#1}
}
+ \cs_new_protected:Npn \xeCJK at fontfamily #1
+ {
+ \str_if_eq:nnTF {#1} { \familydefault }
+ { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ { \@@_update_family_aux: }
+ }
+ \cs_new_protected:Npn \@@_update_family_aux:
+ {
+ \str_case_e:nn { \f at family }
+ {
+ { \rmdefault } { \xeCJK_switch_family:x { \CJKrmdefault } }
+ { \sfdefault } { \xeCJK_switch_family:x { \CJKsfdefault } }
+ { \ttdefault } { \xeCJK_switch_family:x { \CJKttdefault } }
+ { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ }
+ }
}
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2020-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2020-10-19 21:12:08 UTC (rev 56711)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.6}{\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-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2020-10-19 21:12:08 UTC (rev 56711)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.6}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2020-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2020-10-19 21:12:08 UTC (rev 56711)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.6}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -1614,8 +1614,14 @@
\int_compare:nNnTF \tex_lastnodetype:D = { 11 }
{ \__xeCJK_if_last_punct_glue:TF { \use_i:nn } }
{ \use:n }
- { \tex_penalty:D \l__xeCJK_last_penalty_int \use_ii:nn }
+ { \__xeCJK_last_punct_penalty_false:nn }
}
+\cs_new_protected:Npn \__xeCJK_last_punct_penalty_false:nn #1#2
+ {
+ \bool_set_false:N \l__xeCJK_last_penalty_bool
+ \tex_penalty:D \l__xeCJK_last_penalty_int
+ #2
+ }
\cs_new_protected:Npn \__xeCJK_if_last_punct_auxi:TF
{
\tex_unpenalty:D
@@ -4626,40 +4632,50 @@
\__xeCJK_math_robust:N \endmath
}
\__xeCJK_math_robust:N \ensuremath
-\cs_if_exist:NTF \@rmfamilyhook
+\@ifl at t@r \fmtversion { 2020/10/01 }
{
\cs_set_eq:NN \xeCJK at family \xeCJK_switch_family:x
- \g at addto@macro \@rmfamilyhook { \xeCJK at family { \CJKrmdefault } }
- \g at addto@macro \@sffamilyhook { \xeCJK at family { \CJKsfdefault } }
- \g at addto@macro \@ttfamilyhook { \xeCJK at family { \CJKttdefault } }
- \exp_args:Nc \g at addto@macro
- {
- \cs_if_exist:NTF \@defaultfamilyhook
- { @defaultfamilyhook } { normalfont ~ }
- }
- { \xeCJK at family { \CJKfamilydefault } }
+ \AddToHook { rmfamily } { \xeCJK at family { \CJKrmdefault } }
+ \AddToHook { sffamily } { \xeCJK at family { \CJKsfdefault } }
+ \AddToHook { ttfamily } { \xeCJK at family { \CJKttdefault } }
+ \AddToHook { normalfont } { \xeCJK at family { \CJKfamilydefault } }
}
{
- \RenewDocumentCommand \fontfamily { m }
+ \cs_if_exist:NTF \@rmfamilyhook
{
- \tl_set:Nx \f at family {#1}
- \xeCJK at fontfamily {#1}
+ \cs_set_eq:NN \xeCJK at family \xeCJK_switch_family:x
+ \g at addto@macro \@rmfamilyhook { \xeCJK at family { \CJKrmdefault } }
+ \g at addto@macro \@sffamilyhook { \xeCJK at family { \CJKsfdefault } }
+ \g at addto@macro \@ttfamilyhook { \xeCJK at family { \CJKttdefault } }
+ \exp_args:Nc \g at addto@macro
+ {
+ \cs_if_exist:NTF \@defaultfamilyhook
+ { @defaultfamilyhook } { normalfont ~ }
+ }
+ { \xeCJK at family { \CJKfamilydefault } }
}
- \cs_new_protected:Npn \xeCJK at fontfamily #1
{
- \str_if_eq:nnTF {#1} { \familydefault }
- { \xeCJK_switch_family:x { \CJKfamilydefault } }
- { \__xeCJK_update_family_aux: }
- }
- \cs_new_protected:Npn \__xeCJK_update_family_aux:
- {
- \str_case_e:nn { \f at family }
+ \RenewDocumentCommand \fontfamily { m }
{
- { \rmdefault } { \xeCJK_switch_family:x { \CJKrmdefault } }
- { \sfdefault } { \xeCJK_switch_family:x { \CJKsfdefault } }
- { \ttdefault } { \xeCJK_switch_family:x { \CJKttdefault } }
- { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ \tl_set:Nx \f at family {#1}
+ \xeCJK at fontfamily {#1}
}
+ \cs_new_protected:Npn \xeCJK at fontfamily #1
+ {
+ \str_if_eq:nnTF {#1} { \familydefault }
+ { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ { \__xeCJK_update_family_aux: }
+ }
+ \cs_new_protected:Npn \__xeCJK_update_family_aux:
+ {
+ \str_case_e:nn { \f at family }
+ {
+ { \rmdefault } { \xeCJK_switch_family:x { \CJKrmdefault } }
+ { \sfdefault } { \xeCJK_switch_family:x { \CJKsfdefault } }
+ { \ttdefault } { \xeCJK_switch_family:x { \CJKttdefault } }
+ { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ }
+ }
}
}
\cs_new_eq:NN \xeCJK at fix@penalty \fix at penalty
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2020-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2020-10-19 21:12:08 UTC (rev 56711)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.6}{\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-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2020-10-19 21:12:08 UTC (rev 56711)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.6}{\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-10-19 21:11:48 UTC (rev 56710)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2020-10-19 21:12:08 UTC (rev 56711)
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.6}{\ExplFileDescription}
\DeclareUTFSymbol\texthyphenationpoint{"2027}
\DeclareUTFSymbol\texttwoemdash{"2E3A}
\DeclareUTFComposite\textsuperscript
More information about the tex-live-commits
mailing list.