texlive[59658] Master/texmf-dist: xecjk (20jun21)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 20 21:57:32 CEST 2021
Revision: 59658
http://tug.org/svn/texlive?view=revision&revision=59658
Author: karl
Date: 2021-06-20 21:57:32 +0200 (Sun, 20 Jun 2021)
Log Message:
-----------
xecjk (20jun21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md
trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex
trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
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/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md 2021-06-20 19:57:32 UTC (rev 59658)
@@ -20,8 +20,8 @@
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
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/doc/xelatex/xecjk/xunicode-symbols.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex 2021-06-20 19:57:32 UTC (rev 59658)
@@ -10,7 +10,7 @@
\usepackage[margin=2cm]{geometry}
\usepackage{fontspec}
\usepackage{xunicode-addon}
-\usepackage{longtable,tabu,booktabs}
+\usepackage{array,longtable,booktabs}
\usepackage{zref-base}
\setmainfont{FreeSerif}
@@ -156,14 +156,17 @@
\section{#2~(\zref at extractdefault{#1}{default}{0})}
\zref at refused{#1}
\noindent
- \begin{longtabu} to \linewidth {>{\ttfamily\footnotesize}rc>{\ttfamily\footnotesize}X>{\tiny}X}
- \toprule\rowfont{\normalfont\normalsize}
- \multicolumn1c{USV} & Symbol & Macro(s) & Description \\
+ \begin{longtable}[c]{>{\ttfamily\footnotesize}rc>{\ttfamily\footnotesize}p{55mm}>{\tiny}l}
+ \toprule
+ \multicolumn1c{\normalfont\normalsize USV} &
+ \normalfont\normalsize Symbol &
+ \normalfont\normalsize Macro(s) &
+ \normalfont\normalsize Description \\
\midrule \endhead
\bottomrule \endfoot
\int_gzero:N \g__xunsym_symbol_int
\input{#3}
- \end{longtabu}
+ \end{longtable}
\group_begin:
\zref at setcurrent{default}{\int_use:N\g__xunsym_symbol_int}
\zref at wrapper@immediate{\zref at labelbyprops{#1}{default}}
Modified: trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2021-06-20 19:57:32 UTC (rev 59658)
@@ -26,8 +26,8 @@
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -92,8 +92,8 @@
\preamble
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +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.6}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.8.7}{\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{10926}
+% \CheckSum{10934}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -1620,6 +1620,11 @@
{ \msg_critical:nnn { xeCJK } { l3-too-old } { expl3 } }
% \end{macrocode}
%
+% \cs{ctex_disable_package:n} 由 \pkg{ctexhook} 提供。
+% \begin{macrocode}
+\RequirePackage { ctexhook }
+% \end{macrocode}
+%
% \begin{macro}[pTF,int]{\xeCJK_if_package_loaded:n}
% 判断宏包是否被引入，可用于文档正文中。
% \begin{macrocode}
@@ -1632,13 +1637,11 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.8.7}{2021/06/09}{应用 \tn{disable at package@load} 和
+% \tn{declare at file@substitution}。}
+%
% 下面这些 \pkg{CJK} 系列宏包不应该被使用。
% \begin{macrocode}
-\msg_new:nnn { xeCJK } { incompatible-package }
- {
- The~`#1'~package~and~xeCJK~are~incompatible.\\\\
- Please~do~not~use~it.
- }
\msg_new:nnn { xeCJK } { after-package }
{
The~`#1'~package~and~xeCJK~are~incompatible.\\\\
@@ -1650,15 +1653,20 @@
{ \msg_error:nnn { xeCJK } { after-package } {#1} }
}
\clist_map_inline:nn
- { CJKfntef , CJKulem , CJKvert , CJKpunct , CJKutf8 , CJK }
- {
- \xeCJK_if_package_loaded:nTF {#1}
- { \msg_error:nnn { xeCJK } { incompatible-package } {#1} }
- { \tl_const:cn { ver@ #1 . \c_@@_package_ext_tl } { 9999/99/99 } }
- }
+ { CJKulem , CJKvert , CJKpunct , CJKutf8 , CJK }
+ { \ctex_disable_package:n {#1} }
% \end{macrocode}
%
+% \changes{v3.8.7}{2021/06/09}{将 \pkg{CJKfntef} 包替换为 \pkg{xeCJKfntef} 包。}
+%
+% 将 \pkg{CJKfntef} 包替换为 \pkg{xeCJKfntef} 包。
% \begin{macrocode}
+\ctex_if_format_at_least:nTF { 2020/10/01 }
+ { \ctex_replace_package:nn { CJKfntef } { xeCJKfntef } }
+ { \ctex_disable_package:n { CJKfntef } }
+% \end{macrocode}
+%
+% \begin{macrocode}
\RequirePackage { l3keys2e , xtemplate , xparse }
% \end{macrocode}
%
@@ -1708,7 +1716,6 @@
% \@@_after_end_preamble:n,\@@_package_hook:nn}
% 在 \tn{document} 前后和宏包后加上各种钩子，依赖 \pkg{ctexhook}。
% \begin{macrocode}
-\RequirePackage { ctexhook }
\AtBeginDocument { \xeCJK at document@hook }
\ctex_at_end_preamble:n { \xeCJK at document@left at hook }
\ctex_after_end_preamble:n { \xeCJK at document@right at hook }
@@ -9006,12 +9013,12 @@
%
%
% \changes{v3.3.3}{2015/12/12}{解决与 \pkg{microtype} 宏包的兼容问题。}
-% 由于 \pkg{xeCJK} 假装 \pkg{CJK} 已经被引入了，这会导致 \pkg{everysel} 和
-% \pkg{microtype} 等宏包判断错误。需要在它们判断之前取消定义。
+% 由于 \pkg{xeCJK} 假装 \pkg{CJK} 已经被引入了，这会可能导致旧版本的 \pkg{everysel} 包判断错误。
+% 需要在它们判断之前取消定义。
% \begin{macrocode}
-\clist_map_inline:nn { everysel , microtype }
+\@@_package_hook:nn { everysel }
{
- \@@_package_hook:nn {#1}
+ \cs_if_exist:NF \@EverySelectfont at Legacy
{ \cs_undefine:c { ver at CJK . \c_@@_package_ext_tl } }
}
% \end{macrocode}
@@ -9018,6 +9025,7 @@
%
% \changes{v3.2.4}{2013/06/25}{不再使用 \texttt{CJKnumber} 选项，可以在
% \pkg{xeCJK} 之后直接使用 \pkg{CJKnumb} 宏包得到中文数字。}
+% \changes{v3.8.7}{2021/06/04}{更好地兼容 \pkg{CJKnumb}。}
%
% \begin{macro}[int]{\CJKaddEncHook}
% 为使用 \pkg{CJKnumb} 宏包而作一些处理。另外 \pkg{CJKnumb} 使用的是传统汉字“萬”
@@ -9025,25 +9033,33 @@
% \changes{v3.2.10}{2014/03/01}{使用 \pkg{CJKnumb} 时，让 \tn{Unicode} 有定义。}
% \changes{v3.3.1}{2015/05/08}{应用 \texttt{0.99992} 版的新原语 \tn{Ucharcat}。}
% \begin{macrocode}
-\cs_new_protected:Npn \CJKaddEncHook #1#2
+\ctex_at_begin_package:nn { CJKnumb }
{
- \str_if_eq:nnT {#1} { \CJK at UnicodeEnc }
+ \tl_new:N \l_@@_CJK_version_tl
+ \tl_set_eq:Nc \l_@@_CJK_version_tl { ver at CJK . \c_@@_package_ext_tl }
+ \tl_set:cn { ver at CJK . \c_@@_package_ext_tl } { 9999/99/99 }
+ \cs_new_protected:Npn \CJKaddEncHook #1#2
{
- \group_begin:
- \cs_set_eq:NN \Unicode \xeCJK_unicode_char:nn
- \cs_set_eq:NN \def \xdef
- #2
- \group_end:
- \str_gset:Nn \CJK at tenthousand { ^^^^4e07 }
- \str_gset:Nn \CJK at hundredmillion { ^^^^4ebf }
- \tl_if_exist:NF \CJK at UnicodeEnc
- { \tl_const:Nn \CJK at UnicodeEnc { UTF8 } }
- \cs_if_exist:NF \Unicode
- { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
+ \str_if_eq:nnT {#1} { \CJK at UnicodeEnc }
+ {
+ \group_begin:
+ \cs_set_eq:NN \Unicode \xeCJK_unicode_char:nn
+ \cs_set_eq:NN \def \xdef
+ #2
+ \group_end:
+ \str_gset:Nn \CJK at tenthousand { ^^^^4e07 }
+ \str_gset:Nn \CJK at hundredmillion { ^^^^4ebf }
+ \tl_if_exist:NF \CJK at UnicodeEnc
+ { \tl_const:Nn \CJK at UnicodeEnc { UTF8 } }
+ \cs_if_exist:NF \Unicode
+ { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
+ }
}
+ \cs_new:Npn \xeCJK_unicode_char:nn #1#2
+ { \tex_Uchar:D \tex_numexpr:D (#1) * 256 + (#2) \scan_stop: }
}
-\cs_new:Npn \xeCJK_unicode_char:nn #1#2
- { \tex_Uchar:D \tex_numexpr:D (#1) * 256 + (#2) \scan_stop: }
+\ctex_at_end_package:nn { CJKnumb }
+ { \tl_set_eq:cN { ver at CJK . \c_@@_package_ext_tl } \l_@@_CJK_version_tl }
% \end{macrocode}
% \end{macro}
%
@@ -14050,7 +14066,7 @@
\usepackage[margin=2cm]{geometry}
\usepackage{fontspec}
\usepackage{xunicode-addon}
-\usepackage{longtable,tabu,booktabs}
+\usepackage{array,longtable,booktabs}
\usepackage{zref-base}
\setmainfont{FreeSerif}
@@ -14196,14 +14212,17 @@
\section{#2~(\zref at extractdefault{#1}{default}{0})}
\zref at refused{#1}
\noindent
- \begin{longtabu} to \linewidth {>{\ttfamily\footnotesize}rc>{\ttfamily\footnotesize}X>{\tiny}X}
- \toprule\rowfont{\normalfont\normalsize}
- \multicolumn1c{USV} & Symbol & Macro(s) & Description \\
+ \begin{longtable}[c]{>{\ttfamily\footnotesize}rc>{\ttfamily\footnotesize}p{55mm}>{\tiny}l}
+ \toprule
+ \multicolumn1c{\normalfont\normalsize USV} &
+ \normalfont\normalsize Symbol &
+ \normalfont\normalsize Macro(s) &
+ \normalfont\normalsize Description \\
\midrule \endhead
\bottomrule \endfoot
\int_gzero:N \g_@@_symbol_int
\input{#3}
- \end{longtabu}
+ \end{longtable}
\group_begin:
\zref at setcurrent{default}{\int_use:N\g_@@_symbol_int}
\zref at wrapper@immediate{\zref at labelbyprops{#1}{default}}
Modified: trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins 2021-06-20 19:57:32 UTC (rev 59658)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `install')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at 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 at nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2021-06-20 19:57:32 UTC (rev 59658)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `listings')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.8.6}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.7}{\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 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2021-06-20 19:57:32 UTC (rev 59658)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.8.6}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.7}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2021-06-20 19:57:32 UTC (rev 59658)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `package')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.8.6}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.7}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -51,6 +51,7 @@
}
\@ifpackagelater { expl3 } { 2020/02/08 } { }
{ \msg_critical:nnn { xeCJK } { l3-too-old } { expl3 } }
+\RequirePackage { ctexhook }
\prg_new_conditional:Npnn \xeCJK_if_package_loaded:n #1 { p , T , F , TF }
{
\tl_if_exist:cTF { ver@ #1 . \c__xeCJK_package_ext_tl }
@@ -57,11 +58,6 @@
{ \prg_return_true: } { \prg_return_false: }
}
\tl_const:Nx \c__xeCJK_package_ext_tl { \@pkgextension }
-\msg_new:nnn { xeCJK } { incompatible-package }
- {
- The~`#1'~package~and~xeCJK~are~incompatible.\\\\
- Please~do~not~use~it.
- }
\msg_new:nnn { xeCJK } { after-package }
{
The~`#1'~package~and~xeCJK~are~incompatible.\\\\
@@ -73,12 +69,11 @@
{ \msg_error:nnn { xeCJK } { after-package } {#1} }
}
\clist_map_inline:nn
- { CJKfntef , CJKulem , CJKvert , CJKpunct , CJKutf8 , CJK }
- {
- \xeCJK_if_package_loaded:nTF {#1}
- { \msg_error:nnn { xeCJK } { incompatible-package } {#1} }
- { \tl_const:cn { ver@ #1 . \c__xeCJK_package_ext_tl } { 9999/99/99 } }
- }
+ { CJKulem , CJKvert , CJKpunct , CJKutf8 , CJK }
+ { \ctex_disable_package:n {#1} }
+\ctex_if_format_at_least:nTF { 2020/10/01 }
+ { \ctex_replace_package:nn { CJKfntef } { xeCJKfntef } }
+ { \ctex_disable_package:n { CJKfntef } }
\RequirePackage { l3keys2e , xtemplate , xparse }
\tl_new:N \l__xeCJK_tmp_tl
\int_new:N \l__xeCJK_tmp_int
@@ -101,7 +96,6 @@
\cs_new_protected:Npn \xeCJK_no_break:
{ \tex_penalty:D \c__xeCJK_nobreak_penalty_int }
\int_const:Nn \c__xeCJK_nobreak_penalty_int { 10 000 }
-\RequirePackage { ctexhook }
\AtBeginDocument { \xeCJK at document@hook }
\ctex_at_end_preamble:n { \xeCJK at document@left at hook }
\ctex_after_end_preamble:n { \xeCJK at document@right at hook }
@@ -4993,30 +4987,38 @@
}
\__xeCJK_package_hook:nn { listings }
{ \RequirePackage { xeCJK-listings } }
-\clist_map_inline:nn { everysel , microtype }
+\__xeCJK_package_hook:nn { everysel }
{
- \__xeCJK_package_hook:nn {#1}
+ \cs_if_exist:NF \@EverySelectfont at Legacy
{ \cs_undefine:c { ver at CJK . \c__xeCJK_package_ext_tl } }
}
-\cs_new_protected:Npn \CJKaddEncHook #1#2
+\ctex_at_begin_package:nn { CJKnumb }
{
- \str_if_eq:nnT {#1} { \CJK at UnicodeEnc }
+ \tl_new:N \l__xeCJK_CJK_version_tl
+ \tl_set_eq:Nc \l__xeCJK_CJK_version_tl { ver at CJK . \c__xeCJK_package_ext_tl }
+ \tl_set:cn { ver at CJK . \c__xeCJK_package_ext_tl } { 9999/99/99 }
+ \cs_new_protected:Npn \CJKaddEncHook #1#2
{
- \group_begin:
- \cs_set_eq:NN \Unicode \xeCJK_unicode_char:nn
- \cs_set_eq:NN \def \xdef
- #2
- \group_end:
- \str_gset:Nn \CJK at tenthousand { ^^^^4e07 }
- \str_gset:Nn \CJK at hundredmillion { ^^^^4ebf }
- \tl_if_exist:NF \CJK at UnicodeEnc
- { \tl_const:Nn \CJK at UnicodeEnc { UTF8 } }
- \cs_if_exist:NF \Unicode
- { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
+ \str_if_eq:nnT {#1} { \CJK at UnicodeEnc }
+ {
+ \group_begin:
+ \cs_set_eq:NN \Unicode \xeCJK_unicode_char:nn
+ \cs_set_eq:NN \def \xdef
+ #2
+ \group_end:
+ \str_gset:Nn \CJK at tenthousand { ^^^^4e07 }
+ \str_gset:Nn \CJK at hundredmillion { ^^^^4ebf }
+ \tl_if_exist:NF \CJK at UnicodeEnc
+ { \tl_const:Nn \CJK at UnicodeEnc { UTF8 } }
+ \cs_if_exist:NF \Unicode
+ { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
+ }
}
+ \cs_new:Npn \xeCJK_unicode_char:nn #1#2
+ { \tex_Uchar:D \tex_numexpr:D (#1) * 256 + (#2) \scan_stop: }
}
-\cs_new:Npn \xeCJK_unicode_char:nn #1#2
- { \tex_Uchar:D \tex_numexpr:D (#1) * 256 + (#2) \scan_stop: }
+\ctex_at_end_package:nn { CJKnumb }
+ { \tl_set_eq:cN { ver at CJK . \c__xeCJK_package_ext_tl } \l__xeCJK_CJK_version_tl }
\bool_if:NT \g__xeCJK_config_bool
{
\ExplSyntaxOff
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2021-06-20 19:57:32 UTC (rev 59658)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `fntef')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.8.6}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.7}{\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 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2021-06-20 19:57:32 UTC (rev 59658)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `xunicode')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.8.6}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.7}{\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 2021-06-20 19:57:12 UTC (rev 59657)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2021-06-20 19:57:32 UTC (rev 59658)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `xunextra')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2020 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.8.6}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.7}{\ExplFileDescription}
\DeclareUTFSymbol\texthyphenationpoint{"2027}
\DeclareUTFSymbol\texttwoemdash{"2E3A}
\DeclareUTFComposite\textsuperscript
More information about the tex-live-commits
mailing list.