diff options
author | Karl Berry <karl@freefriends.org> | 2015-06-19 22:32:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-06-19 22:32:36 +0000 |
commit | 24a26d6f89a97e7ba548a2c42c0e6a6c80e6fb2a (patch) | |
tree | c87c15ce0105a3b7f9dfef8548ea2b0bb368d91c /Master/texmf-dist/tex/latex/ctex/scheme | |
parent | 28cb2b214ad9bcb5ac65fdf512b438f388a68b1e (diff) |
ctex (19jun15)
git-svn-id: svn://tug.org/texlive/trunk@37615 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/scheme')
8 files changed, 61 insertions, 22 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 3a0fa752e60..b21208988d8 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 @@ -26,15 +26,16 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { + aftertitle = \par , + number = \chinese { part } , nameformat = \Large \bfseries , afterskip = 3ex , - number = \chinese { part } , format = \centering , aftername = \quad , titleformat = \Large \bfseries , @@ -44,6 +45,7 @@ { number = \thesection , aftername = \quad , + aftertitle = \@@par , afterskip = 2.3ex \@plus .2ex , format = \Large \bfseries \centering , beforeskip = 3.5ex \@plus 1ex \@minus .2ex @@ -53,6 +55,7 @@ number = \thesubsection , format = \large \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = 3.25ex \@plus 1ex \@minus .2ex } @@ -61,6 +64,7 @@ number = \thesubsubsection , format = \normalsize \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = 3.25ex \@plus 1ex \@minus .2ex } @@ -80,6 +84,7 @@ { \keys_set:nn { ctex / paragraph } { + aftertitle = \@@par , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1ex \@plus .2ex } @@ -95,6 +100,7 @@ { \keys_set:nn { ctex / subparagraph } { + aftertitle = \@@par , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1ex \@plus .2ex } 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 d44baaf59f3..2d83f7e708f 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 @@ -26,12 +26,14 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { + aftertitle = \par , + number = \chinese { part } , format = \centering , nameformat = \huge \bfseries , aftername = \par \vskip 20 \p@ , @@ -42,6 +44,7 @@ { pagestyle = plain , nameformat = \huge \bfseries , + aftertitle = \par , afterskip = 40 \p@ , number = \chinese { chapter } , format = \centering , @@ -53,6 +56,7 @@ { number = \thesection , aftername = \quad , + aftertitle = \@@par , afterskip = 2.3ex \@plus .2ex , format = \Large \bfseries \centering , beforeskip = 3.5ex \@plus 1ex \@minus .2ex @@ -62,6 +66,7 @@ number = \thesubsection , format = \large \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = 3.25ex \@plus 1ex \@minus .2ex } @@ -70,6 +75,7 @@ number = \thesubsubsection , format = \normalsize \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = 3.25ex \@plus 1ex \@minus .2ex } @@ -89,6 +95,7 @@ { \keys_set:nn { ctex / paragraph } { + aftertitle = \@@par , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1ex \@plus .2ex } @@ -104,6 +111,7 @@ { \keys_set:nn { ctex / subparagraph } { + aftertitle = \@@par , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1ex \@plus .2ex } 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 0b723c70b6d..0bf4aa05931 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 @@ -26,12 +26,14 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { + aftertitle = \par , + number = \chinese { part } , format = \centering , nameformat = \huge \bfseries , aftername = \par \vskip 20 \p@ , @@ -42,6 +44,7 @@ { pagestyle = plain , nameformat = \huge \bfseries , + aftertitle = \par , afterskip = 40 \p@ , number = \chinese { chapter } , format = \centering , @@ -53,6 +56,7 @@ { number = \thesection , aftername = \quad , + aftertitle = \@@par , afterskip = 2.3ex \@plus .2ex , format = \Large \bfseries \centering , beforeskip = 3.5ex \@plus 1ex \@minus .2ex @@ -62,6 +66,7 @@ number = \thesubsection , format = \large \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = 3.25ex \@plus 1ex \@minus .2ex } @@ -70,6 +75,7 @@ number = \thesubsubsection , format = \normalsize \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = 3.25ex \@plus 1ex \@minus .2ex } @@ -89,6 +95,7 @@ { \keys_set:nn { ctex / paragraph } { + aftertitle = \@@par , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1ex \@plus .2ex } @@ -104,6 +111,7 @@ { \keys_set:nn { ctex / subparagraph } { + aftertitle = \@@par , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1ex \@plus .2ex } 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 fbe8be476d4..b3be5572070 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \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 } } @@ -40,11 +40,8 @@ { \keys_set:nn { ctex / option } { linespread = 1.3 } } \ctex_if_autoindent_touched:F { \keys_set:nn { ctex } { autoindent = true } } -\clist_map_inline:nn { article , book , report } - { - \@ifclassloaded {#1} - { \RequirePackage{ indentfirst } } { } - } +\tl_if_exist:NT \c__ctex_std_class_tl + { \RequirePackage{ indentfirst } } %% %% %% End of file `ctex-scheme-chinese.def'. 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 0596bf66e9e..752fefd584d 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 @@ -26,12 +26,13 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { + aftertitle = \par , name = \partname \space , number = \thepart , nameformat = \Large \bfseries , @@ -45,6 +46,7 @@ { number = \thesection , aftername = \quad , + aftertitle = \@@par , afterskip = 2.3ex \@plus .2ex , format = \Large \bfseries , beforeskip = -3.5ex \@plus -1ex \@minus -.2ex @@ -54,6 +56,7 @@ number = \thesubsection , format = \large \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex } @@ -62,6 +65,7 @@ number = \thesubsubsection , format = \normalsize \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex } @@ -81,6 +85,7 @@ { \keys_set:nn { ctex / paragraph } { + aftertitle = \@@par , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex , afterskip = 1ex \@plus .2ex } @@ -96,6 +101,7 @@ { \keys_set:nn { ctex / subparagraph } { + aftertitle = \@@par , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex , afterskip = 1ex \@plus .2ex } 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 9f0898b3b42..202db21f8c7 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 @@ -26,12 +26,13 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { + aftertitle = \par , name = \partname \space , number = \thepart , format = \centering , @@ -44,6 +45,7 @@ { pagestyle = plain , nameformat = \huge \bfseries , + aftertitle = \par , afterskip = 40 \p@ , name = \chaptername \space , number = \thechapter , @@ -56,6 +58,7 @@ { number = \thesection , aftername = \quad , + aftertitle = \@@par , afterskip = 2.3ex \@plus .2ex , format = \Large \bfseries , beforeskip = -3.5ex \@plus -1ex \@minus -.2ex @@ -65,6 +68,7 @@ number = \thesubsection , format = \large \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex } @@ -73,6 +77,7 @@ number = \thesubsubsection , format = \normalsize \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex } @@ -92,6 +97,7 @@ { \keys_set:nn { ctex / paragraph } { + aftertitle = \@@par , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex , afterskip = 1ex \@plus .2ex } @@ -107,6 +113,7 @@ { \keys_set:nn { ctex / subparagraph } { + aftertitle = \@@par , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex , afterskip = 1ex \@plus .2ex } 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 e7fa5adda1e..fac90d7aea7 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 @@ -26,12 +26,13 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { + aftertitle = \par , name = \partname \space , number = \thepart , format = \centering , @@ -44,6 +45,7 @@ { pagestyle = plain , nameformat = \huge \bfseries , + aftertitle = \par , afterskip = 40 \p@ , name = \chaptername \space , number = \thechapter , @@ -56,6 +58,7 @@ { number = \thesection , aftername = \quad , + aftertitle = \@@par , afterskip = 2.3ex \@plus .2ex , format = \Large \bfseries , beforeskip = -3.5ex \@plus -1ex \@minus -.2ex @@ -65,6 +68,7 @@ number = \thesubsection , format = \large \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex } @@ -73,6 +77,7 @@ number = \thesubsubsection , format = \normalsize \bfseries , aftername = \quad , + aftertitle = \@@par , afterskip = 1.5ex \@plus .2ex , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex } @@ -92,6 +97,7 @@ { \keys_set:nn { ctex / paragraph } { + aftertitle = \@@par , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex , afterskip = 1ex \@plus .2ex } @@ -107,6 +113,7 @@ { \keys_set:nn { ctex / subparagraph } { + aftertitle = \@@par , beforeskip = -3.25ex \@plus -1ex \@minus -.2ex , afterskip = 1ex \@plus .2ex } 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 ef554f86843..7823ef28251 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.0.2}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. |