diff options
author | Karl Berry <karl@freefriends.org> | 2024-12-22 22:47:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-12-22 22:47:46 +0000 |
commit | 4095c13da7ba8ed6c28f39b7b2f74386ed452d82 (patch) | |
tree | fc7c55ca2638c1b0b7907dc869d3dd2a38af7b50 /Master/texmf-dist/tex/latex/easybook | |
parent | bcff15e3c15cf9694fd8ce25b93ec97b842b21ee (diff) |
easybook (22dec24)
git-svn-id: svn://tug.org/texlive/trunk@73188 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 | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
3 files changed, 18 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 11925800127..d313c87b2e7 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/12/21}{2024hw} +\ProvidesExplPackage{easybase}{2024/12/22}{2024hx} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1224,8 +1224,8 @@ } \tl_new:N \eb@bitoc@title \bool_new:N \l__eb_toc_notitle_bool -\newbool{bitoc} -\cs_new:Npn \ebifbitoc { \ifbool{bitoc} } +\newbool{@bitoc} +\cs_new:Npn \ebifbitoc { \ifbool{@bitoc} } \seq_new:N \l__eb_level_tmpa_seq \tl_new:N \l__eb_level_tmpa_tl \cs_generate_variant:Nn \regex_extract_all:nnN { no } @@ -1298,9 +1298,9 @@ \str_if_eq:nnTF {#1} { mix } { \AddToHook{cmd/CTEX@addtocline/before}[bitoc] - {\addtocontents{toc}{\boolfalse{bitoc}}} + {\addtocontents{toc}{\boolfalse{@bitoc}}} \AddToHook{cmd/CTEX@addbitocline/before}[bitoc] - {\addtocontents{toc}{\booltrue{bitoc}}} + {\addtocontents{toc}{\booltrue{@bitoc}}} } { \IfHookEmptyTF{cmd/CTEX@addtocline/before}{} @@ -1326,9 +1326,7 @@ \cs_new_protected:Npn \eb_toc_assign_title_judge:nn #1#2 { \tl_set:Nn \eb@toc@title {#1} - \tl_if_novalue:nTF {#2} - { \tl_clear:N \eb@bitoc@title } - { \tl_set:Nn \eb@bitoc@title {#2} } + \tl_if_novalue:nF {#2} { \tl_set:Nn \eb@bitoc@title {#2} } } \cs_new_protected:Npn \eb_toc_start_multi_column_ext:n #1 { @@ -1361,12 +1359,16 @@ \clist_if_exist:cT { l__eb_toc_outer_kv_#1_clist } { \keys_set:nv { eb/tocouter } { l__eb_toc_outer_kv_#1_clist } } } +\cs_new_protected:Npn \eb_toc_kv_set:nn + { + \eb_toc_outer_kv_initial:n {#1} + \IfValueT{#2}{\keys_set:nn { eb/tocouter } {#2}} + } \cs_new_protected:Npn \eb_toc_list_struct_parse:nnnnn #1#2#3#4#5 { \group_begin: \tl_set_eq:Nc \eb@toc@title { list#4name } - \eb_toc_outer_kv_initial:n {#5} - \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}} + \eb_toc_kv_set:nn {#5} {#3} \eb_toc_title_level_cmd:n {#1} \eb_toc_if_title_between_hook:nn {#1} {#4} \eb_toc_start_multi_column_ext:n {#5} @@ -1432,18 +1434,18 @@ { \section* } } } - \eb_toc_outer_kv_initial:n { toc } - \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}} \bool_if:NT \l__eb_toc_plan_cn_bool { + \eb_toc_kv_set:nn { toc } {#3} \IfBooleanF{#1}{\eb@toc@title@level{\eb@toc@title}{}} \eb_toc_if_title_between_hook:nn {#1} { title } - \eb_toc_start_multi_column_ext:n { toc }#4 + \eb_toc_start_multi_column_ext:n { toc } } \bool_if:NT \l__eb_toc_plan_bi_bool { \tl_if_eq:NnF \g__eb_bilist_permute_value_tl { mix } { + \eb_toc_kv_set:nn { tec } {#3}#4 \IfBooleanF{#1}{\eb@toc@title@level{\eb@bitoc@title}{}} \eb_toc_if_title_between_hook:nn {#1} { bititle } \eb_toc_start_multi_column_ext:n { tec } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index cf1a5b398a7..4f54c5e9c41 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/12/21}{2024hw} +\ProvidesExplClass{easybook}{2024/12/22}{2024hx} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool @@ -40,7 +40,7 @@ { \tl_set:Nn \l__eb_font_value_tl {#1} }, font .value_required:n = true, font .initial:n = auto, - cjkfont .code:n = \eb_put_ctexbook:n { fontset = #1 }, + cjkfont .code:n = \eb_put_ctexbook:n { fontset = {#1} }, mathfont .tl_set:N = \l__eb_mathfont_value_tl, mathfont .initial:n = times, configs .clist_gset:N = \g__eb_configs_file_clist, diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 37dfa3d5840..f6e8cba7506 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/12/21}{2024hw} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/12/22}{2024hx} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |