easybook (14aug21)

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

3 files changed, 83 insertions, 62 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 9f31c7f8121..eab1d01e63b 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -8,12 +8,19 @@
 %% Copyright (C) 2021 by Qu Yi <quee123@foxmail.com>
 %% 
 %% This work may be distributed and/or modified under the
-%% conditions of the CC-BY 4.0 License.
-%% The latest version of this license is in
-%%   https://creativecommons.org/licenses/by/4.0/legalcode
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%% 
+%%   http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/13}{1.28N}
+\ProvidesExplPackage{easybase}{2021/08/13}{1.28o}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -126,10 +133,10 @@
 
 \keys_define:nn { easybase }
   {
-    draft .code:n         = \bool_set_true:N \l__eb_compile_draft_bool,
-    floatpage .bool_set:N = \l__eb_float_page_bool,
-    floatpage .default:n  = true,
-    floatpage .initial:n  = false,
+    draft .code:n           = \bool_set_true:N \l__eb_compile_draft_bool,
+    floatpage .bool_set:N   = \l__eb_float_page_bool,
+    floatpage .default:n    = true,
+    floatpage .initial:n    = false,
 
     paper .choice:,
     paper .value_required:n = true,
@@ -362,8 +369,8 @@
   }
 \ctex_define:nn { hdrset }
   {
-    head-foot .tl_set:N   = \l__eb_fancyhf_content_tl,
-    head-foot .initial:n  =
+    head-foot .tl_set:N     = \l__eb_fancyhf_content_tl,
+    head-foot .initial:n    =
       {
         \ifbool{@twoside}
           {
@@ -1731,16 +1738,16 @@
   {
     \sisetup
       {
-        mode = match,
+        mode              = match,
         table-parse-only,
         text-family-to-math,
         text-series-to-math,
-        reset-text-family   = false,
-        reset-text-series   = false,
-        reset-text-shape    = false,
-        range-phrase  = \ensuremath{\sim},
-        range-units   = single,
-        group-digits  = none
+        reset-text-family = false,
+        reset-text-series = false,
+        reset-text-shape  = false,
+        range-phrase      = \ensuremath{\sim},
+        range-units       = single,
+        group-digits      = none
       }
   }{}
 \eb_at_begin_environment:nn
@@ -1823,11 +1830,11 @@
     bib-style .value_required:n = true,
     bib-style .initial:n        = numerical,
 
-    cite-style .code:n      =
+    cite-style .code:n          =
       { \tl_set:Nn \l__eb_bib_cite_style_tl {#1} },
-    datafile .clist_set:N   = \l__eb_bib_datafile_clist,
-    bitoc-title .tl_set:N   = \l__eb_bib_en_bitoc_title_tl,
-    bitoc-title .initial:n  = Reference,
+    datafile .clist_set:N       = \l__eb_bib_datafile_clist,
+    bitoc-title .tl_set:N       = \l__eb_bib_en_bitoc_title_tl,
+    bitoc-title .initial:n      = Reference,
     unknown .code:n = \eb_msg_unknown_option:n { bibset }
   }
 
@@ -1900,8 +1907,32 @@
 
 \cs_new:Npn \eb@lst@if@display #1#2
   { \lst@ifdisplaystyle #1\else #2\fi }
-\lstdefinestyle{easy-listings}
+\lstdefinestyle{lst-base}
+  {
+    breaklines        = true,
+    resetmargins      = true,
+    % numbers           = left,
+    numberstyle       = \footnotesize,
+    basewidth         = 0.5em,
+    columns           = flexible,
+    aboveskip         = 1.5ex plus .2ex minus .1ex,
+    belowskip         = 1.5ex plus .2ex minus .1ex,
+    abovecaptionskip  = -1ex,
+    belowcaptionskip  = 1.5ex,
+    keepspaces        = true,
+    escapeinside      = {(*}{*)},
+    framerule         = \l__eb_rule_width_dim,
+    xleftmargin       = 5pt,
+    xrightmargin      = 5pt,
+    framesep          = \dimexpr(5pt - \l__eb_rule_width_dim),
+    frame             = single,
+    rulecolor         = \color{ctex@frame},
+    commentstyle      = \color{SlateGray},
+    emphstyle         = \color{ctex@emph}
+  }
+\lstdefinestyle{lst-latex}
   {
+    style         = lst-base,
     language      = [LaTeX]TeX,
     texcsstyle    = *\color{ctex@verb}\bfseries,
     basicstyle    =
@@ -1913,33 +1944,9 @@
       {
         \color{ctex@verb}
         \eb@lst@if@display{\bfseries}{}
-      },
-    framexleftmargin  = 0pt,
-    framexrightmargin = 0pt,
-    xleftmargin       = 3pt,
-    xrightmargin      = 3pt,
-    numbersep         = 10pt,
-    framesep          = 3pt,
-    frame             = single,
-    rulecolor         = \color{ctex@frame},
-    commentstyle      = \color{SlateGray},
-    emphstyle         = \color{ctex@emph}
-  }
-\lstset
-  {
-    style         = easy-listings,
-    breaklines    = true,
-    resetmargins  = true,
-    % numbers       = left,
-    numberstyle   = \footnotesize,
-    aboveskip     = 1.5ex plus .2ex minus .1ex,
-    belowskip     = 1.5ex plus .2ex minus .1ex,
-    keepspaces    = true,
-    framerule     = \l__eb_rule_width_dim,
-    columns       = flexible,
-    abovecaptionskip  = -1ex,
-    belowcaptionskip  = 1.5ex
+      }
   }
+\lstset{style = lst-latex}
 \lstloadlanguages{C,C++,Java,Python,Matlab}
 
 \clist_new:N \l__eb_hyperref_clist
@@ -1993,7 +2000,7 @@
     linktype .initial:n         = edge,
 
     linktoc .choice:,
-    linktoc/unknown .code:n =
+    linktoc/unknown .code:n     =
       {
         \eb_put_hyperref:n { linktoc = #1 }
         \clist_map_inline:nn { page,none }
@@ -2005,9 +2012,9 @@
               }
           }
       },
-    linktoc .default:n      = all,
-    linktoc .initial:n      = all,
-    unknown .code:n         =
+    linktoc .default:n          = all,
+    linktoc .initial:n          = all,
+    unknown .code:n             =
       {
         \eb_put_hyperref:x
           {
@@ -2045,8 +2052,8 @@
         { cyberpunk, 601986,eb6877,a4005b }
       }
       \eb_theme_color_set:n
-    color .initial:n  = none,
-    color-all .code:n =
+    color .initial:n        = none,
+    color-all .code:n       =
       { \eb_define_theme_color:n { \exp_not:n {#1} } }
   }
 
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 4895dfdcf12..b30a49bb451 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -8,12 +8,19 @@
 %% Copyright (C) 2021 by Qu Yi <quee123@foxmail.com>
 %% 
 %% This work may be distributed and/or modified under the
-%% conditions of the CC-BY 4.0 License.
-%% The latest version of this license is in
-%%   https://creativecommons.org/licenses/by/4.0/legalcode
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%% 
+%%   http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/08/13}{1.28N}
+\ProvidesExplClass{easybook}{2021/08/13}{1.28o}
   {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 6cee4f74ad3..26e37795609 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -8,10 +8,17 @@
 %% Copyright (C) 2021 by Qu Yi <quee123@foxmail.com>
 %% 
 %% This work may be distributed and/or modified under the
-%% conditions of the CC-BY 4.0 License.
-%% The latest version of this license is in
-%%   https://creativecommons.org/licenses/by/4.0/legalcode
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/13}{1.28N}
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%% 
+%%   http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status `maintained'.
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/13}{1.28o}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }