easybook (11jan22)

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

3 files changed, 16 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index e2a7eb6b934..99663d98e47 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/08}{1.44}
+\ProvidesExplPackage{easybase}{2022/01/08}{1.45}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1493,20 +1493,12 @@
     format          = hang,
     labelfont       = {color = ctex@frame},
     labelsep        = quad,
-    singlelinecheck = true,
-    belowskip       = 0pt,
-    aboveskip       = 10pt
+    singlelinecheck = true
   }
 \captionsetup[table]{font = eb@table@font}
 \captionsetup[figure]{font = eb@figure@font}
 \captionsetup[lstlisting]{font = eb@listing@font}
-\captionsetup[subfigure]
-  {
-    labelformat = parens,
-    font        = eb@figure@font,
-    belowskip   = 2pt,
-    aboveskip   = 6pt
-  }
+\captionsetup[subfigure]{labelformat = parens,font = eb@figure@font}
 \ctex_at_end_package:nn { bicaption }
   {
     \captionsetup[figure][bi-second]{name = Figure}
@@ -1669,9 +1661,9 @@
 \RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
   {\eb@declaretheoremsyle@save[#1,#3]{#2}}
 \cs_set_eq:NN \newtheorem \declaretheorem
-\cs_new_protected:Npn \eb_if_thmframe_with_tcolorbox:TF #1#2
+\cs_new_protected:Npn \eb_tcbwrap_if_load_tcolorbox:TF #1#2
   {
-    \bool_if:NT \l__eb_thm_frame_bool
+    \bool_if:NT \l__eb_thm_tcbwrap_bool
       { \@ifpackageloaded{tcolorbox}{#1}{#2} }
   }
 \NewDocumentCommand{\deftheorem}
@@ -1687,7 +1679,7 @@
       name  = \tl_use:c { #1name },
       style = fancy,#5
       ]
-    \eb_if_thmframe_with_tcolorbox:TF
+    \eb_tcbwrap_if_load_tcolorbox:TF
       {
         \bool_if_exist:cTF { l__eb_tcb_repeat_env_#1_bool }
           { \bool_set_true:c { l__eb_tcb_repeat_env_#1_bool } }
@@ -1718,10 +1710,10 @@
   { \ctex_define:nn { thmset } { #1 .tl_set:N = #2 } }
 \ctex_define:nn { thmset }
   {
-    thmframe .bool_set:N  = \l__eb_thm_frame_bool,
-    thmframe .default:n   = true,
-    thmframe .initial:n   = false,
-    thmbox .meta:n        = { thmframe = #1 },
+    tcbwrap .bool_set:N   = \l__eb_thm_tcbwrap_bool,
+    tcbwrap .default:n    = true,
+    tcbwrap .initial:n    = false,
+    thmbox .meta:n        = { tcbwrap = #1 },
     thmbox .default:n     = true,
     notebraces .tl_set:N  = \l__eb_thm_notebraces_tl,
     unknown .code:n       = \eb_msg_abandon_option:n { thmset }
@@ -1748,12 +1740,12 @@
   }
 \msg_new:nnn { easybase } { need-tcolorbox }
   {
-    Now~that~the~thmframe~option~is~true. \\
+    Now~that~the~option~tcbwrap~is~true. \\
     Please~load~the~tcolorbox~macro~package.
   }
 \eb_at_end_preamble:n
   {
-    \eb_if_thmframe_with_tcolorbox:TF { }
+    \eb_tcbwrap_if_load_tcolorbox:TF { }
       { \msg_warning:nn { easybase } { need-tcolorbox } }
     \clist_put_right:Nx
     \c__eb_thmtools_entry_clist { notebraces = \l__eb_thm_notebraces_tl }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 7df405dd13f..158824816a9 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,7 +20,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/08}{1.44}
+\ProvidesExplClass{easybook}{2022/01/08}{1.45}
   {Typeset Chinese theses or books}
 
 \bool_set_false: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 c54e792660a..24cbbfdf4cd 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/08}{1.44}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/08}{1.45}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
@@ -33,7 +33,6 @@
 \deftcbstyle{tc-theorem}
   {
     enhanced~jigsaw,pad~at~break* = 3pt,
-    opacityback = 0,
     colframe = ctex@emph,
     beforeafter~skip = 1.75ex plus .2ex minus .1ex,
     left = 8pt,right = 8pt,
@@ -101,12 +100,12 @@
       },
     coltitle = #2,tc-ebparbox,#4
   }
-\DeclareTotalTCBox{\ebfbox}{O{Green}vO{}}
+\DeclareTotalTCBox{\ebfbox}{O{Green}mO{}}
   {
     colback = #1,colframe = #1,
     tc-ebfbox,#3
   }{#2}
-\DeclareTotalTCBox{\ebemph}{O{Yellow}vO{}}
+\DeclareTotalTCBox{\ebemph}{O{Yellow}mO{}}
   {
     fuzzy~halo = 2pt~with~#1,
     tc-ebemph,#3