summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ctex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-22 22:41:30 +0000
committerKarl Berry <karl@freefriends.org>2017-11-22 22:41:30 +0000
commit17ae294de8fb69063802da82d29433bc4c7f3b68 (patch)
treea86a5b6ca2753d13c52f6ddca4dd3d5e1c78f961 /Master/texmf-dist/source/latex/ctex
parentac06cb4a387aeacbf1596238bd69a3bb6852afe9 (diff)
ctex (22nov17)
git-svn-id: svn://tug.org/texlive/trunk@45883 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ctex')
-rw-r--r--Master/texmf-dist/source/latex/ctex/ctex.dtx96
1 files changed, 51 insertions, 45 deletions
diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx
index c611e36ffba..4e0f5bc932a 100644
--- a/Master/texmf-dist/source/latex/ctex/ctex.dtx
+++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx
@@ -413,7 +413,7 @@ Copyright and Licence
%<*!(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@gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx f5ff957 2017-11-22 19:13:13 +0800 Qing Lee <sobenlee@gmail.com> $
%<ctxdoc> {ctex documentation (CTEX)}
%<ctxdoc>\ProvidesExplClass{ctxdoc}
%<ctex> {Chinese adapter in LaTeX (CTEX)}
@@ -502,7 +502,7 @@ Copyright and Licence
%<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 @@ Copyright and Licence
%<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 @@ Copyright and Licence
% \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 @@ Copyright and Licence
%
% 多级选项之间用斜线分开,例如,\opt{part/name} 选项设置 \tn{part} 标题的在数
% 字前后的名称,而 \opt{section/number} 选项设置 \tn{section} 标题的数字类型。
+% 注意,斜线 |/| 前后不能有空格或者换行。
%
% 使用 \tn{ctexset} 设置多级选项时,可以在同一个上级选项下设置多个下级选项。
%
@@ -4212,9 +4213,13 @@ Copyright and Licence
\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 @@ Copyright and Licence
"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 @@ Copyright and Licence
% \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,52 +6963,46 @@ Copyright and Licence
#1 / name .code:n =
{ \ctex_assign_heading_name:nn {#1} { ####1 } } ,
#1 / number .tl_set:N = \exp_not:c { CTEX@the#1 } ,
- #1 / format .tl_set:N = \exp_not:c { CTEX@#1@format } ,
- #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1@nameformat } ,
- #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1@numberformat } ,
- #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1@aftername } ,
- #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1@titleformat } ,
- #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1@aftertitle } ,
#1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1@beforeskip } ,
#1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1@afterskip} ,
#1 / indent .tl_set:N = \exp_not:c { CTEX@#1@indent } ,
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1@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@afterindent } ,
#1 / fixskip .bool_set:N = \exp_not:c { CTEX@#1@fixskip } ,
#1 / hang .bool_set:N = \exp_not:c { CTEX@#1@hang } ,
#1 / hang .initial:n = true ,
#1 / runin .bool_set:N = \exp_not:c { CTEX@#1@runin } ,
- #1 / break .tl_set:N = \exp_not:c { CTEX@#1@break } ,
- #1 / break+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1@break } { ####1 } } ,
#1 / tocline .code:n =
{
\cs_set:Npn \exp_not:c { CTEX@#1@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@format } { ####1 } } ,
- #1 / nameformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1@nameformat } { ####1 } } ,
- #1 / numberformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1@numberformat } { ####1 } } ,
- #1 / aftername+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1@aftername } { ####1 } } ,
- #1 / titleformat+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1@titleformat } { ####1 } } ,
- #1 / aftertitle+ .code:n =
- { \tl_put_right:Nn \exp_not:c { CTEX@#1@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 @@ Copyright and Licence
% \begin{macro}[int]{\ps@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@twoside
@@ -8132,7 +8138,7 @@ Copyright and Licence
\if@twoside
\ctex_patch_cmd:Nnn \ps@headings
{ \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
%</book|report>
% \end{macrocode}
@@ -8160,7 +8166,7 @@ Copyright and Licence
{ \CTEXifname { \CTEXthechapter \quad } { } }
\ctex_patch_cmd:Nnn \ps@fancy
{ \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi }
- { \CTEXifname { \CTEXthesection } { } }
+ { \CTEXifname { \CTEXthesection \quad } { } }
%</book|report>
}
% \end{macrocode}
@@ -10048,7 +10054,7 @@ Copyright and Licence
% \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@UGBK@ <simsun.ttc}
@@ -10120,7 +10126,7 @@ Copyright and Licence
% \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 @@ Copyright and Licence
% \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 @@ Copyright and Licence
% \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@UGBK@ <FZSSK.TTF}
@@ -10264,7 +10270,7 @@ Copyright and Licence
% \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@UGBK@ <uming.ttc}