diff options
author | Karl Berry <karl@freefriends.org> | 2024-06-14 21:40:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-06-14 21:40:47 +0000 |
commit | 7c6daf8381f92e1cb7cb876f2252496bf7298f10 (patch) | |
tree | 73ddca6e8f7a7733c78fb0481f86d5a850c8257c /Master/texmf-dist/tex/latex/easybook | |
parent | 3bb7c0c7ab20535ab3c5811d709a0ae9070e5694 (diff) |
easybook (14jun24)
git-svn-id: svn://tug.org/texlive/trunk@71519 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 89 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
3 files changed, 49 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index f6738444952..e01c8a7e42b 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/06/13}{2024cc} +\ProvidesExplPackage{easybase}{2024/06/14}{2024cd} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -107,6 +107,8 @@ \bool_set_true:N \l__eb_class_mode_book_bool \bool_set_false:N \l__eb_compile_draft_bool \clist_new:N \g__eb_ctex_options_clist +\cs_new_protected:Npn \eb_put_geometry:n #1 + { \PassOptionsToPackage{#1}{geometry} } \keys_define:nn { easybase } { @@ -121,19 +123,19 @@ theorem .bool_set:N = \l__eb_theorem_support_bool, theorem .default:n = true, theorem .initial:n = true, - paper .code:n = \PassOptionsToPackage{#1}{geometry}, + paper .code:n = \eb_put_geometry:n {#1}, paper .initial:n = a4paper, class .choice:, class .value_required:n = true, class/book .code:n = { \bool_set_true:N \l__eb_class_mode_book_bool - \PassOptionsToPackage{twoside}{geometry} + \eb_put_geometry:n { twoside } }, class/article .code:n = { \bool_set_false:N \l__eb_class_mode_book_bool - \PassOptionsToPackage{twoside = false}{geometry} + \eb_put_geometry:n { twoside = false } }, class .initial:n = book, book .meta:n = { class = book }, @@ -311,8 +313,7 @@ \cs_new_protected:Npn \blankpagestyle #1 { \tl_set:Nn \l__eb_blank_pagestyle_tl {#1} } \blankpagestyle{empty} -\RenewDocumentCommand{\cleardoublepage} - {O{\l__eb_blank_pagestyle_tl}} +\RenewDocumentCommand{\cleardoublepage}{O{\l__eb_blank_pagestyle_tl}} { \clearpage \ifbool{@twoside} @@ -333,19 +334,6 @@ \booltrue{@mainmatter} \pagenumbering{arabic} } -\clist_map_inline:nn - { chapter,section,subsection } - { - \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout } - {O{\use:c { CTEXthe#1 }}m} - {\tl_set:cn { eb@mark@#1@label } {##1##2}} - \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1 - { - \regex_match:nnTF { \[.*\] } {##1} - { \use:c { eb@mark@#1@label@layout }##1 } - { \use:c { eb@mark@#1@label@layout }{##1} } - } - } \NewDocumentCommand{\markrule} {O{\textwidth}D(){ctex@frame}m>{\SplitArgument{1}{|}}O{}} {\eb_draw_markrule:nnnnn {#1} {#2} {#3} #4} @@ -366,32 +354,49 @@ { none* } { \text_lowercase:n } } } -\ctex_define:nn { hdr } +\cs_new_protected:Npn \eb@register@hdr@mark #1 { - chap-mark .cs_set:Np = \eb@mark@chapter@whole #1, - chap-mark .initial:n = - { - \CTEXifname{\eb@mark@chapter@label}{} - \eb_mark_uppercase_case_init:n {#1} - }, - sec-mark .cs_set:Np = \eb@mark@section@whole #1, - sec-mark .initial:n = + \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout } + {O{\use:c { CTEXthe#1 }}m} + {\tl_set:cn { eb@mark@#1@label } {##1##2}} + \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1 { - \CTEXifname{\eb@mark@section@label}{} - \eb_mark_uppercase_case_init:n {#1} - }, - subsec-mark .cs_set:Np = \eb@mark@subsection@whole #1, - subsec-mark .initial:n = + \regex_match:nnTF { ^\[.*\] } {##1} + { \use:c { eb@mark@#1@label@layout }##1 } + { \use:c { eb@mark@#1@label@layout }{##1} } + } + \ctex_define:nn { hdr } { - \CTEXifname{\eb@mark@subsection@label}{} - \eb_mark_uppercase_case_init:n {#1} - }, - chap-label .code:n = \eb_mark_chapter_name_parse:n {#1}, - chap-label .initial:n = \hspace{1em}, - sec-label .code:n = \eb_mark_section_name_parse:n {#1}, - sec-label .initial:n = \hspace{0.5em}, - subsec-label .code:n = \eb_mark_subsection_name_parse:n {#1}, - subsec-label .initial:n = \hspace{0.5em}, + #1-mark .cs_set:cp = { eb@mark@#1@whole } ##1, + #1-mark .initial:n = + { + \CTEXifname{\use:c { eb@mark@#1@label }}{} + \eb_mark_uppercase_case_init:n {##1} + }, + #1-label .code:n = \use:c { eb_mark_#1_name_parse:n } {##1}, + } + } +\cs_new_protected:Npn \RegisterHdrMark #1 + { + \clist_map_function:nN {#1} + \eb@register@hdr@mark + } +\RegisterHdrMark{chapter,section,subsection} + +\ctex_set:nn { hdr } + { + chapter-label = \hspace{1em}, + section-label = \hspace{0.5em}, + subsection-label = \hspace{0.5em} + } +\ctex_define:nn { hdr } + { + chap-mark .meta:n = { chapter-mark = {#1} }, + sec-mark .meta:n = { section-mark = {#1} }, + subsec-mark .meta:n = { subsection-mark = {#1} }, + chap-label .meta:n = { chapter-label = {#1} }, + sec-label .meta:n = { section-label = {#1} }, + subsec-label .meta:n = { subsection-label = {#1} }, headrulewd .dim_set:N = \eb@head@rule@wd, headrulewd .initial:n = 0.5pt, footnoterulewd .dim_set:N = \eb@footnote@rule@wd, diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index f5537f8f9c2..7c7772e7ce0 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] -\ProvidesExplClass{easybook}{2024/06/13}{2024cc} +\ProvidesExplClass{easybook}{2024/06/14}{2024cd} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index d474d36f0c5..44078e7da97 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/13}{2024cc} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/14}{2024cd} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |