diff options
author | Norbert Preining <preining@logic.at> | 2021-04-07 15:02:50 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2021-04-07 15:02:50 +0000 |
commit | a977bff2c2b6232f38876f26c18ee7bd507d6df2 (patch) | |
tree | f3ecbb62df677982ac66c2be8000eda0df81ac05 /Master/texmf-dist/tex | |
parent | 3d62c21ac11f8ba5544e0f9d6703827284ba3899 (diff) |
easybook (7apr21)
git-svn-id: svn://tug.org/texlive/trunk@58788 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 111 |
1 files changed, 54 insertions, 57 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index bbd9acfebc9..dcd25d8e8e6 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -13,7 +13,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/04/05}{1.24e}{beta} +\ProvidesExplClass{easybook}{2021/04/06}{1.24f}{beta} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -358,7 +358,7 @@ \easyhead[OC]{\color{ctex@frame}\kaishu\rightmark} \easyhead[EL,OR]{\color{ctex@frame}\thepage} }, - chap-mark .tl_set:N = \l__fancyhf_chap_mark_tl, + chap-mark .cs_set:Np = \__fancyhf_chap_mark:n #1, chap-mark .initial:n = { \int_compare:nT {\c@secnumdepth > -1} @@ -368,9 +368,9 @@ \CTEXthechapter\hspace{\ccwd} \fi \fi - } + }#1 }, - sec-mark .tl_set:N = \l__fancyhf_sec_mark_tl, + sec-mark .cs_set:Np = \__fancyhf_sec_mark:n #1, sec-mark .initial:n = { \int_compare:nT {\c@secnumdepth > 0} @@ -378,7 +378,7 @@ \ifodd\CTEX@section@numbering \CTEXthesection\hspace{0.5\ccwd} \fi - } + }#1 }, headrule .tl_gset:N = \headrule, headrule .initial:n = @@ -400,6 +400,12 @@ \group_end: } } +\cs_new_protected:Npn \__ifuppercase_chapmark_set:n #1 + { + \bool_if:NTF \l__uppercase_bool + {\text_uppercase:n {\__fancyhf_chap_mark:n {#1}}} + {\text_titlecase_first:n {\__fancyhf_chap_mark:n {#1}}} + } \ctex_at_end_preamble:n { \exp_args:NV \geometry\g__geometry_clist @@ -410,28 +416,14 @@ \cs_gset:Npn \chaptermark#1 { \markboth - { - \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {\l__fancyhf_chap_mark_tl#1}} - {\text_titlecase_first:n {\l__fancyhf_chap_mark_tl#1}} - }{ - \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {\l__fancyhf_chap_mark_tl#1}} - {\text_titlecase_first:n {\l__fancyhf_chap_mark_tl#1}} - } + {\__ifuppercase_chapmark_set:n {#1}} + {\__ifuppercase_chapmark_set:n {#1}} } \l__fancyhf_content_tl \cs_gset_eq:NN \ps@plain\ps@empty }{ \cs_gset:Npn \chaptermark#1 - { - \markboth - { - \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {\l__fancyhf_chap_mark_tl#1}} - {\text_titlecase_first:n {\l__fancyhf_chap_mark_tl#1}} - }{} - } + {\markboth{\__ifuppercase_chapmark_set:n {#1}}{}} \l__fancyhf_content_tl \cs_gset_eq:NN \ps@plain\ps@empty } @@ -440,8 +432,8 @@ \markright { \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {\l__fancyhf_sec_mark_tl#1}} - {\text_titlecase_first:n {\l__fancyhf_sec_mark_tl#1}} + {\text_uppercase:n {\__fancyhf_sec_mark:n {#1}}} + {\text_titlecase_first:n {\__fancyhf_sec_mark:n {#1}}} } } \bool_if:NT \l__draft_bool @@ -467,25 +459,28 @@ } \__ctex_define:nn {tocset} { - lists/lolskip .skip_set:N = \l__toc_lolskip_skip, - lists/lolskip .initial:n = 0.8pc, - lists/belowoffset .dim_set:N = \l__toc_listsoffset_dim, - lists/belowoffset .initial:n = 0pc, - lists/labelname-fig .cs_set:Np = \labelname@lof#1#2, - lists/labelname-fig .initial:n = + lists/lolskip .skip_set:N = \l__toc_lolskip_skip, + lists/lolskip .initial:n = 0.8pc, + lists/belowoffset .dim_set:N = \l__toc_listsoffset_dim, + lists/belowoffset .initial:n = 0pc, + tocline-fig .cs_set:Np = \labelname@lof#1#2, + tocline-fig .initial:n = {\figurename\space#1\hspace{\list@labelsep}#2}, - lists/labelname-tab .cs_set:Np = \labelname@lot#1#2, - lists/labelname-tab .initial:n = + tocline-tab .cs_set:Np = \labelname@lot#1#2, + tocline-tab .initial:n = {\tablename\space#1\hspace{\list@labelsep}#2}, - lists/labelname-lst .tl_set:N = \labelname@lol, - lists/labelname-lst .initial:n = + tocline-lst .tl_set:N = \labelname@lol, + tocline-lst .initial:n = { \lstlistingname\space \thelstlisting\hspace{\list@labelsep} - \lst@@caption + \lstcaption }, - belowoffset .dim_set:N = \l__toc_offset_dim, - belowoffset .initial:n = -1pc + belowoffset .dim_set:N = \l__toc_offset_dim, + belowoffset .initial:n = -1pc, + line-align .bool_set:N = \l__toc_line_align_bool, + line-align .default:n = true, + line-align .initial:n = true } \ctex_set:nn {tocset} { @@ -510,10 +505,16 @@ lists/rule = \tocrule{$\cdot$} } -\NewDocumentCommand{\tocrule}{O{0.7pc}D(){1.2}mO{}} +\NewDocumentCommand{\tocrule}{sO{0.7pc}D(){1.2}mO{}} { \normalsize\normalfont - \titlerule*[#1]{\scalebox{#2}{#3}}#4\contentspage + \titlerule*[#2]{\scalebox{#3}{#4}}#5 + \IfBooleanTF{#1} + {\thecontentspage} + { + \bool_if:NTF \l__toc_line_align_bool + {\contentspage}{\thecontentspage} + } } \cs_new_protected:Npn \__titlecontents_set:nn #1#2 { @@ -533,6 +534,7 @@ {table}{lists}, {lstlisting}{lists} }{\__titlecontents_set:nn #1} + \prop_new:N \l_label_name_prop \prop_set_from_keyval:Nn \l_label_name_prop { @@ -548,7 +550,10 @@ { \addcontentsline{lol}{lstlisting} {\protect\numberline{\thelstlisting}\lst@@caption} - }{\addcontentsline{lol}{lstlisting}{\labelname@lol}} + }{ + \let\lstcaption\lst@@caption + \addcontentsline{lol}{lstlisting}{\labelname@lol} + } \__appto_cmd:Nn \@chapter { \skip_if_eq:nnF {\l__toc_lolskip_skip}{\c_zero_skip} @@ -570,28 +575,20 @@ The~\string\chapter\space~command~will~not~be~used. } +\cs_new_protected:Npn \__ifuppercase_set:n #1 + { + \bool_if:NTF \l__uppercase_bool + {\text_uppercase:n {#1}} + {\text_titlecase_first:n {#1}} + } \cs_new_protected:Npn \__markboth:n #1 { \bool_if:NTF \l__page_twoside_bool { \markboth - { - \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {#1}} - {\text_titlecase_first:n {#1}} - }{ - \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {#1}} - {\text_titlecase_first:n {#1}} - } - }{ - \markboth - { - \bool_if:NTF \l__uppercase_bool - {\text_uppercase:n {#1}} - {\text_titlecase_first:n {#1}} - }{} - } + {\__ifuppercase_set:n {#1}} + {\__ifuppercase_set:n {#1}} + }{\markboth{\__ifuppercase_set:n {#1}}{}} } \tl_set:Nn \l__toc_type_tl{book} |