texlive[53784] Master/texmf-dist: xecjk (14feb20)
commits+karl at tug.org
commits+karl at tug.org
Fri Feb 14 23:36:10 CET 2020
Revision: 53784
http://tug.org/svn/texlive?view=revision&revision=53784
Author: karl
Date: 2020-02-14 23:36:10 +0100 (Fri, 14 Feb 2020)
Log Message:
-----------
xecjk (14feb20)
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-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2020-02-14 22:36:10 UTC (rev 53784)
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +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.0}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.8.1}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -225,6 +225,8 @@
\newcommand\PSKeyVal[2]{%
\item[#1]\makebox[4em][l]{\meta{#2}}\ignorespaces}
\newcommand\tokslink[1]{\hyperlink{#1}{\ding{51}}}
+\newcommand\ghissue[1]{%
+ \href{https://github.com/CTeX-org/ctex-kit/issues/#1}{\##1}}
\AtBeginDocument{\DeleteShortVerb{\"}}
\ExplSyntaxOn
\NewDocumentCommand \PrintPunctList { O{7} m m }
@@ -283,7 +285,7 @@
% \changes{v3.8.0}{2020/02/09}{兼容 \LaTeXe\ 2020/02/02 对 \pkg{NFSS} 的修改。}
% \changes{v3.8.0}{2020/02/09}{清理过时的兼容性补丁代码。}
%
-% \CheckSum{10751}
+% \CheckSum{10752}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -6606,11 +6608,8 @@
}
\cs_new_protected_nopar:Npn \@@_select_font:Nn #1#2
{
- \cs_if_exist_use:NF #1
- {
- \@@_family_use:n {#2}
- \xeCJK_font_gset_to_current:N #1
- }
+ \cs_if_exist:NF #1 { \@@_font_initial:Nn #1 {#2} }
+ #1
}
\cs_generate_variant:Nn \@@_select_font:Nn { c }
\tl_new:N \l_@@_current_coor_tl
@@ -6619,6 +6618,22 @@
% \end{variable}
% \end{macro}
%
+% \changes{v3.8.1}{2020/02/14}{修复 \cs{l_xeCJK_current_font_tl} 标记错误。}
+%
+% \begin{macro}{\@@_font_initial:Nn}
+% 注意要将 \tn{selectfont} 放在分组中调用，防止 \tn{f at series} 等字体参数被修改，
+% 导致 \cs{l_xeCJK_current_font_tl} 标记前后不一致，引发错误（见~\ghissue{486}）。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_font_initial:Nn #1#2
+ {
+ \group_begin:
+ \@@_family_use:n {#2}
+ \xeCJK_font_gset_to_current:N #1
+ \group_end:
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[int]{\xeCJK_select_punct_font:}
% \begin{variable}[int]{\l_xeCJK_current_punct_font_tl}
% 切换标点符号字体。
@@ -6676,8 +6691,7 @@
\cs_if_exist_use:NF #1
{
\xeCJK_block_family:nn {#2} {#3}
- \@@_family_use:n { #2/#3 }
- \xeCJK_font_gset_to_current:N #1
+ \@@_font_initial:Nn #1 { #2/#3 }
}
}
\cs_generate_variant:Nn \@@_select_font:Nnn { c }
@@ -6704,7 +6718,7 @@
{ xeCJK/family/#1 }
\cs_new_nopar:Npn \@@_family_nfss_csname:n #1
{ xeCJK/family/nfss/#1 }
-\cs_new_nopar:Npn \@@_family_use:n #1
+\cs_new_protected_nopar:Npn \@@_family_use:n #1
{ \use:c { \@@_family_nfss_csname:n {#1} } }
\cs_new_protected_nopar:Npn \@@_gset_family_nfss_cs:nn #1#2
{
@@ -6711,11 +6725,7 @@
\prop_gput:Nnn \g_@@_family_name_prop {#1} {#2}
\cs_gset_protected_nopar:cpx
{ \@@_family_nfss_csname:n {#1} }
- {
- \exp_not:N \fontencoding { \c_@@_encoding_tl }
- \@@_nfss_family:n {#2}
- \exp_not:N \selectfont
- }
+ { \@@_nfss_family:nn { \c_@@_encoding_tl } {#2} }
}
\cs_generate_variant:Nn \@@_gset_family_nfss_cs:nn { xx }
% \end{macrocode}
@@ -6722,12 +6732,13 @@
% \end{macro}
%
% \begin{macro}{\@@_nfss_family:n}
-% 用于处理 \LaTeXe\ 2020/02/02 中 \tn{bfseries at rm} 等与 \tn{\bfdefault} 不一致可能导致的问题。
+% 用于处理 \LaTeXe\ 2020/02/02 中 \tn{bfseries at rm} 等与 \tn{bfdefault} 不一致可能导致的问题。
% \begin{macrocode}
\cs_if_exist:NTF \fontseriesforce
{
- \cs_new_protected_nopar:Npn \@@_nfss_family:n #1
+ \cs_new_protected_nopar:Npn \@@_nfss_family:nn #1#2
{
+ \fontencoding {#1}
\str_if_eq:eeF { \f at series } { \bfdefault }
{
\str_case_e:nn { \f at family }
@@ -6737,7 +6748,8 @@
{ \ttdefault } { \@@_nfss_series:n { tt } }
}
}
- \fontfamily {#1}
+ \fontfamily {#2}
+ \selectfont
}
\cs_new_protected_nopar:Npn \@@_nfss_series:n #1
{
@@ -6746,8 +6758,12 @@
}
}
{
- \cs_new_protected_nopar:Npn \@@_nfss_family:n #1
- { \tl_set:Nn \f at family {#1} }
+ \cs_new_protected_nopar:Npn \@@_nfss_family:nn #1#2
+ {
+ \fontencoding {#1}
+ \tl_set:Nn \f at family {#2}
+ \selectfont
+ }
}
% \end{macrocode}
% \end{macro}
@@ -7358,17 +7374,22 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.8.1}{2020/02/14}{应用 \tn{shapedefault}。}
+%
% \begin{macro}[int]{\xeCJK_declare_mathfont:nn}
+% 注意从 \LaTeXe\ 2020/02/02 开始，\tn{shapedefault} 初始值是 \texttt{n}，
+% 而 \tn{updefault} 初始值是 \texttt{up}，两者并不一致。
+% \pkg{fontspec} 包定义字体使用的是 \tn{shapedefault}。
% \begin{macrocode}
\cs_new_protected_nopar:Npn \xeCJK_declare_mathfont:nn #1#2
{
\xeCJK_declare_symbol_font:nnnnn {#1} { \c_@@_encoding_tl }
- {#2} { \mddefault } { \updefault }
+ {#2} { \mddefault } { \shapedefault }
\cs_if_free:cF
- { \c_@@_encoding_tl/#2/\bfdefault/\updefault }
+ { \c_@@_encoding_tl/#2/\bfdefault/\shapedefault }
{
\SetSymbolFont {#1} { bold } { \c_@@_encoding_tl }
- {#2} { \bfdefault } { \updefault }
+ {#2} { \bfdefault } { \shapedefault }
}
\prop_gput:Nnx \g_@@_fam_prop {#2} { \exp_not:c { sym #1 } }
}
@@ -8285,11 +8306,10 @@
\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:Nx \g at addto@macro
+ \exp_args:Nc \g at addto@macro
{
\cs_if_exist:NTF \@defaultfamilyhook
- { \exp_not:N \@defaultfamilyhook }
- { \exp_not:c { normalfont ~ } }
+ { @defaultfamilyhook } { normalfont ~ }
}
{ \xeCJK at family { \CJKfamilydefault } }
}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2020-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2020-02-14 22:36:10 UTC (rev 53784)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.8.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.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 2020-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2020-02-14 22:36:10 UTC (rev 53784)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.8.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.1}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2020-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2020-02-14 22:36:10 UTC (rev 53784)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.8.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.1}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -3299,15 +3299,19 @@
}
\cs_new_protected_nopar:Npn \__xeCJK_select_font:Nn #1#2
{
- \cs_if_exist_use:NF #1
- {
- \__xeCJK_family_use:n {#2}
- \xeCJK_font_gset_to_current:N #1
- }
+ \cs_if_exist:NF #1 { \__xeCJK_font_initial:Nn #1 {#2} }
+ #1
}
\cs_generate_variant:Nn \__xeCJK_select_font:Nn { c }
\tl_new:N \l__xeCJK_current_coor_tl
\cs_new_eq:NN \xeCJK at setfont \xeCJK_select_font:
+\cs_new_protected_nopar:Npn \__xeCJK_font_initial:Nn #1#2
+ {
+ \group_begin:
+ \__xeCJK_family_use:n {#2}
+ \xeCJK_font_gset_to_current:N #1
+ \group_end:
+ }
\cs_new_eq:NN \xeCJK_select_punct_font: \xeCJK_select_font:
\cs_new_protected_nopar:Npn \__xeCJK_select_punct_font_aux:
{
@@ -3345,8 +3349,7 @@
\cs_if_exist_use:NF #1
{
\xeCJK_block_family:nn {#2} {#3}
- \__xeCJK_family_use:n { #2/#3 }
- \xeCJK_font_gset_to_current:N #1
+ \__xeCJK_font_initial:Nn #1 { #2/#3 }
}
}
\cs_generate_variant:Nn \__xeCJK_select_font:Nnn { c }
@@ -3366,7 +3369,7 @@
{ xeCJK/family/#1 }
\cs_new_nopar:Npn \__xeCJK_family_nfss_csname:n #1
{ xeCJK/family/nfss/#1 }
-\cs_new_nopar:Npn \__xeCJK_family_use:n #1
+\cs_new_protected_nopar:Npn \__xeCJK_family_use:n #1
{ \use:c { \__xeCJK_family_nfss_csname:n {#1} } }
\cs_new_protected_nopar:Npn \__xeCJK_gset_family_nfss_cs:nn #1#2
{
@@ -3373,17 +3376,14 @@
\prop_gput:Nnn \g__xeCJK_family_name_prop {#1} {#2}
\cs_gset_protected_nopar:cpx
{ \__xeCJK_family_nfss_csname:n {#1} }
- {
- \exp_not:N \fontencoding { \c__xeCJK_encoding_tl }
- \__xeCJK_nfss_family:n {#2}
- \exp_not:N \selectfont
- }
+ { \__xeCJK_nfss_family:nn { \c__xeCJK_encoding_tl } {#2} }
}
\cs_generate_variant:Nn \__xeCJK_gset_family_nfss_cs:nn { xx }
\cs_if_exist:NTF \fontseriesforce
{
- \cs_new_protected_nopar:Npn \__xeCJK_nfss_family:n #1
+ \cs_new_protected_nopar:Npn \__xeCJK_nfss_family:nn #1#2
{
+ \fontencoding {#1}
\str_if_eq:eeF { \f at series } { \bfdefault }
{
\str_case_e:nn { \f at family }
@@ -3393,7 +3393,8 @@
{ \ttdefault } { \__xeCJK_nfss_series:n { tt } }
}
}
- \fontfamily {#1}
+ \fontfamily {#2}
+ \selectfont
}
\cs_new_protected_nopar:Npn \__xeCJK_nfss_series:n #1
{
@@ -3402,8 +3403,12 @@
}
}
{
- \cs_new_protected_nopar:Npn \__xeCJK_nfss_family:n #1
- { \tl_set:Nn \f at family {#1} }
+ \cs_new_protected_nopar:Npn \__xeCJK_nfss_family:nn #1#2
+ {
+ \fontencoding {#1}
+ \tl_set:Nn \f at family {#2}
+ \selectfont
+ }
}
\prg_new_protected_conditional:Npnn \xeCJK_family_if_exist:n #1 { T , F , TF }
{
@@ -3866,12 +3871,12 @@
\cs_new_protected_nopar:Npn \xeCJK_declare_mathfont:nn #1#2
{
\xeCJK_declare_symbol_font:nnnnn {#1} { \c__xeCJK_encoding_tl }
- {#2} { \mddefault } { \updefault }
+ {#2} { \mddefault } { \shapedefault }
\cs_if_free:cF
- { \c__xeCJK_encoding_tl/#2/\bfdefault/\updefault }
+ { \c__xeCJK_encoding_tl/#2/\bfdefault/\shapedefault }
{
\SetSymbolFont {#1} { bold } { \c__xeCJK_encoding_tl }
- {#2} { \bfdefault } { \updefault }
+ {#2} { \bfdefault } { \shapedefault }
}
\prop_gput:Nnx \g__xeCJK_fam_prop {#2} { \exp_not:c { sym #1 } }
}
@@ -4495,11 +4500,10 @@
\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:Nx \g at addto@macro
+ \exp_args:Nc \g at addto@macro
{
\cs_if_exist:NTF \@defaultfamilyhook
- { \exp_not:N \@defaultfamilyhook }
- { \exp_not:c { normalfont ~ } }
+ { @defaultfamilyhook } { normalfont ~ }
}
{ \xeCJK at family { \CJKfamilydefault } }
}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2020-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2020-02-14 22:36:10 UTC (rev 53784)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.8.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.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 2020-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2020-02-14 22:36:10 UTC (rev 53784)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.8.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.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 2020-02-14 22:35:32 UTC (rev 53783)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2020-02-14 22:36:10 UTC (rev 53784)
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 2628481 2020-02-14 20:30:07 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.8.0}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.1}{\ExplFileDescription}
\DeclareUTFSymbol\texthyphenationpoint{"2027}
\DeclareUTFSymbol\texttwoemdash{"2E3A}
\DeclareUTFComposite\textsuperscript
More information about the tex-live-commits
mailing list.