ctex (30jun15)

git-svn-id: svn://tug.org/texlive/trunk@37720 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 31 insertions, 22 deletions

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