easybook (28jan22)

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

3 files changed, 21 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 6ec10a050ba..f0ff61233e9 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/25}{1.53}
+\ProvidesExplPackage{easybase}{2022/01/28}{1.54}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -97,12 +97,12 @@
   }
 \msg_new:nnn { easybase } { package-repeat-load-i }
   {
-    The~macro~package~#1~has~been~loaded~repeatedly. \\
+    The~macro~package~'#1'~has~been~loaded~repeatedly. \\
     Please~pass~the~arguments~by \\
     the~\string\PassOptionsToPackage{#2}{#1}\ command.
   }
 \msg_new:nnn { easybase } { package-repeat-load-ii }
-  { The~macro~package~#1~has~been~loaded~repeatedly. }
+  { The~macro~package~'#1'~has~been~loaded~repeatedly. }
 \cs_set_eq:NN \eb@usepackage@save \usepackage
 \RenewDocumentCommand{\usepackage}{O{}m}
   {
@@ -184,14 +184,14 @@
 \eb_seq_map_inline:nn
   { style,subfont,spread,bibset,thmset,hdrset,tocset }
   {
-    \msg_new:nnn { easybase } { abandon-#1 }
+    \msg_new:nnn { easybase } { deprecated-#1 }
       {
-        ##1~is~an~abandoned~option~of~#1~module. \\
+        The~option~'##1'~of~module~'#1'~is~deprecated~or~non-existent. \\
         Please~browse~the~user~manual~for~the~new~options.
       }
   }
-\cs_new_protected:Npn \eb_msg_abandon_option:n #1
-  { \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str }
+\cs_new_protected:Npn \eb_msg_deprecated_option:n #1
+  { \msg_warning:nnV { easybase } { deprecated-#1 } \l_keys_key_str }
 \cs_if_exist:NF \chapter
   {
     \newcounter{chapter}
@@ -213,7 +213,7 @@
   }
 \msg_new:nnn { easybase } { no-chapter }
   {
-    Your~document~class~is~in~article~mode. \\
+    Your~document~class~is~in~'article'~mode. \\
     The~\string\chapter\ command~will~not~be~used.
   }
 
@@ -237,7 +237,7 @@
   }
 \msg_new:nnn { easybase } { package-old }
   {
-    Package~#1~has~been~out~of~date. \\
+    Package~'#1'~has~been~out~of~date. \\
     Some~problems~or~errors~may~occur \\
     if~you~continue~compiling. \\\\
     Please~update~your~macro~package~from~CTAN.
@@ -634,7 +634,7 @@
     fntext-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \thefootnote {#1},
     fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
     fnmate-num .initial:n           = plain,
-    unknown .code:n = \eb_msg_abandon_option:n { hdrset }
+    unknown .code:n = \eb_msg_deprecated_option:n { hdrset }
   }
 
 \eb_at_end_preamble:n
@@ -761,7 +761,7 @@
   {
     It~is~not~recommended~that~you~use~the \\
     hang,~symbol,~marginal,~flushmargin~or~bottom \\
-    options~of~the~footmisc~package.
+    options~of~the~'footmisc'~package.
   }
 
 \cs_set_protected:Npn \footref #1
@@ -1016,7 +1016,7 @@
     hang .initial:n       = false,
     pagenumwd .code:n     = \contentsmargin{#1},
     pagenumwd .initial:n  = 1.55em,
-    unknown .code:n = \eb_msg_abandon_option:n { tocset }
+    unknown .code:n = \eb_msg_deprecated_option:n { tocset }
   }
 \NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}}
   {
@@ -1214,7 +1214,7 @@
         hyphen-listing = #1,hyphen-equation = #1
       },
     hyphen-every .initial:n   = .,
-    unknown .code:n = \eb_msg_abandon_option:n { style }
+    unknown .code:n = \eb_msg_deprecated_option:n { style }
   }
 \eb_seq_map_inline:nn
   { figure,table,lstlisting,equation }
@@ -1445,7 +1445,7 @@
     footnote .tl_set:N        = \l__eb_subfont_footnote_tl,
     marginpar .tl_set:N       = \l__eb_subfont_marginpar_tl,
     marginpar .initial:n      = \footnotesize,
-    unknown .code:n = \eb_msg_abandon_option:n { subfont }
+    unknown .code:n = \eb_msg_deprecated_option:n { subfont }
   }
 \cs_new_protected:Npn \addtosubfont #1#2
   {
@@ -1490,7 +1490,7 @@
         line = #1,table = #1,math = #1,
         caption-every = #1,footnote = #1
       },
-    unknown .code:n = \eb_msg_abandon_option:n { spread }
+    unknown .code:n = \eb_msg_deprecated_option:n { spread }
   }
 
 \tl_gset:Nn \marginfont { \l__eb_subfont_marginpar_tl }
@@ -1536,10 +1536,9 @@
   }
 \dim_zero_new:N \mathindent
 \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
-\skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
-\skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt }
+\skip_set:Nn \textfloatsep { 12pt plus 2pt minus 4pt }
+\skip_set:Nn \dbltextfloatsep { 12pt plus 2pt minus 4pt }
 \skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt }
-\skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt }
 \int_gset:Nn \vbadness { 10000 }
 \int_gset:Nn \hbadness { 10000 }
 \setcounter{topnumber}{4}
@@ -1676,7 +1675,7 @@
     \ctex_define:nn { thmset }
       {
         tcbwrap .code:n = { },
-        unknown .code:n = \eb_msg_abandon_option:n { thmset }
+        unknown .code:n = \eb_msg_deprecated_option:n { thmset }
       }
     \cs_undefine:N \proof
     \declaretheoremstyle{fancy}[
@@ -1758,7 +1757,7 @@
     datafile .clist_set:N     = \l__eb_bib_datafile_clist,
     bititle .tl_set:N         = \eb@bib@bitoc@title,
     bititle .initial:n        = Bibliography,
-    unknown .code:n = \eb_msg_abandon_option:n { bibset }
+    unknown .code:n = \eb_msg_deprecated_option:n { bibset }
   }
 
 \cs_new_protected:Npn \eb_bibtex_natbib_set:
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index c5de0e3a3b3..907e7c47600 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/25}{1.53}
+\ProvidesExplClass{easybook}{2022/01/28}{1.54}
   {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 3dca6194f0b..352ec070d78 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/25}{1.53}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/28}{1.54}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2