easybook (15jan22)

git-svn-id: svn://tug.org/texlive/trunk@61616 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 17 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 50510661bd5..b3470a748c0 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}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/01/14}{1.46A}
+\ProvidesExplPackage{easybase}{2022/01/15}{1.46B}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 07300ce3b7b..e1ff1a41550 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,14 +20,13 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/14}{1.46A}
+\ProvidesExplClass{easybook}{2022/01/15}{1.46B}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
 \bool_set_false:N \l__eb_title_newline_bool
 \bool_set_true:N  \l__eb_class_mode_book_bool
-\tl_new:N         \l__eb_font_value_tl
-\clist_new:N      \g__eb_options_clist
+\clist_new:N      \g__eb_doc_options_clist
 \cs_new_protected:Npn \eb_put_ctexbook:n #1
   { \PassOptionsToClass{#1}{ctexbook} }
 \cs_generate_variant:Nn \eb_put_ctexbook:n { V }
@@ -59,12 +58,12 @@
     config .clist_gset:N        = \g__eb_config_file_clist,
     floatpage .bool_set:N       = \l__eb_float_page_bool,
     floatpage .default:n        = true,
-    unknown .code:n = \clist_gput_right:NV \g__eb_options_clist \CurrentOption
+    unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
   }
 
 \ProcessKeysOptions{easybook}
 \PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK}
-\eb_put_ctexbook:V \g__eb_options_clist
+\eb_put_ctexbook:V \g__eb_doc_options_clist
 \LoadClass[UTF8]{ctexbook}
 
 \RequirePackage{easybase}
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 074a55ea83e..8fa5ee3cf4b 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}{2022/01/14}{1.46A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/15}{1.46B}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
@@ -29,15 +29,14 @@
   { \@ifstar{\deftcbstyle}{\addtotcbstyle} }
 \cs_set_eq:NN \newtcbstyle \deftcbstyle
 
-\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
 \deftcbstyle{tc-theorem}
   {
     enhanced~jigsaw,pad~at~break* = 3pt,
     colframe = ctex@emph,
-    beforeafter~skip = 1.75ex plus .2ex minus .1ex,
+    beforeafter~skip = 0.5\baselineskip,
     left = 8pt,right = 8pt,
-    top = \eb@tc@line@skip,bottom = \eb@tc@line@skip,
-    middle = \eb@tc@line@skip
+    top = 0.5\baselineskip,bottom = 0.5\baselineskip,
+    middle = 0.5\baselineskip
   }
 \deftcbstyle{tc-easybox}
   {
@@ -45,11 +44,11 @@
     center~title,
     left = 8pt,right = 8pt,
     coltitle = black,colframe = black,
-    top = \eb@tc@line@skip,bottom = \eb@tc@line@skip,
-    middle = \eb@tc@line@skip,
-    toptitle = \eb@tc@line@skip,
+    top = 0.5\baselineskip,bottom = 0.5\baselineskip,
+    middle = 0.5\baselineskip,
+    toptitle = 0.5\baselineskip,
     titlerule = 0pt,
-    beforeafter~skip = 1.75ex plus .2ex minus .1ex
+    beforeafter~skip = 0.5\baselineskip
   }
 \deftcbstyle{tc-ebparbox}
   {
@@ -57,8 +56,8 @@
     enhanced~jigsaw,pad~at~break* = 3pt,
     boxrule = 0pt,
     left = 8pt,
-    middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip,
-    beforeafter~skip = 1.75ex plus .2ex minus .1ex
+    middle = 0.5\baselineskip,bottomtitle = 0.5\baselineskip,
+    beforeafter~skip = 0.5\baselineskip
   }
 \deftcbstyle{tc-ebemph}{on~line,blank}
 \deftcbstyle{tc-ebfbox}
@@ -90,8 +89,8 @@
       {
         colback = #2,colbacktitle = #2,
         opacityback = 0.2,opacitybacktitle = 0.2,
-        IfValueTF = {#3}{title = #3,top = 0pt}{top = \eb@tc@line@skip},
-        bottom = \eb@tc@line@skip,toptitle = \eb@tc@line@skip,
+        IfValueTF = {#3}{title = #3,top = 0pt}{top = 0.5\baselineskip},
+        bottom = 0.5\baselineskip,toptitle = 0.5\baselineskip,
         right = 8pt
       }{
         colback   = white,