summaryrefslogtreecommitdiff
path: root/macros/xetex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-21 03:01:17 +0000
committerNorbert Preining <norbert@preining.info>2021-06-21 03:01:17 +0000
commite5ca43f7439d850f4193a932455792429cff61eb (patch)
tree35693997358e4b78d3efaeccbf948d9d68cf11ac /macros/xetex
parent0b024adf546cd484554e4de5bd1a9919a4fdd03d (diff)
CTAN sync 202106210301
Diffstat (limited to 'macros/xetex')
-rw-r--r--macros/xetex/latex/xecjk/README.md4
-rw-r--r--macros/xetex/latex/xecjk/xeCJK.dtx105
-rw-r--r--macros/xetex/latex/xecjk/xeCJK.pdfbin1284546 -> 1309004 bytes
-rw-r--r--macros/xetex/latex/xecjk/xunicode-symbols.pdfbin293063 -> 290784 bytes
4 files changed, 64 insertions, 45 deletions
diff --git a/macros/xetex/latex/xecjk/README.md b/macros/xetex/latex/xecjk/README.md
index 0b9712861b..4d014cc1a9 100644
--- a/macros/xetex/latex/xecjk/README.md
+++ b/macros/xetex/latex/xecjk/README.md
@@ -20,8 +20,8 @@ Copyright and Licence
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku@gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
diff --git a/macros/xetex/latex/xecjk/xeCJK.dtx b/macros/xetex/latex/xecjk/xeCJK.dtx
index 1e1398c406..d22b6aa7d0 100644
--- a/macros/xetex/latex/xecjk/xeCJK.dtx
+++ b/macros/xetex/latex/xecjk/xeCJK.dtx
@@ -26,8 +26,8 @@ Copyright and Licence
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku@gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -92,8 +92,8 @@ Copyright and Licence
\preamble
Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2020 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2020 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2009--2021 by Leo Liu <leoliu.pku@gmail.com>
+ Copyright (C) 2012--2021 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -194,7 +194,7 @@ Copyright and Licence
%<*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@gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 71a7646 2021-06-20 17:05:49 +0800 Qing Lee <sobenlee@gmail.com> $
%<package> {Typesetting CJK scripts with XeLaTeX}
%<config> {Configuration file for xeCJK package}
%<fntef> {xeCJK font effect}
@@ -207,7 +207,7 @@ Copyright and Licence
%<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 @@ Copyright and Licence
% \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 @@ Copyright and Licence
{ \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 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.8.7}{2021/06/09}{应用 \tn{disable@package@load} 和
+% \tn{declare@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,12 +1653,17 @@ Copyright and Licence
{ \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}
@@ -1708,7 +1716,6 @@ Copyright and Licence
% \@@_after_end_preamble:n,\@@_package_hook:nn}
% 在 \tn{document} 前后和宏包后加上各种钩子,依赖 \pkg{ctexhook}。
% \begin{macrocode}
-\RequirePackage { ctexhook }
\AtBeginDocument { \xeCJK@document@hook }
\ctex_at_end_preamble:n { \xeCJK@document@left@hook }
\ctex_after_end_preamble:n { \xeCJK@document@right@hook }
@@ -9006,18 +9013,19 @@ Copyright and Licence
%
%
% \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@Legacy
{ \cs_undefine:c { ver@CJK . \c_@@_package_ext_tl } }
}
% \end{macrocode}
%
% \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 @@ Copyright and Licence
% \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@UnicodeEnc }
+ \tl_new:N \l_@@_CJK_version_tl
+ \tl_set_eq:Nc \l_@@_CJK_version_tl { ver@CJK . \c_@@_package_ext_tl }
+ \tl_set:cn { ver@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@tenthousand { ^^^^4e07 }
- \str_gset:Nn \CJK@hundredmillion { ^^^^4ebf }
- \tl_if_exist:NF \CJK@UnicodeEnc
- { \tl_const:Nn \CJK@UnicodeEnc { UTF8 } }
- \cs_if_exist:NF \Unicode
- { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
+ \str_if_eq:nnT {#1} { \CJK@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@tenthousand { ^^^^4e07 }
+ \str_gset:Nn \CJK@hundredmillion { ^^^^4ebf }
+ \tl_if_exist:NF \CJK@UnicodeEnc
+ { \tl_const:Nn \CJK@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@CJK . \c_@@_package_ext_tl } \l_@@_CJK_version_tl }
% \end{macrocode}
% \end{macro}
%
@@ -14050,7 +14066,7 @@ int main()
\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 @@ int main()
\section{#2~(\zref@extractdefault{#1}{default}{0})}
\zref@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@setcurrent{default}{\int_use:N\g_@@_symbol_int}
\zref@wrapper@immediate{\zref@labelbyprops{#1}{default}}
diff --git a/macros/xetex/latex/xecjk/xeCJK.pdf b/macros/xetex/latex/xecjk/xeCJK.pdf
index 3fa0591aa8..e6643597c3 100644
--- a/macros/xetex/latex/xecjk/xeCJK.pdf
+++ b/macros/xetex/latex/xecjk/xeCJK.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecjk/xunicode-symbols.pdf b/macros/xetex/latex/xecjk/xunicode-symbols.pdf
index 937e245b87..e461a9c3e5 100644
--- a/macros/xetex/latex/xecjk/xunicode-symbols.pdf
+++ b/macros/xetex/latex/xecjk/xunicode-symbols.pdf
Binary files differ