texlive[73188] Master/texmf-dist: easybook (22dec24)

commits+karl at tug.org commits+karl at tug.org
Sun Dec 22 23:47:46 CET 2024


Revision: 73188
          https://tug.org/svn/texlive?view=revision&revision=73188
Author:   karl
Date:     2024-12-22 23:47:46 +0100 (Sun, 22 Dec 2024)
Log Message:
-----------
easybook (22dec24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/easybook/README.md
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
    trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
    trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
    trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
    trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg

Modified: trunk/Master/texmf-dist/doc/latex/easybook/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/README.md	2024-12-22 22:47:38 UTC (rev 73187)
+++ trunk/Master/texmf-dist/doc/latex/easybook/README.md	2024-12-22 22:47:46 UTC (rev 73188)
@@ -1,5 +1,5 @@
 # The `easybook` document class
-Easily typesetting Chinese theses or books (v2024hw)
+Easily typesetting Chinese theses or books (v2024hx)
 
 ## Abstract
 `easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2024-12-22 22:47:38 UTC (rev 73187)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2024-12-22 22:47:46 UTC (rev 73188)
@@ -23,8 +23,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK使用手册,
-    version         = v2024hw,
-    date            = 2024/12/21,
+    version         = v2024hx,
+    date            = 2024/12/22,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
     email           = toquyi at 163.com,

Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx	2024-12-22 22:47:38 UTC (rev 73187)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx	2024-12-22 22:47:46 UTC (rev 73188)
@@ -14,7 +14,7 @@
 % This work has the LPPL maintenance status `maintained'.
 %<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15]
 %<*class>
-\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
@@ -35,7 +35,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,
@@ -308,7 +308,7 @@
 %</class>
 %<*package>
 \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 }
@@ -1512,8 +1512,8 @@
   }
 \tl_new:N \eb at 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 }
@@ -1586,9 +1586,9 @@
         \str_if_eq:nnTF {#1} { mix }
           {
             \AddToHook{cmd/CTEX at addtocline/before}[bitoc]
-              {\addtocontents{toc}{\boolfalse{bitoc}}}
+              {\addtocontents{toc}{\boolfalse{@bitoc}}}
             \AddToHook{cmd/CTEX at addbitocline/before}[bitoc]
-              {\addtocontents{toc}{\booltrue{bitoc}}}
+              {\addtocontents{toc}{\booltrue{@bitoc}}}
           }
           {
             \IfHookEmptyTF{cmd/CTEX at addtocline/before}{}
@@ -1614,9 +1614,7 @@
 \cs_new_protected:Npn \eb_toc_assign_title_judge:nn #1#2
   {
     \tl_set:Nn \eb at toc@title {#1}
-    \tl_if_novalue:nTF {#2}
-      { \tl_clear:N \eb at bitoc@title }
-      { \tl_set:Nn \eb at bitoc@title {#2} }
+    \tl_if_novalue:nF {#2} { \tl_set:Nn \eb at bitoc@title {#2} }
   }
 \cs_new_protected:Npn \eb_toc_start_multi_column_ext:n #1
   {
@@ -1649,12 +1647,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 at 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}
@@ -1720,18 +1722,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 at toc@title at level{\eb at 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 at toc@title at level{\eb at bitoc@title}{}}
             \eb_toc_if_title_between_hook:nn {#1} { bititle }
             \eb_toc_start_multi_column_ext:n { tec }
@@ -3006,7 +3008,7 @@
   }
 %</package>
 %<*tcolorbox>
-\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

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty	2024-12-22 22:47:38 UTC (rev 73187)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty	2024-12-22 22:47:46 UTC (rev 73188)
@@ -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 at 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 at addtocline/before}[bitoc]
-              {\addtocontents{toc}{\boolfalse{bitoc}}}
+              {\addtocontents{toc}{\boolfalse{@bitoc}}}
             \AddToHook{cmd/CTEX at addbitocline/before}[bitoc]
-              {\addtocontents{toc}{\booltrue{bitoc}}}
+              {\addtocontents{toc}{\booltrue{@bitoc}}}
           }
           {
             \IfHookEmptyTF{cmd/CTEX at addtocline/before}{}
@@ -1326,9 +1326,7 @@
 \cs_new_protected:Npn \eb_toc_assign_title_judge:nn #1#2
   {
     \tl_set:Nn \eb at toc@title {#1}
-    \tl_if_novalue:nTF {#2}
-      { \tl_clear:N \eb at bitoc@title }
-      { \tl_set:Nn \eb at bitoc@title {#2} }
+    \tl_if_novalue:nF {#2} { \tl_set:Nn \eb at 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 at 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 at toc@title at level{\eb at 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 at toc@title at level{\eb at bitoc@title}{}}
             \eb_toc_if_title_between_hook:nn {#1} { bititle }
             \eb_toc_start_multi_column_ext:n { tec }

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2024-12-22 22:47:38 UTC (rev 73187)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2024-12-22 22:47:46 UTC (rev 73188)
@@ -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,

Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg	2024-12-22 22:47:38 UTC (rev 73187)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg	2024-12-22 22:47:46 UTC (rev 73188)
@@ -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



More information about the tex-live-commits mailing list.