texlive[42351] Master/texmf-dist: ctex (25oct16)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 25 22:39:26 CEST 2016
Revision: 42351
http://tug.org/svn/texlive?view=revision&revision=42351
Author: karl
Date: 2016-10-25 22:39:25 +0200 (Tue, 25 Oct 2016)
Log Message:
-----------
ctex (25oct16)
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2016-10-25 20:39:25 UTC (rev 42351)
@@ -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 b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +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.4}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.4.5}{\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> [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
-%<ctexspa> [2016/09/21 v2.4.4 Space info for CJKpunct (CTEX)]
-%<dict&theorem> [2016/09/21 v2.4.4 Chinese translation for theorem name (CTEX)]
+%<c19|c70> [2016/10/25 v2.4.5 Chinese font definition (CTEX)]
+%<ctexspa> [2016/10/25 v2.4.5 Space info for CJKpunct (CTEX)]
+%<dict&theorem> [2016/10/25 v2.4.5 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{5793}
+% \CheckSum{5862}
%
% \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
@@ -558,7 +558,7 @@
% \GetFileId{ctex.sty}%
%
% \title{\bfseries \CTeX{} 宏集手册}
-% \author{\href{http://www.ctex.org}{ctex.org}}
+% \author{\href{http://www.ctex.org}{CTEX.ORG}}
% \date{\filedate\qquad\fileversion\thanks{\ctexkitrev{\ExplFileVersion}.}}
% \maketitle
%
@@ -1136,7 +1136,7 @@
% \end{function}
% \begin{optdesc}[itemsep=\medskipamount]
% \item[chinese] 对 \cls{beamer} 以外的文档类，调整默认字号为五号字，并调
-%` 整行距为 |1.3|；汉化文档中的标题名字（如“图”、“表”、“目录”和“参
+% 整行距为 |1.3|；汉化文档中的标题名字（如“图”、“表”、“目录”和“参
% 考文献”等，见 \ref{subs:capname}~节）；
% 在 \opt{heading = true} 的情况下^^A
% \footnote{使用 \CTeX{} 文档类，或者使用 \pkg{ctex} 宏包且开启该选项时。}^^A
@@ -1442,7 +1442,7 @@
% }
% }
% \renewcommand\sectionmark[1]{%
-% \markright{\CTEXthesection——#1}}
+% \markright{\CTEXifname{\CTEXthesection——}{}#1}}
%
% \begin{document}
%
@@ -1515,13 +1515,14 @@
% \opt{name}, \opt{number}, \opt{format}, \opt{nameformat}, \opt{numberformat},
% \opt{aftername}, \opt{titleformat}, \opt{aftertitle}, \opt{runin},
% \opt{afterindent}, \opt{beforeskip}, \opt{afterskip}, \opt{fixskip},
-% \opt{indent}, \opt{pagestyle}, \opt{break} 等。
+% \opt{lotskip}, \opt{lofskip}, \opt{indent}, \opt{hang},
+% \opt{pagestyle}, \opt{break}, \opt{tocline} 等。
%
% 注意，对 \cls{article} 及其衍生的 \cls{ctexart} 等文档类，没有 |chapter|
% 级别的标题。而对于 \cls{beamer} 文档类，这些选项控制的是由 \tn{partpage},
% \tn{sectionpage} 和 \tn{subsectionpage} 产生的标题格式，此时只有 |part|,
% |section| 和 |subsection| 这三层级别，并且 \opt{runin}, \opt{afterindent},
-% \opt{fixskip} 和 \opt{break} 这四个格式无效。
+% \opt{fixskip}, \opt{hang}, \opt{break} 和 \opt{tocline} 这六个格式无效。
%
% 多级选项之间用斜线分开，例如，\opt{part/name} 选项设置 \tn{part} 标题的在数
% 字前后的名称，而 \opt{section/number} 选项设置 \tn{section} 标题的数字类型。
@@ -2093,6 +2094,19 @@
% \opt{fixskip} 选项用于抑制这些多余间距。
% \end{function}
%
+% \begin{function}[EXP,added=2016-10-01]{chapter/lofskip, chapter/lotskip}
+% \begin{syntax}
+% lofskip = \Arg{弹性间距}
+% lotskip = \Arg{弹性间距}
+% \end{syntax}
+% \opt{lofskip} 选项控制插图目录（\file{.lof}）中，章之间的插图标题的距离。
+%
+% 同样，\opt{lotskip} 选项控制表格目录（\file{.lot}）中，章之间的表格标题的距离。
+%
+% 目前，这两个选项只在 \opt{chapter} 标题下有定义。
+% 他们的默认值，在 \opt{scheme} 选项的不同取值下都为 \SI{10}{pt}。
+% \end{function}
+%
% \begin{function}[EXP,updated=2015-06-27]{.../indent}
% \begin{syntax}
% indent = \Arg{缩进间距}
@@ -2113,6 +2127,15 @@
% \noindent 无缩进的正文。
% \end{ctexexam}
%
+% \begin{function}[EXP,added=2016-10-22]{section/hang, subsection/hang,
+% subsubsection/hang, paragraph/hang, subparagraph/hang}
+% \begin{syntax}
+% hang = \TTF
+% \end{syntax}
+% 默认情况下，\tn{section} 级以下标题具有悬挂缩进的效果（缩进的宽度为名字宽度和 \opt{indent} 选项
+% 设置的宽度之和）。设置 \opt{hang} 选项为 \opt{false} 可以取消这一效果。
+% \end{function}
+%
% \begin{function}[EXP,added=2014-03-21]{part/pagestyle, chapter/pagestyle}
% \begin{syntax}
% pagestyle = \Arg{页面格式}
@@ -2172,6 +2195,42 @@
% \end{tabular}
% \end{table}
%
+% \begin{function}[EXP,added=2016-10-25]{.../tocline}
+% \begin{syntax}
+% tocline = \Arg{格式定义}
+% \end{syntax}
+% \opt{tocline} 选项用于定义章节标题在目录文件（\file{.toc}）中的格式。\meta{格式定义}有两个参数：
+% 参数 |#1| 是 |part|、|chapter| 等名字，参数 |#2| 是标题内容。
+% \end{function}
+%
+% \begin{table}[htbp]
+% \small\centering
+% \caption{\opt{tocline} 选项的默认设置}
+% \begin{tabular}{ll}
+% \toprule
+% 标题名 & 默认值 \\
+% \midrule
+% part & |\CTEXifname{\CTEXthepart\hspace{1em}}{}#2| \\
+% chapter (\opt{chinese})
+% & |\CTEXifname{\protect\numberline{\CTEXthechapter\hspace{.3em}}}{}#2| \\
+% chapter (\opt{plain})
+% & |\CTEXnumberline{#1}#2| \\
+% section & |\CTEXnumberline{#1}#2| \\
+% subsection & 同上 \\
+% subsubsection & 同上 \\
+% paragraph & 同上 \\
+% subparagraph & 同上 \\
+% \bottomrule
+% \end{tabular}
+%
+% \medskip
+% 其中 \tn{CTEXnumberline} 的意义是若标题 |#1| 没有名字，则不输出 |\numberline{\CTEXthe#1}|
+% 等编号：
+% \begin{verbatim}
+% \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}
+% \end{verbatim}
+% \end{table}
+%
% \begin{function}[EXP,added=2015-06-21]{appendix/numbering}
% \begin{syntax}
% numbering = \TTF
@@ -2182,7 +2241,7 @@
% 用法与普通章节 \opt{numbering} 选项类似。
% \end{function}
%
-% \begin{function}[updated=2014-03-08]{appendix/name}
+% \begin{function}[EXP,updated=2014-03-08]{appendix/name}
% \begin{syntax}
% name = \{<前名字>,<后名字>\}
% name = \Arg{前名字}
@@ -6780,6 +6839,8 @@
% \changes{v2.2}{2015/06/27}{新的标题格式选项 \opt{runin}。}
% \changes{v2.4.3}{2016/06/03}{新的标题格式选项 \opt{fixskip}。}
% \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}。}
%
% \begin{macro}[int]{\@@_def_heading_keys:n}
% \begin{macrocode}
@@ -6804,10 +6865,17 @@
%<*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 } ,
+ #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 }
+ } ,
%</article|book|report>
#1 / format+ .code:n =
{ \tl_put_right:Nn \exp_not:c { CTEX@#1 at format } { ####1 } } ,
@@ -6858,8 +6926,10 @@
% \opt{chapter/fixbeforeskip}。}
% \changes{v2.4.3}{2016/06/03}{删除选项 \opt{part/fixbeforeskip} 和
% \opt{chapter/fixbeforeskip}。}
+% \changes{v2.4.5}{2016/10/01}{新的标题格式选项 \opt{chapter/lofskip} 和
+% \opt{chapter/lotskip}。}
%
-% \begin{macro}{part/pagestyle,chapter/pagestyle}
+% \begin{macro}{part/pagestyle,chapter/pagestyle,chapter/lofskip,chapter/lotskip}
% 只在 \cls{ctexbook} 和 \cls{ctexrep} 下有定义。
% \begin{macrocode}
\group_begin:
@@ -6868,6 +6938,12 @@
{
part / pagestyle .tl_set:N = \CTEX at part@pagestyle ,
chapter / pagestyle .tl_set:N = \CTEX at chapter@pagestyle ,
+ chapter / lofskip .tl_set:N = \CTEX at chapter@lofskip ,
+ chapter / lotskip .tl_set:N = \CTEX at chapter@lotskip ,
+ chapter / lofskip .initial:n = \c_zero_skip ,
+ chapter / lotskip .initial:n = \c_zero_skip ,
+ chapter / lofskip .value_required:n = true ,
+ chapter / lotskip .value_required:n = true ,
}
%</book|report>
%<*article|beamer>
@@ -6952,6 +7028,36 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}[int]{\CTEX at addloflotskip}
+% 往插图和表格目录中加入额外间距。如果间距为零，则不加入。
+% \begin{macrocode}
+%<*book|report>
+\cs_new_protected_nopar:Npn \CTEX at addloflotskip #1
+ {
+ \skip_set:Nn \l_@@_heading_skip { \use:c { CTEX@#1 at lofskip } }
+ \skip_if_eq:nnF { \l_@@_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lof }
+ { \protect \addvspace { \skip_use:N \l_@@_heading_skip } }
+ }
+ \skip_set:Nn \l_@@_heading_skip { \use:c { CTEX@#1 at lotskip } }
+ \skip_if_eq:nnF { \l_@@_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lot }
+ { \protect \addvspace { \skip_use:N \l_@@_heading_skip } }
+ }
+ }
+%</book|report>
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{\CTEX at addtocline}
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v2.2}{2015/06/27}{\opt{beforeskip}、\opt{afterskip} 和 \opt{indent}
% 选项支持表达式。}
%
@@ -7016,17 +7122,17 @@
\CTEX at ifnametrue
\refstepcounter{part}%
% \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
+% \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
+% \addcontentsline{toc}{part}{#1}%
\fi
+ \CTEX at addtocline{part}{#1}%
{\interlinepenalty \@M
% \normalfont \parindent \z@ \raggedright
\normalfont \parindent \dimexpr \CTEX at part@indent \relax \CTEX at part@format
@@ -7053,17 +7159,17 @@
\CTEX at ifnametrue
\refstepcounter{part}%
% \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
+% \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
+% \addcontentsline{toc}{part}{#1}%
\fi
+ \CTEX at addtocline{part}{#1}%
% \markboth{}{}%
\partmark{#1}%
{\interlinepenalty \@M
@@ -7167,33 +7273,38 @@
% \begin{macrocode}
\def\@chapter[#1]#2{%
\ifnum \c at secnumdepth >\m at ne
-%<book> \if at mainmatter
+%<*book>
+ \if at mainmatter
+%</book>
\ifodd \CTEX at chapter@numbering
\CTEX at ifnametrue
\refstepcounter{chapter}%
% \typeout{\@chapapp\space\thechapter.}%
\typeout{\CTEXthechapter}%
- \addcontentsline{toc}{chapter}
+% \addcontentsline{toc}{chapter}
% {\protect\numberline{\thechapter}#1}%
- {\protect\numberline{\CTEXthechapter\hspace{0.3em}}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
+% \addcontentsline{toc}{chapter}{#1}%
\fi
-%<book> \else
-%<book> \CTEX at ifnamefalse
-%<book> \CTEX at makeanchor@chapter{\Hy at chapapp*}%
-%<book> \addcontentsline{toc}{chapter}{#1}%
-%<book> \fi
+%<*book>
+ \else
+ \CTEX at ifnamefalse
+ \CTEX at makeanchor@chapter{\Hy at chapapp*}%
+% \addcontentsline{toc}{chapter}{#1}%
+ \fi
+%</book>
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
+% \addcontentsline{toc}{chapter}{#1}%
\fi
+ \CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+% \addtocontents{lof}{\protect\addvspace{10\p@}}%
+% \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \CTEX at addloflotskip{chapter}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -7338,7 +7449,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
% \interlinepenalty \@M #8\@@par}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
@@ -7345,12 +7456,12 @@
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
+% \addcontentsline{toc}{#1}{%
% \ifnum #2>\c at secnumdepth \else
% \protect\numberline{\csname the#1\endcsname}%
% \fi
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+% #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -7359,12 +7470,12 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
+% \addcontentsline{toc}{#1}{%
% \ifnum #2>\c at secnumdepth \else
% \protect\numberline{\csname the#1\endcsname}%
% \fi
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+% #7}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
% \end{macrocode}
@@ -7379,7 +7490,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
% \interlinepenalty \@M #5\@@par}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
@@ -7432,6 +7543,18 @@
%<@@=ctex>
% \end{macrocode}
%
+% \begin{macro}[int]{\CTEX at hangfrom}
+% \opt{hang} 选项控制是否采用悬挂缩进。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[int]{\CTEX at update@sectionformat at n}
% 在 \tn{@startsection} 中设置 \tn{CTEX at titleformat@n} 等为相应函数。
% \begin{macrocode}
@@ -7441,6 +7564,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -7447,11 +7571,42 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[int]{\CTEX at part@tocline, \CTEX at chapter@tocline}
% \begin{macrocode}
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{\CTEXnumberline}
+% \begin{macrocode}
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
\int_zero:N \l_@@_tmp_int
\seq_map_inline:Nn \c_@@_section_headings_seq
{
@@ -7465,6 +7620,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
% \end{macrocode}
%
@@ -7837,15 +7994,23 @@
% \subsubsection{页眉信息的修改}
%
% \begin{macro}[int]{\ps at headings}
+% \changes{v2.4.5}{2016/10/01}{修复补丁失败。}
% \begin{macrocode}
%<*article>
-\ctex_patch_cmd:Nnn \ps at headings
- { \ifnum \c at secnumdepth > \z@ \thesection \quad \fi }
- { \CTEXifname { \CTEXthesection \quad } { } }
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
+ { \ifnum \c at secnumdepth > \z@ \thesection \quad \fi }
+ { \CTEXifname { \CTEXthesection \quad } { } }
+ \ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \@ne \thesubsection \quad \fi }
{ \CTEXifname { \CTEXthesubsection \quad } { } }
+\else:
+% \end{macrocode}
+% 不知为何，标准文档类此处对 \texttt{secnumdepth} 的判断为 $0$，与 \tn{section} 的层次 $1$ 不符。
+% \begin{macrocode}
+ \ctex_patch_cmd:Nnn \ps at headings
+ { \ifnum \c at secnumdepth > \m at ne \thesection \quad \fi }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
%</article>
%<*book|report>
@@ -8142,6 +8307,8 @@
aftertitle = \par ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
+ lofskip = 10 \p@ ,
+ lotskip = 10 \p@ ,
break = \if at openright \cleardoublepage \else \clearpage \fi ,
%<*plain>
name = \chaptername \space ,
@@ -8150,7 +8317,8 @@
nameformat = \huge \bfseries ,
aftername = \par \nobreak \vskip 20 \p@ ,
titleformat = \Huge \bfseries ,
- afterindent = false
+ afterindent = false ,
+ tocline = \CTEXnumberline {#1} #2
%</plain>
%<*chinese>
number = \chinese { chapter } ,
@@ -9765,7 +9933,7 @@
% \begin{macrocode}
%<*windows>
\ProvidesFile{zhwindowsfonts.tex}%
- [2016/09/21 v2.4.4 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
@@ -9837,7 +10005,7 @@
% \begin{macrocode}
%<*adobe>
\ProvidesFile{zhadobefonts.tex}%
- [2016/09/21 v2.4.4 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -9873,7 +10041,7 @@
% \begin{macrocode}
%<*fandol>
\ProvidesFile{zhfandolfonts.tex}%
- [2016/09/21 v2.4.4 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -9909,7 +10077,7 @@
% \begin{macrocode}
%<*founder>
\ProvidesFile{zhfounderfonts.tex}%
- [2016/09/21 v2.4.4 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
@@ -9981,7 +10149,7 @@
% \begin{macrocode}
%<*ubuntu>
\ProvidesFile{zhubuntufonts.tex}%
- [2016/09/21 v2.4.4 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
@@ -11179,6 +11347,7 @@
\everypar {#1}
\if at inlabel
\global \@inlabelfalse
+ \@noparlistfalse
\llap { \box \@labels \hskip \leftskip }
\fi
#1
@@ -11186,7 +11355,7 @@
}
\ctex_patch_cmd:Nnn \macro at code
{ \if at inlabel \leavevmode \fi }
- { }
+ { \partopsep \z at skip }
\group_begin:
\int_set_eq:NN \tex_endlinechar:D \c_minus_one
\use:n
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2016-10-25 20:39:25 UTC (rev 42351)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2016/09/21 v2.4.4 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2016-10-25 20:39:25 UTC (rev 42351)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2016/09/21 v2.4.4 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2016-10-25 20:39:25 UTC (rev 42351)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2016/09/21 v2.4.4 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2016-10-25 20:39:25 UTC (rev 42351)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2016/09/21 v2.4.4 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2016-10-25 20:39:25 UTC (rev 42351)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2016/09/21 v2.4.4 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2016/10/25 v2.4.5 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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = Ŀ¼ ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding UTF8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = 目录 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
@@ -86,10 +86,17 @@
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
#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 =
@@ -150,6 +157,8 @@
{ \cs_set_eq:NN \CTEXifname \use_i:nn }
\cs_new_protected_nopar:Npn \CTEX at ifnamefalse
{ \cs_set_eq:NN \CTEXifname \use_ii:nn }
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
\renewcommand\part{%
\if at noskipsec \leavevmode \fi
\par
@@ -168,17 +177,15 @@
\ifodd \CTEX at part@numbering
\CTEX at ifnametrue
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
\fi
+ \CTEX at addtocline{part}{#1}%
{\interlinepenalty \@M
\normalfont \parindent \dimexpr \CTEX at part@indent \relax \CTEX at part@format
\ifnum \c at secnumdepth >\m at ne \ifodd \CTEX at part@numbering
@@ -247,15 +254,13 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -263,9 +268,7 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
@@ -273,7 +276,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
\CTEX at aftertitle}%
@@ -307,6 +310,12 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
\cs_new_protected_nopar:Npn \CTEX at update@sectionformat at n #1
{
\cs_set_eq:Nc \CTEX at titleformat@n { CTEX@#1 at titleformat }
@@ -313,6 +322,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -319,7 +329,28 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
\int_zero:N \l__ctex_tmp_int
\seq_map_inline:Nn \c__ctex_section_headings_seq
{
@@ -333,6 +364,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
\keys_define:nn { ctex }
{
@@ -565,13 +598,17 @@
}
}
}
-\ctex_patch_cmd:Nnn \ps at headings
- { \ifnum \c at secnumdepth > \z@ \thesection \quad \fi }
- { \CTEXifname { \CTEXthesection \quad } { } }
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
+ { \ifnum \c at secnumdepth > \z@ \thesection \quad \fi }
+ { \CTEXifname { \CTEXthesection \quad } { } }
+ \ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \@ne \thesubsection \quad \fi }
{ \CTEXifname { \CTEXthesubsection \quad } { } }
+\else:
+ \ctex_patch_cmd:Nnn \ps at headings
+ { \ifnum \c at secnumdepth > \m at ne \thesection \quad \fi }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
\ctex_at_end_package:nn { fancyhdr }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\seq_new:N \c__ctex_headings_seq
\seq_gset_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
@@ -87,10 +87,17 @@
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
#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 =
@@ -127,6 +134,12 @@
{
part / pagestyle .tl_set:N = \CTEX at part@pagestyle ,
chapter / pagestyle .tl_set:N = \CTEX at chapter@pagestyle ,
+ chapter / lofskip .tl_set:N = \CTEX at chapter@lofskip ,
+ chapter / lotskip .tl_set:N = \CTEX at chapter@lotskip ,
+ chapter / lofskip .initial:n = \c_zero_skip ,
+ chapter / lotskip .initial:n = \c_zero_skip ,
+ chapter / lofskip .value_required:n = true ,
+ chapter / lotskip .value_required:n = true ,
}
\seq_map_inline:Nn \c__ctex_headings_seq
{
@@ -161,6 +174,23 @@
{ \cs_set_eq:NN \CTEXifname \use_i:nn }
\cs_new_protected_nopar:Npn \CTEX at ifnamefalse
{ \cs_set_eq:NN \CTEXifname \use_ii:nn }
+\cs_new_protected_nopar:Npn \CTEX at addloflotskip #1
+ {
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lofskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lof }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lotskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lot }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ }
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -179,17 +209,15 @@
\ifodd \CTEX at part@numbering
\CTEX at ifnametrue
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
\fi
+ \CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX at part@format
@@ -239,26 +267,21 @@
\CTEX at ifnametrue
\refstepcounter{chapter}%
\typeout{\CTEXthechapter}%
- \addcontentsline{toc}{chapter}
- {\protect\numberline{\CTEXthechapter\hspace{0.3em}}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
+ \CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \CTEX at addloflotskip{chapter}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -345,15 +368,13 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -361,9 +382,7 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
@@ -371,7 +390,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
\CTEX at aftertitle}%
@@ -405,6 +424,12 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
\cs_new_protected_nopar:Npn \CTEX at update@sectionformat at n #1
{
\cs_set_eq:Nc \CTEX at titleformat@n { CTEX@#1 at titleformat }
@@ -411,6 +436,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -417,7 +443,28 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
\int_zero:N \l__ctex_tmp_int
\seq_map_inline:Nn \c__ctex_section_headings_seq
{
@@ -431,6 +478,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
\keys_define:nn { ctex }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { 5 }
{
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { -4 }
{
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
@@ -87,10 +87,17 @@
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
#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 =
@@ -127,6 +134,12 @@
{
part / pagestyle .tl_set:N = \CTEX at part@pagestyle ,
chapter / pagestyle .tl_set:N = \CTEX at chapter@pagestyle ,
+ chapter / lofskip .tl_set:N = \CTEX at chapter@lofskip ,
+ chapter / lotskip .tl_set:N = \CTEX at chapter@lotskip ,
+ chapter / lofskip .initial:n = \c_zero_skip ,
+ chapter / lotskip .initial:n = \c_zero_skip ,
+ chapter / lofskip .value_required:n = true ,
+ chapter / lotskip .value_required:n = true ,
}
\seq_map_inline:Nn \c__ctex_headings_seq
{
@@ -161,6 +174,23 @@
{ \cs_set_eq:NN \CTEXifname \use_i:nn }
\cs_new_protected_nopar:Npn \CTEX at ifnamefalse
{ \cs_set_eq:NN \CTEXifname \use_ii:nn }
+\cs_new_protected_nopar:Npn \CTEX at addloflotskip #1
+ {
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lofskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lof }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lotskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lot }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ }
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -179,17 +209,15 @@
\ifodd \CTEX at part@numbering
\CTEX at ifnametrue
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
\fi
+ \CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX at part@format
@@ -238,21 +266,17 @@
\CTEX at ifnametrue
\refstepcounter{chapter}%
\typeout{\CTEXthechapter}%
- \addcontentsline{toc}{chapter}
- {\protect\numberline{\CTEXthechapter\hspace{0.3em}}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
+ \CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \CTEX at addloflotskip{chapter}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -339,15 +363,13 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -355,9 +377,7 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
@@ -365,7 +385,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
\CTEX at aftertitle}%
@@ -399,6 +419,12 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
\cs_new_protected_nopar:Npn \CTEX at update@sectionformat at n #1
{
\cs_set_eq:Nc \CTEX at titleformat@n { CTEX@#1 at titleformat }
@@ -405,6 +431,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -411,7 +438,28 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
\int_zero:N \l__ctex_tmp_int
\seq_map_inline:Nn \c__ctex_section_headings_seq
{
@@ -425,6 +473,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
\keys_define:nn { ctex }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\msg_new:nnnn { ctex } { subpackage-loaded }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -649,10 +649,17 @@
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
#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 =
@@ -713,6 +720,8 @@
{ \cs_set_eq:NN \CTEXifname \use_i:nn }
\cs_new_protected_nopar:Npn \CTEX at ifnamefalse
{ \cs_set_eq:NN \CTEXifname \use_ii:nn }
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
\renewcommand\part{%
\if at noskipsec \leavevmode \fi
\par
@@ -731,17 +740,15 @@
\ifodd \CTEX at part@numbering
\CTEX at ifnametrue
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
\fi
+ \CTEX at addtocline{part}{#1}%
{\interlinepenalty \@M
\normalfont \parindent \dimexpr \CTEX at part@indent \relax \CTEX at part@format
\ifnum \c at secnumdepth >\m at ne \ifodd \CTEX at part@numbering
@@ -810,15 +817,13 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -826,9 +831,7 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
@@ -836,7 +839,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
\CTEX at aftertitle}%
@@ -870,6 +873,12 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
\cs_new_protected_nopar:Npn \CTEX at update@sectionformat at n #1
{
\cs_set_eq:Nc \CTEX at titleformat@n { CTEX@#1 at titleformat }
@@ -876,6 +885,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -882,7 +892,28 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
\int_zero:N \l__ctex_tmp_int
\seq_map_inline:Nn \c__ctex_section_headings_seq
{
@@ -896,6 +927,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
\keys_define:nn { ctex }
{
@@ -1128,13 +1161,17 @@
}
}
}
-\ctex_patch_cmd:Nnn \ps at headings
- { \ifnum \c at secnumdepth > \z@ \thesection \quad \fi }
- { \CTEXifname { \CTEXthesection \quad } { } }
\if at twoside
\ctex_patch_cmd:Nnn \ps at headings
+ { \ifnum \c at secnumdepth > \z@ \thesection \quad \fi }
+ { \CTEXifname { \CTEXthesection \quad } { } }
+ \ctex_patch_cmd:Nnn \ps at headings
{ \ifnum \c at secnumdepth > \@ne \thesubsection \quad \fi }
{ \CTEXifname { \CTEXthesubsection \quad } { } }
+\else:
+ \ctex_patch_cmd:Nnn \ps at headings
+ { \ifnum \c at secnumdepth > \m at ne \thesection \quad \fi }
+ { \CTEXifname { \CTEXthesection \quad } { } }
\fi:
\ctex_at_end_package:nn { fancyhdr }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -650,10 +650,17 @@
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
#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 =
@@ -690,6 +697,12 @@
{
part / pagestyle .tl_set:N = \CTEX at part@pagestyle ,
chapter / pagestyle .tl_set:N = \CTEX at chapter@pagestyle ,
+ chapter / lofskip .tl_set:N = \CTEX at chapter@lofskip ,
+ chapter / lotskip .tl_set:N = \CTEX at chapter@lotskip ,
+ chapter / lofskip .initial:n = \c_zero_skip ,
+ chapter / lotskip .initial:n = \c_zero_skip ,
+ chapter / lofskip .value_required:n = true ,
+ chapter / lotskip .value_required:n = true ,
}
\seq_map_inline:Nn \c__ctex_headings_seq
{
@@ -724,6 +737,23 @@
{ \cs_set_eq:NN \CTEXifname \use_i:nn }
\cs_new_protected_nopar:Npn \CTEX at ifnamefalse
{ \cs_set_eq:NN \CTEXifname \use_ii:nn }
+\cs_new_protected_nopar:Npn \CTEX at addloflotskip #1
+ {
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lofskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lof }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lotskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lot }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ }
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -742,17 +772,15 @@
\ifodd \CTEX at part@numbering
\CTEX at ifnametrue
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
\fi
+ \CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX at part@format
@@ -802,26 +830,21 @@
\CTEX at ifnametrue
\refstepcounter{chapter}%
\typeout{\CTEXthechapter}%
- \addcontentsline{toc}{chapter}
- {\protect\numberline{\CTEXthechapter\hspace{0.3em}}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
+ \CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \CTEX at addloflotskip{chapter}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -908,15 +931,13 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -924,9 +945,7 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
@@ -934,7 +953,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
\CTEX at aftertitle}%
@@ -968,6 +987,12 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
\cs_new_protected_nopar:Npn \CTEX at update@sectionformat at n #1
{
\cs_set_eq:Nc \CTEX at titleformat@n { CTEX@#1 at titleformat }
@@ -974,6 +999,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -980,7 +1006,28 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
\int_zero:N \l__ctex_tmp_int
\seq_map_inline:Nn \c__ctex_section_headings_seq
{
@@ -994,6 +1041,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
\keys_define:nn { ctex }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\clist_new:N \l__ctex_ctexcap_options_clist
\clist_set:Nx \l__ctex_ctexcap_options_clist
{ \exp_not:v { opt@ \@currname . \@currext } , heading }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -650,10 +650,17 @@
#1 / numbering .bool_set:N = \exp_not:c { CTEX@#1 at numbering } ,
#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 =
@@ -690,6 +697,12 @@
{
part / pagestyle .tl_set:N = \CTEX at part@pagestyle ,
chapter / pagestyle .tl_set:N = \CTEX at chapter@pagestyle ,
+ chapter / lofskip .tl_set:N = \CTEX at chapter@lofskip ,
+ chapter / lotskip .tl_set:N = \CTEX at chapter@lotskip ,
+ chapter / lofskip .initial:n = \c_zero_skip ,
+ chapter / lotskip .initial:n = \c_zero_skip ,
+ chapter / lofskip .value_required:n = true ,
+ chapter / lotskip .value_required:n = true ,
}
\seq_map_inline:Nn \c__ctex_headings_seq
{
@@ -724,6 +737,23 @@
{ \cs_set_eq:NN \CTEXifname \use_i:nn }
\cs_new_protected_nopar:Npn \CTEX at ifnamefalse
{ \cs_set_eq:NN \CTEXifname \use_ii:nn }
+\cs_new_protected_nopar:Npn \CTEX at addloflotskip #1
+ {
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lofskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lof }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at lotskip } }
+ \skip_if_eq:nnF { \l__ctex_heading_skip } { \c_zero_skip }
+ {
+ \addtocontents { lot }
+ { \protect \addvspace { \skip_use:N \l__ctex_heading_skip } }
+ }
+ }
+\cs_new_protected:Npn \CTEX at addtocline #1#2
+ { \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -742,17 +772,15 @@
\ifodd \CTEX at part@numbering
\CTEX at ifnametrue
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\CTEXthepart\hspace{1em}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
- \addcontentsline{toc}{part}{#1}%
\fi
\else
\CTEX at ifnamefalse
- \CTEX at makeanchor@part{part*}%
- \addcontentsline{toc}{part}{#1}%
+ \CTEX at makeanchor{part*}%
\fi
+ \CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX at part@format
@@ -801,21 +829,17 @@
\CTEX at ifnametrue
\refstepcounter{chapter}%
\typeout{\CTEXthechapter}%
- \addcontentsline{toc}{chapter}
- {\protect\numberline{\CTEXthechapter\hspace{0.3em}}#1}%
\else
\CTEX at ifnamefalse
\CTEX at makeanchor{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
\else
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
- \addcontentsline{toc}{chapter}{#1}%
\fi
+ \CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \CTEX at addloflotskip{chapter}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -902,15 +926,13 @@
\unless \ifodd \CTEX at runin
\begingroup
#6{%
- \@hangfrom{\hskip\glueexpr #3\relax\@svsec}%
+ \CTEX at hangfrom{\hskip\glueexpr #3\relax\@svsec}%
\interlinepenalty \@M
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\endgroup
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}%
+ \CTEX at addtocline{#1}{#7}%
\else
\def\@svsechd{%
#6{\hskip\glueexpr #3\relax
@@ -918,9 +940,7 @@
\csname CTEX@#1 at titleformat\endcsname{#8}%
\csname CTEX@#1 at aftertitle\endcsname}%
\csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \CTEXifname{\protect\numberline{\csname CTEXthe#1\endcsname}}{}%
- #7}}%
+ \CTEX at addtocline{#1}{#7}}%
\fi
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
@@ -928,7 +948,7 @@
\unless \ifodd \CTEX at runin
\begingroup
#4{%
- \@hangfrom{\hskip\glueexpr #1\relax}%
+ \CTEX at hangfrom{\hskip\glueexpr #1\relax}%
\interlinepenalty \@M
\CTEX at titleformat@n{#5}%
\CTEX at aftertitle}%
@@ -962,6 +982,12 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected_nopar:Npn \CTEX at hangfrom
+ {
+ \bool_if:NTF \CTEX at hang
+ { \@hangfrom }
+ { \noindent \use:n }
+ }
\cs_new_protected_nopar:Npn \CTEX at update@sectionformat at n #1
{
\cs_set_eq:Nc \CTEX at titleformat@n { CTEX@#1 at titleformat }
@@ -968,6 +994,7 @@
\cs_set_eq:Nc \CTEX at aftertitle { CTEX@#1 at aftertitle }
\cs_set_eq:Nc \CTEX at afterindent { CTEX@#1 at afterindent }
\cs_set_eq:Nc \CTEX at fixskip { CTEX@#1 at fixskip }
+ \cs_set_eq:Nc \CTEX at hang { CTEX@#1 at hang }
\cs_set_eq:Nc \CTEX at runin { CTEX@#1 at runin }
}
\cs_new_eq:NN \CTEX at titleformat@n \use:n
@@ -974,7 +1001,28 @@
\cs_new_eq:NN \CTEX at aftertitle \prg_do_nothing:
\cs_new_eq:NN \CTEX at afterindent \c_true_bool
\cs_new_eq:NN \CTEX at fixskip \c_false_bool
+\cs_new_eq:NN \CTEX at hang \c_true_bool
\cs_new_eq:NN \CTEX at runin \c_false_bool
+\cs_new:Npn \CTEX at part@tocline #1#2
+ {
+ \CTEXifname
+ { \CTEXthepart \hspace { 1em } }
+ { }
+ #2
+ }
+\cs_new:Npn \CTEX at chapter@tocline #1#2
+ {
+ \CTEXifname
+ { \protect \numberline { \CTEXthechapter \hspace { .3em } } }
+ { }
+ #2
+ }
+\cs_new_nopar:Npn \CTEXnumberline #1
+ {
+ \CTEXifname
+ { \protect \numberline { \use:c { CTEXthe #1 } } }
+ { }
+ }
\int_zero:N \l__ctex_tmp_int
\seq_map_inline:Nn \c__ctex_section_headings_seq
{
@@ -988,6 +1036,8 @@
{ \exp_not:c { CTEX@#1 at afterskip } }
{ \exp_not:N \normalfont \exp_not:c { CTEX@#1 at format } }
}
+ \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ { \CTEXnumberline { ##1 } ##2 }
}
\keys_define:nn { ctex }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
\keys_define:nn { ctex / option }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,7 +28,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2016/09/21 v2.4.4 Space info for CJKpunct (CTEX)]
+ [2016/10/25 v2.4.5 Space info for CJKpunct (CTEX)]
\ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,}
\ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,}
\ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2016-10-25 20:39:25 UTC (rev 42351)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{ctex documentation (CTEX)}
\ProvidesExplClass{ctxdoc}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\ExplSyntaxOff
\let\pdfmdfivesum\mdfivesum
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
@@ -428,6 +428,7 @@
\everypar {#1}
\if at inlabel
\global \@inlabelfalse
+ \@noparlistfalse
\llap { \box \@labels \hskip \leftskip }
\fi
#1
@@ -435,7 +436,7 @@
}
\ctex_patch_cmd:Nnn \macro at code
{ \if at inlabel \leavevmode \fi }
- { }
+ { \partopsep \z at skip }
\group_begin:
\int_set_eq:NN \tex_endlinechar:D \c_minus_one
\use:n
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2016/09/21 v2.4.4 Chinese translation for theorem name (CTEX)]
+ [2016/10/25 v2.4.5 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{\xC6\xC0\xC2\xDB}
\providetranslation{comments}{\xC6\xC0\xC2\xDB}
\providetranslation{Comment}{\xC6\xC0\xC2\xDB}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2016/09/21 v2.4.4 Chinese translation for theorem name (CTEX)]
+ [2016/10/25 v2.4.5 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{评论}
\providetranslation{comments}{评论}
\providetranslation{Comment}{评论}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
+ [2016/10/25 v2.4.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
+ [2016/10/25 v2.4.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
+ [2016/10/25 v2.4.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
+ [2016/10/25 v2.4.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
+ [2016/10/25 v2.4.5 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2016-10-25 20:39:25 UTC (rev 42351)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2016/09/21 v2.4.4 Chinese font definition (CTEX)]
+ [2016/10/25 v2.4.5 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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Mac OS X fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for Vista or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for XP or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -47,6 +47,8 @@
aftertitle = \par ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
+ lofskip = 10 \p@ ,
+ lotskip = 10 \p@ ,
break = \if at openright \cleardoublepage \else \clearpage \fi ,
number = \chinese { chapter } ,
format = \huge \bfseries \centering ,
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -47,6 +47,8 @@
aftertitle = \par ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
+ lofskip = 10 \p@ ,
+ lotskip = 10 \p@ ,
break = \if at openright \cleardoublepage \else \clearpage \fi ,
number = \chinese { chapter } ,
format = \huge \bfseries \centering ,
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -50,6 +50,8 @@
aftertitle = \par ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
+ lofskip = 10 \p@ ,
+ lotskip = 10 \p@ ,
break = \if at openright \cleardoublepage \else \clearpage \fi ,
name = \chaptername \space ,
number = \thechapter ,
@@ -57,7 +59,8 @@
nameformat = \huge \bfseries ,
aftername = \par \nobreak \vskip 20 \p@ ,
titleformat = \Huge \bfseries ,
- afterindent = false
+ afterindent = false ,
+ tocline = \CTEXnumberline {#1} #2
}
\keys_set:nn { ctex / section }
{
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -50,6 +50,8 @@
aftertitle = \par ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
+ lofskip = 10 \p@ ,
+ lotskip = 10 \p@ ,
break = \if at openright \cleardoublepage \else \clearpage \fi ,
name = \chaptername \space ,
number = \thechapter ,
@@ -57,7 +59,8 @@
nameformat = \huge \bfseries ,
aftername = \par \nobreak \vskip 20 \p@ ,
titleformat = \Huge \bfseries ,
- afterindent = false
+ afterindent = false ,
+ tocline = \CTEXnumberline {#1} #2
}
\keys_set:nn { ctex / section }
{
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 2016-10-25 20:39:07 UTC (rev 42350)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2016-10-25 20:39:25 UTC (rev 42351)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 575f038 2016-10-25 17:56:58 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.5}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
More information about the tex-live-commits
mailing list