diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-21 20:41:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-21 20:41:10 +0000 |
commit | 18662b9a3d569ac82849d73b96ae9004c8200c3a (patch) | |
tree | b6abb714eb5b0a66e3d13dad45f10a4e95e199e7 /Master/texmf-dist/tex/latex/ctex/heading | |
parent | 166e20addacc9c78978838a17bc09cddcff30eef (diff) |
ctex
git-svn-id: svn://tug.org/texlive/trunk@58583 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/heading')
4 files changed, 89 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def index 63d2b391995..03d7154fafe 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,article') %% -%% Copyright (C) 2003--2020 +%% Copyright (C) 2003--2021 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@gmail.com> $ {Heading modification for article (CTEX)} \ProvidesExplFile{ctex-article.def} - {\ExplFileDate}{2.5.5}{\ExplFileDescription} + {\ExplFileDate}{2.5.6}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -657,12 +657,35 @@ \fi: \ctex_at_end_package:nn { fancyhdr } { - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesection \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesubsection \quad } { } } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \m@ne \@chapapp\ \thechapter . ~ \ \fi } + { \CTEXifname { \CTEXthechapter \quad } { } } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \f@nch@initialise + \@ifpackagewith { fancyhdr } { headings } + { + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection \quad \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \@ne \thesubsection \quad \fi } + { \CTEXifname { \CTEXthesubsection \quad } { } } + \else: + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection \quad \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: + } + { } } \ctex_define:n { diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def index b2c33a84c4f..74a6ed0db7b 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,beamer') %% -%% Copyright (C) 2003--2020 +%% Copyright (C) 2003--2021 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@gmail.com> $ {Heading modification for beamer (CTEX)} \ProvidesExplFile{ctex-beamer.def} - {\ExplFileDate}{2.5.5}{\ExplFileDescription} + {\ExplFileDate}{2.5.6}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_headings_seq { part , section , subsection } \cs_new_protected:Npn \__ctex_initial_heading:n #1 diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def index cf9a4860c13..c8f308a4438 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,book') %% -%% Copyright (C) 2003--2020 +%% Copyright (C) 2003--2021 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@gmail.com> $ {Heading modification for book (CTEX)} \ProvidesExplFile{ctex-book.def} - {\ExplFileDate}{2.5.5}{\ExplFileDescription} + {\ExplFileDate}{2.5.6}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -784,12 +784,35 @@ \fi: \ctex_at_end_package:nn { fancyhdr } { - \ctex_patch_cmd:Nnn \ps@fancy - { \ifnum \c@secnumdepth > \m@ne \@chapapp \ \thechapter . ~ \ \fi } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \z@ \thesection \hskip 1em \relax \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } + { \CTEXifname { \CTEXthesubsection \quad } { } } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \m@ne \@chapapp\ \thechapter . ~ \ \fi } { \CTEXifname { \CTEXthechapter \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } + \f@nch@initialise + \@ifpackagewith { fancyhdr } { headings } + { + \ctex_patch_cmd:Nnn \ps@headings + { + \ifnum \c@secnumdepth > \m@ne \if@mainmatter + \@chapapp \ \thechapter . ~ \ % + \fi \fi + } + { \CTEXifname { \CTEXthechapter \quad } { } } + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: + } + { } } \ctex_define:n { diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def index 48ceb94224a..bf1501ca57a 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,report') %% -%% Copyright (C) 2003--2020 +%% Copyright (C) 2003--2021 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@gmail.com> $ {Heading modification for report (CTEX)} \ProvidesExplFile{ctex-report.def} - {\ExplFileDate}{2.5.5}{\ExplFileDescription} + {\ExplFileDate}{2.5.6}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -779,12 +779,35 @@ \fi: \ctex_at_end_package:nn { fancyhdr } { - \ctex_patch_cmd:Nnn \ps@fancy - { \ifnum \c@secnumdepth > \m@ne \@chapapp \ \thechapter . ~ \ \fi } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \z@ \thesection \hskip 1em \relax \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } + { \CTEXifname { \CTEXthesubsection \quad } { } } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \m@ne \@chapapp\ \thechapter . ~ \ \fi } { \CTEXifname { \CTEXthechapter \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } + \f@nch@initialise + \@ifpackagewith { fancyhdr } { headings } + { + \ctex_patch_cmd:Nnn \ps@headings + { + \ifnum \c@secnumdepth > \m@ne + \@chapapp \ \thechapter . ~ \ % + \fi + } + { \CTEXifname { \CTEXthechapter \quad } { } } + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: + } + { } } \ctex_define:n { |