summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/scheme
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-30 21:26:14 +0000
committerKarl Berry <karl@freefriends.org>2015-06-30 21:26:14 +0000
commitaaec8ff3cf7236ae9429a6d9238b1838af2441d6 (patch)
tree7d00cf0ec8459200ac8e721eed28d09e155012c9 /Master/texmf-dist/tex/latex/ctex/scheme
parent56e4ae7a5ecbbf9bf7b858d20cb0c3e0d21edc8a (diff)
ctex (30jun15)
git-svn-id: svn://tug.org/texlive/trunk@37720 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.def47
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def53
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def53
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def45
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def51
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def51
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def4
8 files changed, 187 insertions, 123 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 b21208988d8..744ddadda77 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,29 +26,30 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
number = \chinese { part } ,
- nameformat = \Large \bfseries ,
+ beforeskip = 4ex ,
afterskip = 3ex ,
- format = \centering ,
+ format = \Large \bfseries \centering ,
aftername = \quad ,
- titleformat = \Large \bfseries ,
- beforeskip = 4ex
+ afterindent = true
}
\keys_set:nn { ctex / section }
{
number = \thesection ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.5ex \@plus 1ex \@minus .2ex ,
afterskip = 2.3ex \@plus .2ex ,
+ runin = false ,
format = \Large \bfseries \centering ,
- beforeskip = 3.5ex \@plus 1ex \@minus .2ex
+ afterindent = true
}
\keys_set:nn { ctex / subsection }
{
@@ -56,8 +57,10 @@
format = \large \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex
+ runin = false ,
+ afterindent = true
}
\keys_set:nn { ctex / subsubsection }
{
@@ -65,35 +68,41 @@
format = \normalsize \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex
+ runin = false ,
+ afterindent = true
}
\keys_set:nn { ctex / paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = true
}
\keys_set:nn { ctex / subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = true
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
{
\keys_set:nn { ctex / paragraph }
{
aftertitle = \@@par ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / paragraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
@@ -101,15 +110,15 @@
\keys_set:nn { ctex / subparagraph }
{
aftertitle = \@@par ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / subparagraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
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 2d83f7e708f..055ca1c859d 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,40 +26,41 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
number = \chinese { part } ,
- format = \centering ,
- nameformat = \huge \bfseries ,
aftername = \par \vskip 20 \p@ ,
+ beforeskip = 0pt \@plus 1fil ,
+ afterskip = 0pt \@plus 1fil ,
pagestyle = plain ,
- titleformat = \huge \bfseries
+ format = \huge \bfseries \centering
}
\keys_set:nn { ctex / chapter }
{
pagestyle = plain ,
- nameformat = \huge \bfseries ,
aftertitle = \par ,
+ beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
number = \chinese { chapter } ,
- format = \centering ,
+ format = \huge \bfseries \centering ,
aftername = \quad ,
- titleformat = \huge \bfseries ,
- beforeskip = 50 \p@
+ afterindent = true
}
\keys_set:nn { ctex / section }
{
number = \thesection ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.5ex \@plus 1ex \@minus .2ex ,
afterskip = 2.3ex \@plus .2ex ,
+ runin = false ,
format = \Large \bfseries \centering ,
- beforeskip = 3.5ex \@plus 1ex \@minus .2ex
+ afterindent = true
}
\keys_set:nn { ctex / subsection }
{
@@ -67,8 +68,10 @@
format = \large \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex
+ runin = false ,
+ afterindent = true
}
\keys_set:nn { ctex / subsubsection }
{
@@ -76,35 +79,41 @@
format = \normalsize \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex
+ runin = false ,
+ afterindent = true
}
\keys_set:nn { ctex / paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = true
}
\keys_set:nn { ctex / subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = true
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
{
\keys_set:nn { ctex / paragraph }
{
aftertitle = \@@par ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / paragraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
@@ -112,15 +121,15 @@
\keys_set:nn { ctex / subparagraph }
{
aftertitle = \@@par ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / subparagraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
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 0bf4aa05931..017ee477859 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,40 +26,41 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
number = \chinese { part } ,
- format = \centering ,
- nameformat = \huge \bfseries ,
aftername = \par \vskip 20 \p@ ,
+ beforeskip = 0pt \@plus 1fil ,
+ afterskip = 0pt \@plus 1fil ,
pagestyle = plain ,
- titleformat = \huge \bfseries
+ format = \huge \bfseries \centering
}
\keys_set:nn { ctex / chapter }
{
pagestyle = plain ,
- nameformat = \huge \bfseries ,
aftertitle = \par ,
+ beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
number = \chinese { chapter } ,
- format = \centering ,
+ format = \huge \bfseries \centering ,
aftername = \quad ,
- titleformat = \huge \bfseries ,
- beforeskip = 50 \p@
+ afterindent = true
}
\keys_set:nn { ctex / section }
{
number = \thesection ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.5ex \@plus 1ex \@minus .2ex ,
afterskip = 2.3ex \@plus .2ex ,
+ runin = false ,
format = \Large \bfseries \centering ,
- beforeskip = 3.5ex \@plus 1ex \@minus .2ex
+ afterindent = true
}
\keys_set:nn { ctex / subsection }
{
@@ -67,8 +68,10 @@
format = \large \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex
+ runin = false ,
+ afterindent = true
}
\keys_set:nn { ctex / subsubsection }
{
@@ -76,35 +79,41 @@
format = \normalsize \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex
+ runin = false ,
+ afterindent = true
}
\keys_set:nn { ctex / paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = true
}
\keys_set:nn { ctex / subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = true
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
{
\keys_set:nn { ctex / paragraph }
{
aftertitle = \@@par ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / paragraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
@@ -112,15 +121,15 @@
\keys_set:nn { ctex / subparagraph }
{
aftertitle = \@@par ,
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / subparagraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
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 b3be5572070..e5b315b71c9 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 ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\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 } }
@@ -41,7 +41,7 @@
\ctex_if_autoindent_touched:F
{ \keys_set:nn { ctex } { autoindent = true } }
\tl_if_exist:NT \c__ctex_std_class_tl
- { \RequirePackage{ indentfirst } }
+ { \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 752fefd584d..771341156b2 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,30 +26,33 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
name = \partname \space ,
number = \thepart ,
- nameformat = \Large \bfseries ,
+ beforeskip = 4ex ,
afterskip = 3ex ,
format = \raggedright ,
+ nameformat = \Large \bfseries ,
aftername = \par \nobreak ,
titleformat = \huge \bfseries ,
- beforeskip = -4ex
+ afterindent = false
}
\keys_set:nn { ctex / section }
{
number = \thesection ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.5ex \@plus 1ex \@minus .2ex ,
afterskip = 2.3ex \@plus .2ex ,
+ runin = false ,
format = \Large \bfseries ,
- beforeskip = -3.5ex \@plus -1ex \@minus -.2ex
+ afterindent = false
}
\keys_set:nn { ctex / subsection }
{
@@ -57,8 +60,10 @@
format = \large \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex
+ runin = false ,
+ afterindent = false
}
\keys_set:nn { ctex / subsubsection }
{
@@ -66,35 +71,41 @@
format = \normalsize \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex
+ runin = false ,
+ afterindent = false
}
\keys_set:nn { ctex / paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = false
}
\keys_set:nn { ctex / subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = false
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
{
\keys_set:nn { ctex / paragraph }
{
aftertitle = \@@par ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / paragraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
@@ -102,15 +113,15 @@
\keys_set:nn { ctex / subparagraph }
{
aftertitle = \@@par ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / subparagraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
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 202db21f8c7..e3ab04495eb 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,42 +26,47 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
name = \partname \space ,
number = \thepart ,
- format = \centering ,
- nameformat = \huge \bfseries ,
aftername = \par \vskip 20 \p@ ,
+ beforeskip = 0pt \@plus 1fil ,
+ afterskip = 0pt \@plus 1fil ,
pagestyle = plain ,
+ format = \centering ,
+ nameformat = \huge \bfseries ,
titleformat = \Huge \bfseries
}
\keys_set:nn { ctex / chapter }
{
pagestyle = plain ,
- nameformat = \huge \bfseries ,
aftertitle = \par ,
+ beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
name = \chaptername \space ,
number = \thechapter ,
format = \raggedright ,
+ nameformat = \huge \bfseries ,
aftername = \par \nobreak \vskip 20 \p@ ,
titleformat = \Huge \bfseries ,
- beforeskip = -50 \p@
+ afterindent = false
}
\keys_set:nn { ctex / section }
{
number = \thesection ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.5ex \@plus 1ex \@minus .2ex ,
afterskip = 2.3ex \@plus .2ex ,
+ runin = false ,
format = \Large \bfseries ,
- beforeskip = -3.5ex \@plus -1ex \@minus -.2ex
+ afterindent = false
}
\keys_set:nn { ctex / subsection }
{
@@ -69,8 +74,10 @@
format = \large \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex
+ runin = false ,
+ afterindent = false
}
\keys_set:nn { ctex / subsubsection }
{
@@ -78,35 +85,41 @@
format = \normalsize \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex
+ runin = false ,
+ afterindent = false
}
\keys_set:nn { ctex / paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = false
}
\keys_set:nn { ctex / subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = false
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
{
\keys_set:nn { ctex / paragraph }
{
aftertitle = \@@par ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / paragraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
@@ -114,15 +127,15 @@
\keys_set:nn { ctex / subparagraph }
{
aftertitle = \@@par ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / subparagraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
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 fac90d7aea7..61d509648d8 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,42 +26,47 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
name = \partname \space ,
number = \thepart ,
- format = \centering ,
- nameformat = \huge \bfseries ,
aftername = \par \vskip 20 \p@ ,
+ beforeskip = 0pt \@plus 1fil ,
+ afterskip = 0pt \@plus 1fil ,
pagestyle = plain ,
+ format = \centering ,
+ nameformat = \huge \bfseries ,
titleformat = \Huge \bfseries
}
\keys_set:nn { ctex / chapter }
{
pagestyle = plain ,
- nameformat = \huge \bfseries ,
aftertitle = \par ,
+ beforeskip = 50 \p@ ,
afterskip = 40 \p@ ,
name = \chaptername \space ,
number = \thechapter ,
format = \raggedright ,
+ nameformat = \huge \bfseries ,
aftername = \par \nobreak \vskip 20 \p@ ,
titleformat = \Huge \bfseries ,
- beforeskip = -50 \p@
+ afterindent = false
}
\keys_set:nn { ctex / section }
{
number = \thesection ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.5ex \@plus 1ex \@minus .2ex ,
afterskip = 2.3ex \@plus .2ex ,
+ runin = false ,
format = \Large \bfseries ,
- beforeskip = -3.5ex \@plus -1ex \@minus -.2ex
+ afterindent = false
}
\keys_set:nn { ctex / subsection }
{
@@ -69,8 +74,10 @@
format = \large \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex
+ runin = false ,
+ afterindent = false
}
\keys_set:nn { ctex / subsubsection }
{
@@ -78,35 +85,41 @@
format = \normalsize \bfseries ,
aftername = \quad ,
aftertitle = \@@par ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
afterskip = 1.5ex \@plus .2ex ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex
+ runin = false ,
+ afterindent = false
}
\keys_set:nn { ctex / paragraph }
{
number = \theparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = false
}
\keys_set:nn { ctex / subparagraph }
{
number = \thesubparagraph ,
format = \normalsize \bfseries ,
- aftername = \quad
+ aftername = \quad ,
+ beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
+ afterindent = false
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
{
\keys_set:nn { ctex / paragraph }
{
aftertitle = \@@par ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / paragraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_three
@@ -114,15 +127,15 @@
\keys_set:nn { ctex / subparagraph }
{
aftertitle = \@@par ,
- beforeskip = -3.25ex \@plus -1ex \@minus -.2ex ,
- afterskip = 1ex \@plus .2ex
+ afterskip = 1ex \@plus .2ex ,
+ runin = false
}
}
{
\keys_set:nn { ctex / subparagraph }
{
- beforeskip = 3.25ex \@plus 1ex \@minus .2ex ,
- afterskip = -1em
+ afterskip = 1em ,
+ runin = true
}
}
\int_compare:nNnTF \g__ctex_section_depth_flag > \c_two
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 7823ef28251..c3cee4ceabb 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 ca75f0e 2015-06-19 17:39:23 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.1}{\ExplFileDescription}
+ {\ExplFileDate}{2.2}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.