texlive[51262] Master/texmf-dist: ctex (29may19)
commits+karl at tug.org
commits+karl at tug.org
Wed May 29 22:52:28 CEST 2019
Revision: 51262
http://tug.org/svn/texlive?view=revision&revision=51262
Author: karl
Date: 2019-05-29 22:52:28 +0200 (Wed, 29 May 2019)
Log Message:
-----------
ctex (29may19)
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/fd/jt2zhrm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
trunk/Master/texmf-dist/tex/latex/ctex/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
Removed Paths:
-------------
trunk/Master/texmf-dist/source/latex/ctex/ctex.ins
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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2019-05-29 20:52:28 UTC (rev 51262)
@@ -445,7 +445,7 @@
%<*!(fd|ctexspa|dict)>
%<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\NeedsTeXFormat{LaTeX2e}
%<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
%<ctxdoc> {ctex documentation (CTEX)}
%<ctxdoc>\ProvidesExplClass{ctxdoc}
%<ctex> {Chinese adapter in LaTeX (CTEX)}
@@ -538,7 +538,7 @@
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.4.16}{\ExplFileDescription}
%</!(fd|ctexspa|dict)>
%<c19&rm>\ProvidesFile{c19rm.fd}%
%<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -555,9 +555,9 @@
%<ctexspa>\ProvidesFile{ctexspa.def}%
%<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
%<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<fd> [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
-%<ctexspa> [2019/04/07 v2.4.15 Space info for CJKpunct (CTEX)]
-%<dict&theorem> [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)]
+%<fd> [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
+%<ctexspa> [2019/05/29 v2.4.16 Space info for CJKpunct (CTEX)]
+%<dict&theorem> [2019/05/29 v2.4.16 Chinese translation for theorem name (CTEX)]
%</!(driver|readme|install|zhmap|spa|docstrip)>
%<*driver>
\documentclass{ctxdoc}
@@ -581,7 +581,7 @@
% \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
%
%
-% \CheckSum{5914}
+% \CheckSum{5934}
%
% \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
@@ -3257,36 +3257,24 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v2.3}{2015/09/17}{代码实现避免使用 \tn{lowercase} 技巧（Joseph Wright）。}
+%
+% \changes{v2.4.16}{2019/05/11}{允许设置 \texttt{autoindent} 为 $0$。}
+%
% \begin{macro}[int]{\ctex_set_default_ccwd:Nn}
% 若参数 |#2| 带长度单位，则设置它为 |tl| 变量 |#1| 的值，否则以 \tn{ccwd} 为单位。
% \begin{macrocode}
-\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2
+\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2
+ { \tl_set:Nx #1 { \@@_default_ccwd_aux:n {#2} } }
+\cs_new:Npn \@@_default_ccwd_aux:n #1
{
- \dim_compare:nNnTF
- { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } }
- { \tl_set:Nn #1 {#2} }
- { \tl_set:Nn #1 { #2 \ccwd } }
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \changes{v2.3}{2015/09/17}{代码实现避免使用 \tn{lowercase} 技巧（Joseph Wright）。}
-%
-% \begin{macro}[int]{\ctex_default_pt:n}
-% 最新版本的 \pkg{expl3} 已经不允许 \cs{dim_to_decimal:n} 的参数带额外的单位。
-% 然而我们需要这个特性实现可展的 \tn{@defaultunits}。
-% \begin{macrocode}
-\cs_new:Npn \ctex_default_pt:n #1
- {
- \exp_after:wN \@@_default_pt:w
+ \exp_not:n {#1}
+ \exp_after:wN \@@_default_ccwd_aux:w
\dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
-\use:x
- {
- \cs_new:Npn \exp_not:N \@@_default_pt:w
- ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop
- { ##1 \tl_to_str:n { pt } }
- }
+\exp_last_unbraced:NNNNo
+ \cs_new:Npn \@@_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop
+ { \tl_if_empty:nT {#2} { \ccwd } }
% \end{macrocode}
% \end{macro}
%
@@ -7301,10 +7289,20 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[int]{\CTEX at disableautoindent}
+% 禁用自动调整首行缩进。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l_@@_autoindent_tl }
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v2.2}{2015/06/27}{\opt{beforeskip}、\opt{afterskip} 和 \opt{indent}
% 选项支持表达式。}
% \changes{v2.4.15}{2019/03/31}{修正 \opt{part/indent} 和 \opt{chapter/indent} 的实现方法。}
% \changes{v2.4.15}{2019/03/31}{定义 \opt{part/hang} 和 \opt{chapter/hang}。}
+% \changes{v2.4.16}{2019/05/11}{修正 \opt{part/indent} 和 \opt{chapter/indent}
+% 的实现方法，在其标题内部禁用 \opt{autoindent}。}
%
% \paragraph{part 的标题}
%
@@ -7377,9 +7375,11 @@
\CTEX at makeanchor{part*}%
% \addcontentsline{toc}{part}{#1}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
{\interlinepenalty \@M
% \normalfont \parindent \z@ \raggedright
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
% \ifnum \c at secnumdepth >\m at ne
% \Large\bfseries\partname\nobreakspace\thepart\par\nobreak
@@ -7415,11 +7415,13 @@
\CTEX at makeanchor{part*}%
% \addcontentsline{toc}{part}{#1}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
% \markboth{}{}%
\partmark{#1}%
{\interlinepenalty \@M
% \normalfont \centering
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
% \ifnum \c at secnumdepth >-2\relax
% \huge\bfseries\partname\nobreakspace\thepart\par\vskip 20\p@
@@ -7440,8 +7442,10 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
% \normalfont \parindent \z@ \raggedright
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
% \huge \bfseries #1\par}%
@@ -7458,8 +7462,10 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
% \normalfont \centering
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
% \Huge \bfseries #1\par}%
@@ -7548,6 +7554,7 @@
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
% \addcontentsline{toc}{chapter}{#1}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
% \addtocontents{lof}{\protect\addvspace{10\p@}}%
@@ -7567,6 +7574,7 @@
\def\@schapter#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@schapter{\Hy at chapapp*}%
+ \CTEX at gettitle{#1}%
\if at twocolumn
\@topnewpage[\@makeschapterhead{#1}]%
\else
@@ -7584,7 +7592,8 @@
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
% {\normalfont \parindent \z@ \raggedright
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
% \ifnum \c at secnumdepth >\m at ne
% \if at mainmatter
@@ -7613,7 +7622,8 @@
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
% {\normalfont \parindent \z@ \raggedright
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}{}%
% \Huge \bfseries #1\par\nobreak
@@ -7692,6 +7702,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
% \@tempskipa #5\relax
% \ifdim \@tempskipa>\z@
\unless \ifodd \CTEX at runin
@@ -7733,6 +7744,7 @@
% \begin{macrocode}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
% \@tempskipa #3\relax
% \ifdim \@tempskipa>\z@
\unless \ifodd \CTEX at runin
@@ -7796,18 +7808,15 @@
% \begin{macrocode}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \@@_indent_aux:n {#1} #2 }
+ { \@hangfrom { \@@_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \@@_indent_aux:n #1
+\cs_new_protected_nopar:Npn \@@_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l_@@_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l_@@_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l_@@_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
% \end{macrocode}
% \end{macro}
@@ -8005,6 +8014,27 @@
}
% \end{macrocode}
%
+% \paragraph{兼容 \pkg{nameref} 宏包}
+%
+% \changes{v2.4.16}{2019/05/29}{更好地兼容 \pkg{nameref} 宏包。}
+%
+% \begin{macro}[int]{\CTEX at gettitle}
+% 在 \pkg{nameref} 载入后才有意义，与上述 \pkg{hyperref} 的处理类似。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c_@@_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \paragraph{兼容 \pkg{titlesec} 宏包}
%
% 我们修改了 \tn{@startsection} 的定义，它的第四个（\meta{beforeskip}）和
@@ -8355,7 +8385,7 @@
% \begin{macrocode}
\defbeamertemplate*{part page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
% \centering
% {\usebeamerfont{part name}%
% \usebeamercolor[fg]{part name}\partname~\insertromanpartnumber}
@@ -8379,7 +8409,7 @@
% \begin{macrocode}
\defbeamertemplate*{section page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
% \centering
% {\usebeamerfont{section name}%
% \usebeamercolor[fg]{section name}\sectionname~\insertsectionnumber}
@@ -8403,7 +8433,7 @@
% \begin{macrocode}
\defbeamertemplate*{subsection page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
% \centering
% {\usebeamerfont{subsection name}%
% \usebeamercolor[fg]{subsection name}\subsectionname~\insertsubsectionnumber}
@@ -10242,7 +10272,7 @@
% \begin{macrocode}
%<*windows>
\ProvidesFile{zhwindowsfonts.tex}%
- [2019/04/07 v2.4.15 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
@@ -10314,7 +10344,7 @@
% \begin{macrocode}
%<*adobe>
\ProvidesFile{zhadobefonts.tex}%
- [2019/04/07 v2.4.15 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10350,7 +10380,7 @@
% \begin{macrocode}
%<*fandol>
\ProvidesFile{zhfandolfonts.tex}%
- [2019/04/07 v2.4.15 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10386,7 +10416,7 @@
% \begin{macrocode}
%<*founder>
\ProvidesFile{zhfounderfonts.tex}%
- [2019/04/07 v2.4.15 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
@@ -10458,7 +10488,7 @@
% \begin{macrocode}
%<*ubuntu>
\ProvidesFile{zhubuntufonts.tex}%
- [2019/04/07 v2.4.15 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
Deleted: trunk/Master/texmf-dist/source/latex/ctex/ctex.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.ins 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.ins 2019-05-29 20:52:28 UTC (rev 51262)
@@ -1,307 +0,0 @@
-%%
-%% This is file `ctex.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ctex.dtx (with options: `install')
-%%
-%% Copyright (C) 2003--2019
-%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
-%%
-%% ------------------------------------------------------------------------------
-%%
-
-\input ctxdocstrip %
-
-\preamble
-
- Copyright (C) 2003--2019
- CTEX.ORG and any individual authors listed in the documentation.
-------------------------------------------------------------------------------
-
- This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either
- version 1.3c of this license or (at your option) any later
- version. This version of this license is in
- http://www.latex-project.org/lppl/lppl-1-3c.txt
- and the latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of
- LaTeX version 2005/12/01 or later.
-
- This work has the LPPL maintenance status `maintained'.
-
- The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
-
-------------------------------------------------------------------------------
-
-\endpreamble
-\postamble
-
- This package consists of the file ctex.dtx,
- and the derived files ctex.pdf,
- ctex.ins,
- ctex.sty,
- ctexsize.sty,
- ctexheading.sty,
- ctexart.cls,
- ctexbook.cls,
- ctexrep.cls,
- ctexbeamer.cls,
- ctxdoc.cls,
- ctexcap.sty,
- ctexhook.sty,
- ctexpatch.sty,
- ctex-c5size.clo,
- ctex-cs4size.clo,
- ctex-article.def,
- ctex-book.def,
- ctex-report.def,
- ctex-beamer.def,
- ctex-scheme-plain.def,
- ctex-scheme-plain-article.def,
- ctex-scheme-plain-book.def,
- ctex-scheme-plain-report.def,
- ctex-scheme-plain-beamer.def,
- ctex-scheme-chinese.def,
- ctex-scheme-chinese-article.def,
- ctex-scheme-chinese-book.def,
- ctex-scheme-chinese-report.def,
- ctex-scheme-chinese-beamer.def,
- ctex-name-gbk.cfg,
- ctex-name-utf8.cfg,
- ctex.cfg,
- ctexopts.cfg,
- ctex-engine-pdftex.def,
- ctex-engine-xetex.def,
- ctex-engine-luatex.def,
- ctex-engine-aptex.def,
- ctex-engine-uptex.def,
- c19rm.fd,
- c19sf.fd,
- c19tt.fd,
- c70rm.fd,
- c70sf.fd,
- c70tt.fd,
- jy2zhrm.fd,
- jy2zhsf.fd,
- jy2zhtt.fd,
- jt2zhrm.fd,
- jt2zhsf.fd,
- jt2zhtt.fd,
- ctex-fontset-windows.def,
- ctex-fontset-windowsnew.def,
- ctex-fontset-windowsold.def,
- ctex-fontset-adobe.def,
- ctex-fontset-fandol.def,
- ctex-fontset-mac.def,
- ctex-fontset-macnew.def,
- ctex-fontset-macold.def,
- ctex-fontset-founder.def,
- ctex-fontset-ubuntu.def,
- ctexspa.def,
- ctexpunct.spa,
- ctexmakespa.tex,
- ctexspamacro.tex,
- ctxdocstrip.tex,
- zhadobefonts.tex,
- zhfandolfonts.tex,
- zhfounderfonts.tex,
- zhubuntufonts.tex,
- zhwindowsfonts.tex,
- translator-theorem-dictionary-ChineseGBK.dict,
- translator-theorem-dictionary-ChineseUTF8.dict, and
- README.md.
-\endpostamble
-
-\generate
- {
- \usedir{tex/latex/ctex}
- \file{ctex.sty} {\from{\jobname.dtx}{style,ctex}}
- \file{ctexsize.sty} {\from{\jobname.dtx}{style,ctexsize}}
- \file{ctexheading.sty} {\from{\jobname.dtx}{style,ctexheading}}
- \file{ctexart.cls} {\from{\jobname.dtx}{class,article}}
- \file{ctexbook.cls} {\from{\jobname.dtx}{class,book}}
- \file{ctexrep.cls} {\from{\jobname.dtx}{class,report}}
- \file{ctexbeamer.cls} {\from{\jobname.dtx}{class,beamer}}
- \usepostamble\emptypostamble
- \file{ctxdoc.cls} {\from{\jobname.dtx}{ctxdoc}}
- \file{ctexcap.sty} {\from{\jobname.dtx}{ctexcap}}
- \file{ctexhook.sty} {\from{\jobname.dtx}{ctexhook}}
- \file{ctexpatch.sty} {\from{\jobname.dtx}{ctexpatch}}
- \file{ctex-c5size.clo} {\from{\jobname.dtx}{c5size}}
- \file{ctex-cs4size.clo} {\from{\jobname.dtx}{cs4size}}
- \file{ctex-article.def} {\from{\jobname.dtx}{heading,article}}
- \file{ctex-book.def} {\from{\jobname.dtx}{heading,book}}
- \file{ctex-report.def} {\from{\jobname.dtx}{heading,report}}
- \file{ctex-beamer.def} {\from{\jobname.dtx}{heading,beamer}}
- \file{ctex-scheme-plain.def} {\from{\jobname.dtx}{scheme,generic,plain}}
- \file{ctex-scheme-plain-article.def} {\from{\jobname.dtx}{scheme,article,plain}}
- \file{ctex-scheme-plain-book.def} {\from{\jobname.dtx}{scheme,book,plain}}
- \file{ctex-scheme-plain-report.def} {\from{\jobname.dtx}{scheme,report,plain}}
- \file{ctex-scheme-plain-beamer.def} {\from{\jobname.dtx}{scheme,beamer,plain}}
- \file{ctex-scheme-chinese.def} {\from{\jobname.dtx}{scheme,generic,chinese}}
- \file{ctex-scheme-chinese-article.def} {\from{\jobname.dtx}{scheme,article,chinese}}
- \file{ctex-scheme-chinese-book.def} {\from{\jobname.dtx}{scheme,book,chinese}}
- \file{ctex-scheme-chinese-report.def} {\from{\jobname.dtx}{scheme,report,chinese}}
- \file{ctex-scheme-chinese-beamer.def} {\from{\jobname.dtx}{scheme,beamer,chinese}}
- \file{ctex-name-gbk.cfg} {\from{\jobname.dtx}{name,GBK}}
- \file{ctex-name-utf8.cfg} {\from{\jobname.dtx}{name,UTF8}}
- \file{ctex.cfg} {\from{\jobname.dtx}{config}}
- \file{ctexopts.cfg} {\from{\jobname.dtx}{ctexopts}}
- \file{ctex-engine-pdftex.def} {\from{\jobname.dtx}{pdftex}}
- \file{ctex-engine-xetex.def} {\from{\jobname.dtx}{xetex}}
- \file{ctex-engine-luatex.def} {\from{\jobname.dtx}{luatex}}
- \file{ctex-engine-aptex.def} {\from{\jobname.dtx}{aptex}}
- \file{ctex-engine-uptex.def} {\from{\jobname.dtx}{uptex}}
- \file{c19rm.fd} {\from{\jobname.dtx}{fd,rm,c19}}
- \file{c19sf.fd} {\from{\jobname.dtx}{fd,sf,c19}}
- \file{c19tt.fd} {\from{\jobname.dtx}{fd,tt,c19}}
- \file{c70rm.fd} {\from{\jobname.dtx}{fd,rm,c70}}
- \file{c70sf.fd} {\from{\jobname.dtx}{fd,sf,c70}}
- \file{c70tt.fd} {\from{\jobname.dtx}{fd,tt,c70}}
- \file{jy2zhrm.fd} {\from{\jobname.dtx}{fd,rm,jy2}}
- \file{jy2zhsf.fd} {\from{\jobname.dtx}{fd,sf,jy2}}
- \file{jy2zhtt.fd} {\from{\jobname.dtx}{fd,tt,jy2}}
- \file{jt2zhrm.fd} {\from{\jobname.dtx}{fd,rm,jt2}}
- \file{jt2zhsf.fd} {\from{\jobname.dtx}{fd,sf,jt2}}
- \file{jt2zhtt.fd} {\from{\jobname.dtx}{fd,tt,jt2}}
- \file{ctex-fontset-windows.def} {\from{\jobname.dtx}{fontset,windows}}
- \file{ctex-fontset-windowsnew.def} {\from{\jobname.dtx}{fontset,windowsnew}}
- \file{ctex-fontset-windowsold.def} {\from{\jobname.dtx}{fontset,windowsold}}
- \file{ctex-fontset-adobe.def} {\from{\jobname.dtx}{fontset,adobe}}
- \file{ctex-fontset-fandol.def} {\from{\jobname.dtx}{fontset,fandol}}
- \file{ctex-fontset-mac.def} {\from{\jobname.dtx}{fontset,mac}}
- \file{ctex-fontset-macold.def} {\from{\jobname.dtx}{fontset,macold}}
- \file{ctex-fontset-macnew.def} {\from{\jobname.dtx}{fontset,macnew}}
- \file{ctex-fontset-founder.def} {\from{\jobname.dtx}{fontset,founder}}
- \file{ctex-fontset-ubuntu.def} {\from{\jobname.dtx}{fontset,ubuntu}}
- \file{translator-theorem-dictionary-ChineseGBK.dict}
- {\from{\jobname.dtx}{dict,theorem,GBK}}
- \file{translator-theorem-dictionary-ChineseUTF8.dict}
- {\from{\jobname.dtx}{dict,theorem,UTF8}}
- \file{ctexspa.def}
- {
- \from{\jobname.dtx} {ctexspa}
- \from{ctexpunct.spa} {}
- }
- \usedir{tex/generic/ctex}
- \file{ctexmakespa.tex} {\from{\jobname.dtx}{spa,make}}
- \file{ctexspamacro.tex} {\from{\jobname.dtx}{spa,macro}}
- \file{zhadobefonts.tex} {\from{\jobname.dtx}{zhmap,adobe}}
- \file{zhfandolfonts.tex} {\from{\jobname.dtx}{zhmap,fandol}}
- \file{zhfounderfonts.tex} {\from{\jobname.dtx}{zhmap,founder}}
- \file{zhubuntufonts.tex} {\from{\jobname.dtx}{zhmap,ubuntu}}
- \file{zhwindowsfonts.tex} {\from{\jobname.dtx}{zhmap,windows}}
- \file{ctxdocstrip.tex} {\from{\jobname.dtx}{docstrip}}
- \nopreamble\nopostamble
- \usedir{doc/latex/ctex}
- \file{README.md} {\from{\jobname.dtx}{readme}}
- }
-
-\catcode32=12\space
-
-\Msg{*************************************************************}
-\Msg{* *}
-\Msg{* To finish the installation you have to move the following *}
-\Msg{* file into proper directories searched by TeX: *}
-\Msg{* *}
-\Msg{* The recommended directory is TDS:tex/latex/ctex *}
-\Msg{* *}
-\Msg{* ctex.sty *}
-\Msg{* ctexsize.sty *}
-\Msg{* ctexheading.sty *}
-\Msg{* ctexart.cls *}
-\Msg{* ctexbook.cls *}
-\Msg{* ctexrep.cls *}
-\Msg{* ctexbeamer.cls *}
-\Msg{* ctxdoc.cls *}
-\Msg{* ctexcap.sty *}
-\Msg{* ctexhook.sty *}
-\Msg{* ctexpatch.sty *}
-\Msg{* ctex-c5size.clo *}
-\Msg{* ctex-cs4size.clo *}
-\Msg{* ctex-article.def *}
-\Msg{* ctex-book.def *}
-\Msg{* ctex-report.def *}
-\Msg{* ctex-beamer.def *}
-\Msg{* ctex-scheme-plain.def *}
-\Msg{* ctex-scheme-plain-article.def *}
-\Msg{* ctex-scheme-plain-book.def *}
-\Msg{* ctex-scheme-plain-report.def *}
-\Msg{* ctex-scheme-plain-beamer.def *}
-\Msg{* ctex-scheme-chinese.def *}
-\Msg{* ctex-scheme-chinese-article.def *}
-\Msg{* ctex-scheme-chinese-book.def *}
-\Msg{* ctex-scheme-chinese-report.def *}
-\Msg{* ctex-scheme-chinese-beamer.def *}
-\Msg{* ctex-name-gbk.cfg *}
-\Msg{* ctex-name-utf8.cfg *}
-\Msg{* ctex.cfg *}
-\Msg{* ctexopts.cfg *}
-\Msg{* ctex-engine-pdftex.def *}
-\Msg{* ctex-engine-xetex.def *}
-\Msg{* ctex-engine-luatex.def *}
-\Msg{* ctex-engine-aptex.def *}
-\Msg{* ctex-engine-uptex.def *}
-\Msg{* c19rm.fd *}
-\Msg{* c19sf.fd *}
-\Msg{* c19tt.fd *}
-\Msg{* c70rm.fd *}
-\Msg{* c70sf.fd *}
-\Msg{* c70tt.fd *}
-\Msg{* jy2zhrm.fd *}
-\Msg{* jy2zhsf.fd *}
-\Msg{* jy2zhtt.fd *}
-\Msg{* jt2zhrm.fd *}
-\Msg{* jt2zhsf.fd *}
-\Msg{* jt2zhtt.fd *}
-\Msg{* ctex-fontset-windows.def *}
-\Msg{* ctex-fontset-windowsnew.def *}
-\Msg{* ctex-fontset-windowsold.def *}
-\Msg{* ctex-fontset-adobe.def *}
-\Msg{* ctex-fontset-fandol.def *}
-\Msg{* ctex-fontset-mac.def *}
-\Msg{* ctex-fontset-macold.def *}
-\Msg{* ctex-fontset-macnew.def *}
-\Msg{* ctex-fontset-founder.def *}
-\Msg{* ctex-fontset-ubuntu.def *}
-\Msg{* ctexspa.def *}
-\Msg{* ctexmakespa.tex *}
-\Msg{* ctexspamacro.tex *}
-\Msg{* ctxdocstrip.tex *}
-\Msg{* zhadobefonts.tex *}
-\Msg{* zhfandolfonts.tex *}
-\Msg{* zhfounderfonts.tex *}
-\Msg{* zhubuntufonts.tex *}
-\Msg{* zhwindowsfonts.tex *}
-\Msg{* translator-theorem-dictionary-ChineseGBK.dict *}
-\Msg{* translator-theorem-dictionary-ChineseUTF8.dict *}
-\Msg{* *}
-\Msg{* To produce the documentation run the file ctex.dtx *}
-\Msg{* through XeLaTeX. *}
-\Msg{* *}
-\Msg{* Happy TeXing! *}
-\Msg{* *}
-\Msg{*************************************************************}
-
-\endbatchfile
-%%
-%%
-%% End of file `ctex.ins'.
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2019-05-29 20:52:28 UTC (rev 51262)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2019/04/07 v2.4.15 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2019-05-29 20:52:28 UTC (rev 51262)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2019/04/07 v2.4.15 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2019-05-29 20:52:28 UTC (rev 51262)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2019/04/07 v2.4.15 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2019-05-29 20:52:28 UTC (rev 51262)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2019/04/07 v2.4.15 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2019-05-29 20:52:28 UTC (rev 51262)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2019/04/07 v2.4.15 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding UTF8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -152,6 +152,8 @@
{ \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} } }
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l__ctex_autoindent_tl }
\renewcommand\part{%
\if at noskipsec \leavevmode \fi
\par
@@ -178,8 +180,10 @@
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}%
{\CTEXifname{\CTEX at partname\CTEX at part@aftername}{}}%
@@ -194,7 +198,9 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
\CTEX at part@titleformat{#1}%
@@ -243,6 +249,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
\unless \ifodd \CTEX at runin
\begingroup
#6{%
@@ -265,6 +272,7 @@
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
\unless \ifodd \CTEX at runin
\begingroup
#4{%
@@ -304,18 +312,15 @@
\ignorespaces}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \__ctex_indent_aux:n {#1} #2 }
+ { \@hangfrom { \__ctex_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \__ctex_indent_aux:n #1
+\cs_new_protected_nopar:Npn \__ctex_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l__ctex_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
\cs_new_protected_nopar:Npn \CTEX at hangfrom
{
@@ -428,6 +433,17 @@
}
\CTEX at hyperheadinghook
}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c__ctex_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
\cs_new_protected_nopar:Npn \ctex_titlesec_hook:
{
\@ifpackagewith { titlesec } { explicit }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
\cs_new_protected_nopar:Npn \__ctex_initial_heading:n #1
@@ -122,7 +122,7 @@
\ExplSyntaxOff
\defbeamertemplate*{part page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
\par \addvspace{\glueexpr\CTEX at part@beforeskip\relax}%
\CTEX at part@format
\parindent \dimexpr \CTEX at part@indent \relax
@@ -137,7 +137,7 @@
}
\defbeamertemplate*{section page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
\par \addvspace{\glueexpr\CTEX at section@beforeskip\relax}%
\CTEX at section@format
\parindent \dimexpr \CTEX at section@indent \relax
@@ -152,7 +152,7 @@
}
\defbeamertemplate*{subsection page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
\par \addvspace{\glueexpr\CTEX at subsection@beforeskip\relax}%
\CTEX at subsection@format
\parindent \dimexpr \CTEX at subsection@indent \relax
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -184,6 +184,8 @@
}
\cs_new_protected:Npn \CTEX at addtocline #1#2
{ \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l__ctex_autoindent_tl }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -210,9 +212,11 @@
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}%
{\CTEXifname{\CTEX at partname\CTEX at part@aftername}{}}%
@@ -222,7 +226,9 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
\CTEX at part@titleformat{#1}%
@@ -272,6 +278,7 @@
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
\CTEX at addloflotskip{chapter}%
@@ -284,6 +291,7 @@
\def\@schapter#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@schapter{\Hy at chapapp*}%
+ \CTEX at gettitle{#1}%
\if at twocolumn
\@topnewpage[\@makeschapterhead{#1}]%
\else
@@ -294,7 +302,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}%
{\CTEXifname{\CTEX at chaptername\CTEX at chapter@aftername}{}}%
@@ -309,7 +318,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}{}%
\CTEX at chapter@titleformat{#1}%
@@ -358,6 +368,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
\unless \ifodd \CTEX at runin
\begingroup
#6{%
@@ -380,6 +391,7 @@
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
\unless \ifodd \CTEX at runin
\begingroup
#4{%
@@ -419,18 +431,15 @@
\ignorespaces}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \__ctex_indent_aux:n {#1} #2 }
+ { \@hangfrom { \__ctex_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \__ctex_indent_aux:n #1
+\cs_new_protected_nopar:Npn \__ctex_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l__ctex_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
\cs_new_protected_nopar:Npn \CTEX at hangfrom
{
@@ -550,6 +559,17 @@
}
\CTEX at hyperheadinghook
}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c__ctex_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
\cs_new_protected_nopar:Npn \ctex_titlesec_hook:
{
\@ifpackagewith { titlesec } { explicit }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -184,6 +184,8 @@
}
\cs_new_protected:Npn \CTEX at addtocline #1#2
{ \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l__ctex_autoindent_tl }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -210,9 +212,11 @@
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}%
{\CTEXifname{\CTEX at partname\CTEX at part@aftername}{}}%
@@ -222,7 +226,9 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
\CTEX at part@titleformat{#1}%
@@ -267,6 +273,7 @@
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
\CTEX at addloflotskip{chapter}%
@@ -279,6 +286,7 @@
\def\@schapter#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@schapter{\Hy at chapapp*}%
+ \CTEX at gettitle{#1}%
\if at twocolumn
\@topnewpage[\@makeschapterhead{#1}]%
\else
@@ -289,7 +297,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}%
{\CTEXifname{\CTEX at chaptername\CTEX at chapter@aftername}{}}%
@@ -304,7 +313,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}{}%
\CTEX at chapter@titleformat{#1}%
@@ -353,6 +363,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
\unless \ifodd \CTEX at runin
\begingroup
#6{%
@@ -375,6 +386,7 @@
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
\unless \ifodd \CTEX at runin
\begingroup
#4{%
@@ -414,18 +426,15 @@
\ignorespaces}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \__ctex_indent_aux:n {#1} #2 }
+ { \@hangfrom { \__ctex_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \__ctex_indent_aux:n #1
+\cs_new_protected_nopar:Npn \__ctex_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l__ctex_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
\cs_new_protected_nopar:Npn \CTEX at hangfrom
{
@@ -545,6 +554,17 @@
}
\CTEX at hyperheadinghook
}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c__ctex_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
\cs_new_protected_nopar:Npn \ctex_titlesec_hook:
{
\@ifpackagewith { titlesec } { explicit }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 }
@@ -118,24 +118,17 @@
{ \cs_new_eq:NN \ifctexpdf \if_false: }
\cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn
\ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn }
-\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2
+\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2
+ { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } }
+\cs_new:Npn \__ctex_default_ccwd_aux:n #1
{
- \dim_compare:nNnTF
- { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } }
- { \tl_set:Nn #1 {#2} }
- { \tl_set:Nn #1 { #2 \ccwd } }
- }
-\cs_new:Npn \ctex_default_pt:n #1
- {
- \exp_after:wN \__ctex_default_pt:w
+ \exp_not:n {#1}
+ \exp_after:wN \__ctex_default_ccwd_aux:w
\dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
-\use:x
- {
- \cs_new:Npn \exp_not:N \__ctex_default_pt:w
- ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop
- { ##1 \tl_to_str:n { pt } }
- }
+\exp_last_unbraced:NNNNo
+ \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop
+ { \tl_if_empty:nT {#2} { \ccwd } }
\tl_new:N \l__ctex_encoding_tl
\tl_set:Nx \l__ctex_encoding_tl
{ \sys_if_engine_pdftex:TF { GBK } { UTF8 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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
@@ -112,24 +112,17 @@
{ \cs_new_eq:NN \ifctexpdf \if_false: }
\cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn
\ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn }
-\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2
+\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2
+ { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } }
+\cs_new:Npn \__ctex_default_ccwd_aux:n #1
{
- \dim_compare:nNnTF
- { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } }
- { \tl_set:Nn #1 {#2} }
- { \tl_set:Nn #1 { #2 \ccwd } }
- }
-\cs_new:Npn \ctex_default_pt:n #1
- {
- \exp_after:wN \__ctex_default_pt:w
+ \exp_not:n {#1}
+ \exp_after:wN \__ctex_default_ccwd_aux:w
\dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
-\use:x
- {
- \cs_new:Npn \exp_not:N \__ctex_default_pt:w
- ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop
- { ##1 \tl_to_str:n { pt } }
- }
+\exp_last_unbraced:NNNNo
+ \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop
+ { \tl_if_empty:nT {#2} { \ccwd } }
\tl_new:N \l__ctex_encoding_tl
\tl_set:Nx \l__ctex_encoding_tl
{ \sys_if_engine_pdftex:TF { GBK } { UTF8 } }
@@ -717,6 +710,8 @@
{ \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} } }
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l__ctex_autoindent_tl }
\renewcommand\part{%
\if at noskipsec \leavevmode \fi
\par
@@ -743,8 +738,10 @@
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}%
{\CTEXifname{\CTEX at partname\CTEX at part@aftername}{}}%
@@ -759,7 +756,9 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
\CTEX at part@titleformat{#1}%
@@ -808,6 +807,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
\unless \ifodd \CTEX at runin
\begingroup
#6{%
@@ -830,6 +830,7 @@
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
\unless \ifodd \CTEX at runin
\begingroup
#4{%
@@ -869,18 +870,15 @@
\ignorespaces}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \__ctex_indent_aux:n {#1} #2 }
+ { \@hangfrom { \__ctex_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \__ctex_indent_aux:n #1
+\cs_new_protected_nopar:Npn \__ctex_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l__ctex_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
\cs_new_protected_nopar:Npn \CTEX at hangfrom
{
@@ -993,6 +991,17 @@
}
\CTEX at hyperheadinghook
}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c__ctex_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
\cs_new_protected_nopar:Npn \ctex_titlesec_hook:
{
\@ifpackagewith { titlesec } { explicit }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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
@@ -110,24 +110,17 @@
{ \cs_new_eq:NN \ifctexpdf \if_false: }
\cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn
\ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn }
-\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2
+\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2
+ { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } }
+\cs_new:Npn \__ctex_default_ccwd_aux:n #1
{
- \dim_compare:nNnTF
- { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } }
- { \tl_set:Nn #1 {#2} }
- { \tl_set:Nn #1 { #2 \ccwd } }
- }
-\cs_new:Npn \ctex_default_pt:n #1
- {
- \exp_after:wN \__ctex_default_pt:w
+ \exp_not:n {#1}
+ \exp_after:wN \__ctex_default_ccwd_aux:w
\dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
-\use:x
- {
- \cs_new:Npn \exp_not:N \__ctex_default_pt:w
- ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop
- { ##1 \tl_to_str:n { pt } }
- }
+\exp_last_unbraced:NNNNo
+ \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop
+ { \tl_if_empty:nT {#2} { \ccwd } }
\tl_new:N \l__ctex_encoding_tl
\tl_set:Nx \l__ctex_encoding_tl
{ \sys_if_engine_pdftex:TF { GBK } { UTF8 } }
@@ -682,7 +675,7 @@
\ExplSyntaxOff
\defbeamertemplate*{part page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
\par \addvspace{\glueexpr\CTEX at part@beforeskip\relax}%
\CTEX at part@format
\parindent \dimexpr \CTEX at part@indent \relax
@@ -697,7 +690,7 @@
}
\defbeamertemplate*{section page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
\par \addvspace{\glueexpr\CTEX at section@beforeskip\relax}%
\CTEX at section@format
\parindent \dimexpr \CTEX at section@indent \relax
@@ -712,7 +705,7 @@
}
\defbeamertemplate*{subsection page}{CTEX}[1][]{%
\begingroup
- \ctexset{autoindent=false}%
+ \CTEX at disableautoindent
\par \addvspace{\glueexpr\CTEX at subsection@beforeskip\relax}%
\CTEX at subsection@format
\parindent \dimexpr \CTEX at subsection@indent \relax
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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
@@ -112,24 +112,17 @@
{ \cs_new_eq:NN \ifctexpdf \if_false: }
\cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn
\ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn }
-\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2
+\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2
+ { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } }
+\cs_new:Npn \__ctex_default_ccwd_aux:n #1
{
- \dim_compare:nNnTF
- { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } }
- { \tl_set:Nn #1 {#2} }
- { \tl_set:Nn #1 { #2 \ccwd } }
- }
-\cs_new:Npn \ctex_default_pt:n #1
- {
- \exp_after:wN \__ctex_default_pt:w
+ \exp_not:n {#1}
+ \exp_after:wN \__ctex_default_ccwd_aux:w
\dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
-\use:x
- {
- \cs_new:Npn \exp_not:N \__ctex_default_pt:w
- ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop
- { ##1 \tl_to_str:n { pt } }
- }
+\exp_last_unbraced:NNNNo
+ \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop
+ { \tl_if_empty:nT {#2} { \ccwd } }
\tl_new:N \l__ctex_encoding_tl
\tl_set:Nx \l__ctex_encoding_tl
{ \sys_if_engine_pdftex:TF { GBK } { UTF8 } }
@@ -749,6 +742,8 @@
}
\cs_new_protected:Npn \CTEX at addtocline #1#2
{ \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l__ctex_autoindent_tl }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -775,9 +770,11 @@
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}%
{\CTEXifname{\CTEX at partname\CTEX at part@aftername}{}}%
@@ -787,7 +784,9 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
\CTEX at part@titleformat{#1}%
@@ -837,6 +836,7 @@
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
\CTEX at addloflotskip{chapter}%
@@ -849,6 +849,7 @@
\def\@schapter#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@schapter{\Hy at chapapp*}%
+ \CTEX at gettitle{#1}%
\if at twocolumn
\@topnewpage[\@makeschapterhead{#1}]%
\else
@@ -859,7 +860,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}%
{\CTEXifname{\CTEX at chaptername\CTEX at chapter@aftername}{}}%
@@ -874,7 +876,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}{}%
\CTEX at chapter@titleformat{#1}%
@@ -923,6 +926,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
\unless \ifodd \CTEX at runin
\begingroup
#6{%
@@ -945,6 +949,7 @@
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
\unless \ifodd \CTEX at runin
\begingroup
#4{%
@@ -984,18 +989,15 @@
\ignorespaces}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \__ctex_indent_aux:n {#1} #2 }
+ { \@hangfrom { \__ctex_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \__ctex_indent_aux:n #1
+\cs_new_protected_nopar:Npn \__ctex_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l__ctex_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
\cs_new_protected_nopar:Npn \CTEX at hangfrom
{
@@ -1115,6 +1117,17 @@
}
\CTEX at hyperheadinghook
}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c__ctex_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
\cs_new_protected_nopar:Npn \ctex_titlesec_hook:
{
\@ifpackagewith { titlesec } { explicit }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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
@@ -112,24 +112,17 @@
{ \cs_new_eq:NN \ifctexpdf \if_false: }
\cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn
\ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn }
-\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2
+\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2
+ { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } }
+\cs_new:Npn \__ctex_default_ccwd_aux:n #1
{
- \dim_compare:nNnTF
- { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } }
- { \tl_set:Nn #1 {#2} }
- { \tl_set:Nn #1 { #2 \ccwd } }
- }
-\cs_new:Npn \ctex_default_pt:n #1
- {
- \exp_after:wN \__ctex_default_pt:w
+ \exp_not:n {#1}
+ \exp_after:wN \__ctex_default_ccwd_aux:w
\dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
-\use:x
- {
- \cs_new:Npn \exp_not:N \__ctex_default_pt:w
- ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop
- { ##1 \tl_to_str:n { pt } }
- }
+\exp_last_unbraced:NNNNo
+ \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop
+ { \tl_if_empty:nT {#2} { \ccwd } }
\tl_new:N \l__ctex_encoding_tl
\tl_set:Nx \l__ctex_encoding_tl
{ \sys_if_engine_pdftex:TF { GBK } { UTF8 } }
@@ -749,6 +742,8 @@
}
\cs_new_protected:Npn \CTEX at addtocline #1#2
{ \addcontentsline { toc } {#1} { \use:c { CTEX@#1 at tocline } {#1} {#2} } }
+\cs_new_protected_nopar:Npn \CTEX at disableautoindent
+ { \tl_clear:N \l__ctex_autoindent_tl }
\renewcommand\part{%
\CTEX at part@break
\thispagestyle{\CTEX at part@pagestyle}%
@@ -775,9 +770,11 @@
\CTEX at ifnamefalse
\CTEX at makeanchor{part*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{part}{#1}%
\partmark{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}%
{\CTEXifname{\CTEX at partname\CTEX at part@aftername}{}}%
@@ -787,7 +784,9 @@
\def\@spart#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@spart{part*}%
+ \CTEX at gettitle{#1}%
{\interlinepenalty \@M
+ \CTEX at disableautoindent
\normalfont \CTEX at part@format
\CTEX at hangindent{part}{}%
\CTEX at part@titleformat{#1}%
@@ -832,6 +831,7 @@
\CTEX at ifnamefalse
\CTEX at makeanchor@chapter{\Hy at chapapp*}%
\fi
+ \CTEX at gettitle{#1}%
\CTEX at addtocline{chapter}{#1}%
\chaptermark{#1}%
\CTEX at addloflotskip{chapter}%
@@ -844,6 +844,7 @@
\def\@schapter#1{%
\CTEX at ifnamefalse
\CTEX at makeanchor@schapter{\Hy at chapapp*}%
+ \CTEX at gettitle{#1}%
\if at twocolumn
\@topnewpage[\@makeschapterhead{#1}]%
\else
@@ -854,7 +855,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}%
{\CTEXifname{\CTEX at chaptername\CTEX at chapter@aftername}{}}%
@@ -869,7 +871,8 @@
\CTEX at setheadingskip \CTEX at chapter@beforeskip
\ifodd \CTEX at chapter@fixskip \CTEX at fixtopskip \fi
\vspace*{\CTEX at headingskip}%
- {\normalfont \CTEX at chapter@format
+ {\CTEX at disableautoindent
+ \normalfont \CTEX at chapter@format
\interlinepenalty\@M
\CTEX at hangindent{chapter}{}%
\CTEX at chapter@titleformat{#1}%
@@ -918,6 +921,7 @@
\let\@svsec\@empty
\fi
\fi
+ \CTEX at gettitle{#7}%
\unless \ifodd \CTEX at runin
\begingroup
#6{%
@@ -940,6 +944,7 @@
\@xsect{#5}}
\def\@ssect#1#2#3#4#5{%
\CTEX at ifnamefalse
+ \CTEX at gettitle{#5}%
\unless \ifodd \CTEX at runin
\begingroup
#4{%
@@ -979,18 +984,15 @@
\ignorespaces}
\cs_new_protected:Npn \CTEX at hangindent #1#2
{
+ \dim_set:Nn \parindent { \use:c { CTEX@#1 at indent } }
\bool_if:cTF { CTEX@#1 at hang }
- { \@hangfrom }
- { \noindent \use:n }
- { \__ctex_indent_aux:n {#1} #2 }
+ { \@hangfrom { \__ctex_indent_aux: #2 } }
+ {#2}
}
-\cs_new_protected:Npn \__ctex_indent_aux:n #1
+\cs_new_protected_nopar:Npn \__ctex_indent_aux:
{
- \group_begin:
- \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1 at indent } }
- \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
- { \skip_horizontal:N \l__ctex_heading_skip }
- \group_end:
+ \dim_compare:nNnF \parindent = \c_zero_dim
+ { \skip_horizontal:n { \parindent } }
}
\cs_new_protected_nopar:Npn \CTEX at hangfrom
{
@@ -1110,6 +1112,17 @@
}
\CTEX at hyperheadinghook
}
+\cs_new_protected:Npn \CTEX at gettitle #1
+ { }
+\ctex_at_end_package:nn { nameref }
+ {
+ \cs_gset_protected_nopar:Npn \CTEX at gettitle { \NR at gettitle }
+ \seq_map_inline:Nn \c__ctex_headings_cs_seq
+ {
+ \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 }
+ { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } }
+ }
+ }
\cs_new_protected_nopar:Npn \ctex_titlesec_hook:
{
\@ifpackagewith { titlesec } { explicit }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\int_new:N \g__ctex_font_size_int
\int_set:Nn \g__ctex_font_size_int { -1 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,7 +28,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2019/04/07 v2.4.15 Space info for CJKpunct (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2019-05-29 20:52:28 UTC (rev 51262)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{ctex documentation (CTEX)}
\ProvidesExplClass{ctxdoc}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\ExplSyntaxOff
\let\pdfmdfivesum\mdfivesum
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{jt2zhrm.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhrm}{}
\DeclareFontShape{JT2}{zhrm}{m}{n}{<-> upzhserif-v}{}
\DeclareFontShape{JT2}{zhrm}{m}{it}{<-> upzhserifit-v}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{jt2zhsf.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhsf}{}
\DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{}
\DeclareFontShape{JT2}{zhsf}{bx}{n}{<-> upzhsansb-v}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{jt2zhtt.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhtt}{}
\DeclareFontShape{JT2}{zhtt}{m}{n}{<-> upzhmono-v}{}
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{jy2zhrm.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhrm}{}
\DeclareFontShape{JY2}{zhrm}{m}{n}{<-> upzhserif-h}{}
\DeclareFontShape{JY2}{zhrm}{m}{it}{<-> upzhserifit-h}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{jy2zhsf.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhsf}{}
\DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{}
\DeclareFontShape{JY2}{zhsf}{bx}{n}{<-> upzhsansb-h}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2019-05-29 20:52:28 UTC (rev 51262)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{jy2zhtt.fd}%
- [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+ [2019/05/29 v2.4.16 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhtt}{}
\DeclareFontShape{JY2}{zhtt}{m}{n}{<-> upzhmono-h}{}
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Mac OS X fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\file_if_exist:nTF { /System/Library/Fonts/PingFang.ttc }
{ \ctex_file_input:n { ctex-fontset-macnew.def } }
{ \ctex_file_input:n { ctex-fontset-macold.def } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Mac OS X fonts definition for El Capitan or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-macnew.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{ \ctex_fontset_error:n { mac } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Mac OS X fonts definition for Yosemite or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-macold.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for Vista or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for XP or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\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 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2019-05-29 20:52:07 UTC (rev 51261)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2019-05-29 20:52:28 UTC (rev 51262)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.15}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.16}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
More information about the tex-live-commits
mailing list