summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex10
-rw-r--r--Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex4
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex4
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex4
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex4
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-article.def46
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-beamer.def29
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-book.def53
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-report.def53
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex.sty53
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexart.cls95
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls71
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbook.cls102
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexcap.sty6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexheading.sty19
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexhook.sty6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexpatch.sty12
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexrep.cls102
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexsize.sty28
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexspa.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctxdoc.cls36
-rw-r--r--Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def89
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def66
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def22
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def89
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd37
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd36
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd35
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd37
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd36
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd35
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def9
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def16
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def10
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def17
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def18
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def18
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def10
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def13
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def14
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def14
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def6
69 files changed, 933 insertions, 583 deletions
diff --git a/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex b/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
index bc9afc70ed4..3e46540e514 100644
--- a/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
+++ b/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `spa,make')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex b/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
index 3c04a6717a2..80a148e24c3 100644
--- a/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
+++ b/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `spa,macro')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -58,7 +58,7 @@
\l__ctex_punct_font
\clist_clear:N \l__ctex_punct_bounds_clist
\seq_map_inline:Nn \c__ctex_punct_seq
- { \exp_args:No \__ctex_save_bounds:n { \int_use:N \xetex_charglyph:D ##1 } }
+ { \exp_args:No \__ctex_save_bounds:n { \int_use:N \tex_XeTeXcharglyph:D ##1 } }
\iow_now:Nx \g__ctex_spa_iow
{
\token_to_str:N \ctexspadef {#1}
@@ -70,8 +70,8 @@
{
\clist_put_right:Nx \l__ctex_punct_bounds_clist
{
- \__ctex_calc_bounds:nn { \c_one } {#1} ,
- \__ctex_calc_bounds:nn { \c_three } {#1}
+ \__ctex_calc_bounds:nn { 1 } {#1} ,
+ \__ctex_calc_bounds:nn { 3 } {#1}
}
}
\clist_new:N \l__ctex_punct_bounds_clist
@@ -82,7 +82,7 @@
round
(
\dim_to_decimal_in_unit:nn
- { 100 \xetex_glyphbounds:D #1 ~ #2 }
+ { 100 \tex_XeTeXglyphbounds:D #1 ~ #2 }
{ 1 em }
)
}
diff --git a/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex b/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
index eb317a321a3..a1948f8bad0 100644
--- a/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
+++ b/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `docstrip')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
index 8240b7a0351..9d504033268 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `zhmap,adobe')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2018/05/01 v2.4.14 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2019/04/07 v2.4.15 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
diff --git a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
index c16cd5cebb5..29832e4a059 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `zhmap,fandol')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2018/05/01 v2.4.14 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2019/04/07 v2.4.15 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
diff --git a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
index 0d68b6a7c94..2de5087fc1d 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `zhmap,founder')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2018/05/01 v2.4.14 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/04/07 v2.4.15 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk@UGBK@ <FZSSK.TTF}
diff --git a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
index 0bf5673759a..00ff878fa8e 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `zhmap,ubuntu')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2018/05/01 v2.4.14 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/04/07 v2.4.15 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk@UGBK@ <uming.ttc}
diff --git a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
index 63254a47f80..172b41b51ee 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `zhmap,windows')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2018/05/01 v2.4.14 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2019/04/07 v2.4.15 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk@UGBK@ <simsun.ttc}
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
index 05f836333e7..d5c3abd4366 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `name,GBK')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = Ŀ¼ ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
index 396cff26016..c318664ce58 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `name,UTF8')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Caption with encoding UTF8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = 目录 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
index a60f752e4bf..b3d04a88324 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `config')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
%%
%%
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
index 400db474d50..d0b4e077134 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `ctexopts')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
%%
%% \keys_set:nn { ctex / option } { fontset = windowsnew }
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-article.def b/Master/texmf-dist/tex/latex/ctex/ctex-article.def
index 08a0bc1fd6f..69e4f2ae061 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-article.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `heading,article')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -112,7 +112,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -180,10 +180,9 @@
\fi
\CTEX@addtocline{part}{#1}%
{\interlinepenalty \@M
- \normalfont \parindent \dimexpr \CTEX@part@indent \relax \CTEX@part@format
- \ifnum \c@secnumdepth >\m@ne \ifodd \CTEX@part@numbering
- \CTEX@partname \CTEX@part@aftername
- \fi \fi
+ \normalfont \CTEX@part@format
+ \CTEX@hangindent{part}%
+ {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}%
\CTEX@part@titleformat{#2}%
\partmark{#1}%
\CTEX@part@aftertitle}%
@@ -196,8 +195,8 @@
\CTEX@ifnamefalse
\CTEX@makeanchor@spart{part*}%
{\interlinepenalty \@M
- \normalfont \parindent \dimexpr \CTEX@part@indent \relax
- \CTEX@part@format
+ \normalfont \CTEX@part@format
+ \CTEX@hangindent{part}{}%
\CTEX@part@titleformat{#1}%
\CTEX@part@aftertitle}%
\nobreak
@@ -303,6 +302,21 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected:Npn \CTEX@hangindent #1#2
+ {
+ \bool_if:cTF { CTEX@#1@hang }
+ { \@hangfrom }
+ { \noindent \use:n }
+ { \__ctex_indent_aux:n {#1} #2 }
+ }
+\cs_new_protected:Npn \__ctex_indent_aux:n #1
+ {
+ \group_begin:
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } }
+ \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
+ { \skip_horizontal:N \l__ctex_heading_skip }
+ \group_end:
+ }
\cs_new_protected_nopar:Npn \CTEX@hangfrom
{
\bool_if:NTF \CTEX@hang
@@ -312,11 +326,11 @@
\cs_new_protected_nopar:Npn \CTEX@update@sectionformat@n #1
{
\cs_set_eq:Nc \CTEX@titleformat@n { CTEX@#1@titleformat }
- \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
- \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
- \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
- \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
- \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
+ \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
+ \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
+ \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
+ \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
+ \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
}
\cs_new_eq:NN \CTEX@titleformat@n \use:n
\cs_new_eq:NN \CTEX@aftertitle \prg_do_nothing:
@@ -559,7 +573,7 @@
\dim_set:Nn \@tempdima
{
\dim_max:nn { \@tempdima }
- { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / \c_two }
+ { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / 2 }
}
}
\group_begin:
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def b/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
index b2b869e4d7e..8f11e15aae1 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `heading,beamer')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
\cs_new_protected_nopar:Npn \__ctex_initial_heading:n #1
@@ -98,7 +98,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -120,45 +120,48 @@
\keys_define:nn { ctex } { \exp_not:o { \l__ctex_tmp_tl } }
}
\ExplSyntaxOff
-\defbeamertemplate*{part page}{CTEX}[1][]{
+\defbeamertemplate*{part page}{CTEX}[1][]{%
\begingroup
+ \ctexset{autoindent=false}%
\par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}%
- \parindent \dimexpr \CTEX@part@indent \relax
\CTEX@part@format
+ \parindent \dimexpr \CTEX@part@indent \relax
\ifodd \CTEX@part@numbering
\CTEX@partname \CTEX@part@aftername
\fi
\begin{beamercolorbox}[sep=16pt,center,#1]{part title}
\CTEX@part@titleformat \insertpart \CTEX@part@aftertitle
- \end{beamercolorbox}
+ \end{beamercolorbox}%
\par \addvspace{\glueexpr\CTEX@part@afterskip\relax}%
\endgroup
}
-\defbeamertemplate*{section page}{CTEX}[1][]{
+\defbeamertemplate*{section page}{CTEX}[1][]{%
\begingroup
+ \ctexset{autoindent=false}%
\par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}%
- \parindent \dimexpr \CTEX@section@indent \relax
\CTEX@section@format
+ \parindent \dimexpr \CTEX@section@indent \relax
\ifodd \CTEX@section@numbering
\CTEX@sectionname \CTEX@section@aftername
\fi
\begin{beamercolorbox}[sep=12pt,center,#1]{part title}
\CTEX@section@titleformat \insertsection \CTEX@section@aftertitle
- \end{beamercolorbox}
+ \end{beamercolorbox}%
\par \addvspace{\glueexpr\CTEX@section@afterskip\relax}%
\endgroup
}
-\defbeamertemplate*{subsection page}{CTEX}[1][]{
+\defbeamertemplate*{subsection page}{CTEX}[1][]{%
\begingroup
+ \ctexset{autoindent=false}%
\par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}%
- \parindent \dimexpr \CTEX@subsection@indent \relax
\CTEX@subsection@format
+ \parindent \dimexpr \CTEX@subsection@indent \relax
\ifodd \CTEX@subsection@numbering
\CTEX@subsectionname \CTEX@subsection@aftername
\fi
\begin{beamercolorbox}[sep=8pt,center,#1]{part title}
\CTEX@subsection@titleformat \insertsubsection \CTEX@subsection@aftertitle
- \end{beamercolorbox}
+ \end{beamercolorbox}%
\par \addvspace{\glueexpr\CTEX@subsection@afterskip\relax}%
\endgroup
}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-book.def b/Master/texmf-dist/tex/latex/ctex/ctex-book.def
index d8449cacffe..e97cbee7cac 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-book.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `heading,book')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -113,7 +113,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -214,9 +214,8 @@
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
- \ifnum \c@secnumdepth >-2\relax \ifodd \CTEX@part@numbering
- \CTEX@partname \CTEX@part@aftername
- \fi \fi
+ \CTEX@hangindent{part}%
+ {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}%
\CTEX@part@titleformat{#2}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -225,6 +224,7 @@
\CTEX@makeanchor@spart{part*}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
+ \CTEX@hangindent{part}{}%
\CTEX@part@titleformat{#1}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -294,10 +294,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
- \CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}%
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
+ \CTEX@hangindent{chapter}%
+ {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}%
\CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
@@ -309,10 +309,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
- \CTEX@chapter@titleformat{#1}
+ \CTEX@hangindent{chapter}{}%
+ \CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
\CTEX@setheadingskip \CTEX@chapter@afterskip
@@ -417,6 +417,21 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected:Npn \CTEX@hangindent #1#2
+ {
+ \bool_if:cTF { CTEX@#1@hang }
+ { \@hangfrom }
+ { \noindent \use:n }
+ { \__ctex_indent_aux:n {#1} #2 }
+ }
+\cs_new_protected:Npn \__ctex_indent_aux:n #1
+ {
+ \group_begin:
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } }
+ \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
+ { \skip_horizontal:N \l__ctex_heading_skip }
+ \group_end:
+ }
\cs_new_protected_nopar:Npn \CTEX@hangfrom
{
\bool_if:NTF \CTEX@hang
@@ -426,11 +441,11 @@
\cs_new_protected_nopar:Npn \CTEX@update@sectionformat@n #1
{
\cs_set_eq:Nc \CTEX@titleformat@n { CTEX@#1@titleformat }
- \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
- \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
- \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
- \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
- \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
+ \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
+ \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
+ \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
+ \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
+ \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
}
\cs_new_eq:NN \CTEX@titleformat@n \use:n
\cs_new_eq:NN \CTEX@aftertitle \prg_do_nothing:
@@ -681,7 +696,7 @@
\dim_set:Nn \@tempdima
{
\dim_max:nn { \@tempdima }
- { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / \c_two }
+ { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / 2 }
}
}
\group_begin:
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
index 33312609749..e4c429e0f75 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `c5size')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { 5 }
{
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
index 16b88893ffe..43ec2dfa51d 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `cs4size')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { -4 }
{
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-report.def b/Master/texmf-dist/tex/latex/ctex/ctex-report.def
index 50750dcb0b3..24c7719f4c1 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-report.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `heading,report')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -113,7 +113,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -214,9 +214,8 @@
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
- \ifnum \c@secnumdepth >-2\relax \ifodd \CTEX@part@numbering
- \CTEX@partname \CTEX@part@aftername
- \fi \fi
+ \CTEX@hangindent{part}%
+ {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}%
\CTEX@part@titleformat{#2}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -225,6 +224,7 @@
\CTEX@makeanchor@spart{part*}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
+ \CTEX@hangindent{part}{}%
\CTEX@part@titleformat{#1}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -289,10 +289,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
- \CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}%
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
+ \CTEX@hangindent{chapter}%
+ {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}%
\CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
@@ -304,10 +304,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
- \CTEX@chapter@titleformat{#1}
+ \CTEX@hangindent{chapter}{}%
+ \CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
\CTEX@setheadingskip \CTEX@chapter@afterskip
@@ -412,6 +412,21 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected:Npn \CTEX@hangindent #1#2
+ {
+ \bool_if:cTF { CTEX@#1@hang }
+ { \@hangfrom }
+ { \noindent \use:n }
+ { \__ctex_indent_aux:n {#1} #2 }
+ }
+\cs_new_protected:Npn \__ctex_indent_aux:n #1
+ {
+ \group_begin:
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } }
+ \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
+ { \skip_horizontal:N \l__ctex_heading_skip }
+ \group_end:
+ }
\cs_new_protected_nopar:Npn \CTEX@hangfrom
{
\bool_if:NTF \CTEX@hang
@@ -421,11 +436,11 @@
\cs_new_protected_nopar:Npn \CTEX@update@sectionformat@n #1
{
\cs_set_eq:Nc \CTEX@titleformat@n { CTEX@#1@titleformat }
- \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
- \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
- \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
- \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
- \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
+ \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
+ \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
+ \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
+ \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
+ \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
}
\cs_new_eq:NN \CTEX@titleformat@n \use:n
\cs_new_eq:NN \CTEX@aftertitle \prg_do_nothing:
@@ -676,7 +691,7 @@
\dim_set:Nn \@tempdima
{
\dim_max:nn { \@tempdima }
- { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / \c_two }
+ { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / 2 }
}
}
\group_begin:
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index a5947bb6999..699ceb748fa 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `style,ctex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\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 }
@@ -54,7 +54,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\str_const:Nx \c__ctex_engine_str
{ \cs_if_exist:NTF \ngostype { aptex } { \c_sys_engine_str } }
@@ -105,7 +105,8 @@
{ }
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
-\cs_new_eq:NN \g__ctex_section_depth_flag \c_two
+\int_new:N \g__ctex_section_depth_int
+\int_gset:Nn \g__ctex_section_depth_int { 2 }
\msg_new:nnnn { ctex } { package-too-old }
{ Support~package~`#1'~too~old. }
{
@@ -127,7 +128,7 @@
\cs_new:Npn \ctex_default_pt:n #1
{
\exp_after:wN \__ctex_default_pt:w
- \dim_use:N \etex_dimexpr:D #1 pt \scan_stop: \q_stop
+ \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
\use:x
{
@@ -153,15 +154,15 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
zihao .value_required:n = true ,
- zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
- zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
- zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+ zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+ zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
c5size .code:n =
{
\msg_warning:nnn { ctex } { deprecated-option }
@@ -301,9 +302,9 @@
nospace .value_forbidden:n = true ,
heading .bool_set:N = \l__ctex_heading_bool ,
sub3section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_three } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 3 } } ,
sub4section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_four } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 4 } } ,
sub3section .value_forbidden:n = true ,
sub4section .value_forbidden:n = true ,
scheme .tl_set:N = \l__ctex_scheme_tl ,
@@ -356,7 +357,7 @@
\tl_put_right:Nn \l__ctex_tmp_tl
{
#1 .code:n =
- { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
#1 .value_forbidden:n = true ,
}
}
@@ -442,7 +443,7 @@
{ \ctex_update_ccwd: }
{
\dim_set:Nn \l__ctex_tmp_dim
- { \baselinestretch \etex_glueexpr:D \f@baselineskip \scan_stop: }
+ { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: }
\skip_set:Nn \l__ctex_ccglue_skip
{ \c_zero_dim plus .08 \l__ctex_tmp_dim }
\ctex_update_ccglue:
@@ -450,9 +451,9 @@
}
{
\int_set:Nn \l__ctex_tmp_int
- { \etex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
+ { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
\tex_divide:D \l__ctex_tmp_int \ccwd
- \int_compare:nNnTF \l__ctex_tmp_int > \c_zero
+ \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int
{
\skip_set:Nn \l__ctex_ccglue_skip
{
@@ -496,15 +497,15 @@
\dim_sub:Nn \l__ctex_tmp_dim { \l__ctex_tmp_int \ccwd }
\dim_compare:nNnF \parindent = \c_zero_dim
{
- \int_compare:nNnF \l__ctex_tmp_int < \c_three
- { \int_sub:Nn \l__ctex_tmp_int { \c_two } }
+ \int_compare:nNnF \l__ctex_tmp_int < 3
+ { \int_sub:Nn \l__ctex_tmp_int { 2 } }
}
\skip_set:Nn \l__ctex_ccglue_skip
{
\l__ctex_ziju_dim
plus \dim_eval:n { \l__ctex_tmp_dim / \l__ctex_tmp_int }
minus \dim_min:nn { \dim_abs:n { \l__ctex_ziju_dim } }
- { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + \c_one ) }
+ { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + 1 ) }
}
}
{ \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } }
@@ -662,7 +663,7 @@
\prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
{
{ \dim_to_decimal:n {#2} }
- { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+ { \dim_to_decimal:n { (#2) * 6 / 5 } }
}
}
\seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -730,7 +731,7 @@
}
\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
{ \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\ctex_file_input:n { ctex-c5size.clo }
\or:
\ctex_file_input:n { ctex-cs4size.clo }
@@ -792,7 +793,7 @@
{
\ctex_if_preamble:TF
{
- \str_if_eq_x:nnTF {#1} { none }
+ \str_if_eq:eeTF {#1} { none }
{ \msg_warning:nnn { ctex } { invalid-value } {#1} }
{
\str_if_eq:onTF { \g__ctex_fontset_tl } { none }
@@ -868,6 +869,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
index 0f7f58d6f54..20707c50646 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `class,article')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -99,7 +99,8 @@
{ }
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
-\cs_new_eq:NN \g__ctex_section_depth_flag \c_two
+\int_new:N \g__ctex_section_depth_int
+\int_gset:Nn \g__ctex_section_depth_int { 2 }
\msg_new:nnnn { ctex } { package-too-old }
{ Support~package~`#1'~too~old. }
{
@@ -121,7 +122,7 @@
\cs_new:Npn \ctex_default_pt:n #1
{
\exp_after:wN \__ctex_default_pt:w
- \dim_use:N \etex_dimexpr:D #1 pt \scan_stop: \q_stop
+ \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
\use:x
{
@@ -148,15 +149,15 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
zihao .value_required:n = true ,
- zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
- zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
- zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+ zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+ zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
c5size .code:n =
{
\msg_warning:nnn { ctex } { deprecated-option }
@@ -296,9 +297,9 @@
nospace .value_forbidden:n = true ,
heading .bool_set:N = \l__ctex_heading_bool ,
sub3section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_three } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 3 } } ,
sub4section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_four } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 4 } } ,
sub3section .value_forbidden:n = true ,
sub4section .value_forbidden:n = true ,
scheme .tl_set:N = \l__ctex_scheme_tl ,
@@ -352,7 +353,7 @@
{
#1 .code:n =
{
- \cs_gset_eq:NN \g__ctex_font_size_flag \c_two
+ \int_gset:Nn \g__ctex_font_size_int { 2 }
\clist_gput_right:Nn \g__ctex_std_options_clist {#1}
} ,
#1 .value_forbidden:n = true ,
@@ -367,7 +368,7 @@
}
\ctex_file_input:n { ctexopts.cfg }
\ProcessKeysOptions { ctex / option }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\clist_gput_right:Nn \g__ctex_std_options_clist { 10pt }
\or:
\clist_gput_right:Nn \g__ctex_std_options_clist { 12pt }
@@ -453,7 +454,7 @@
{ \ctex_update_ccwd: }
{
\dim_set:Nn \l__ctex_tmp_dim
- { \baselinestretch \etex_glueexpr:D \f@baselineskip \scan_stop: }
+ { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: }
\skip_set:Nn \l__ctex_ccglue_skip
{ \c_zero_dim plus .08 \l__ctex_tmp_dim }
\ctex_update_ccglue:
@@ -461,9 +462,9 @@
}
{
\int_set:Nn \l__ctex_tmp_int
- { \etex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
+ { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
\tex_divide:D \l__ctex_tmp_int \ccwd
- \int_compare:nNnTF \l__ctex_tmp_int > \c_zero
+ \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int
{
\skip_set:Nn \l__ctex_ccglue_skip
{
@@ -507,15 +508,15 @@
\dim_sub:Nn \l__ctex_tmp_dim { \l__ctex_tmp_int \ccwd }
\dim_compare:nNnF \parindent = \c_zero_dim
{
- \int_compare:nNnF \l__ctex_tmp_int < \c_three
- { \int_sub:Nn \l__ctex_tmp_int { \c_two } }
+ \int_compare:nNnF \l__ctex_tmp_int < 3
+ { \int_sub:Nn \l__ctex_tmp_int { 2 } }
}
\skip_set:Nn \l__ctex_ccglue_skip
{
\l__ctex_ziju_dim
plus \dim_eval:n { \l__ctex_tmp_dim / \l__ctex_tmp_int }
minus \dim_min:nn { \dim_abs:n { \l__ctex_ziju_dim } }
- { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + \c_one ) }
+ { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + 1 ) }
}
}
{ \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } }
@@ -676,7 +677,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -744,10 +745,9 @@
\fi
\CTEX@addtocline{part}{#1}%
{\interlinepenalty \@M
- \normalfont \parindent \dimexpr \CTEX@part@indent \relax \CTEX@part@format
- \ifnum \c@secnumdepth >\m@ne \ifodd \CTEX@part@numbering
- \CTEX@partname \CTEX@part@aftername
- \fi \fi
+ \normalfont \CTEX@part@format
+ \CTEX@hangindent{part}%
+ {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}%
\CTEX@part@titleformat{#2}%
\partmark{#1}%
\CTEX@part@aftertitle}%
@@ -760,8 +760,8 @@
\CTEX@ifnamefalse
\CTEX@makeanchor@spart{part*}%
{\interlinepenalty \@M
- \normalfont \parindent \dimexpr \CTEX@part@indent \relax
- \CTEX@part@format
+ \normalfont \CTEX@part@format
+ \CTEX@hangindent{part}{}%
\CTEX@part@titleformat{#1}%
\CTEX@part@aftertitle}%
\nobreak
@@ -867,6 +867,21 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected:Npn \CTEX@hangindent #1#2
+ {
+ \bool_if:cTF { CTEX@#1@hang }
+ { \@hangfrom }
+ { \noindent \use:n }
+ { \__ctex_indent_aux:n {#1} #2 }
+ }
+\cs_new_protected:Npn \__ctex_indent_aux:n #1
+ {
+ \group_begin:
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } }
+ \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
+ { \skip_horizontal:N \l__ctex_heading_skip }
+ \group_end:
+ }
\cs_new_protected_nopar:Npn \CTEX@hangfrom
{
\bool_if:NTF \CTEX@hang
@@ -876,11 +891,11 @@
\cs_new_protected_nopar:Npn \CTEX@update@sectionformat@n #1
{
\cs_set_eq:Nc \CTEX@titleformat@n { CTEX@#1@titleformat }
- \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
- \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
- \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
- \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
- \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
+ \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
+ \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
+ \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
+ \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
+ \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
}
\cs_new_eq:NN \CTEX@titleformat@n \use:n
\cs_new_eq:NN \CTEX@aftertitle \prg_do_nothing:
@@ -1123,7 +1138,7 @@
\dim_set:Nn \@tempdima
{
\dim_max:nn { \@tempdima }
- { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / \c_two }
+ { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / 2 }
}
}
\group_begin:
@@ -1224,7 +1239,7 @@
\prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
{
{ \dim_to_decimal:n {#2} }
- { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+ { \dim_to_decimal:n { (#2) * 6 / 5 } }
}
}
\seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -1292,7 +1307,7 @@
}
\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
{ \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\ctex_file_input:n { ctex-c5size.clo }
\or:
\ctex_file_input:n { ctex-cs4size.clo }
@@ -1354,7 +1369,7 @@
{
\ctex_if_preamble:TF
{
- \str_if_eq_x:nnTF {#1} { none }
+ \str_if_eq:eeTF {#1} { none }
{ \msg_warning:nnn { ctex } { invalid-value } {#1} }
{
\str_if_eq:onTF { \g__ctex_fontset_tl } { none }
@@ -1430,6 +1445,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
index 6e294129256..87c2009d2f5 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `class,beamer')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -120,7 +120,7 @@
\cs_new:Npn \ctex_default_pt:n #1
{
\exp_after:wN \__ctex_default_pt:w
- \dim_use:N \etex_dimexpr:D #1 pt \scan_stop: \q_stop
+ \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
\use:x
{
@@ -147,15 +147,15 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
zihao .value_required:n = true ,
- zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
- zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
- zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+ zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+ zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
c5size .code:n =
{
\msg_warning:nnn { ctex } { deprecated-option }
@@ -345,7 +345,7 @@
{
#1 .code:n =
{
- \cs_gset_eq:NN \g__ctex_font_size_flag \c_two
+ \int_gset:Nn \g__ctex_font_size_int { 2 }
\clist_gput_right:Nn \g__ctex_std_options_clist {#1}
} ,
#1 .value_forbidden:n = true ,
@@ -360,7 +360,7 @@
}
\ctex_file_input:n { ctexopts.cfg }
\ProcessKeysOptions { ctex / option }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\clist_gput_right:Nn \g__ctex_std_options_clist { 10pt }
\or:
\clist_gput_right:Nn \g__ctex_std_options_clist { 12pt }
@@ -446,7 +446,7 @@
{ \ctex_update_ccwd: }
{
\dim_set:Nn \l__ctex_tmp_dim
- { \baselinestretch \etex_glueexpr:D \f@baselineskip \scan_stop: }
+ { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: }
\skip_set:Nn \l__ctex_ccglue_skip
{ \c_zero_dim plus .08 \l__ctex_tmp_dim }
\ctex_update_ccglue:
@@ -454,9 +454,9 @@
}
{
\int_set:Nn \l__ctex_tmp_int
- { \etex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
+ { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
\tex_divide:D \l__ctex_tmp_int \ccwd
- \int_compare:nNnTF \l__ctex_tmp_int > \c_zero
+ \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int
{
\skip_set:Nn \l__ctex_ccglue_skip
{
@@ -500,15 +500,15 @@
\dim_sub:Nn \l__ctex_tmp_dim { \l__ctex_tmp_int \ccwd }
\dim_compare:nNnF \parindent = \c_zero_dim
{
- \int_compare:nNnF \l__ctex_tmp_int < \c_three
- { \int_sub:Nn \l__ctex_tmp_int { \c_two } }
+ \int_compare:nNnF \l__ctex_tmp_int < 3
+ { \int_sub:Nn \l__ctex_tmp_int { 2 } }
}
\skip_set:Nn \l__ctex_ccglue_skip
{
\l__ctex_ziju_dim
plus \dim_eval:n { \l__ctex_tmp_dim / \l__ctex_tmp_int }
minus \dim_min:nn { \dim_abs:n { \l__ctex_ziju_dim } }
- { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + \c_one ) }
+ { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + 1 ) }
}
}
{ \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } }
@@ -658,7 +658,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -680,45 +680,48 @@
\keys_define:nn { ctex } { \exp_not:o { \l__ctex_tmp_tl } }
}
\ExplSyntaxOff
-\defbeamertemplate*{part page}{CTEX}[1][]{
+\defbeamertemplate*{part page}{CTEX}[1][]{%
\begingroup
+ \ctexset{autoindent=false}%
\par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}%
- \parindent \dimexpr \CTEX@part@indent \relax
\CTEX@part@format
+ \parindent \dimexpr \CTEX@part@indent \relax
\ifodd \CTEX@part@numbering
\CTEX@partname \CTEX@part@aftername
\fi
\begin{beamercolorbox}[sep=16pt,center,#1]{part title}
\CTEX@part@titleformat \insertpart \CTEX@part@aftertitle
- \end{beamercolorbox}
+ \end{beamercolorbox}%
\par \addvspace{\glueexpr\CTEX@part@afterskip\relax}%
\endgroup
}
-\defbeamertemplate*{section page}{CTEX}[1][]{
+\defbeamertemplate*{section page}{CTEX}[1][]{%
\begingroup
+ \ctexset{autoindent=false}%
\par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}%
- \parindent \dimexpr \CTEX@section@indent \relax
\CTEX@section@format
+ \parindent \dimexpr \CTEX@section@indent \relax
\ifodd \CTEX@section@numbering
\CTEX@sectionname \CTEX@section@aftername
\fi
\begin{beamercolorbox}[sep=12pt,center,#1]{part title}
\CTEX@section@titleformat \insertsection \CTEX@section@aftertitle
- \end{beamercolorbox}
+ \end{beamercolorbox}%
\par \addvspace{\glueexpr\CTEX@section@afterskip\relax}%
\endgroup
}
-\defbeamertemplate*{subsection page}{CTEX}[1][]{
+\defbeamertemplate*{subsection page}{CTEX}[1][]{%
\begingroup
+ \ctexset{autoindent=false}%
\par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}%
- \parindent \dimexpr \CTEX@subsection@indent \relax
\CTEX@subsection@format
+ \parindent \dimexpr \CTEX@subsection@indent \relax
\ifodd \CTEX@subsection@numbering
\CTEX@subsectionname \CTEX@subsection@aftername
\fi
\begin{beamercolorbox}[sep=8pt,center,#1]{part title}
\CTEX@subsection@titleformat \insertsubsection \CTEX@subsection@aftertitle
- \end{beamercolorbox}
+ \end{beamercolorbox}%
\par \addvspace{\glueexpr\CTEX@subsection@afterskip\relax}%
\endgroup
}
@@ -781,7 +784,7 @@
\prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
{
{ \dim_to_decimal:n {#2} }
- { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+ { \dim_to_decimal:n { (#2) * 6 / 5 } }
}
}
\seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -849,7 +852,7 @@
}
\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
{ \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\ctex_file_input:n { ctex-c5size.clo }
\or:
\ctex_file_input:n { ctex-cs4size.clo }
@@ -911,7 +914,7 @@
{
\ctex_if_preamble:TF
{
- \str_if_eq_x:nnTF {#1} { none }
+ \str_if_eq:eeTF {#1} { none }
{ \msg_warning:nnn { ctex } { invalid-value } {#1} }
{
\str_if_eq:onTF { \g__ctex_fontset_tl } { none }
@@ -987,6 +990,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
index 2280d5dde3f..56e9fe9dadf 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `class,book')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -99,7 +99,8 @@
{ }
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
-\cs_new_eq:NN \g__ctex_section_depth_flag \c_two
+\int_new:N \g__ctex_section_depth_int
+\int_gset:Nn \g__ctex_section_depth_int { 2 }
\msg_new:nnnn { ctex } { package-too-old }
{ Support~package~`#1'~too~old. }
{
@@ -121,7 +122,7 @@
\cs_new:Npn \ctex_default_pt:n #1
{
\exp_after:wN \__ctex_default_pt:w
- \dim_use:N \etex_dimexpr:D #1 pt \scan_stop: \q_stop
+ \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
\use:x
{
@@ -148,15 +149,15 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
zihao .value_required:n = true ,
- zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
- zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
- zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+ zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+ zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
c5size .code:n =
{
\msg_warning:nnn { ctex } { deprecated-option }
@@ -296,9 +297,9 @@
nospace .value_forbidden:n = true ,
heading .bool_set:N = \l__ctex_heading_bool ,
sub3section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_three } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 3 } } ,
sub4section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_four } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 4 } } ,
sub3section .value_forbidden:n = true ,
sub4section .value_forbidden:n = true ,
scheme .tl_set:N = \l__ctex_scheme_tl ,
@@ -352,7 +353,7 @@
{
#1 .code:n =
{
- \cs_gset_eq:NN \g__ctex_font_size_flag \c_two
+ \int_gset:Nn \g__ctex_font_size_int { 2 }
\clist_gput_right:Nn \g__ctex_std_options_clist {#1}
} ,
#1 .value_forbidden:n = true ,
@@ -367,7 +368,7 @@
}
\ctex_file_input:n { ctexopts.cfg }
\ProcessKeysOptions { ctex / option }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\clist_gput_right:Nn \g__ctex_std_options_clist { 10pt }
\or:
\clist_gput_right:Nn \g__ctex_std_options_clist { 12pt }
@@ -453,7 +454,7 @@
{ \ctex_update_ccwd: }
{
\dim_set:Nn \l__ctex_tmp_dim
- { \baselinestretch \etex_glueexpr:D \f@baselineskip \scan_stop: }
+ { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: }
\skip_set:Nn \l__ctex_ccglue_skip
{ \c_zero_dim plus .08 \l__ctex_tmp_dim }
\ctex_update_ccglue:
@@ -461,9 +462,9 @@
}
{
\int_set:Nn \l__ctex_tmp_int
- { \etex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
+ { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
\tex_divide:D \l__ctex_tmp_int \ccwd
- \int_compare:nNnTF \l__ctex_tmp_int > \c_zero
+ \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int
{
\skip_set:Nn \l__ctex_ccglue_skip
{
@@ -507,15 +508,15 @@
\dim_sub:Nn \l__ctex_tmp_dim { \l__ctex_tmp_int \ccwd }
\dim_compare:nNnF \parindent = \c_zero_dim
{
- \int_compare:nNnF \l__ctex_tmp_int < \c_three
- { \int_sub:Nn \l__ctex_tmp_int { \c_two } }
+ \int_compare:nNnF \l__ctex_tmp_int < 3
+ { \int_sub:Nn \l__ctex_tmp_int { 2 } }
}
\skip_set:Nn \l__ctex_ccglue_skip
{
\l__ctex_ziju_dim
plus \dim_eval:n { \l__ctex_tmp_dim / \l__ctex_tmp_int }
minus \dim_min:nn { \dim_abs:n { \l__ctex_ziju_dim } }
- { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + \c_one ) }
+ { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + 1 ) }
}
}
{ \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } }
@@ -677,7 +678,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -778,9 +779,8 @@
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
- \ifnum \c@secnumdepth >-2\relax \ifodd \CTEX@part@numbering
- \CTEX@partname \CTEX@part@aftername
- \fi \fi
+ \CTEX@hangindent{part}%
+ {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}%
\CTEX@part@titleformat{#2}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -789,6 +789,7 @@
\CTEX@makeanchor@spart{part*}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
+ \CTEX@hangindent{part}{}%
\CTEX@part@titleformat{#1}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -858,10 +859,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
- \CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}%
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
+ \CTEX@hangindent{chapter}%
+ {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}%
\CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
@@ -873,10 +874,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
- \CTEX@chapter@titleformat{#1}
+ \CTEX@hangindent{chapter}{}%
+ \CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
\CTEX@setheadingskip \CTEX@chapter@afterskip
@@ -981,6 +982,21 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected:Npn \CTEX@hangindent #1#2
+ {
+ \bool_if:cTF { CTEX@#1@hang }
+ { \@hangfrom }
+ { \noindent \use:n }
+ { \__ctex_indent_aux:n {#1} #2 }
+ }
+\cs_new_protected:Npn \__ctex_indent_aux:n #1
+ {
+ \group_begin:
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } }
+ \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
+ { \skip_horizontal:N \l__ctex_heading_skip }
+ \group_end:
+ }
\cs_new_protected_nopar:Npn \CTEX@hangfrom
{
\bool_if:NTF \CTEX@hang
@@ -990,11 +1006,11 @@
\cs_new_protected_nopar:Npn \CTEX@update@sectionformat@n #1
{
\cs_set_eq:Nc \CTEX@titleformat@n { CTEX@#1@titleformat }
- \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
- \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
- \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
- \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
- \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
+ \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
+ \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
+ \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
+ \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
+ \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
}
\cs_new_eq:NN \CTEX@titleformat@n \use:n
\cs_new_eq:NN \CTEX@aftertitle \prg_do_nothing:
@@ -1245,7 +1261,7 @@
\dim_set:Nn \@tempdima
{
\dim_max:nn { \@tempdima }
- { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / \c_two }
+ { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / 2 }
}
}
\group_begin:
@@ -1346,7 +1362,7 @@
\prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
{
{ \dim_to_decimal:n {#2} }
- { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+ { \dim_to_decimal:n { (#2) * 6 / 5 } }
}
}
\seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -1414,7 +1430,7 @@
}
\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
{ \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\ctex_file_input:n { ctex-c5size.clo }
\or:
\ctex_file_input:n { ctex-cs4size.clo }
@@ -1476,7 +1492,7 @@
{
\ctex_if_preamble:TF
{
- \str_if_eq_x:nnTF {#1} { none }
+ \str_if_eq:eeTF {#1} { none }
{ \msg_warning:nnn { ctex } { invalid-value } {#1} }
{
\str_if_eq:onTF { \g__ctex_fontset_tl } { none }
@@ -1552,6 +1568,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
index e57d260855a..0036391d0ff 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `ctexcap')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\clist_new:N \l__ctex_ctexcap_options_clist
\clist_set:Nx \l__ctex_ctexcap_options_clist
{ \exp_not:v { opt@ \@currname . \@currext } , heading }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
index 883368b1e33..67c125554e9 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `style,ctexheading')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
@@ -69,13 +69,14 @@
{ }
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
-\cs_new_eq:NN \g__ctex_section_depth_flag \c_two
+\int_new:N \g__ctex_section_depth_int
+\int_gset:Nn \g__ctex_section_depth_int { 2 }
\keys_define:nn { ctex / option }
{
sub3section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_three } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 3 } } ,
sub4section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_four } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 4 } } ,
sub3section .value_forbidden:n = true ,
sub4section .value_forbidden:n = true ,
scheme .tl_set:N = \l__ctex_scheme_tl ,
@@ -158,6 +159,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
index dc9ccbc8450..814b5eb4a23 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `ctexhook')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\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
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
index e13eb5a56f7..ee308aaaa09 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `ctexpatch')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\cs_if_exist:NF \str_new:N { \RequirePackage { l3str } }
\cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
{
@@ -94,7 +94,7 @@
{
\group_end:
\__ctex_parse_name:nNNNnN
- { \token_get_replacement_spec:N ##2 }
+ { \cs_replacement_spec:N ##2 }
\exp_not:N ##2
\exp_not:c { ##3 ~ }
\exp_not:c { #1##3 }
@@ -112,11 +112,11 @@
{ \x@protect ##2 \protect ##3 } { }
}
{
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \exp_not:n { #1@protected@ ##3 #1##3 } }
{
\exp_last_unbraced:Nf \__ctex_parse_name:w
- \token_get_replacement_spec:N ##3 #3 ~ #2 \q_stop
+ \cs_replacement_spec:N ##3 #3 ~ #2 \q_stop
}
{ #1##5 ~ } { ##5 ~ }
}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
index 551bd64196c..4408972c5f0 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `class,report')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -99,7 +99,8 @@
{ }
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
-\cs_new_eq:NN \g__ctex_section_depth_flag \c_two
+\int_new:N \g__ctex_section_depth_int
+\int_gset:Nn \g__ctex_section_depth_int { 2 }
\msg_new:nnnn { ctex } { package-too-old }
{ Support~package~`#1'~too~old. }
{
@@ -121,7 +122,7 @@
\cs_new:Npn \ctex_default_pt:n #1
{
\exp_after:wN \__ctex_default_pt:w
- \dim_use:N \etex_dimexpr:D #1 pt \scan_stop: \q_stop
+ \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop
}
\use:x
{
@@ -148,15 +149,15 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
zihao .value_required:n = true ,
- zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
- zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
- zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+ zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+ zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
c5size .code:n =
{
\msg_warning:nnn { ctex } { deprecated-option }
@@ -296,9 +297,9 @@
nospace .value_forbidden:n = true ,
heading .bool_set:N = \l__ctex_heading_bool ,
sub3section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_three } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 3 } } ,
sub4section .code:n =
- { \cs_gset_eq:NN \g__ctex_section_depth_flag \c_four } ,
+ { \int_gset:Nn \g__ctex_section_depth_int { 4 } } ,
sub3section .value_forbidden:n = true ,
sub4section .value_forbidden:n = true ,
scheme .tl_set:N = \l__ctex_scheme_tl ,
@@ -352,7 +353,7 @@
{
#1 .code:n =
{
- \cs_gset_eq:NN \g__ctex_font_size_flag \c_two
+ \int_gset:Nn \g__ctex_font_size_int { 2 }
\clist_gput_right:Nn \g__ctex_std_options_clist {#1}
} ,
#1 .value_forbidden:n = true ,
@@ -367,7 +368,7 @@
}
\ctex_file_input:n { ctexopts.cfg }
\ProcessKeysOptions { ctex / option }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\clist_gput_right:Nn \g__ctex_std_options_clist { 10pt }
\or:
\clist_gput_right:Nn \g__ctex_std_options_clist { 12pt }
@@ -453,7 +454,7 @@
{ \ctex_update_ccwd: }
{
\dim_set:Nn \l__ctex_tmp_dim
- { \baselinestretch \etex_glueexpr:D \f@baselineskip \scan_stop: }
+ { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: }
\skip_set:Nn \l__ctex_ccglue_skip
{ \c_zero_dim plus .08 \l__ctex_tmp_dim }
\ctex_update_ccglue:
@@ -461,9 +462,9 @@
}
{
\int_set:Nn \l__ctex_tmp_int
- { \etex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
+ { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: }
\tex_divide:D \l__ctex_tmp_int \ccwd
- \int_compare:nNnTF \l__ctex_tmp_int > \c_zero
+ \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int
{
\skip_set:Nn \l__ctex_ccglue_skip
{
@@ -507,15 +508,15 @@
\dim_sub:Nn \l__ctex_tmp_dim { \l__ctex_tmp_int \ccwd }
\dim_compare:nNnF \parindent = \c_zero_dim
{
- \int_compare:nNnF \l__ctex_tmp_int < \c_three
- { \int_sub:Nn \l__ctex_tmp_int { \c_two } }
+ \int_compare:nNnF \l__ctex_tmp_int < 3
+ { \int_sub:Nn \l__ctex_tmp_int { 2 } }
}
\skip_set:Nn \l__ctex_ccglue_skip
{
\l__ctex_ziju_dim
plus \dim_eval:n { \l__ctex_tmp_dim / \l__ctex_tmp_int }
minus \dim_min:nn { \dim_abs:n { \l__ctex_ziju_dim } }
- { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + \c_one ) }
+ { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + 1 ) }
}
}
{ \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } }
@@ -677,7 +678,7 @@
{ \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } }
}
\NewDocumentCommand \ctex_assign_heading_name:nn
- { m > { \SplitArgument { \c_one } { , } } +m }
+ { m > { \SplitArgument { 1 } { , } } +m }
{ \__ctex_assign_heading_name:nnn {#1} #2 }
\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3
{
@@ -778,9 +779,8 @@
\partmark{#1}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
- \ifnum \c@secnumdepth >-2\relax \ifodd \CTEX@part@numbering
- \CTEX@partname \CTEX@part@aftername
- \fi \fi
+ \CTEX@hangindent{part}%
+ {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}%
\CTEX@part@titleformat{#2}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -789,6 +789,7 @@
\CTEX@makeanchor@spart{part*}%
{\interlinepenalty \@M
\normalfont \CTEX@part@format
+ \CTEX@hangindent{part}{}%
\CTEX@part@titleformat{#1}%
\CTEX@part@aftertitle}%
\@endpart}
@@ -853,10 +854,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
- \CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}%
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
+ \CTEX@hangindent{chapter}%
+ {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}%
\CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
@@ -868,10 +869,10 @@
\CTEX@setheadingskip \CTEX@chapter@beforeskip
\ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi
\vspace*{\CTEX@headingskip}%
- {\normalfont \parindent \dimexpr \CTEX@chapter@indent \relax
- \CTEX@chapter@format
+ {\normalfont \CTEX@chapter@format
\interlinepenalty\@M
- \CTEX@chapter@titleformat{#1}
+ \CTEX@hangindent{chapter}{}%
+ \CTEX@chapter@titleformat{#1}%
\CTEX@chapter@aftertitle
\nobreak
\CTEX@setheadingskip \CTEX@chapter@afterskip
@@ -976,6 +977,21 @@
\fi}%
\fi
\ignorespaces}
+\cs_new_protected:Npn \CTEX@hangindent #1#2
+ {
+ \bool_if:cTF { CTEX@#1@hang }
+ { \@hangfrom }
+ { \noindent \use:n }
+ { \__ctex_indent_aux:n {#1} #2 }
+ }
+\cs_new_protected:Npn \__ctex_indent_aux:n #1
+ {
+ \group_begin:
+ \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } }
+ \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim
+ { \skip_horizontal:N \l__ctex_heading_skip }
+ \group_end:
+ }
\cs_new_protected_nopar:Npn \CTEX@hangfrom
{
\bool_if:NTF \CTEX@hang
@@ -985,11 +1001,11 @@
\cs_new_protected_nopar:Npn \CTEX@update@sectionformat@n #1
{
\cs_set_eq:Nc \CTEX@titleformat@n { CTEX@#1@titleformat }
- \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
- \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
- \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
- \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
- \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
+ \cs_set_eq:Nc \CTEX@aftertitle { CTEX@#1@aftertitle }
+ \cs_set_eq:Nc \CTEX@afterindent { CTEX@#1@afterindent }
+ \cs_set_eq:Nc \CTEX@fixskip { CTEX@#1@fixskip }
+ \cs_set_eq:Nc \CTEX@hang { CTEX@#1@hang }
+ \cs_set_eq:Nc \CTEX@runin { CTEX@#1@runin }
}
\cs_new_eq:NN \CTEX@titleformat@n \use:n
\cs_new_eq:NN \CTEX@aftertitle \prg_do_nothing:
@@ -1240,7 +1256,7 @@
\dim_set:Nn \@tempdima
{
\dim_max:nn { \@tempdima }
- { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / \c_two }
+ { \box_wd:N \l__ctex_tmp_box + \f@size \p@ / 2 }
}
}
\group_begin:
@@ -1341,7 +1357,7 @@
\prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
{
{ \dim_to_decimal:n {#2} }
- { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+ { \dim_to_decimal:n { (#2) * 6 / 5 } }
}
}
\seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -1409,7 +1425,7 @@
}
\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
{ \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\ctex_file_input:n { ctex-c5size.clo }
\or:
\ctex_file_input:n { ctex-cs4size.clo }
@@ -1471,7 +1487,7 @@
{
\ctex_if_preamble:TF
{
- \str_if_eq_x:nnTF {#1} { none }
+ \str_if_eq:eeTF {#1} { none }
{ \msg_warning:nnn { ctex } { invalid-value } {#1} }
{
\str_if_eq:onTF { \g__ctex_fontset_tl } { none }
@@ -1547,6 +1563,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
index f4193842bab..469bd91da9a 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `style,ctexsize')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,20 +28,20 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
zihao .value_required:n = true ,
- zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
- zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
- zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+ zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+ zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
}
\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
@@ -53,7 +53,7 @@
\tl_put_right:Nn \l__ctex_tmp_tl
{
#1 .code:n =
- { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+ { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
#1 .value_forbidden:n = true ,
}
}
@@ -84,7 +84,7 @@
\prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
{
{ \dim_to_decimal:n {#2} }
- { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+ { \dim_to_decimal:n { (#2) * 6 / 5 } }
}
}
\seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -152,7 +152,7 @@
}
\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
{ \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
\ctex_file_input:n { ctex-c5size.clo }
\or:
\ctex_file_input:n { ctex-cs4size.clo }
@@ -204,6 +204,12 @@
%% 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,
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
index 9f8064ae692..787f928e276 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
@@ -7,7 +7,7 @@
%% ctex.dtx (with options: `ctexspa')
%% ctexpunct.spa
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,7 +28,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2018/05/01 v2.4.14 Space info for CJKpunct (CTEX)]
+ [2019/04/07 v2.4.15 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,,,}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
index e76cddd4513..9622d13580c 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `ctxdoc')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{ctex documentation (CTEX)}
\ProvidesExplClass{ctxdoc}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\ExplSyntaxOff
\let\pdfmdfivesum\mdfivesum
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
@@ -62,7 +62,7 @@
\RequirePackage{unicode-math}
\RequirePackage{xcolor}
\RequirePackage{caption}
-\RequirePackage{fvrb-ex}
+\RequirePackage{fancyvrb-ex}
\RequirePackage{zref-base}
\geometry{includemp,hmargin={0mm,15mm},vmargin={25mm,15mm},footskip=7mm}
\hypersetup{pdfstartview=FitH,bookmarksdepth=subparagraph}
@@ -220,8 +220,8 @@
{ \iow_term:n { *** ~ FAIL ~ *** } }
\ctex_patch_cmd_once:NnnnTF \__codedoc_macro_dump:
{ }
- { \hbox_unpack_clear:N }
- { \MacroFont \hbox_unpack_clear:N }
+ { \hbox_unpack_drop:N }
+ { \MacroFont \hbox_unpack_drop:N }
{ \iow_term:n { *** ~ SUCCESS ~ *** } }
{ \iow_term:n { *** ~ FAIL ~ *** } }
\cs_set_eq:NN \__codedoc_macro_end_style:n \use_none:n
@@ -230,7 +230,7 @@
\vbox_set:Nn \l__codedoc_macro_box
{
\MacroFont
- \vbox_unpack_clear:N \l__codedoc_macro_box
+ \vbox_unpack_drop:N \l__codedoc_macro_box
\hbox_set:Nn \l_tmpa_box
{ \__codedoc_print_macroname:nN {#1} #2 }
\dim_set:Nn \l_tmpa_dim { \marginparwidth - \labelsep }
@@ -293,16 +293,12 @@
\DeclareDocumentCommand \GetFileId { m }
{
\GetFileInfo {#1}
- \ior_open:NnTF \g__ctxdoc_id_ior { \c_sys_jobname_str .id }
- {
- \ior_get:NN \g__ctxdoc_id_ior \l__ctxdoc_tmp_tl
- \ior_close:N \g__ctxdoc_id_ior
- \exp_after:wN \GetIdInfo \l__ctxdoc_tmp_tl
- }
+ \file_get:nnNTF { \c_sys_jobname_str .id }
+ { \int_set:Nn \tex_endlinechar:D { -1 } } \l__ctxdoc_tmp_tl
+ { \exp_after:wN \GetIdInfo \l__ctxdoc_tmp_tl }
{ \GetIdInfo $Id$ }
{ \fileinfo }
}
-\ior_new:N \g__ctxdoc_id_ior
\cs_new_eq:NN \__ctxdoc_ltx_changes:nnn \changes@
\cs_set_protected:Npn \changes@ #1#2
{
@@ -324,10 +320,10 @@
\int_zero:N \l_tmpa_int
\seq_set_split:Nnn \l_tmpa_seq { . } {#1}
\seq_map_function:NN \l_tmpa_seq \__ctxdoc_version_zfill:n
- \int_compare:nNnF \l_tmpa_int > \c_two
+ \int_compare:nNnF \l_tmpa_int > 2
{
\tl_put_right:Nx \l__ctxdoc_tmp_tl
- { \prg_replicate:nn { \c_three - \l_tmpa_int } { 00000 } }
+ { \prg_replicate:nn { 3 - \l_tmpa_int } { 00000 } }
}
\__ctxdoc_ltx_changes:nnn { \l__ctxdoc_tmp_tl \actualchar #2 }
}
@@ -490,7 +486,7 @@
\tl_new:N \g__ctxdoc_verbatim_verb_stop_tl
\cs_new_protected_nopar:Npn \__ctxdoc_process_normal_line:
{
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \str_head:N \l__ctxdoc_verbatim_line_tl } { \c_percent_str }
{ \__ctxdoc_check_angle:x { \tl_tail:N \l__ctxdoc_verbatim_line_tl } }
{ \__ctxdoc_output_line: }
@@ -517,7 +513,7 @@
{ \cs_set_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_output_line: }
\cs_new_protected:Npn \__ctxdoc_check_angle:n #1
{
- \str_if_eq_x:nnTF { \str_head:n {#1} } { < }
+ \str_if_eq:eeTF { \str_head:n {#1} } { < }
{ \__ctxdoc_check_module:x { \tl_tail:n {#1} } }
{ \__ctxdoc_output_percent_line: }
}
@@ -614,7 +610,7 @@
\tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \c__ctxdoc_active_cr_tl
{ \tl_use:N \l__ctxdoc_verbatim_line_tl }
{
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \str_head:N \l__ctxdoc_verbatim_line_tl }
{ \c_percent_str }
{ \__ctxdoc_output_percent_line: }
@@ -627,7 +623,7 @@
\group_begin:
\color { code@gray }
\__ctxdoc_swap_cr:
- \str_if_eq_x:nnTF { \f@shape } { \updefault }
+ \str_if_eq:eeTF { \f@shape } { \updefault }
{ \slshape }
{ \upshape }
\__ctxdoc_output_line:
diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
index 072cc570d72..eb6d9ea49e1 100644
--- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
+++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `dict,theorem,GBK')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2018/05/01 v2.4.14 Chinese translation for theorem name (CTEX)]
+ [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{ÆÀÂÛ}
\providetranslation{comments}{ÆÀÂÛ}
\providetranslation{Comment}{ÆÀÂÛ}
diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
index 0ee03f451a8..dfc9d9c8c05 100644
--- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
+++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `dict,theorem,UTF8')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2018/05/01 v2.4.14 Chinese translation for theorem name (CTEX)]
+ [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{评论}
\providetranslation{comments}{评论}
\providetranslation{Comment}{评论}
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
index 792efb9a6cb..58a354885a6 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `aptex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -37,32 +37,43 @@
{ \AtBeginShipoutFirst {#1} }
}
\@onlypreamble \ctex_set_zhmap:n
-\tl_set:Nn \CJKrmdefault { rm }
-\tl_set:Nn \CJKsfdefault { sf }
-\tl_set:Nn \CJKttdefault { tt }
+\tl_set:Nn \CJKrmdefault { zhrm }
+\tl_set:Nn \CJKsfdefault { zhsf }
+\tl_set:Nn \CJKttdefault { zhtt }
\tl_set:Nn \CJKfamilydefault { \CJKrmdefault }
-\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKrmdefault } }
- { }
- { \ctex_patch_failure:N \rmfamily }
-\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKsfdefault } }
- { }
- { \ctex_patch_failure:N \sffamily }
-\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKttdefault } }
- { }
- { \ctex_patch_failure:N \ttfamily }
-\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
- { \kanjifamily { \CJKfamilydefault } }
- { \cs_set_eq:NN \reset@font \normalfont }
- { \ctex_patch_failure:N \normalfont }
+\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
+\RenewDocumentCommand \rmfamily { }
+ {
+ \not@math@alphabet \rmfamily \mathrm
+ \romanfamily \rmdefault
+ \kanjifamily \CJKrmdefault
+ \selectfont
+ }
+\RenewDocumentCommand \sffamily { }
+ {
+ \not@math@alphabet \sffamily \mathsf
+ \romanfamily \sfdefault
+ \kanjifamily \CJKsfdefault
+ \selectfont
+ }
+\RenewDocumentCommand \ttfamily { }
+ {
+ \not@math@alphabet \ttfamily \mathtt
+ \romanfamily \ttdefault
+ \kanjifamily \CJKttdefault
+ \selectfont
+ }
\NewDocumentCommand \CJKfamily { m }
{
- \kanjifamily { #1 }
+ \kanjifamily {#1}
\selectfont
}
-\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
+\DeclareErrorKanjiFont{JY2}{zhrm}{m}{n}{10}
+\DeclareKanjiSubstitution{JY2}{zhrm}{m}{n}
+\DeclareKanjiSubstitution{JT2}{zhrm}{m}{n}
+\DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n}
+\SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n}
+\jfam \symmincho
\ctex_at_end_preamble:n { \ctex_update_default_family: }
\normalfont
\ctex_patch_cmd_once:NnnnTF \em
@@ -164,14 +175,14 @@
\cs_new_eq:NN \CTEXfilltwosides \use_none:n
\cs_new_eq:NN \endCTEXfilltwosides \prg_do_nothing:
\cs_new_protected_nopar:Npn \ctex_update_ccwd:
- { \skip_set:Nn \ccwd { 1zw + \ptex_kanjiskip:D } }
+ { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } }
\dim_new:N \ccwd
\cs_new_protected_nopar:Npn \ctex_update_ccglue:
- { \skip_set_eq:NN \ptex_kanjiskip:D \l__ctex_ccglue_skip }
+ { \skip_set_eq:NN \tex_kanjiskip:D \l__ctex_ccglue_skip }
\skip_new:N \l__ctex_ccglue_skip
\prg_new_conditional:Npnn \ctex_if_ccglue_touched: { TF }
{
- \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \ptex_kanjiskip:D }
+ \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \tex_kanjiskip:D }
{ \prg_return_false: } { \prg_return_true: }
}
\cs_new_protected_nopar:Npn \ctex_update_em_unit:
@@ -208,10 +219,10 @@
\cs_new_protected_nopar:Npn \ctex_update_xkanjiskip:
{
\skip_if_eq:nnT
- { \ptex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip }
+ { \tex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip }
{
\skip_set:Nn \l__ctex_xkanjiskip_skip { \l__ctex_xkanjiskip_tl }
- \skip_set_eq:NN \ptex_xkanjiskip:D \l__ctex_xkanjiskip_skip
+ \skip_set_eq:NN \tex_xkanjiskip:D \l__ctex_xkanjiskip_skip
}
}
\tl_new:N \l__ctex_xkanjiskip_tl
@@ -219,7 +230,7 @@
{ .25zw plus 1pt minus 1pt }
\skip_new:N \l__ctex_xkanjiskip_skip
\skip_set:Nn \l__ctex_xkanjiskip_skip
- { \ptex_xkanjiskip:D }
+ { \tex_xkanjiskip:D }
\ctex_add_to_selectfont:n { \ctex_update_xkanjiskip: }
\keys_define:nn { ctex }
{
@@ -236,24 +247,6 @@
punct .default:n = { quanjiao } ,
}
\tl_set:Nn \l__ctex_encoding_tl { UTF8 }
-\DeclareKanjiFamily{JY2}{rm}{}
-\DeclareKanjiFamily{JY2}{sf}{}
-\DeclareKanjiFamily{JY2}{tt}{}
-\DeclareKanjiFamily{JT2}{rm}{}
-\DeclareKanjiFamily{JT2}{sf}{}
-\DeclareKanjiFamily{JT2}{tt}{}
-\DeclareFontShape{JY2}{rm}{m}{n}{<-> upzhserif-h}{}
-\DeclareFontShape{JY2}{rm}{m}{it}{<-> upzhserifit-h}{}
-\DeclareFontShape{JY2}{rm}{bx}{n}{<-> upzhserifb-h}{}
-\DeclareFontShape{JT2}{rm}{m}{n}{<-> upzhserif-v}{}
-\DeclareFontShape{JT2}{rm}{m}{it}{<-> upzhserifit-v}{}
-\DeclareFontShape{JT2}{rm}{bx}{n}{<-> upzhserifb-v}{}
-\DeclareFontShape{JY2}{sf}{m}{n}{<-> upzhsans-h}{}
-\DeclareFontShape{JY2}{sf}{bx}{n}{<-> upzhsansb-h}{}
-\DeclareFontShape{JT2}{sf}{m}{n}{<-> upzhsans-v}{}
-\DeclareFontShape{JT2}{sf}{bx}{n}{<-> upzhsansb-v}{}
-\DeclareFontShape{JY2}{tt}{m}{n}{<-> upzhmono-h}{}
-\DeclareFontShape{JT2}{tt}{m}{n}{<-> upzhmono-v}{}
%%
%%
%% End of file `ctex-engine-aptex.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
index 931d4739967..bcdc2e50814 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `luatex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -81,13 +81,13 @@
\AtBeginUTFCommand
{
\group_begin:
- \lua_now_x:n { tex.globaldefs = 0 }
+ \lua_now:e { tex.globaldefs = 0 }
\ltj@allalchar
}
\AtEndUTFCommand { \group_end: }
\cs_set_protected:Npn \fontspec_visible_space:
{
- \etex_iffontchar:D \tex_font:D "2423 \exp_stop_f:
+ \tex_iffontchar:D \tex_font:D "2423 \exp_stop_f:
\ltjalchar "2423 \exp_stop_f:
\else:
\fontspec_visible_space_fallback:
@@ -155,7 +155,7 @@
}
\exp_after:wN \globaljfont \font@name \external@font \scan_stop:
\font@name
- \lua_now_x:n { font.current(tex.getattribute('ltj@curjfnt')) }
+ \lua_now:e { font.current(tex.getattribute('ltj@curjfnt')) }
\use:c { \f@encoding + \f@family }
\use:c { \curr@fontshape }
}
@@ -181,21 +181,21 @@
}
\prg_new_conditional:Npnn \ctex_ltj_if_alternate_shape_exist:n #1 { T , F , TF }
{
- \lua_now_x:n { luatexja.jfont.does_alt_set ('\lua_escape_x:n {#1}') }
+ \lua_now:e { luatexja.jfont.does_alt_set ('\lua_escape:e {#1}') }
\prg_return_true: \else: \prg_return_false: \fi:
}
\cs_new_nopar:Npn \__ctex_ltj_patch_external_font:w #1 ~ at
- { #1 \lua_now_x:n { luatexja.jfont.print_aftl_address() } ~ at }
+ { #1 \lua_now:e { luatexja.jfont.print_aftl_address() } ~ at }
\cs_new_protected_nopar:Npn \ctex_ltj_select_alternate_font:
{
\ctex_ltj_if_alternate_shape_exist:nT { \l__ctex_ltj_current_shape_tl }
{
- \lua_now_x:n
+ \lua_now:e
{
luatexja.jfont.output_alt_font_cmd
- ('y', '\lua_escape_x:n { \l__ctex_ltj_current_shape_tl }')
+ ('y', '\lua_escape:e { \l__ctex_ltj_current_shape_tl }')
}
- \lua_now_x:n { luatexja.jfont.pickup_alt_font_a ('\f@size') }
+ \lua_now:e { luatexja.jfont.pickup_alt_font_a ('\f@size') }
}
}
\tl_new:N \l__ctex_ltj_current_shape_tl
@@ -216,16 +216,16 @@
\cs_new_protected_nopar:Npn \ltj@pickup@altfont@copy #1#2
{
\ltj@@getjfontnumber #1
- \lua_now_x:n
+ \lua_now:e
{
luatexja.jfont.pickup_alt_font_b
- ( \int_use:N \ltj@tempcntc, '\lua_escape_x:n {#2}' )
+ ( \int_use:N \ltj@tempcntc, '\lua_escape:e {#2}' )
}
}
\cs_new:Npn \ctex_ltj_if_jfont:nTF #1
{
- \lua_now_x:n
- { luatexja.jfont.is_kenc( string.match('\lua_escape_x:n {#1}', '[^/]+') ) }
+ \lua_now:e
+ { luatexja.jfont.is_kenc( string.match('\lua_escape:e {#1}', '[^/]+') ) }
\ifin@ \exp_after:wN \use_i:nn \else: \exp_after:wN \use_ii:nn \fi:
}
\cs_new:Npn \ctex_ltj_if_jfont_math:NTF #1
@@ -315,7 +315,7 @@
\exp_not:N \DeclareFontSubstitution
{ \CJK@encoding } { song } { \mddefault } { \updefault }
}
-\lua_now_x:n { luatexja.jfont.add_kyenc_list('\CJK@encoding') }
+\lua_now:e { luatexja.jfont.add_kyenc_list('\CJK@encoding') }
\cs_new_protected_nopar:Npn \__ctex_ltj_change_encoding:
{ \tl_set_eq:NN \g_fontspec_encoding_tl \CJK@encoding }
\DeclareFontFamily { \CJK@encoding } { song } { }
@@ -462,7 +462,7 @@
}
\cs_new_nopar:Npn \__ctex_ltj_msg_def_family_map:n #1
{
- \str_case_x:nnF {#1}
+ \str_case_e:nnF {#1}
{
\CJKrmdefault { \token_to_str:N \setCJKmainfont }
\CJKsfdefault { \token_to_str:N \setCJKsansfont }
@@ -473,7 +473,7 @@
}
\cs_new_nopar:Npn \__ctex_ltj_msg_family_map:n #1
{
- \str_case_x:nnF {#1}
+ \str_case_e:nnF {#1}
{
\CJKrmdefault { \token_to_str:N \CJKrmdefault }
\CJKsfdefault { \token_to_str:N \CJKsfdefault }
@@ -636,7 +636,7 @@
}
\cs_new_protected_nopar:Npn \__ctex_ltj_update_family_aux:
{
- \str_case_x:nn { \f@family }
+ \str_case_e:nn { \f@family }
{
{ \rmdefault } { \CJKfamily { \CJKrmdefault } }
{ \sfdefault } { \CJKfamily { \CJKsfdefault } }
@@ -651,7 +651,7 @@
{
\ctex_ltj_family_if_exist:xNF { \CJKfamilydefault } \l__ctex_ltj_tmp_tl
{
- \str_if_eq_x:nnTF { \CJKfamilydefault } { \CJKrmdefault }
+ \str_if_eq:eeTF { \CJKfamilydefault } { \CJKrmdefault }
{ \use:n }
{
\ctex_ltj_family_if_exist:xNTF { \CJKrmdefault } \l__ctex_ltj_tmp_tl
@@ -832,10 +832,10 @@
\__ctex_ltj_save_alternate_shape:cnn
{ \__ctex_ltj_alternate_cs:n { clear / \l__ctex_ltj_base_CJKfamily_tl } }
{ luatexja.jfont.clear_alt_font_latex }
- { '\lua_escape_x:n { \CJK@encoding/#2/#3/#4 }' }
+ { '\lua_escape:e { \CJK@encoding/#2/#3/#4 }' }
}
\NewDocumentCommand \ctex_ltj_set_alternate_shape:nnn
- { m m > { \SplitArgument { \c_one } { -> } } m }
+ { m m > { \SplitArgument { 1 } { -> } } m }
{ \ctex_ltj_set_alternate_shape:nnnn {#1} {#2} #3 }
\cs_new_protected_nopar:Npn \ctex_ltj_set_alternate_shape:nnnn #1#2#3#4
{
@@ -847,13 +847,13 @@
\int_eval:n { \tl_if_blank:nTF {#3} { "80 } {#3} } ,
\int_eval:n { \tl_if_blank:nTF {#4} { "10FFFF } {#4} } ,
}
- '\lua_escape_x:n { \CJK@encoding/#2 }' ,
- '\lua_escape_x:n { \CJK@encoding/#1 }'
+ '\lua_escape:e { \CJK@encoding/#2 }' ,
+ '\lua_escape:e { \CJK@encoding/#1 }'
}
}
\cs_new_protected_nopar:Npn \ctex_ltj_set_alternate_shape:n #1
{
- \lua_now_x:n { luatexja.jfont.set_alt_font_latex ( #1 ) }
+ \lua_now:e { luatexja.jfont.set_alt_font_latex ( #1 ) }
\__ctex_ltj_save_alternate_shape:cnn
{ \__ctex_ltj_alternate_cs:n { reset / \l__ctex_ltj_base_CJKfamily_tl } }
{ luatexja.jfont.set_alt_font_latex } {#1}
@@ -865,8 +865,8 @@
\ctex_ltj_set_alternate_shape:n
{
##1 ,
- '\lua_escape_x:n { \CJK@encoding/#2 }' ,
- '\lua_escape_x:n { \CJK@encoding/#1 }'
+ '\lua_escape:e { \CJK@encoding/#2 }' ,
+ '\lua_escape:e { \CJK@encoding/#1 }'
}
}
}
@@ -875,9 +875,9 @@
\group_begin:
\cs_if_exist:NF #1 { \cs_set_eq:NN #1 \prg_do_nothing: }
\cs_set_eq:NN \l__ctex_ltj_base_family_tl \scan_stop:
- \cs_set_eq:NN \lua_escape_x:n \scan_stop:
+ \cs_set_eq:NN \lua_escape:e \scan_stop:
\cs_gset_protected_nopar:Npx #1
- { \exp_not:o {#1} \exp_not:N \lua_now_x:n { #2 ( #3 ) } }
+ { \exp_not:o {#1} \exp_not:N \lua_now:e { #2 ( #3 ) } }
\group_end:
}
\cs_generate_variant:Nn \__ctex_ltj_save_alternate_shape:Nnn { c }
@@ -940,7 +940,7 @@
\tl_new:N \l__ctex_ltj_char_range_tl
\prop_new:N \g__ctex_ltj_char_range_prop
\NewDocumentCommand \ctex_ltj_save_char_range:n
- { > { \SplitArgument { \c_one } { -> } } m }
+ { > { \SplitArgument { 1 } { -> } } m }
{ \ctex_ltj_save_char_range:nn #1 }
\cs_new_protected_nopar:Npn \ctex_ltj_save_char_range:nn #1#2
{
@@ -1035,7 +1035,7 @@
{
\tl_gset:Nx \g__ctex_fontset_tl
{
- \lua_now_x:n
+ \lua_now:e
{
if ~ os.name == 'windows' then ~
tex.sprint ( 'windows' )
@@ -1127,7 +1127,7 @@
\newluafunction \g__ctex_kanjisize_func
\group_begin:
\char_set_catcode_space:n { 32 }
-\lua_now_x:n
+\lua_now:e
{
local nulltable = { }
local t = lua.get_functions_table()
@@ -1145,7 +1145,7 @@
}
\group_end:
\cs_new_protected_nopar:Npn \ctex_update_kanjisize:
- { \luatex_luafunction:D \g__ctex_kanjisize_func }
+ { \tex_luafunction:D \g__ctex_kanjisize_func }
\ctex_add_to_selectfont:n { \ctex_update_kanjisize: }
\keys_define:nn { ctex }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
index 83bbd3cc2a1..8e2dd5f65c6 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `pdftex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -63,11 +63,11 @@
\cs_new_protected_nopar:Npn \__ctex_save_cmap:Nn #1#2
{
\tl_set:Nx \l__ctex_tmp_tl { \str_lower_case:n {#2} \CJK@plane }
- \tex_immediate:D \pdftex_pdfobj:D stream ~ file { \l__ctex_tmp_tl .cmap }
+ \tex_immediate:D \tex_pdfobj:D stream ~ file { \l__ctex_tmp_tl .cmap }
\cs_new_protected_nopar:Npx #1
{
- \exp_not:N \pdftex_pdffontattr:D \exp_not:N \tex_font:D
- { /ToUnicode ~ \int_use:N \pdftex_pdflastobj:D \c_space_tl 0 ~ R }
+ \exp_not:N \tex_pdffontattr:D \exp_not:N \tex_font:D
+ { /ToUnicode ~ \int_use:N \tex_pdflastobj:D \c_space_tl 0 ~ R }
}
}
\group_begin:
@@ -157,16 +157,16 @@
\tl_set:Nx \l__ctex_tmp_tl {#2}
\int_set:Nn \l__ctex_tmp_int
{ \exp_args:No \int_from_hex:n { \l__ctex_tmp_tl } }
- \int_compare:nNnTF \l__ctex_tmp_int < \c_two_hundred_fifty_six
+ \int_compare:nNnTF \l__ctex_tmp_int < { 256 }
{ \tl_gset:Nx #1 { \int_to_Hex:n { \l__ctex_tmp_int } } }
{
- \int_sub:Nn \l__ctex_tmp_int { \c_two_hundred_fifty_six }
+ \int_sub:Nn \l__ctex_tmp_int { 256 }
\tl_gset:Nx #1
{
\int_to_Hex:n
- { \int_div_truncate:nn { \l__ctex_tmp_int } { \c_four } + "D800 }
+ { \int_div_truncate:nn { \l__ctex_tmp_int } { 4 } + "D800 }
\int_to_Hex:n
- { \int_mod:nn { \l__ctex_tmp_int } { \c_four } + "DC }
+ { \int_mod:nn { \l__ctex_tmp_int } { 4 } + "DC }
}
}
}
@@ -174,7 +174,7 @@
\fi:
\AtBeginDocument
{
- \str_if_eq_x:nnF { \l__ctex_punct_tl } { quanjiao }
+ \str_if_eq:eeF { \l__ctex_punct_tl } { quanjiao }
{ \punctstyle { \l__ctex_punct_tl } }
}
\ctex_at_end_preamble:n { \ctex_update_default_family: }
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
index 21f4ff1d648..45203929a3c 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `uptex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -37,32 +37,43 @@
{ \AtBeginShipoutFirst {#1} }
}
\@onlypreamble \ctex_set_zhmap:n
-\tl_set:Nn \CJKrmdefault { rm }
-\tl_set:Nn \CJKsfdefault { sf }
-\tl_set:Nn \CJKttdefault { tt }
+\tl_set:Nn \CJKrmdefault { zhrm }
+\tl_set:Nn \CJKsfdefault { zhsf }
+\tl_set:Nn \CJKttdefault { zhtt }
\tl_set:Nn \CJKfamilydefault { \CJKrmdefault }
-\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKrmdefault } }
- { }
- { \ctex_patch_failure:N \rmfamily }
-\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKsfdefault } }
- { }
- { \ctex_patch_failure:N \sffamily }
-\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKttdefault } }
- { }
- { \ctex_patch_failure:N \ttfamily }
-\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
- { \kanjifamily { \CJKfamilydefault } }
- { \cs_set_eq:NN \reset@font \normalfont }
- { \ctex_patch_failure:N \normalfont }
+\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
+\RenewDocumentCommand \rmfamily { }
+ {
+ \not@math@alphabet \rmfamily \mathrm
+ \romanfamily \rmdefault
+ \kanjifamily \CJKrmdefault
+ \selectfont
+ }
+\RenewDocumentCommand \sffamily { }
+ {
+ \not@math@alphabet \sffamily \mathsf
+ \romanfamily \sfdefault
+ \kanjifamily \CJKsfdefault
+ \selectfont
+ }
+\RenewDocumentCommand \ttfamily { }
+ {
+ \not@math@alphabet \ttfamily \mathtt
+ \romanfamily \ttdefault
+ \kanjifamily \CJKttdefault
+ \selectfont
+ }
\NewDocumentCommand \CJKfamily { m }
{
- \kanjifamily { #1 }
+ \kanjifamily {#1}
\selectfont
}
-\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
+\DeclareErrorKanjiFont{JY2}{zhrm}{m}{n}{10}
+\DeclareKanjiSubstitution{JY2}{zhrm}{m}{n}
+\DeclareKanjiSubstitution{JT2}{zhrm}{m}{n}
+\DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n}
+\SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n}
+\jfam \symmincho
\ctex_at_end_preamble:n { \ctex_update_default_family: }
\normalfont
\ctex_patch_cmd_once:NnnnTF \em
@@ -174,14 +185,14 @@
\cs_new_eq:NN \CTEXfilltwosides \use_none:n
\cs_new_eq:NN \endCTEXfilltwosides \prg_do_nothing:
\cs_new_protected_nopar:Npn \ctex_update_ccwd:
- { \skip_set:Nn \ccwd { 1zw + \ptex_kanjiskip:D } }
+ { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } }
\dim_new:N \ccwd
\cs_new_protected_nopar:Npn \ctex_update_ccglue:
- { \skip_set_eq:NN \ptex_kanjiskip:D \l__ctex_ccglue_skip }
+ { \skip_set_eq:NN \tex_kanjiskip:D \l__ctex_ccglue_skip }
\skip_new:N \l__ctex_ccglue_skip
\prg_new_conditional:Npnn \ctex_if_ccglue_touched: { TF }
{
- \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \ptex_kanjiskip:D }
+ \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \tex_kanjiskip:D }
{ \prg_return_false: } { \prg_return_true: }
}
\cs_new_protected_nopar:Npn \ctex_update_em_unit:
@@ -218,10 +229,10 @@
\cs_new_protected_nopar:Npn \ctex_update_xkanjiskip:
{
\skip_if_eq:nnT
- { \ptex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip }
+ { \tex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip }
{
\skip_set:Nn \l__ctex_xkanjiskip_skip { \l__ctex_xkanjiskip_tl }
- \skip_set_eq:NN \ptex_xkanjiskip:D \l__ctex_xkanjiskip_skip
+ \skip_set_eq:NN \tex_xkanjiskip:D \l__ctex_xkanjiskip_skip
}
}
\tl_new:N \l__ctex_xkanjiskip_tl
@@ -229,7 +240,7 @@
{ .25zw plus 1pt minus 1pt }
\skip_new:N \l__ctex_xkanjiskip_skip
\skip_set:Nn \l__ctex_xkanjiskip_skip
- { \ptex_xkanjiskip:D }
+ { \tex_xkanjiskip:D }
\ctex_add_to_selectfont:n { \ctex_update_xkanjiskip: }
\keys_define:nn { ctex }
{
@@ -246,24 +257,6 @@
punct .default:n = { quanjiao } ,
}
\tl_set:Nn \l__ctex_encoding_tl { UTF8 }
-\DeclareKanjiFamily{JY2}{rm}{}
-\DeclareKanjiFamily{JY2}{sf}{}
-\DeclareKanjiFamily{JY2}{tt}{}
-\DeclareKanjiFamily{JT2}{rm}{}
-\DeclareKanjiFamily{JT2}{sf}{}
-\DeclareKanjiFamily{JT2}{tt}{}
-\DeclareFontShape{JY2}{rm}{m}{n}{<-> upzhserif-h}{}
-\DeclareFontShape{JY2}{rm}{m}{it}{<-> upzhserifit-h}{}
-\DeclareFontShape{JY2}{rm}{bx}{n}{<-> upzhserifb-h}{}
-\DeclareFontShape{JT2}{rm}{m}{n}{<-> upzhserif-v}{}
-\DeclareFontShape{JT2}{rm}{m}{it}{<-> upzhserifit-v}{}
-\DeclareFontShape{JT2}{rm}{bx}{n}{<-> upzhserifb-v}{}
-\DeclareFontShape{JY2}{sf}{m}{n}{<-> upzhsans-h}{}
-\DeclareFontShape{JY2}{sf}{bx}{n}{<-> upzhsansb-h}{}
-\DeclareFontShape{JT2}{sf}{m}{n}{<-> upzhsans-v}{}
-\DeclareFontShape{JT2}{sf}{bx}{n}{<-> upzhsansb-v}{}
-\DeclareFontShape{JY2}{tt}{m}{n}{<-> upzhmono-h}{}
-\DeclareFontShape{JT2}{tt}{m}{n}{<-> upzhmono-v}{}
%%
%%
%% End of file `ctex-engine-uptex.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
index 977282b3f70..e5dd620e88b 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `xetex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
index 7a4433f78d5..10a8c8487b1 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% ctex.dtx (with options: `rm,c19')
+%% ctex.dtx (with options: `fd,rm,c19')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
index ed6aa2d5a1c..24fb2757fdd 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% ctex.dtx (with options: `sf,c19')
+%% ctex.dtx (with options: `fd,sf,c19')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
index 7661cca669a..838cd9fdb3b 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% ctex.dtx (with options: `tt,c19')
+%% ctex.dtx (with options: `fd,tt,c19')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
index 9b39fba23f6..654b6b643b5 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% ctex.dtx (with options: `rm,c70')
+%% ctex.dtx (with options: `fd,rm,c70')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
index 0702017e7e1..37aa4c51d26 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% ctex.dtx (with options: `sf,c70')
+%% ctex.dtx (with options: `fd,sf,c70')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
index 3409768a06c..efaa7b56ccd 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% ctex.dtx (with options: `tt,c70')
+%% ctex.dtx (with options: `fd,tt,c70')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
new file mode 100644
index 00000000000..999887dda80
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
@@ -0,0 +1,37 @@
+%%
+%% This is file `jt2zhrm.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fd,rm,jt2')
+%%
+%% 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.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\ProvidesFile{jt2zhrm.fd}%
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+\DeclareKanjiFamily{JT2}{zhrm}{}
+\DeclareFontShape{JT2}{zhrm}{m}{n}{<-> upzhserif-v}{}
+\DeclareFontShape{JT2}{zhrm}{m}{it}{<-> upzhserifit-v}{}
+\DeclareFontShape{JT2}{zhrm}{bx}{n}{<-> upzhserifb-v}{}
+%%
+%%
+%% End of file `jt2zhrm.fd'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
new file mode 100644
index 00000000000..c95b887f611
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
@@ -0,0 +1,36 @@
+%%
+%% This is file `jt2zhsf.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fd,sf,jt2')
+%%
+%% 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.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\ProvidesFile{jt2zhsf.fd}%
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+\DeclareKanjiFamily{JT2}{zhsf}{}
+\DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{}
+\DeclareFontShape{JT2}{zhsf}{bx}{n}{<-> upzhsansb-v}{}
+%%
+%%
+%% End of file `jt2zhsf.fd'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
new file mode 100644
index 00000000000..518d5813a8f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
@@ -0,0 +1,35 @@
+%%
+%% This is file `jt2zhtt.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fd,tt,jt2')
+%%
+%% 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.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\ProvidesFile{jt2zhtt.fd}%
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+\DeclareKanjiFamily{JT2}{zhtt}{}
+\DeclareFontShape{JT2}{zhtt}{m}{n}{<-> upzhmono-v}{}
+%%
+%%
+%% End of file `jt2zhtt.fd'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
new file mode 100644
index 00000000000..93beac66dc8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
@@ -0,0 +1,37 @@
+%%
+%% This is file `jy2zhrm.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fd,rm,jy2')
+%%
+%% 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.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\ProvidesFile{jy2zhrm.fd}%
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+\DeclareKanjiFamily{JY2}{zhrm}{}
+\DeclareFontShape{JY2}{zhrm}{m}{n}{<-> upzhserif-h}{}
+\DeclareFontShape{JY2}{zhrm}{m}{it}{<-> upzhserifit-h}{}
+\DeclareFontShape{JY2}{zhrm}{bx}{n}{<-> upzhserifb-h}{}
+%%
+%%
+%% End of file `jy2zhrm.fd'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
new file mode 100644
index 00000000000..9815f9aa3c6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
@@ -0,0 +1,36 @@
+%%
+%% This is file `jy2zhsf.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fd,sf,jy2')
+%%
+%% 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.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\ProvidesFile{jy2zhsf.fd}%
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+\DeclareKanjiFamily{JY2}{zhsf}{}
+\DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{}
+\DeclareFontShape{JY2}{zhsf}{bx}{n}{<-> upzhsansb-h}{}
+%%
+%%
+%% End of file `jy2zhsf.fd'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
new file mode 100644
index 00000000000..ca1b391bd3a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
@@ -0,0 +1,35 @@
+%%
+%% This is file `jy2zhtt.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fd,tt,jy2')
+%%
+%% 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.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\ProvidesFile{jy2zhtt.fd}%
+ [2019/04/07 v2.4.15 Chinese font definition (CTEX)]
+\DeclareKanjiFamily{JY2}{zhtt}{}
+\DeclareFontShape{JY2}{zhtt}{m}{n}{<-> upzhmono-h}{}
+%%
+%%
+%% End of file `jy2zhtt.fd'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
index 2f7d9ad646c..24b82dfa15c 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,adobe')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
index ab9494f0b13..ffc3daef3ef 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,fandol')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
index 25f10f7409b..e58699dc34e 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,founder')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
@@ -81,8 +81,7 @@
{
\setCJKmainfont
[ BoldFont = FZXiaoBiaoSong-B05 , ItalicFont = FZKai-Z03 ] { FZShuSong-Z01 }
- \setCJKsansfont [ BoldFont = FZHei-B01 ]
- { \sys_if_engine_xetex:TF { 方正细黑一_GBK } { FZXH1K--GBK1-0 } }
+ \setCJKsansfont [ BoldFont = FZHei-B01 ] { FZXiHeiI-Z08 }
\setCJKmonofont { FZFangSong-Z02 }
\setCJKfamilyfont { zhsong } [ BoldFont = FZXiaoBiaoSong-B05 ] { FZShuSong-Z01 }
\setCJKfamilyfont { zhhei } { FZHei-B01 }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
index afa2f94ae30..775678999ac 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,mac')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Mac OS X fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\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 } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
index 41afdc2b279..61a5a50b7d4 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,macnew')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Mac OS X fonts definition for El Capitan or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-macnew.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{ \ctex_fontset_error:n { mac } }
{
@@ -38,20 +38,22 @@
{
\setCJKmainfont
[
- UprightFont = Songti~SC~Light,
- ItalicFont = Kaiti~SC,
+ UprightFont = *~Light ,
+ BoldFont = *~Bold ,
+ ItalicFont = Kaiti~SC ,
BoldItalicFont = Kaiti~SC~Bold
] { Songti~SC }
\setCJKsansfont { PingFang~SC }
\setCJKmonofont { STFangsong }
\setCJKfamilyfont { zhsong }
[
- UprightFont = Songti~SC~Light,
+ UprightFont = *~Light ,
+ BoldFont = *~Bold ,
] { Songti~SC }
\setCJKfamilyfont { zhhei } { Heiti~SC }
\setCJKfamilyfont { zhpf } { PingFang~SC }
\setCJKfamilyfont { zhfs } { STFangsong }
- \setCJKfamilyfont { zhkai } { Kaiti~SC }
+\setCJKfamilyfont { zhkai } { Kaiti~SC }
}
}
\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
index e17a0ce897d..cefa3558604 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,macold')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,23 +26,23 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Mac OS X fonts definition for Yosemite or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-macold.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{ \ctex_fontset_error:n { mac } }
{
\sys_if_engine_uptex:TF
{ \ctex_fontset_error:n { mac } }
{
- \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong }
+ \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong }
\setCJKsansfont [ BoldFont = STHeiti ] { STXihei }
\setCJKmonofont { STFangsong }
\setCJKfamilyfont { zhsong } { STSong }
\setCJKfamilyfont { zhhei } { STHeiti }
\setCJKfamilyfont { zhfs } { STFangsong }
- \setCJKfamilyfont { zhkai } { STKaiti }
+\setCJKfamilyfont { zhkai } { STKaiti }
}
}
\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
index 60020f71903..f26bb8f5c85 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,ubuntu')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
index 3d9da9fec6d..926a505af46 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,windows')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\file_if_exist:nTF { C:/bootfont.bin }
{ \ctex_file_input:n { ctex-fontset-windowsold.def } }
{ \ctex_file_input:n { ctex-fontset-windowsnew.def } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
index 194a9779add..25cbd32fc64 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,windowsnew')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Windows fonts definition for Vista or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\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 }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
index 51a94ce63df..0750b692479 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `fontset,windowsold')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Windows fonts definition for XP or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
index 1c6d2f2e77c..f58fb5e25ed 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,article,chinese')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,13 +26,14 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
+ hang = false ,
number = \chinese { part } ,
beforeskip = 4ex ,
afterskip = 3ex ,
@@ -94,7 +95,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
\keys_set:nn { ctex / paragraph }
{
@@ -110,7 +111,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
+\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
\keys_set:nn { ctex / subparagraph }
{
@@ -126,7 +127,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{ \keys_set:nn { ctex / subparagraph } { indent = \c_zero_dim } }
{ \keys_set:nn { ctex / subparagraph } { indent = \parindent } }
\keys_set:nn { ctex / appendix }
@@ -138,8 +139,8 @@
\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
{ \ctex_file_input:n { ctex-name-gbk.cfg } }
{ \ctex_file_input:n { ctex-name-utf8.cfg } }
-\int_compare:nNnF \g__ctex_font_size_flag > { -1 }
- { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero }
+\int_compare:nNnF \g__ctex_font_size_int > { -1 }
+ { \int_gset:Nn \g__ctex_font_size_int { 0 } }
\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
index 4f73ccd40b6..82867dc4d25 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,beamer,chinese')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
index 63bbdcd9103..96fb4a39efc 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,book,chinese')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,13 +26,14 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
+ hang = false ,
number = \chinese { part } ,
aftername = \par \vskip 20 \p@ ,
beforeskip = 0pt \@plus 1fil ,
@@ -45,6 +46,7 @@
{
pagestyle = plain ,
aftertitle = \par ,
+ hang = false ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
lofskip = 10 \p@ ,
@@ -109,7 +111,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
\keys_set:nn { ctex / paragraph }
{
@@ -125,7 +127,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
+\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
\keys_set:nn { ctex / subparagraph }
{
@@ -141,7 +143,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{ \keys_set:nn { ctex / subparagraph } { indent = \c_zero_dim } }
{ \keys_set:nn { ctex / subparagraph } { indent = \parindent } }
\keys_set:nn { ctex / appendix }
@@ -156,8 +158,8 @@
\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
{ \ctex_file_input:n { ctex-name-gbk.cfg } }
{ \ctex_file_input:n { ctex-name-utf8.cfg } }
-\int_compare:nNnF \g__ctex_font_size_flag > { -1 }
- { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero }
+\int_compare:nNnF \g__ctex_font_size_int > { -1 }
+ { \int_gset:Nn \g__ctex_font_size_int { 0 } }
\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
index ff27c9a0d82..b2c1b67e0fe 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,report,chinese')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,13 +26,14 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
+ hang = false ,
number = \chinese { part } ,
aftername = \par \vskip 20 \p@ ,
beforeskip = 0pt \@plus 1fil ,
@@ -45,6 +46,7 @@
{
pagestyle = plain ,
aftertitle = \par ,
+ hang = false ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
lofskip = 10 \p@ ,
@@ -109,7 +111,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
\keys_set:nn { ctex / paragraph }
{
@@ -125,7 +127,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
+\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
\keys_set:nn { ctex / subparagraph }
{
@@ -141,7 +143,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{ \keys_set:nn { ctex / subparagraph } { indent = \c_zero_dim } }
{ \keys_set:nn { ctex / subparagraph } { indent = \parindent } }
\keys_set:nn { ctex / appendix }
@@ -156,8 +158,8 @@
\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
{ \ctex_file_input:n { ctex-name-gbk.cfg } }
{ \ctex_file_input:n { ctex-name-utf8.cfg } }
-\int_compare:nNnF \g__ctex_font_size_flag > { -1 }
- { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero }
+\int_compare:nNnF \g__ctex_font_size_int > { -1 }
+ { \int_gset:Nn \g__ctex_font_size_int { 0 } }
\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
index 804cd53111e..297a76fd4ed 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,generic,chinese')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex } { today = small }
\ctex_if_autoindent_touched:F
{ \keys_set:nn { ctex } { autoindent = true } }
@@ -53,8 +53,8 @@
\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
{ \ctex_file_input:n { ctex-name-gbk.cfg } }
{ \ctex_file_input:n { ctex-name-utf8.cfg } }
- \int_compare:nNnF \g__ctex_font_size_flag > { -1 }
- { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero }
+ \int_compare:nNnF \g__ctex_font_size_int > { -1 }
+ { \int_gset:Nn \g__ctex_font_size_int { 0 } }
\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\tl_if_exist:NT \c__ctex_std_class_tl
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
index 3de1a969733..33daafd0fcc 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,article,plain')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,13 +26,14 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
+ hang = false ,
name = \partname \space ,
number = \thepart ,
beforeskip = 4ex ,
@@ -97,7 +98,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
\keys_set:nn { ctex / paragraph }
{
@@ -113,7 +114,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
+\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
\keys_set:nn { ctex / subparagraph }
{
@@ -129,7 +130,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{ \keys_set:nn { ctex / subparagraph } { indent = \c_zero_dim } }
{ \keys_set:nn { ctex / subparagraph } { indent = \parindent } }
\keys_set:nn { ctex / appendix }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
index feae2098768..d3a8eb93fa5 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,beamer,plain')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
index 3742f826ff5..dbd7e2d5bd3 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,book,plain')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,13 +26,14 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
+ hang = false ,
name = \partname \space ,
number = \thepart ,
aftername = \par \vskip 20 \p@ ,
@@ -48,6 +49,7 @@
{
pagestyle = plain ,
aftertitle = \par ,
+ hang = false ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
lofskip = 10 \p@ ,
@@ -116,7 +118,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
\keys_set:nn { ctex / paragraph }
{
@@ -132,7 +134,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
+\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
\keys_set:nn { ctex / subparagraph }
{
@@ -148,7 +150,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{ \keys_set:nn { ctex / subparagraph } { indent = \c_zero_dim } }
{ \keys_set:nn { ctex / subparagraph } { indent = \parindent } }
\keys_set:nn { ctex / appendix }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
index c302cc1a96d..76f693cd411 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,report,plain')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,13 +26,14 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
+ hang = false ,
name = \partname \space ,
number = \thepart ,
aftername = \par \vskip 20 \p@ ,
@@ -48,6 +49,7 @@
{
pagestyle = plain ,
aftertitle = \par ,
+ hang = false ,
beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
lofskip = 10 \p@ ,
@@ -116,7 +118,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
\keys_set:nn { ctex / paragraph }
{
@@ -132,7 +134,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
+\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
\keys_set:nn { ctex / subparagraph }
{
@@ -148,7 +150,7 @@
runin = true
}
}
-\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
+\int_compare:nNnTF \g__ctex_section_depth_int > 2
{ \keys_set:nn { ctex / subparagraph } { indent = \c_zero_dim } }
{ \keys_set:nn { ctex / subparagraph } { indent = \parindent } }
\keys_set:nn { ctex / appendix }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
index c3bbc582f10..e9ec07ddd09 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `scheme,generic,plain')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.