texlive[45883] Master/texmf-dist: ctex (22nov17)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 22 23:41:31 CET 2017
Revision: 45883
http://tug.org/svn/texlive?view=revision&revision=45883
Author: karl
Date: 2017-11-22 23:41:30 +0100 (Wed, 22 Nov 2017)
Log Message:
-----------
ctex (22nov17)
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/zhadobefonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.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/ctexopts.cfg
trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def
trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
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-report.def
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/ctxdoc.cls
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/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-ubuntu.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2017-11-22 22:41:30 UTC (rev 45883)
@@ -413,7 +413,7 @@
%<*!(c19|c70|ctexspa|dict)>
%<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\NeedsTeXFormat{LaTeX2e}
%<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
%<ctxdoc> {ctex documentation (CTEX)}
%<ctxdoc>\ProvidesExplClass{ctxdoc}
%<ctex> {Chinese adapter in LaTeX (CTEX)}
@@ -502,7 +502,7 @@
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.4.11}{\ExplFileDescription}
%</!(c19|c70|ctexspa|dict)>
%<c19&rm>\ProvidesFile{c19rm.fd}%
%<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -513,9 +513,9 @@
%<ctexspa>\ProvidesFile{ctexspa.def}%
%<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
%<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<c19|c70> [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
-%<ctexspa> [2017/08/07 v2.4.10 Space info for CJKpunct (CTEX)]
-%<dict&theorem> [2017/08/07 v2.4.10 Chinese translation for theorem name (CTEX)]
+%<c19|c70> [2017/11/22 v2.4.11 Chinese font definition (CTEX)]
+%<ctexspa> [2017/11/22 v2.4.11 Space info for CJKpunct (CTEX)]
+%<dict&theorem> [2017/11/22 v2.4.11 Chinese translation for theorem name (CTEX)]
%</!(driver|readme|install|zhmap|spa|docstrip)>
%<*driver>
\documentclass{ctxdoc}
@@ -537,7 +537,7 @@
% \changes{v2.4}{2015/02/19}{加强 \pkg{beamer} 宏包支持。}
%
%
-% \CheckSum{5923}
+% \CheckSum{5918}
%
% \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
@@ -1526,6 +1526,7 @@
%
% 多级选项之间用斜线分开，例如，\opt{part/name} 选项设置 \tn{part} 标题的在数
% 字前后的名称，而 \opt{section/number} 选项设置 \tn{section} 标题的数字类型。
+% 注意，斜线 |/| 前后不能有空格或者换行。
%
% 使用 \tn{ctexset} 设置多级选项时，可以在同一个上级选项下设置多个下级选项。
%
@@ -4212,9 +4213,13 @@
\ExplSyntaxOff
% \end{macrocode}
%
-% 以下设置抄录自 \file{lltjdefs.sty}。
+% 以下设置抄录自 \file{lltjdefs.sty}，略有改动。
+%
+% \changes{v2.4.11}{2017/08/17}{不把 Enclosed Alphanumerics 设置为 JAchar。}
+% U+2460--U+24FF (Enclosed Alphanumerics) 原属于字符范围 6，是 JAchar，
+% 我们把它们归入字符范围 1，改成 ALchar。
% \begin{macrocode}
-\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
+\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF, "2460-"24FF}
\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
\ltjdefcharrange{3}{%
"2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
@@ -4224,13 +4229,17 @@
"FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
\ltjdefcharrange{6}{%
- "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
+ "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
"4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF, "E0100-"E01EF}
\ltjdefcharrange{7}{
"1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F,
"AC00-"D7FF}
\ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
+% \end{macrocode}
+% \changes{v2.4.11}{2017/08/17}{不把希腊和西里尔字母设置为 JAchar。}
+% \pkg{LuaTeX-ja} 默认把字符范围 2 和 3 设置为 JAchar，我们这里把它们都改成 ALchar。
+% \begin{macrocode}
+\ltjsetparameter{jacharrange={-1, -2, -3, -4, -5, +6, +7, -8}}
\directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
% \end{macrocode}
%
@@ -6941,6 +6950,8 @@
% \changes{v2.4.4}{2016/09/19}{新的标题格式选项 \opt{break}。}
% \changes{v2.4.5}{2016/10/22}{新的标题格式选项 \opt{hang}。}
% \changes{v2.4.5}{2016/10/25}{新的标题格式选项 \opt{tocline}。}
+% \changes{v2.4.11}{2017/11/21}{因上游 \pkg{l3keys} 变化，重新定义
+% \opt{format\textvisiblespace+} 等带空格加号的选项。}
%
% \begin{macro}[int]{\@@_def_heading_keys:n}
% \begin{macrocode}
@@ -6952,16 +6963,17 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
%<*article|book|report>
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
@@ -6968,36 +6980,29 @@
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
+ \@@_plus_key_aux:nn {#1} { break } ,
%</article|book|report>
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \@@_plus_key_aux:nn {#1} { format } ,
+ \@@_plus_key_aux:nn {#1} { nameformat } ,
+ \@@_plus_key_aux:nn {#1} { numberformat } ,
+ \@@_plus_key_aux:nn {#1} { titleformat } ,
+ \@@_plus_key_aux:nn {#1} { aftername } ,
+ \@@_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \@@_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -8101,6 +8106,7 @@
% \begin{macro}[int]{\ps at headings}
% \changes{v2.4.5}{2016/10/01}{修复补丁失败。}
% \changes{v2.4.7}{2016/12/23}{修复 \cls{ctexrep} 类的 \tn{chaptermark} 汉化错误。}
+% \changes{v2.4.11}{2017/09/13}{补充页眉空格。}
% \begin{macrocode}
%<*article>
\if at twoside
@@ -8132,7 +8138,7 @@
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
%</book|report>
% \end{macrocode}
@@ -8160,7 +8166,7 @@
{ \CTEXifname { \CTEXthechapter \quad } { } }
\ctex_patch_cmd:Nnn \ps at fancy
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
%</book|report>
}
% \end{macrocode}
@@ -10048,7 +10054,7 @@
% \begin{macrocode}
%<*windows>
\ProvidesFile{zhwindowsfonts.tex}%
- [2017/08/07 v2.4.10 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
@@ -10120,7 +10126,7 @@
% \begin{macrocode}
%<*adobe>
\ProvidesFile{zhadobefonts.tex}%
- [2017/08/07 v2.4.10 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10156,7 +10162,7 @@
% \begin{macrocode}
%<*fandol>
\ProvidesFile{zhfandolfonts.tex}%
- [2017/08/07 v2.4.10 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10192,7 +10198,7 @@
% \begin{macrocode}
%<*founder>
\ProvidesFile{zhfounderfonts.tex}%
- [2017/08/07 v2.4.10 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
@@ -10264,7 +10270,7 @@
% \begin{macrocode}
%<*ubuntu>
\ProvidesFile{zhubuntufonts.tex}%
- [2017/08/07 v2.4.10 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2017-11-22 22:41:30 UTC (rev 45883)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2017/08/07 v2.4.10 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2017-11-22 22:41:30 UTC (rev 45883)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2017/08/07 v2.4.10 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2017-11-22 22:41:30 UTC (rev 45883)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2017/08/07 v2.4.10 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2017-11-22 22:41:30 UTC (rev 45883)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2017/08/07 v2.4.10 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2017-11-22 22:41:30 UTC (rev 45883)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2017/08/07 v2.4.10 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/11/22 v2.4.11 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding UTF8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
%%
%% \keys_set:nn { ctex / option } { fontset = windowsnew }
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
@@ -74,50 +74,44 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { break } ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\seq_new:N \c__ctex_headings_seq
\seq_gset_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
@@ -71,28 +71,10 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
#1 / numbering .initial:n = true ,
#1 / beforeskip .initial:n = \c_zero_skip ,
#1 / afterskip .initial:n = \c_zero_skip ,
@@ -100,8 +82,22 @@
#1 / beforeskip .value_required:n = true ,
#1 / afterskip .value_required:n = true ,
#1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
@@ -75,50 +75,44 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { break } ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
@@ -724,7 +718,7 @@
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
\ctex_at_end_package:nn { fancyhdr }
{
@@ -733,7 +727,7 @@
{ \CTEXifname { \CTEXthechapter \quad } { } }
\ctex_patch_cmd:Nnn \ps at fancy
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
}
\cs_new_protected_nopar:Npn \CTEX at setcurrentlabel@n #1
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { -4 }
{
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
@@ -75,50 +75,44 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { break } ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
@@ -719,7 +713,7 @@
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
\ctex_at_end_package:nn { fancyhdr }
{
@@ -728,7 +722,7 @@
{ \CTEXifname { \CTEXthechapter \quad } { } }
\ctex_patch_cmd:Nnn \ps at fancy
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
}
\cs_new_protected_nopar:Npn \CTEX at setcurrentlabel@n #1
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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
@@ -638,50 +638,44 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { break } ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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
@@ -631,28 +631,10 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
#1 / numbering .initial:n = true ,
#1 / beforeskip .initial:n = \c_zero_skip ,
#1 / afterskip .initial:n = \c_zero_skip ,
@@ -660,8 +642,22 @@
#1 / beforeskip .value_required:n = true ,
#1 / afterskip .value_required:n = true ,
#1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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
@@ -639,50 +639,44 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { break } ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
@@ -1288,7 +1282,7 @@
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
\ctex_at_end_package:nn { fancyhdr }
{
@@ -1297,7 +1291,7 @@
{ \CTEXifname { \CTEXthechapter \quad } { } }
\ctex_patch_cmd:Nnn \ps at fancy
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
}
\cs_new_protected_nopar:Npn \CTEX at setcurrentlabel@n #1
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_at_end_preamble:n #1
{ \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl {#1} }
\cs_new_protected:Npn \ctex_after_end_preamble:n #1
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\cs_if_exist:NF \str_new:N { \RequirePackage { l3str } }
\cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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
@@ -639,50 +639,44 @@
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX at the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1 at format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1 at nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1 at numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1 at aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1 at titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1 at aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1 at beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1 at afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1 at indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
+ #1 / numbering .initial:n = true ,
+ #1 / beforeskip .initial:n = \c_zero_skip ,
+ #1 / afterskip .initial:n = \c_zero_skip ,
+ #1 / indent .initial:n = \c_zero_dim ,
+ #1 / beforeskip .value_required:n = true ,
+ #1 / afterskip .value_required:n = true ,
+ #1 / indent .value_required:n = true ,
#1 / afterindent .bool_set:N = \exp_not:c { CTEX@#1 at afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1 at fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1 at hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1 at runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1 at break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1 at tocline}
\exp_not:n { ####1####2 } { ####1 }
} ,
- #1 / format+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1 at aftertitle } { ####1 } } ,
- #1 / numbering .initial:n = true ,
- #1 / beforeskip .initial:n = \c_zero_skip ,
- #1 / afterskip .initial:n = \c_zero_skip ,
- #1 / indent .initial:n = \c_zero_dim ,
- #1 / beforeskip .value_required:n = true ,
- #1 / afterskip .value_required:n = true ,
- #1 / indent .value_required:n = true ,
+ \__ctex_plus_key_aux:nn {#1} { break } ,
+ \__ctex_plus_key_aux:nn {#1} { format } ,
+ \__ctex_plus_key_aux:nn {#1} { nameformat } ,
+ \__ctex_plus_key_aux:nn {#1} { numberformat } ,
+ \__ctex_plus_key_aux:nn {#1} { titleformat } ,
+ \__ctex_plus_key_aux:nn {#1} { aftername } ,
+ \__ctex_plus_key_aux:nn {#1} { aftertitle } ,
}
}
+\cs_new_nopar:Npn \__ctex_plus_key_aux:nn #1#2
+ {
+ #1 / #2 .tl_set:N = \exp_not:c { CTEX@#1@#2 } ,
+ #1 / #2 + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } ,
+ #1 / #2 ~ + .code:n =
+ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
+ }
\NewDocumentCommand \ctex_assign_heading_name:nn
{ m > { \SplitArgument { \c_one } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
@@ -1283,7 +1277,7 @@
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
\ctex_at_end_package:nn { fancyhdr }
{
@@ -1292,7 +1286,7 @@
{ \CTEXifname { \CTEXthechapter \quad } { } }
\ctex_patch_cmd:Nnn \ps at fancy
{ \ifnum \c at secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
}
\cs_new_protected_nopar:Npn \CTEX at setcurrentlabel@n #1
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\int_new:N \g__ctex_font_size_flag
\int_set:Nn \g__ctex_font_size_flag { -1 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,7 +28,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2017/08/07 v2.4.10 Space info for CJKpunct (CTEX)]
+ [2017/11/22 v2.4.11 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/ctxdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2017-11-22 22:41:30 UTC (rev 45883)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{ctex documentation (CTEX)}
\ProvidesExplClass{ctxdoc}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\ExplSyntaxOff
\let\pdfmdfivesum\mdfivesum
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2017/08/07 v2.4.10 Chinese translation for theorem name (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2017/08/07 v2.4.10 Chinese translation for theorem name (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -45,7 +45,7 @@
\@ifpackagelater { fontspec } { 2014/05/25 } { }
{ \msg_error:nnn { ctex } { package-too-old } { fontspec } }
\ExplSyntaxOff
-\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
+\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF, "2460-"24FF}
\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
\ltjdefcharrange{3}{%
"2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
@@ -55,13 +55,13 @@
"FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
\ltjdefcharrange{6}{%
- "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
+ "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
"4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF, "E0100-"E01EF}
\ltjdefcharrange{7}{
"1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F,
"AC00-"D7FF}
\ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
+\ltjsetparameter{jacharrange={-1, -2, -3, -4, -5, +6, +7, -8}}
\directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
\directlua{
local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+ [2017/11/22 v2.4.11 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2017-11-22 22:41:30 UTC (rev 45883)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+ [2017/11/22 v2.4.11 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Mac OS X fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{ \ctex_fontset_error:n { mac } }
{
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\file_if_exist:nTF { C:/bootfont.bin }
{ \ctex_file_input:n { ctex-fontset-windowsold.def } }
{ \ctex_file_input:n { ctex-fontset-windowsnew.def } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for Vista or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\tl_new:N \l__ctex_msyh_suffix_tl
\tl_set:Nn \l__ctex_msyh_suffix_tl { .ttc }
\file_if_exist:nF { C:/Windows/Fonts/msyh.ttc }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for XP or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex } { today = small }
\ctex_if_autoindent_touched:F
{ \keys_set:nn { ctex } { 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
\keys_set:nn { ctex / 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 2017-11-22 01:53:20 UTC (rev 45882)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2017-11-22 22:41:30 UTC (rev 45883)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.10}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.11}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
More information about the tex-live-commits
mailing list