texlive[56705] Master/texmf-dist: ctex (19oct20)
commits+karl at tug.org
commits+karl at tug.org
Mon Oct 19 23:09:26 CEST 2020
Revision: 56705
http://tug.org/svn/texlive?view=revision&revision=56705
Author: karl
Date: 2020-10-19 23:09:26 +0200 (Mon, 19 Oct 2020)
Log Message:
-----------
ctex (19oct20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
Modified: trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2020-10-19 21:09:26 UTC (rev 56705)
@@ -443,7 +443,7 @@
%<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e}
%<class>\input{ctexbackend.cfg}
%<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
%<ctex> {Chinese adapter in LaTeX (CTEX)}
%<ctex>\ProvidesExplPackage{\ExplFileName}
%<ctexsize> {Chinese font size definition (CTEX)}
@@ -530,7 +530,7 @@
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.5.5}{\ExplFileDescription}
%</!(fd|ctexspa|dict|backend)>
%<c19&rm>\ProvidesFile{c19rm.fd}%
%<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -548,10 +548,10 @@
%<backend>\ProvidesFile{ctexbackend.cfg}%
%<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
%<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<fd> [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
-%<ctexspa> [2020/08/23 v2.5.4 Space info for CJKpunct (CTEX)]
-%<backend> [2020/08/23 v2.5.4 Backend configuration file (CTEX)]
-%<dict&theorem> [2020/08/23 v2.5.4 Chinese translation for theorem name (CTEX)]
+%<fd> [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
+%<ctexspa> [2020/10/19 v2.5.5 Space info for CJKpunct (CTEX)]
+%<backend> [2020/10/19 v2.5.5 Backend configuration file (CTEX)]
+%<dict&theorem> [2020/10/19 v2.5.5 Chinese translation for theorem name (CTEX)]
%</!(driver|readme|install|zhmap|spa|docstrip)>
%<*driver>
\documentclass{ctxdoc}
@@ -575,7 +575,7 @@
% \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
% \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} 更名为 \pkg{ctex-zhconv}。}
%
-% \CheckSum{6228}
+% \CheckSum{6265}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3423,21 +3423,49 @@
%
% \changes{v2.5.3}{2020/06/06}{正确关闭和恢复 \LaTeXiii 语法环境。}
% \changes{v2.5.4}{2020/08/02}{应用 \pkg{l3cctab}。}
+% \changes{v2.5.5}{2020/10/17}{放弃应用 \pkg{l3cctab}。}
%
% \begin{macro}[int]{\ctex_file_input:n}
-% 输入文件，关闭 \LaTeXiii 语法环境，并设置 |@| 为字母类。
+% 输入文件，关闭 \LaTeXiii 语法环境，并设置 |@| 为字母类、|^| 为上标和 \tn{endlinechar} 为 $13$。
% \begin{macrocode}
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c_@@_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c_@@_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g_@@_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g_@@_file_status_seq \l_@@_file_status_tl
+ \exp_after:wN \@@_pop_file_aux:nnnn \l_@@_file_status_tl
+ }
+\cs_new_protected:Npn \@@_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l_@@_file_status_tl
+\seq_new:N \g_@@_file_status_seq
% \end{macrocode}
% \end{macro}
%
@@ -3447,7 +3475,7 @@
%<*!ctexsize>
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c_@@_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c_@@_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c_@@_class_tl .def }
@@ -3454,7 +3482,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
% \end{macrocode}
@@ -4105,6 +4133,8 @@
% \tn{AtBeginShipoutFirst}。该宏对 \pdfTeX{} 和 \upTeX{} 均有用。
% \tn{AtBeginDvi} 直接将 \tn{special} 保存到盒子中，
% \tn{AtBeginShipoutFirst} 是保存到到宏中，并且不展开参数。
+%
+% 可以使用 \LaTeX\ 2020/10/01 的钩子机制来统一设置。
% \begin{macrocode}
%<*pdftex|uptex|aptex>
\cs_new_protected:Npn \ctex_set_zhmap:n
@@ -4111,13 +4141,17 @@
{ \tl_gput_right:Nx \g_@@_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
{ \tl_use:N \g_@@_zhmap_tl }
-\cs_new_protected:Npn \ctex_add_dvi_zhmap:
- { \AtBeginDvi { \ctex_use_zhmap: } }
-\ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
-\ctex_at_end_package:nn { atbegshi }
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
+ { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
{
- \AtBeginShipoutFirst { \ctex_use_zhmap: }
- \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ \cs_new_protected:Npn \ctex_add_dvi_zhmap:
+ { \AtBeginDvi { \ctex_use_zhmap: } }
+ \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
+ \ctex_at_end_package:nn { atbegshi }
+ {
+ \AtBeginShipoutFirst { \ctex_use_zhmap: }
+ \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ }
}
\tl_new:N \g_@@_zhmap_tl
\@onlypreamble \ctex_set_zhmap:n
@@ -4246,15 +4280,11 @@
% \begin{macrocode}
\cs_new_protected:Npn \ctex_CJK_input:n #1
{
- \cctab_begin:N \c_@@_CJK_cctab
+ \ctex_push_file:
+ \int_set:Nn \tex_endlinechar:D { -1 }
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c_@@_CJK_cctab
- {
- \cctab_select:N \c_@@_package_cctab
- \int_set:Nn \tex_endlinechar:D { -1 }
- }
\cs_set_eq:NN \CJK at input \ctex_CJK_input:n
% \end{macrocode}
% \end{macro}
@@ -4385,11 +4415,13 @@
% \end{macro}
%
% \begin{macro}[int]{\CJKhook}
+% \changes{v2.5.5}{2020/10/06}{不再通过旧的钩子命令来定义。}
% \env{CJK} 和 \env{CJK*} 环境都会重新定义 \tn{CJK at ignorespaces}。我们在 \pkg{CJK}
% 宏包提供的 \tn{CJKhook} 里重新设置它，让这两个环境忽略空格的方式都受 \opt{space}
% 选项的控制。这对 \pkg{zhmCJK} 是必要的。
% \begin{macrocode}
-\ctex_gadd_hook:Nn \CJKhook { \ctex_set_ignorespaces: }
+\tl_if_exist:NF \CJKhook { \tl_new:N \CJKhook }
+\tl_gput_right:Nn \CJKhook { \ctex_set_ignorespaces: }
% \end{macrocode}
% \end{macro}
%
@@ -4548,13 +4580,6 @@
{ \msg_error:nnn { ctex } { package-too-old } { fontspec } }
% \end{macrocode}
%
-% 引擎文件是通过 \cs{ctex_file_input:n} 载入的，其中的 \tn{catcodetable} 机制会完整恢复
-% 文件载入之前的 \tn{catcode} 状态，在引擎文件中的 \tn{catcode} 设置都无效。
-% 因此，对 \tn{ltjlineendcomment} 的设置要放到文件之外进行。
-% \begin{macrocode}
-\ctex_at_end:n { \char_set_catcode_comment:n { \ltjlineendcomment } }
-% \end{macrocode}
-%
% \paragraph{\pkg{LuaTeX-ja} 的默认设置}
%
% \begin{macrocode}
@@ -6390,6 +6415,8 @@
%<pdftex>\reverse_if:N \if_bool:N \g_@@_zhmCJK_bool
% \end{macrocode}
%
+% \changes{v2.5.5}{2020/10/17}{进一步应用 \LaTeX\ 2020/10/01 的新钩子。}
+%
% \begin{macro}[int]{\ctex_provide_font_hook:NNN,\CTEX at rmfamilyhook}
% 给 \tn{rmfamily} 等字体命令加钩子，钩子名字统一为 \tn{CTEX at rmfamilyhook} 等。
% \begin{macrocode}
@@ -6398,17 +6425,27 @@
\exp_args:Nc \@@_provide_font_hook_aux:NNNN
{ CTEX \cs_to_str:N #2 } #1#2
}
-\cs_new_protected:Npn \@@_provide_font_hook_aux:NNNN #1#2#3#4
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
{
- \tl_new:N #1
- \cs_if_exist:NTF #3
- { \tl_gput_right:Nn #3 {#1} }
+ \cs_new_protected:Npn \@@_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \exp_args:Nx \ctex_gadd_ltxhook:nn { \cs_to_str:N #2 } {#1}
+ }
+ }
+ {
+ \cs_new_protected:Npn \@@_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \cs_if_exist:NTF #3
+ { \tl_gput_right:Nn #3 {#1} }
% \end{macrocode}
% 注意此处不能用 \cs{ctex_patch_cmd:Nnn} 来打补丁，因其会关闭 \LaTeXiii 语法，
% 但 \pkg{fontspec} 会在 \tn{rmfamily} 的命令中相应加入
% \cs{l__fontspec_rmfamily_encoding_tl} 等，导致补丁失败。
% \begin{macrocode}
- { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ }
}
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
@@ -10818,17 +10855,17 @@
% 文件标识信息。
% \begin{macrocode}
%<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}%
-%<adobe> [2020/08/23 v2.5.4 Adobe font map loader for DVIPDFMx (CTEX)]
+%<adobe> [2020/10/19 v2.5.5 Adobe font map loader for DVIPDFMx (CTEX)]
%<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}%
-%<fandol> [2020/08/23 v2.5.4 Fandol font map loader for DVIPDFMx (CTEX)]
+%<fandol> [2020/10/19 v2.5.5 Fandol font map loader for DVIPDFMx (CTEX)]
%<founder>\ProvidesFile{ctex-zhmap-founder.tex}%
-%<founder> [2020/08/23 v2.5.4 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<founder> [2020/10/19 v2.5.5 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
%<mac>\ProvidesFile{ctex-zhmap-mac.tex}%
-%<mac> [2020/08/23 v2.5.4 Mac font map loader for DVIPDFMx (CTEX)]
+%<mac> [2020/10/19 v2.5.5 Mac font map loader for DVIPDFMx (CTEX)]
%<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}%
-%<ubuntu> [2020/08/23 v2.5.4 Ubuntu font map loader for DVIPDFMx (CTEX)]
+%<ubuntu> [2020/10/19 v2.5.5 Ubuntu font map loader for DVIPDFMx (CTEX)]
%<windows>\ProvidesFile{ctex-zhmap-windows.tex}%
-%<windows> [2020/08/23 v2.5.4 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<windows> [2020/10/19 v2.5.5 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
% \end{macrocode}
%
% \paragraph{\pkg{ctex-zhmap-adobe.tex}}
@@ -11426,12 +11463,14 @@
% \begin{macrocode}
\@ifl at t@r \fmtversion { 2020/10/01 }
{
- \cs_new_protected:Npx \ctex_at_end_preamble:n
- { \hook_gput_code:nnn { env/document/before } { \c_novalue_tl } }
- \cs_new_protected:Npx \ctex_after_end_preamble:n
- { \hook_gput_code:nnn { begindocument/end } { \c_novalue_tl } }
- \cs_new_protected:Npx \ctex_gadd_package_hook:nnn #1#2
- { \hook_gput_code:nnn { package/#1/#2 } { \c_novalue_tl } }
+ \cs_new_protected:Npx \ctex_gadd_ltxhook:nn #1
+ { \hook_gput_code:nnn {#1} { \c_novalue_tl } }
+ \cs_new_protected:Npn \ctex_at_end_preamble:n
+ { \ctex_gadd_ltxhook:nn { env/document/before } }
+ \cs_new_protected:Npn \ctex_after_end_preamble:n
+ { \ctex_gadd_ltxhook:nn { begindocument/end } }
+ \cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2
+ { \ctex_gadd_ltxhook:nn { package/#1/#2 } }
\file_input_stop:
}
{ }
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex 2020-10-19 21:09:26 UTC (rev 56705)
@@ -75,7 +75,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-adobe.tex}%
- [2020/08/23 v2.5.4 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2020/10/19 v2.5.5 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex 2020-10-19 21:09:26 UTC (rev 56705)
@@ -75,7 +75,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-fandol.tex}%
- [2020/08/23 v2.5.4 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2020/10/19 v2.5.5 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex 2020-10-19 21:09:26 UTC (rev 56705)
@@ -75,7 +75,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-founder.tex}%
- [2020/08/23 v2.5.4 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2020/10/19 v2.5.5 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
\pdfmapline{=gbksong at UGBK@ <FZSSK.TTF}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex 2020-10-19 21:09:26 UTC (rev 56705)
@@ -75,7 +75,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-mac.tex}%
- [2020/08/23 v2.5.4 Mac font map loader for DVIPDFMx (CTEX)]
+ [2020/10/19 v2.5.5 Mac font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex 2020-10-19 21:09:26 UTC (rev 56705)
@@ -75,7 +75,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-ubuntu.tex}%
- [2020/08/23 v2.5.4 Ubuntu font map loader for DVIPDFMx (CTEX)]
+ [2020/10/19 v2.5.5 Ubuntu font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex 2020-10-19 21:09:26 UTC (rev 56705)
@@ -75,7 +75,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-windows.tex}%
- [2020/08/23 v2.5.4 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2020/10/19 v2.5.5 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
\pdfmapline{=gbksong at UGBK@ <simsun.ttc}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = Ŀ¼ ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding UTF-8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = 目录 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexbackend.cfg}%
- [2020/08/23 v2.5.4 Backend configuration file (CTEX)]
+ [2020/10/19 v2.5.5 Backend configuration file (CTEX)]
\begingroup
\expandafter\ifx\csname Umathchardef\endcsname\relax
\else\expandafter\endgroup\expandafter\endinput\fi
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
%%
%% \ctex_set:nn { option } { fontset = windows }
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { 5 }
{
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { -4 }
{
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\msg_new:nnnn { ctex } { subpackage-loaded }
@@ -82,18 +82,45 @@
{ \keys_set:nn { ctex / #1 } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c__ctex_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
@@ -100,7 +127,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2020-10-19 21:09:26 UTC (rev 56705)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -77,18 +77,45 @@
{ \keys_set:nn { ctex / #1 } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c__ctex_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
@@ -95,7 +122,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2020-10-19 21:09:26 UTC (rev 56705)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -77,18 +77,45 @@
{ \keys_set:nn { ctex / #1 } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c__ctex_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
@@ -95,7 +122,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\msg_new:nnnn { ctex } { package-too-old }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2020-10-19 21:09:26 UTC (rev 56705)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -77,18 +77,45 @@
{ \keys_set:nn { ctex / #1 } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c__ctex_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
@@ -95,7 +122,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\clist_new:N \l__ctex_ctexcap_options_clist
\clist_set:Nx \l__ctex_ctexcap_options_clist
{ \exp_not:v { opt@ \@currname . \@currext } , heading }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
@@ -45,18 +45,45 @@
{ \keys_set:nn { ctex / #1 } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c__ctex_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
@@ -63,7 +90,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_at_begin_package:nn #1
{
\@ifpackageloaded {#1}
@@ -51,12 +51,14 @@
}
\@ifl at t@r \fmtversion { 2020/10/01 }
{
- \cs_new_protected:Npx \ctex_at_end_preamble:n
- { \hook_gput_code:nnn { env/document/before } { \c_novalue_tl } }
- \cs_new_protected:Npx \ctex_after_end_preamble:n
- { \hook_gput_code:nnn { begindocument/end } { \c_novalue_tl } }
- \cs_new_protected:Npx \ctex_gadd_package_hook:nnn #1#2
- { \hook_gput_code:nnn { package/#1/#2 } { \c_novalue_tl } }
+ \cs_new_protected:Npx \ctex_gadd_ltxhook:nn #1
+ { \hook_gput_code:nnn {#1} { \c_novalue_tl } }
+ \cs_new_protected:Npn \ctex_at_end_preamble:n
+ { \ctex_gadd_ltxhook:nn { env/document/before } }
+ \cs_new_protected:Npn \ctex_after_end_preamble:n
+ { \ctex_gadd_ltxhook:nn { begindocument/end } }
+ \cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2
+ { \ctex_gadd_ltxhook:nn { package/#1/#2 } }
\file_input_stop:
}
{ }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
{
\ctex_patch_boot:NNnnTF \__ctex_patch_cmd:Nnnnnw #1
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2020-10-19 21:09:26 UTC (rev 56705)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -77,18 +77,45 @@
{ \keys_set:nn { ctex / #1 } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\tl_if_exist:NTF \c__ctex_class_tl
{
\file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
@@ -95,7 +122,7 @@
{ \file_input:n { ctex-scheme- #1 .def } }
}
{ \file_input:n { ctex-scheme- #1 .def } }
- \cctab_end:
+ \ctex_pop_file:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { fix-cm }
\cs_new_protected:Npn \ctex_define_option:n
@@ -36,15 +36,42 @@
{ \keys_define:nn { ctex / option } }
\cs_new_protected:Npn \ctex_file_input:n #1
{
- \cctab_begin:N \c__ctex_package_cctab
+ \ctex_push_file:
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
{
- \cctab_select:N \c_document_cctab
+ \seq_gpush:Nx \g__ctex_file_status_seq
+ {
+ {
+ \bool_if:NTF \l__kernel_expl_bool
+ { \ExplSyntaxOn }
+ { \ExplSyntaxOff }
+ }
+ { \char_value_catcode:n { 64 } }
+ { \char_value_catcode:n { 94 } }
+ { \int_use:N \tex_endlinechar:D }
+ }
+ \ExplSyntaxOff
\char_set_catcode_letter:n { 64 }
+ \char_set_catcode_math_superscript:n { 94 }
+ \int_set:Nn \tex_endlinechar:D { 13 }
}
+\cs_new_protected:Npn \ctex_pop_file:
+ {
+ \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+ \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+ }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+ {
+ #1
+ \char_set_catcode:nn { 64 } {#2}
+ \char_set_catcode:nn { 94 } {#3}
+ \int_set:Nn \tex_endlinechar:D {#4}
+ }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
\int_new:N \g__ctex_font_size_int
\int_gset:Nn \g__ctex_font_size_int { -1 }
\ctex_define_option:n
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -26,7 +26,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2020/08/23 v2.5.4 Space info for CJKpunct (CTEX)]
+ [2020/10/19 v2.5.5 Space info for CJKpunct (CTEX)]
\ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,}
\ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,}
\ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2020/08/23 v2.5.4 Chinese translation for theorem name (CTEX)]
+ [2020/10/19 v2.5.5 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{\xC6\xC0\xC2\xDB}
\providetranslation{comments}{\xC6\xC0\xC2\xDB}
\providetranslation{Comment}{\xC6\xC0\xC2\xDB}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2020/08/23 v2.5.4 Chinese translation for theorem name (CTEX)]
+ [2020/10/19 v2.5.5 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{评论}
\providetranslation{comments}{评论}
\providetranslation{Comment}{评论}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,21 +24,25 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
{ \tl_use:N \g__ctex_zhmap_tl }
-\cs_new_protected:Npn \ctex_add_dvi_zhmap:
- { \AtBeginDvi { \ctex_use_zhmap: } }
-\ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
-\ctex_at_end_package:nn { atbegshi }
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
+ { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
{
- \AtBeginShipoutFirst { \ctex_use_zhmap: }
- \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ \cs_new_protected:Npn \ctex_add_dvi_zhmap:
+ { \AtBeginDvi { \ctex_use_zhmap: } }
+ \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
+ \ctex_at_end_package:nn { atbegshi }
+ {
+ \AtBeginShipoutFirst { \ctex_use_zhmap: }
+ \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ }
}
\tl_new:N \g__ctex_zhmap_tl
\@onlypreamble \ctex_set_zhmap:n
@@ -118,13 +122,23 @@
\exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
{ CTEX \cs_to_str:N #2 } #1#2
}
-\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
{
- \tl_new:N #1
- \cs_if_exist:NTF #3
- { \tl_gput_right:Nn #3 {#1} }
- { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \exp_args:Nx \ctex_gadd_ltxhook:nn { \cs_to_str:N #2 } {#1}
+ }
}
+ {
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \cs_if_exist:NTF #3
+ { \tl_gput_right:Nn #3 {#1} }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ }
+ }
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -42,7 +42,6 @@
\RequirePackage { fontspec }
\@ifpackagelater { fontspec } { 2020/02/21 } { }
{ \msg_error:nnn { ctex } { package-too-old } { fontspec } }
-\ctex_at_end:n { \char_set_catcode_comment:n { \ltjlineendcomment } }
\ExplSyntaxOff
\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
@@ -1092,13 +1091,23 @@
\exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
{ CTEX \cs_to_str:N #2 } #1#2
}
-\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
{
- \tl_new:N #1
- \cs_if_exist:NTF #3
- { \tl_gput_right:Nn #3 {#1} }
- { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \exp_args:Nx \ctex_gadd_ltxhook:nn { \cs_to_str:N #2 } {#1}
+ }
}
+ {
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \cs_if_exist:NTF #3
+ { \tl_gput_right:Nn #3 {#1} }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ }
+ }
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,21 +24,25 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
{ \tl_use:N \g__ctex_zhmap_tl }
-\cs_new_protected:Npn \ctex_add_dvi_zhmap:
- { \AtBeginDvi { \ctex_use_zhmap: } }
-\ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
-\ctex_at_end_package:nn { atbegshi }
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
+ { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
{
- \AtBeginShipoutFirst { \ctex_use_zhmap: }
- \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ \cs_new_protected:Npn \ctex_add_dvi_zhmap:
+ { \AtBeginDvi { \ctex_use_zhmap: } }
+ \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
+ \ctex_at_end_package:nn { atbegshi }
+ {
+ \AtBeginShipoutFirst { \ctex_use_zhmap: }
+ \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ }
}
\tl_new:N \g__ctex_zhmap_tl
\@onlypreamble \ctex_set_zhmap:n
@@ -108,15 +112,11 @@
\fi:
\cs_new_protected:Npn \ctex_CJK_input:n #1
{
- \cctab_begin:N \c__ctex_CJK_cctab
+ \ctex_push_file:
+ \int_set:Nn \tex_endlinechar:D { -1 }
\file_input:n {#1}
- \cctab_end:
+ \ctex_pop_file:
}
-\cctab_const:Nn \c__ctex_CJK_cctab
- {
- \cctab_select:N \c__ctex_package_cctab
- \int_set:Nn \tex_endlinechar:D { -1 }
- }
\cs_set_eq:NN \CJK at input \ctex_CJK_input:n
\if_cs_exist:N \CJK at surr
\cs_new_protected:Npn \ctex_plane_to_utfxvibe:Nn #1#2
@@ -167,7 +167,8 @@
}
\cs_new_protected:Npn \ctex_set_ignorespaces:
{ \cs_set_eq:NN \CJK at ignorespaces \ctex_auto_ignorespaces: }
-\ctex_gadd_hook:Nn \CJKhook { \ctex_set_ignorespaces: }
+\tl_if_exist:NF \CJKhook { \tl_new:N \CJKhook }
+\tl_gput_right:Nn \CJKhook { \ctex_set_ignorespaces: }
\cs_new_protected:Npn \ctex_punct_set:n #1
{
\clist_map_inline:Nn \c__ctex_punct_family_clist
@@ -227,13 +228,23 @@
\exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
{ CTEX \cs_to_str:N #2 } #1#2
}
-\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
{
- \tl_new:N #1
- \cs_if_exist:NTF #3
- { \tl_gput_right:Nn #3 {#1} }
- { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \exp_args:Nx \ctex_gadd_ltxhook:nn { \cs_to_str:N #2 } {#1}
+ }
}
+ {
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \cs_if_exist:NTF #3
+ { \tl_gput_right:Nn #3 {#1} }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ }
+ }
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,21 +24,25 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
{ \tl_use:N \g__ctex_zhmap_tl }
-\cs_new_protected:Npn \ctex_add_dvi_zhmap:
- { \AtBeginDvi { \ctex_use_zhmap: } }
-\ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
-\ctex_at_end_package:nn { atbegshi }
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
+ { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
{
- \AtBeginShipoutFirst { \ctex_use_zhmap: }
- \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ \cs_new_protected:Npn \ctex_add_dvi_zhmap:
+ { \AtBeginDvi { \ctex_use_zhmap: } }
+ \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
+ \ctex_at_end_package:nn { atbegshi }
+ {
+ \AtBeginShipoutFirst { \ctex_use_zhmap: }
+ \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ }
}
\tl_new:N \g__ctex_zhmap_tl
\@onlypreamble \ctex_set_zhmap:n
@@ -118,13 +122,23 @@
\exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
{ CTEX \cs_to_str:N #2 } #1#2
}
-\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
{
- \tl_new:N #1
- \cs_if_exist:NTF #3
- { \tl_gput_right:Nn #3 {#1} }
- { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \exp_args:Nx \ctex_gadd_ltxhook:nn { \cs_to_str:N #2 } {#1}
+ }
}
+ {
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \cs_if_exist:NTF #3
+ { \tl_gput_right:Nn #3 {#1} }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ }
+ }
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhrm.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhrm}{}
\DeclareFontShape{JT2}{zhrm}{m}{n}{<-> upzhserif-v}{}
\DeclareFontShape{JT2}{zhrm}{m}{it}{<-> upzhserifit-v}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhsf.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhsf}{}
\DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{}
\DeclareFontShape{JT2}{zhsf}{b}{n}{<-> upzhsansb-v}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhtt.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhtt}{}
\DeclareFontShape{JT2}{zhtt}{m}{n}{<-> upzhmono-v}{}
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhrm.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhrm}{}
\DeclareFontShape{JY2}{zhrm}{m}{n}{<-> upzhserif-h}{}
\DeclareFontShape{JY2}{zhrm}{m}{it}{<-> upzhserifit-h}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhsf.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhsf}{}
\DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{}
\DeclareFontShape{JY2}{zhsf}{b}{n}{<-> upzhsansb-h}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2020-10-19 21:09:26 UTC (rev 56705)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhtt.fd}%
- [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
+ [2020/10/19 v2.5.5 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhtt}{}
\DeclareFontShape{JY2}{zhtt}{m}{n}{<-> upzhmono-h}{}
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { adobe } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { fandol } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_fontset_case:nnn
{
\ctex_zhmap_case:nnn
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{macOS fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\file_if_exist:nTF { /System/Library/Fonts/PingFang.ttc }
{ \ctex_file_input:n { ctex-fontset-macnew.def } }
{ \ctex_file_input:n { ctex-fontset-macold.def } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{macOS fonts definition for El Capitan or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-macnew.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{macOS fonts definition for Yosemite or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-macold.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
{ \ctex_fontset_error:n { macold } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { ubuntu } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\file_if_exist:nTF { \c_dollar_str WINDIR/Fonts/msyh.ttc }
{ \tl_const:Nn \c__ctex_msyh_suffix_tl { ttc } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
\cs_new_protected:Npn \__ctex_initial_heading:n #1
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
{ \ctex_set:n { autoindent = true } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2020-10-19 21:08:58 UTC (rev 56704)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2020-10-19 21:09:26 UTC (rev 56705)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
More information about the tex-live-commits
mailing list.