From cdbf5b2c845ca6b373fff9043f2e00b14807950a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Sep 2016 21:05:03 +0000 Subject: ctex git-svn-id: svn://tug.org/texlive/trunk@42148 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/ctex/scheme/ctex-scheme-chinese-article.def | 9 +++++++-- .../tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def | 4 ++-- .../tex/latex/ctex/scheme/ctex-scheme-chinese-book.def | 11 +++++++++-- .../tex/latex/ctex/scheme/ctex-scheme-chinese-report.def | 11 +++++++++-- .../texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def | 4 ++-- .../tex/latex/ctex/scheme/ctex-scheme-plain-article.def | 9 +++++++-- .../tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def | 4 ++-- .../tex/latex/ctex/scheme/ctex-scheme-plain-book.def | 11 +++++++++-- .../tex/latex/ctex/scheme/ctex-scheme-plain-report.def | 11 +++++++++-- Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def | 4 ++-- 10 files changed, 58 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ctex/scheme') 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 fc8f1584bbc..64358c44c7c 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,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -48,6 +48,7 @@ beforeskip = 3.5ex \@plus 1ex \@minus .2ex , afterskip = 2.3ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , format = \Large \bfseries \centering , afterindent = true } @@ -60,6 +61,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / subsubsection } @@ -71,6 +73,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / paragraph } @@ -79,6 +82,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / subparagraph } @@ -87,6 +91,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = true } \int_compare:nNnTF \g__ctex_section_depth_flag > \c_two 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 b4716185c90..43ec409b072 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Chinese scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-beamer.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\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 1973416383b..c180029d209 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,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -38,6 +38,7 @@ beforeskip = 0pt \@plus 1fil , afterskip = 0pt \@plus 1fil , pagestyle = plain , + break = \if@openright \cleardoublepage \else \clearpage \fi , format = \huge \bfseries \centering } \keys_set:nn { ctex / chapter } @@ -46,6 +47,7 @@ aftertitle = \par , beforeskip = 50 \p@ , afterskip = 40 \p@ , + break = \if@openright \cleardoublepage \else \clearpage \fi , number = \chinese { chapter } , format = \huge \bfseries \centering , aftername = \quad , @@ -59,6 +61,7 @@ beforeskip = 3.5ex \@plus 1ex \@minus .2ex , afterskip = 2.3ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , format = \Large \bfseries \centering , afterindent = true } @@ -71,6 +74,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / subsubsection } @@ -82,6 +86,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / paragraph } @@ -90,6 +95,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / subparagraph } @@ -98,6 +104,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = 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 cd71b7ae9a8..dd8995d2d92 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,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -38,6 +38,7 @@ beforeskip = 0pt \@plus 1fil , afterskip = 0pt \@plus 1fil , pagestyle = plain , + break = \if@openright \cleardoublepage \else \clearpage \fi , format = \huge \bfseries \centering } \keys_set:nn { ctex / chapter } @@ -46,6 +47,7 @@ aftertitle = \par , beforeskip = 50 \p@ , afterskip = 40 \p@ , + break = \if@openright \cleardoublepage \else \clearpage \fi , number = \chinese { chapter } , format = \huge \bfseries \centering , aftername = \quad , @@ -59,6 +61,7 @@ beforeskip = 3.5ex \@plus 1ex \@minus .2ex , afterskip = 2.3ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , format = \Large \bfseries \centering , afterindent = true } @@ -71,6 +74,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / subsubsection } @@ -82,6 +86,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / paragraph } @@ -90,6 +95,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = true } \keys_set:nn { ctex / subparagraph } @@ -98,6 +104,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = 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 02fd2548e60..9b71d1df5ba 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 e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex } { today = small } \ctex_if_autoindent_touched:F { \keys_set:nn { ctex } { autoindent = true } } 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 cdb870f9105..666ee851723 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,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -51,6 +51,7 @@ beforeskip = 3.5ex \@plus 1ex \@minus .2ex , afterskip = 2.3ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , format = \Large \bfseries , afterindent = false } @@ -63,6 +64,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / subsubsection } @@ -74,6 +76,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / paragraph } @@ -82,6 +85,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / subparagraph } @@ -90,6 +94,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = false } \int_compare:nNnTF \g__ctex_section_depth_flag > \c_two 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 08ee4d11e98..c3e569c1093 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Plain scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-plain-beamer.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\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 a34365f1653..a1e840e79d3 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,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -39,6 +39,7 @@ beforeskip = 0pt \@plus 1fil , afterskip = 0pt \@plus 1fil , pagestyle = plain , + break = \if@openright \cleardoublepage \else \clearpage \fi , format = \centering , nameformat = \huge \bfseries , titleformat = \Huge \bfseries @@ -49,6 +50,7 @@ aftertitle = \par , beforeskip = 50 \p@ , afterskip = 40 \p@ , + break = \if@openright \cleardoublepage \else \clearpage \fi , name = \chaptername \space , number = \thechapter , format = \raggedright , @@ -65,6 +67,7 @@ beforeskip = 3.5ex \@plus 1ex \@minus .2ex , afterskip = 2.3ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , format = \Large \bfseries , afterindent = false } @@ -77,6 +80,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / subsubsection } @@ -88,6 +92,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / paragraph } @@ -96,6 +101,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / subparagraph } @@ -104,6 +110,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = false } \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 90eacdb46bd..cf917497eb3 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,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -39,6 +39,7 @@ beforeskip = 0pt \@plus 1fil , afterskip = 0pt \@plus 1fil , pagestyle = plain , + break = \if@openright \cleardoublepage \else \clearpage \fi , format = \centering , nameformat = \huge \bfseries , titleformat = \Huge \bfseries @@ -49,6 +50,7 @@ aftertitle = \par , beforeskip = 50 \p@ , afterskip = 40 \p@ , + break = \if@openright \cleardoublepage \else \clearpage \fi , name = \chaptername \space , number = \thechapter , format = \raggedright , @@ -65,6 +67,7 @@ beforeskip = 3.5ex \@plus 1ex \@minus .2ex , afterskip = 2.3ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , format = \Large \bfseries , afterindent = false } @@ -77,6 +80,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / subsubsection } @@ -88,6 +92,7 @@ beforeskip = 3.25ex \@plus 1ex \@minus .2ex , afterskip = 1.5ex \@plus .2ex , runin = false , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / paragraph } @@ -96,6 +101,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = false } \keys_set:nn { ctex / subparagraph } @@ -104,6 +110,7 @@ format = \normalsize \bfseries , aftername = \quad , beforeskip = 3.25ex \@plus 1ex \@minus .2ex , + break = \addpenalty \@secpenalty , afterindent = false } \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 834f7b0fc86..8436dcc7906 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 e653f84 2016-08-27 11:05:06 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx b7f83de 2016-09-21 21:27:31 +0800 Qing Lee $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.4.3}{\ExplFileDescription} + {\ExplFileDate}{2.4.4}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. -- cgit v1.2.3