easybook (31dec21)

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

6 files changed, 26 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 299886a6a55..2dcc78cc66e 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 9179fa30027..9ec728b7eb3 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.42E,
-    date            = 2021/12/26,
+    version         = v1.42F,
+    date            = 2021/12/31,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 86fed33e09c..881c1e23819 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/26}{1.42E}
+\ProvidesExplClass{easybook}{2021/12/31}{1.42F}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -307,7 +307,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/26}{1.42E}
+\ProvidesExplPackage{easybase}{2021/12/31}{1.42F}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2129,16 +2129,15 @@
 \ctex_define:nn { bibset }
   {
     backend .choice:,
-    backend .value_required:n   = true,
-    backend/bibtex .code:n      = { },
-    backend/biblatex .code:n    = \bool_set_false:N \l__eb_backend_bibtex_bool,
-    bibstyle .code:n            = \tl_set:Nn \l__eb_bib_both_style_tl {#1},
-    bibstyle .value_required:n  = true,
-    bibstyle .initial:n         = numerical,
-    citestyle .code:n           = \tl_set:Nn \l__eb_bib_cite_style_tl {#1},
-    datafile .clist_set:N       = \l__eb_bib_datafile_clist,
-    bititle .tl_set:N           = \l__eb_bib_en_bitoc_title_tl,
-    bititle .initial:n          = Bibliography,
+    backend .value_required:n = true,
+    backend/bibtex .code:n    = \bool_set_true:N \l__eb_backend_bibtex_bool,
+    backend/biblatex .code:n  = \bool_set_false:N \l__eb_backend_bibtex_bool,
+    bibstyle .tl_set:N        = \l__eb_bib_both_style_tl,
+    bibstyle .initial:n       = numerical,
+    citestyle .tl_set:N       = \l__eb_bib_cite_style_tl,
+    datafile .clist_set:N     = \l__eb_bib_datafile_clist,
+    bititle .tl_set:N         = \l__eb_bib_en_bitoc_title_tl,
+    bititle .initial:n        = Bibliography,
     unknown .code:n = \eb_msg_abandon_option:n { bibset }
   }
 
@@ -2432,7 +2431,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/26}{1.42E}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/31}{1.42F}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index f1ac27b38ce..aedf43e538d 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}{2021/12/26}{1.42E}
+\ProvidesExplPackage{easybase}{2021/12/31}{1.42F}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1842,16 +1842,15 @@
 \ctex_define:nn { bibset }
   {
     backend .choice:,
-    backend .value_required:n   = true,
-    backend/bibtex .code:n      = { },
-    backend/biblatex .code:n    = \bool_set_false:N \l__eb_backend_bibtex_bool,
-    bibstyle .code:n            = \tl_set:Nn \l__eb_bib_both_style_tl {#1},
-    bibstyle .value_required:n  = true,
-    bibstyle .initial:n         = numerical,
-    citestyle .code:n           = \tl_set:Nn \l__eb_bib_cite_style_tl {#1},
-    datafile .clist_set:N       = \l__eb_bib_datafile_clist,
-    bititle .tl_set:N           = \l__eb_bib_en_bitoc_title_tl,
-    bititle .initial:n          = Bibliography,
+    backend .value_required:n = true,
+    backend/bibtex .code:n    = \bool_set_true:N \l__eb_backend_bibtex_bool,
+    backend/biblatex .code:n  = \bool_set_false:N \l__eb_backend_bibtex_bool,
+    bibstyle .tl_set:N        = \l__eb_bib_both_style_tl,
+    bibstyle .initial:n       = numerical,
+    citestyle .tl_set:N       = \l__eb_bib_cite_style_tl,
+    datafile .clist_set:N     = \l__eb_bib_datafile_clist,
+    bititle .tl_set:N         = \l__eb_bib_en_bitoc_title_tl,
+    bititle .initial:n        = Bibliography,
     unknown .code:n = \eb_msg_abandon_option:n { bibset }
   }
 
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 62a23e1f309..79266daa766 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}{2021/12/26}{1.42E}
+\ProvidesExplClass{easybook}{2021/12/31}{1.42F}
   {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 2d49b33272f..0cd5448005d 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}{2021/12/26}{1.42E}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/31}{1.42F}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1