summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/scheme
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-02 22:24:14 +0000
committerKarl Berry <karl@freefriends.org>2020-05-02 22:24:14 +0000
commit15f0c94913f0d5cb24dd909c5358b3a997994dd7 (patch)
tree9043df32cd0199835f5b3f9804ad132907857139 /Master/texmf-dist/tex/latex/ctex/scheme
parent151fbc4b66cb3705f6ce20368a2c6f7c06b8d57d (diff)
ctex (2may20)
git-svn-id: svn://tug.org/texlive/trunk@54976 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/scheme')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def48
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def26
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def50
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def50
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def24
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def40
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def20
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def42
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def42
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def14
10 files changed, 168 insertions, 188 deletions
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 209f8079d4b..144c3d6f476 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,article,chinese')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
hang = false ,
@@ -41,7 +39,7 @@
aftername = \quad ,
afterindent = true
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
number = \thesection ,
aftername = \quad ,
@@ -53,7 +51,7 @@
format = \Large \bfseries \centering ,
afterindent = true
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \thesubsection ,
format = \large \bfseries ,
@@ -65,7 +63,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / subsubsection }
+\ctex_set:nn { subsubsection }
{
number = \thesubsubsection ,
format = \normalsize \bfseries ,
@@ -77,7 +75,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / paragraph }
+\ctex_set:nn { paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
@@ -86,7 +84,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / subparagraph }
+\ctex_set:nn { subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
@@ -97,7 +95,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -105,7 +103,7 @@
}
}
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
afterskip = 1em ,
runin = true
@@ -113,7 +111,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -121,27 +119,27 @@
}
}
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
afterskip = 1em ,
runin = true
}
}
\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 }
+ { \ctex_set:nn { subparagraph } { indent = \c_zero_dim } }
+ { \ctex_set:nn { subparagraph } { indent = \parindent } }
+\ctex_set:nn { appendix }
{ number = \@Alph \c@section }
\pagestyle { headings }
-\keys_set:nn { ctex } { today = small }
+\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
- { \keys_set:nn { ctex } { autoindent = true } }
-\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
+ { \ctex_set:n { autoindent = true } }
+\str_if_eq:onTF { \g__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_int > { -1 }
{ \int_gset:Nn \g__ctex_font_size_int { 0 } }
-\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
+\fp_if_nan:nT { \l__ctex_line_spread_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd }
\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 9a0b8cdbe16..c290f86a614 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,beamer,chinese')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
number = \chinese { part } ,
@@ -40,7 +38,7 @@
aftername = \vskip 1em \par ,
titleformat = \usebeamerfont { part ~ title }
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
format = \centering ,
number = \insertsectionnumber ,
@@ -50,7 +48,7 @@
titleformat = \usebeamerfont { section ~ title } ,
aftertitle = \par
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \arabic { section } . \arabic { subsection } ,
format = \centering ,
@@ -60,10 +58,10 @@
titleformat = \usebeamerfont { subsection ~ title } ,
aftertitle = \par
}
-\keys_set:nn { ctex } { today = small }
+\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
- { \keys_set:nn { ctex } { autoindent = true } }
-\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
+ { \ctex_set:n { autoindent = true } }
+\str_if_eq:onTF { \g__ctex_encoding_tl } { GBK }
{
\uselanguage { ChineseGBK }
\languagealias { chinese } { ChineseGBK }
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 22b0d7cc354..c35e5602359 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,book,chinese')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
hang = false ,
@@ -42,7 +40,7 @@
break = \if@openright \cleardoublepage \else \clearpage \fi ,
format = \huge \bfseries \centering
}
-\keys_set:nn { ctex / chapter }
+\ctex_set:nn { chapter }
{
pagestyle = plain ,
aftertitle = \par ,
@@ -57,7 +55,7 @@
aftername = \quad ,
afterindent = true
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
number = \thesection ,
aftername = \quad ,
@@ -69,7 +67,7 @@
format = \Large \bfseries \centering ,
afterindent = true
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \thesubsection ,
format = \large \bfseries ,
@@ -81,7 +79,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / subsubsection }
+\ctex_set:nn { subsubsection }
{
number = \thesubsubsection ,
format = \normalsize \bfseries ,
@@ -93,7 +91,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / paragraph }
+\ctex_set:nn { paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
@@ -102,7 +100,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / subparagraph }
+\ctex_set:nn { subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
@@ -113,7 +111,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -121,7 +119,7 @@
}
}
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
afterskip = 1em ,
runin = true
@@ -129,7 +127,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -137,30 +135,30 @@
}
}
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
afterskip = 1em ,
runin = true
}
}
\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 }
+ { \ctex_set:nn { subparagraph } { indent = \c_zero_dim } }
+ { \ctex_set:nn { subparagraph } { indent = \parindent } }
+\ctex_set:nn { appendix }
{
name = \appendixname \space ,
number = \@Alph \c@chapter
}
\pagestyle { headings }
-\keys_set:nn { ctex } { today = small }
+\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
- { \keys_set:nn { ctex } { autoindent = true } }
-\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
+ { \ctex_set:n { autoindent = true } }
+\str_if_eq:onTF { \g__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_int > { -1 }
{ \int_gset:Nn \g__ctex_font_size_int { 0 } }
-\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
+\fp_if_nan:nT { \l__ctex_line_spread_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd }
\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 8fa5249d020..59e4dcc76ae 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,report,chinese')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
hang = false ,
@@ -42,7 +40,7 @@
break = \if@openright \cleardoublepage \else \clearpage \fi ,
format = \huge \bfseries \centering
}
-\keys_set:nn { ctex / chapter }
+\ctex_set:nn { chapter }
{
pagestyle = plain ,
aftertitle = \par ,
@@ -57,7 +55,7 @@
aftername = \quad ,
afterindent = true
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
number = \thesection ,
aftername = \quad ,
@@ -69,7 +67,7 @@
format = \Large \bfseries \centering ,
afterindent = true
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \thesubsection ,
format = \large \bfseries ,
@@ -81,7 +79,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / subsubsection }
+\ctex_set:nn { subsubsection }
{
number = \thesubsubsection ,
format = \normalsize \bfseries ,
@@ -93,7 +91,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / paragraph }
+\ctex_set:nn { paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
@@ -102,7 +100,7 @@
break = \addpenalty \@secpenalty ,
afterindent = true
}
-\keys_set:nn { ctex / subparagraph }
+\ctex_set:nn { subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
@@ -113,7 +111,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -121,7 +119,7 @@
}
}
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
afterskip = 1em ,
runin = true
@@ -129,7 +127,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -137,30 +135,30 @@
}
}
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
afterskip = 1em ,
runin = true
}
}
\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 }
+ { \ctex_set:nn { subparagraph } { indent = \c_zero_dim } }
+ { \ctex_set:nn { subparagraph } { indent = \parindent } }
+\ctex_set:nn { appendix }
{
name = \appendixname \space ,
number = \@Alph \c@chapter
}
\pagestyle { headings }
-\keys_set:nn { ctex } { today = small }
+\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
- { \keys_set:nn { ctex } { autoindent = true } }
-\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
+ { \ctex_set:n { autoindent = true } }
+\str_if_eq:onTF { \g__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_int > { -1 }
{ \int_gset:Nn \g__ctex_font_size_int { 0 } }
-\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
+\fp_if_nan:nT { \l__ctex_line_spread_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd }
\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 8bf9e5551f6..bcdabc1787c 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,generic,chinese')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,23 +20,21 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex } { today = small }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
- { \keys_set:nn { ctex } { autoindent = true } }
+ { \ctex_set:n { autoindent = true } }
\tl_set:Nn \l__ctex_tmp_tl { beamer }
\tl_if_eq:NNTF \c__ctex_std_class_tl \l__ctex_tmp_tl
{
- \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
+ \str_if_eq:onTF { \g__ctex_encoding_tl } { GBK }
{
\uselanguage { ChineseGBK }
\languagealias { chinese } { ChineseGBK }
@@ -50,12 +48,12 @@
\clist_put_left:Nn \trans@languagepath { chinese }
}
{
- \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
+ \str_if_eq:onTF { \g__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_int > { -1 }
{ \int_gset:Nn \g__ctex_font_size_int { 0 } }
- \fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp }
+ \fp_if_nan:nT { \l__ctex_line_spread_fp }
{ \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } }
\tl_if_exist:NT \c__ctex_std_class_tl
{ \RequirePackage { indentfirst } }
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 7d24f3b7fe9..803fd2a5fee 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,article,plain')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
hang = false ,
@@ -44,7 +42,7 @@
titleformat = \huge \bfseries ,
afterindent = false
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
number = \thesection ,
aftername = \quad ,
@@ -56,7 +54,7 @@
format = \Large \bfseries ,
afterindent = false
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \thesubsection ,
format = \large \bfseries ,
@@ -68,7 +66,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / subsubsection }
+\ctex_set:nn { subsubsection }
{
number = \thesubsubsection ,
format = \normalsize \bfseries ,
@@ -80,7 +78,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / paragraph }
+\ctex_set:nn { paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
@@ -89,7 +87,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / subparagraph }
+\ctex_set:nn { subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
@@ -100,7 +98,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -108,7 +106,7 @@
}
}
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
afterskip = 1em ,
runin = true
@@ -116,7 +114,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -124,16 +122,16 @@
}
}
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
afterskip = 1em ,
runin = true
}
}
\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 }
+ { \ctex_set:nn { subparagraph } { indent = \c_zero_dim } }
+ { \ctex_set:nn { subparagraph } { indent = \parindent } }
+\ctex_set:nn { appendix }
{ number = \@Alph \c@section }
%%
%%
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 92f67b60812..c103ca8b61c 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,beamer,plain')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
name = \partname \space ,
@@ -41,7 +39,7 @@
aftername = \vskip 1em \par ,
titleformat = \usebeamerfont { part ~ title }
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
name = \sectionname \space ,
format = \centering ,
@@ -52,7 +50,7 @@
titleformat = \usebeamerfont { section ~ title } ,
aftertitle = \par
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
name = \subsectionname \space ,
number = \insertsubsectionnumber ,
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 25ad8806276..7c0f0f6bd89 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,book,plain')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
hang = false ,
@@ -45,7 +43,7 @@
nameformat = \huge \bfseries ,
titleformat = \Huge \bfseries
}
-\keys_set:nn { ctex / chapter }
+\ctex_set:nn { chapter }
{
pagestyle = plain ,
aftertitle = \par ,
@@ -64,7 +62,7 @@
afterindent = false ,
tocline = \CTEXnumberline {#1} #2
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
number = \thesection ,
aftername = \quad ,
@@ -76,7 +74,7 @@
format = \Large \bfseries ,
afterindent = false
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \thesubsection ,
format = \large \bfseries ,
@@ -88,7 +86,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / subsubsection }
+\ctex_set:nn { subsubsection }
{
number = \thesubsubsection ,
format = \normalsize \bfseries ,
@@ -100,7 +98,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / paragraph }
+\ctex_set:nn { paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
@@ -109,7 +107,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / subparagraph }
+\ctex_set:nn { subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
@@ -120,7 +118,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -128,7 +126,7 @@
}
}
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
afterskip = 1em ,
runin = true
@@ -136,7 +134,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -144,16 +142,16 @@
}
}
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
afterskip = 1em ,
runin = true
}
}
\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 }
+ { \ctex_set:nn { subparagraph } { indent = \c_zero_dim } }
+ { \ctex_set:nn { subparagraph } { indent = \parindent } }
+\ctex_set:nn { appendix }
{
name = \appendixname \space ,
number = \@Alph \c@chapter
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 347d75b590e..e353a1281b8 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,report,plain')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,17 +20,15 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\keys_set:nn { ctex / part }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_set:nn { part }
{
aftertitle = \par ,
hang = false ,
@@ -45,7 +43,7 @@
nameformat = \huge \bfseries ,
titleformat = \Huge \bfseries
}
-\keys_set:nn { ctex / chapter }
+\ctex_set:nn { chapter }
{
pagestyle = plain ,
aftertitle = \par ,
@@ -64,7 +62,7 @@
afterindent = false ,
tocline = \CTEXnumberline {#1} #2
}
-\keys_set:nn { ctex / section }
+\ctex_set:nn { section }
{
number = \thesection ,
aftername = \quad ,
@@ -76,7 +74,7 @@
format = \Large \bfseries ,
afterindent = false
}
-\keys_set:nn { ctex / subsection }
+\ctex_set:nn { subsection }
{
number = \thesubsection ,
format = \large \bfseries ,
@@ -88,7 +86,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / subsubsection }
+\ctex_set:nn { subsubsection }
{
number = \thesubsubsection ,
format = \normalsize \bfseries ,
@@ -100,7 +98,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / paragraph }
+\ctex_set:nn { paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
@@ -109,7 +107,7 @@
break = \addpenalty \@secpenalty ,
afterindent = false
}
-\keys_set:nn { ctex / subparagraph }
+\ctex_set:nn { subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
@@ -120,7 +118,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 2
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -128,7 +126,7 @@
}
}
{
- \keys_set:nn { ctex / paragraph }
+ \ctex_set:nn { paragraph }
{
afterskip = 1em ,
runin = true
@@ -136,7 +134,7 @@
}
\int_compare:nNnTF \g__ctex_section_depth_int > 3
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
aftertitle = \@@par ,
afterskip = 1ex \@plus .2ex ,
@@ -144,16 +142,16 @@
}
}
{
- \keys_set:nn { ctex / subparagraph }
+ \ctex_set:nn { subparagraph }
{
afterskip = 1em ,
runin = true
}
}
\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 }
+ { \ctex_set:nn { subparagraph } { indent = \c_zero_dim } }
+ { \ctex_set:nn { subparagraph } { indent = \parindent } }
+\ctex_set:nn { appendix }
{
name = \appendixname \space ,
number = \@Alph \c@chapter
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 f2ac6d86d0a..be3e922893f 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,9 +6,9 @@
%%
%% ctex.dtx (with options: `scheme,generic,plain')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% 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
@@ -20,16 +20,14 @@
%% 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'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.