CTAN sync 202102140300

6 files changed, 118 insertions, 111 deletions

diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index f668a9e04b..8e0b1215f2 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index f9046d9a39..e4a64adbb8 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -15,7 +15,8 @@
         % withpart = true,
         % perpart = true,
         perpage = true,
-        % notomath = false
+        % notomath = false,
+        rulewidth = 0.75pt
       },
     link =
       {
@@ -25,19 +26,19 @@
       },
     spread =
       {
-        linespread = 1.355,
-        tabspread = 1.05,
-        mathspread = 1.05,
-        capspread = 1,
-        fnspread = 1
+        line = 1.355,
+        table = 1.05,
+        math = 1.05,
+        caption = 1,
+        footnote = 1
       },
     elfont =
       {
-        tabfont = \sffamily\zihao{5},
-        figfont = \sffamily\zihao{5},
-        lstfont = \sffamily\zihao{5},
-        fnfont = \rmfamily,
-        marfont = \sffamily\zihao{-5}
+        table-cap = \sffamily\zihao{5},
+        figure-cap = \sffamily\zihao{5},
+        listing-cap = \sffamily\zihao{5},
+        footnote = \rmfamily,
+        marginpar = \sffamily\zihao{-5}
       },
     thmset =
       {
@@ -94,7 +95,7 @@
         \github~\url{https://github.com/texl3/easybook} \\
         \edge~\url{https://latexstudio.net}
       }
-    \date{2021/02/10\hskip\ccwd\relax v1.23c}
+    \date{2021/02/13\hskip\ccwd\relax v1.23d}
   }
 
 \begin{document}
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index 283aa4c6f3..f53a65b20f 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex
index fee663811c..aaaab47ed8 100644
--- a/macros/latex/contrib/easybook/doc/easybook.tex
+++ b/macros/latex/contrib/easybook/doc/easybook.tex
@@ -3,7 +3,7 @@
 
 \title{\sffamily easybook书籍文档类}
 \author{瞿毅}
-\date{2021/02/10\hskip\ccwd\relax v1.23c\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/13\hskip\ccwd\relax v1.23d\thanks{\url{https://gitee.com/texl3/easybook}}}
 
 \begin{document}
 \maketitle
@@ -100,7 +100,7 @@
 \cls{easybook} 扩展了\CTeX 宏集\LaTeX 3风格键值的通用控制命令 \tn{ctexset}，接口选项同样用它设置， 原有的键值列表仍然可用。
 \end{function}
 
-\begin{function}[added = 2021-01-08]{config}
+\begin{function}[EXP,added = 2021-01-08]{config}
 \begin{syntax}
   config = <配置文件名>
 \end{syntax}
@@ -109,7 +109,7 @@
 \end{function}
 
 \subsection{风格}
-\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-08]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath}
+\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-09]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath,style/rulewidth}
 \begin{syntax}
   color = <(none)|seaside|energy|cyberpunk>
   capdash = <true|(false)>
@@ -118,9 +118,11 @@
   perpart = <true|(false)>
   perpage = <true|(false)>
   notomath = <(true)|false>
+  rulewidth = <(0.75pt)>
 \end{syntax}
 \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。}
 \changes{v1.23}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。}
+\changes{v1.23b}{2021/02/09}{增加控制页面横线粗细的选项。}
 \opt{style} 选项控制文章的风格。
 \end{function}
 
@@ -139,6 +141,7 @@
   \item[perpart] 使脚注跟随每一部分编号，默认不跟随。
   \item[perpage] 使脚注跟随每一页编号，默认不跟随。
   \item[notomath] 使用 \opt{noto} 风格的数学字体，将会加载 \pkg{newtxmath} 宏包。
+  \item[rulewidth] 调整页眉、定理盒子以及代码框线条的粗细。
 \end{optdesc}
 
 \subsection{超链接}
@@ -166,13 +169,13 @@
 \end{optdesc}
 
 \subsection{行距}
-\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-09]{spread/linespread,spread/tabspread,spread/mathspread,spread/capspread,spread/fnspread}
+\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-13]{spread/line,spread/table,spread/math,spread/caption,spread/footnote}
 \begin{syntax}
-  linespread = <(1.3)>
-  tabspread = <(1.05)>
-  mathspread = <(1.05)>
-  capspread = <(1)>
-  fnspread = <(1)>
+  line = <(1.3)>
+  table = <(1.05)>
+  math = <(1.05)>
+  caption = <(1)>
+  footnote = <(1)>
 \end{syntax}
 \changes{v1.21b}{2021/01/12}{增加脚注线间的距离选项。}
 \changes{v1.23b}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
@@ -180,32 +183,32 @@
 \end{function}
 
 \begin{optdesc}
-  \item[linespread] 正文行距。
-  \item[tabspread] 表格行距。
-  \item[mathspread] 数学环境行距。
-  \item[capspread] 图表代码标题行距。
-  \item[fnspread] 脚注行距。
+  \item[line] 正文行距。
+  \item[table] 表格行距。
+  \item[math] 数学环境行距。
+  \item[caption] 图表代码标题行距。
+  \item[footnote] 脚注行距。
 \end{optdesc}
 
 \subsection{其它字体}
-\begin{function}[EXP,added = 2021-01-08,updated = 2021-02-08]{elfont/tabfont,elfont/figfont,elfont/lstfont,elfont/fnfont,elfont/marfont}
+\begin{function}[EXP,added = 2021-01-08,updated = 2021-02-13]{elfont/table-cap,elfont/figure-cap,elfont/listing-cap,elfont/footnote,elfont/marginpart}
 \begin{syntax}
-  tabfont = <\tn{sffamily}\tn{small}>
-  figfont = <\tn{sffamily}\tn{small}>
-  lstfont = <\tn{sffamily}\tn{small}>
-  fnfont = <\tn{rmfamily}>
-  marfont = <\tn{rmfamily}\tn{footnotesize}>
+  table-cap = <\tn{sffamily}\tn{small}>
+  figure-cap = <\tn{sffamily}\tn{small}>
+  listing-cap = <\tn{sffamily}\tn{small}>
+  footnote = <\tn{rmfamily}>
+  marginpart = <\tn{rmfamily}\tn{footnotesize}>
 \end{syntax}
 \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
 \changes{v1.23a}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
 \end{function}
 
 \begin{optdesc}
-  \item[tabfont] 表格标题的字体设置。
-  \item[figfont] 图片标题的字体设置。
-  \item[lstfont] 代码标题的字体设置。
-  \item[fnfont] 脚注的字体设置，请不要使用字号命令。
-  \item[marfont] 边注的字体设置。
+  \item[table-cap] 表格标题的字体设置。
+  \item[figure-cap] 图片标题的字体设置。
+  \item[listing-cap] 代码标题的字体设置。
+  \item[footnote] 脚注的字体设置，请不要使用字号命令。
+  \item[marginpar] 边注的字体设置。
 \end{optdesc}
 
 \subsection{参考文献}
@@ -410,16 +413,16 @@
 \end{function}
 
 \subsection{习题}
-\begin{function}[added = 2021-01-05,updated = 2021-02-08]{exercise}
+\begin{function}[added = 2021-01-05,updated = 2021-02-13]{exercise}
 \begin{syntax}
-  \tn{begin}\marg{exercise}\oarg{颜色名}\oarg{编号}\oarg{标题}
+  \tn{begin}\marg{exercise}\oarg{颜色名|(LightYellow)}\oarg{编号|(1.)}\oarg{标题|(习题)}
   \tn{item} <习题内容>
   \tn{end}\marg{exercise}
 \end{syntax}
 \changes{v1.23a}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
-习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称（深色），正文编号格式与小节 \ref{sort list} 排序列表相同，标题名默认为摘要，参数只能\textbf{从右往左}省略。
+习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称，正文编号格式与小节 \ref{sort list} 排序列表相同，标题名默认为摘要，参数只能\textbf{从右往左}省略。
 \begin{ctexexam}
-    \begin{exercise}[black][1.][习题]
+    \begin{exercise}[LightYellow][1.][习题]
     \item 习题内容
     \item 习题内容
     \end{exercise}
@@ -445,15 +448,15 @@
 \end{function}
 
 \subsubsection{段落盒子}
-\begin{function}[added = 2021-01-05]{mybox}
+\begin{function}[added = 2021-01-05,updated = 2021-02-13]{mybox}
 \begin{syntax}
-  \tn{begin}\marg{mybox}\oarg{段落标题}
+  \tn{begin}\marg{mybox}\oarg{段落标题}\oarg{颜色名|(MintCream)}
   <盒子内容>
   \tn{end}\marg{mybox}
 \end{syntax}
-环境 \opt{mybox} 创建一个段落盒子，可以添加可选参数的标题，否则无标题框。带有星号的环境会生成浅灰背景，否则是纯白背景。
+环境 \opt{mybox} 创建一个段落盒子，可以添加可选参数的标题，否则无标题框。当使用带有星号的环境时 \oarg{颜色名} 选项生效，可以自定义背景颜色，否则无背景颜色。
 \begin{ctexexam}
-    \begin{mybox}*[段落标题]
+    \begin{mybox}*[段落标题][MintCream]
       盒子内容
       \tcblower   % 盒子上下部分分界线
       盒子内容
@@ -467,7 +470,7 @@
   \tn{concise}\oarg{颜色名}\oarg{配置}\marg{内容}
   \tn{fuzzy}\oarg{颜色名}\oarg{配置}\marg{内容}
 \end{syntax}
-设置了两个参数选项相同的行内盒子，盒子 \opt{concise} 可以为抄录盒子有三个参数，行内盒子内容是必选参数其他可选。盒子 \opt{fuzzy} 不是抄录盒子，具有模糊边缘类似高亮的效果。
+设置了两个参数选项相同的行内盒子，盒子 \opt{concise} 可以为抄录盒子有三个参数，行内盒子内容是必选参数其他可选。盒子 \opt{fuzzy} 不是抄录盒子，具有模糊边缘类似高亮的效果。配置的选项由 \pkg{tcolorbox} 提供支持。
 \end{function}
 
 \section{其它格式}
diff --git a/macros/latex/contrib/easybook/doc/pages/chapter2.tex b/macros/latex/contrib/easybook/doc/pages/chapter2.tex
index bf2bbf7798..6c094eb9f6 100644
--- a/macros/latex/contrib/easybook/doc/pages/chapter2.tex
+++ b/macros/latex/contrib/easybook/doc/pages/chapter2.tex
@@ -58,7 +58,7 @@ The Stokes formula is an extension of the basic calculus formula in the case of
 这是一个证明，末尾自动添加证明结束符。
 \end{proof}
 
-\begin{mybox}*[My title]
+\begin{mybox}*[My title][MintCream]
 \index{z@自定义盒子}
   \zhlipsum*[3][name = aspirin]
   \tcblower
@@ -66,7 +66,7 @@ The Stokes formula is an extension of the basic calculus formula in the case of
 \end{mybox}
 
 \zhlipsum*[3][name = aspirin]
-\begin{exercise}[black][1.][习题]
+\begin{exercise}[LightYellow][1.][习题]
 \index{x@习题环境}
   \item 设$w = f(x+y+z,xyz)$，$f$具有二阶连续偏导数，求$\dfrac{{\partial w}}{{\partial x}}$和$\dfrac{{{\partial ^2}w}}{{\partial x\partial z}}$。
   \item 已知$y = y(x)$在任意点$x$处的增量$\Delta y = \dfrac{y\Delta x}{1+x^2}+\alpha$，其中$\alpha$是$\Delta x$的高阶无穷小（$\Delta x\to 0$时），$y(0) = \pi$，则$y(1) = \uline{\mbox{\hspace{2em}}}$。
diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls
index e3f6b5ce9e..305f33ac69 100644
--- a/macros/latex/contrib/easybook/easybook.cls
+++ b/macros/latex/contrib/easybook/easybook.cls
@@ -9,7 +9,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/10}{1.23c}{}
+\ProvidesExplClass{easybook}{2021/02/13}{1.23d}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -126,7 +126,9 @@
     perpage   .initial:n = false,
     notomath  .bool_set:N = \l__notomath_bool,
     notomath  .default:n = true,
-    notomath  .initial:n = true
+    notomath  .initial:n = true,
+    rulewidth .dim_set:N = \l__rule_width_dim,
+    rulewidth .initial:n = 0.75pt
   }
 
 \clist_map_inline:nn
@@ -389,7 +391,7 @@
     \cs_gset:Npn \headrule
       {
         \color{ctex@frame}\vspace{2.5pt}
-        \hrule width\textwidth height 0.75pt
+        \hrule width\textwidth height \l__rule_width_dim
       }
     \bool_if:NT \l__draft_bool
       {
@@ -432,7 +434,7 @@
     section/rule      .initial:n = \tocrule{$\cdot$},
 
     subsection/format .tl_set:N = \l__toc_subsec_format_tl,
-    subsection/forma  .initial:n = \addvspace{0.35pc},
+    subsection/format .initial:n = \addvspace{0.35pc},
     subsection/indent .tl_set:N = \l__toc_subsec_indent_tl,
     subsection/indent .initial:n = 3.8\ccwd,
     subsection/rule   .tl_set:N = \l__toc_subsec_rule_tl,
@@ -622,48 +624,48 @@
   {\@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}}
   {\__markboth:n \indexname}
 
-\tl_new:N \l__tab_font_tl
-\tl_new:N \l__fig_font_tl
-\tl_new:N \l__lst_font_tl
-\tl_new:N \l__foot_font_tl
-\tl_new:N \l__margin_font_tl
+\tl_new:N \l__table_font_tl
+\tl_new:N \l__figure_font_tl
+\tl_new:N \l__listing_font_tl
+\tl_new:N \l__footnote_font_tl
+\tl_new:N \l__marginpar_font_tl
 
 \__ctex_define:nn {elfont}
   {
-    tabfont .tl_set:N = \l__tab_font_tl,
-    tabfont .initial:n = \sffamily\small,
-    figfont .tl_set:N = \l__fig_font_tl,
-    figfont .initial:n = \sffamily\small,
-    lstfont .tl_set:N = \l__lst_font_tl,
-    lstfont .initial:n = \sffamily\small,
-    fnfont  .tl_set:N = \l__foot_font_tl,
-    fnfont  .initial:n = \rmfamily,
-    marfont .tl_set:N = \l__margin_font_tl,
-    marfont .initial:n = \rmfamily\footnotesize
+    table-cap   .tl_set:N = \l__table_font_tl,
+    table-cap   .initial:n = \sffamily\small,
+    figure-cap  .tl_set:N = \l__figure_font_tl,
+    figure-cap  .initial:n = \sffamily\small,
+    listing-cap .tl_set:N = \l__listing_font_tl,
+    listing-cap .initial:n = \sffamily\small,
+    footnote    .tl_set:N = \l__footnote_font_tl,
+    footnote    .initial:n = \rmfamily,
+    marginpar   .tl_set:N = \l__marginpar_font_tl,
+    marginpar   .initial:n = \rmfamily\footnotesize
   }
 
 \DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}}
 \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
-\DeclareCaptionFont{tabfont}{\l__tab_font_tl}
-\DeclareCaptionFont{figfont}{\l__fig_font_tl}
-\DeclareCaptionFont{lstfont}{\l__lst_font_tl}
+\DeclareCaptionFont{tablefont}{\l__table_font_tl}
+\DeclareCaptionFont{figurefont}{\l__figure_font_tl}
+\DeclareCaptionFont{listingfont}{\l__listing_font_tl}
 \captionsetup
   {
     format = hang,
     % figurewithin = section,
     % tablewithin = section,
-    font = {stretch = {\fp_use:N \l__cap_spread_fp}},
+    font = {stretch = {\fp_use:N \l__caption_spread_fp}},
     labelfont = {color = ctex@frame},
     labelsep = ccwd,
     belowskip = 0pt,aboveskip = 10pt
   }
-\captionsetup[table]{font += tabfont}
-\captionsetup[figure]{font += figfont}
-\captionsetup[lstlisting]{singlelinecheck = false,font += lstfont}
+\captionsetup[table]{font += tablefont}
+\captionsetup[figure]{font += figurefont}
+\captionsetup[lstlisting]{singlelinecheck = false,font += listingfont}
 \captionsetup[subfigure]
   {
     labelformat = parens,
-    font += figfont,
+    font += figurefont,
     belowskip = 2pt,aboveskip = 6pt
   }
 \captionsetup[figure][bi-second]{name = Figure}
@@ -679,28 +681,28 @@
       }
   }
 \AtBeginEnvironment{tabularx}
-  {\exp_args:Nx \linespread{\fp_use:N \l__tab_spread_fp}\selectfont\ignorespaces}
+  {\exp_args:Nx \linespread{\fp_use:N \l__table_spread_fp}\selectfont\ignorespaces}
 \AtBeginEnvironment{tabular}
-  {\exp_args:Nx \linespread{\fp_use:N \l__tab_spread_fp}\selectfont\ignorespaces}
+  {\exp_args:Nx \linespread{\fp_use:N \l__table_spread_fp}\selectfont\ignorespaces}
 
 \fp_new:N \l__line_spread_fp
-\fp_new:N \l__tab_spread_fp
+\fp_new:N \l__table_spread_fp
 \fp_new:N \l__math_spread_fp
-\fp_new:N \l__cap_spread_fp
-\fp_new:N \l__foot_spread_fp
+\fp_new:N \l__caption_spread_fp
+\fp_new:N \l__footnote_spread_fp
 
 \__ctex_define:nn {spread}
   {
-    linespread  .fp_set:N = \l__line_spread_fp,
-    linespread  .initial:n = 1.3,
-    tabspread   .fp_set:N = \l__tab_spread_fp,
-    tabspread   .initial:n = 1.05,
-    mathspread  .fp_set:N = \l__math_spread_fp,
-    mathspread  .initial:n = 1.05,
-    capspread   .fp_set:N = \l__cap_spread_fp,
-    capspread   .initial:n = 1,
-    fnspread    .fp_set:N = \l__foot_spread_fp,
-    fnspread    .initial:n = 1
+    line      .fp_set:N = \l__line_spread_fp,
+    line      .initial:n = 1.3,
+    table     .fp_set:N = \l__table_spread_fp,
+    table     .initial:n = 1.05,
+    math      .fp_set:N = \l__math_spread_fp,
+    math      .initial:n = 1.05,
+    caption   .fp_set:N = \l__caption_spread_fp,
+    caption   .initial:n = 1,
+    footnote  .fp_set:N = \l__footnote_spread_fp,
+    footnote  .initial:n = 1
   }
 
 \skip_set:Nn \parskip{0pt plus 2pt minus 1pt}
@@ -933,7 +935,7 @@
         left = 1.5pc,right = 1.5pc,top = 1pc,bottom = 0.5pc,
         boxsep = 5pt
       },
-    exsty/.style =
+    exersty/.style =
       {
         enhanced,on~line,
         arc = 5pt,
@@ -943,7 +945,7 @@
         before~skip = 4ex,after~skip = 2.25ex
       },
     breakable,
-    boxrule = .75pt
+    boxrule = \l__rule_width_dim
   }
 \ctex_at_end_preamble:n
   {
@@ -965,15 +967,15 @@
       \end{outlinelist}
     \end{tcolorbox}
   }
-\NewDocumentEnvironment{exercise}{sO{black}O{1.}O{\c__name_exercise_tl}}
+\NewDocumentEnvironment{exercise}{sO{LightYellow}O{1.}O{\c__name_exercise_tl}}
   {
     \begin{center}
       \bool_if:NTF \l__thmbox_bool
         {
           \tcbox[
-            exsty,
-            colback = #2!8!white,colframe = #2!50!black,
-            drop~fuzzy~shadow = #2!50!white,
+            exersty,
+            colback = #2,colframe = black,
+            drop~fuzzy~shadow = #2,
             phantom =
               \IfBooleanF{#1}
                 {
@@ -999,10 +1001,10 @@
   }{
     \end{compactenum}
   }
-\DeclareTColorBox{mybox}{so}
+\DeclareTColorBox{mybox}{soO{MintCream}}
   {
     enhanced~jigsaw,pad~at~break* = 3pt,
-    IfBooleanF = {#1}{opacityback = 0,colframe = ctex@emph},
+    IfBooleanTF = {#1}{colback = #3}{opacityback = 0,colframe = ctex@emph},
     coltitle = black,opacitybacktitle = 0,
     fonttitle = \sffamily,
     left = .2pc,right = .2pc,top = .5pc,bottom = .5pc,middle= .5pc,
@@ -1019,7 +1021,7 @@
   {
     nobeforeafter,tcbox~raise~base,
     top = 2pt,bottom = 2.5pt,left = 2pt,right = 2pt,
-    boxsep = 0pt,arc = 1pt,
+    boxsep = 0pt,boxrule = 0.75pt,arc = 1pt,
     colback = #1!15!white,#2
   }{#3}
 
@@ -1119,13 +1121,13 @@
     \skip_set:Nn \footnotemargin{0.5\ccwd}
     \group_begin:
     \footnotesize
-    \exp_args:Nx \linespread{\fp_use:N \l__foot_spread_fp}\selectfont
+    \exp_args:Nx \linespread{\fp_use:N \l__footnote_spread_fp}\selectfont
     \skip_gset:Nn \footnotesep{\ht\strutbox}
     \group_end:
     \cs_gset:Npn \hangfootparskip{0ex}
     \cs_gset:Npn \footnoterule
       {
-        \color{ctex@frame}\hrule width 0.35\columnwidth height 0.75pt
+        \color{ctex@frame}\hrule width 0.35\columnwidth height \l__rule_width_dim
         \vspace*{2.6pt}\color{black}
       }
     \bool_if:NT \l__lang_chinese_bool
@@ -1145,13 +1147,13 @@
   }
 \__patch_cmd:Nnn \@footnotetext
   {\reset@font}
-  {\def\baselinestretch{\fp_use:N \l__foot_spread_fp}\l__foot_font_tl}
+  {\def\baselinestretch{\fp_use:N \l__footnote_spread_fp}\l__footnote_font_tl}
 \__patch_cmd:Nnn \@mpfootnotetext
   {\reset@font}
-  {\def\baselinestretch{\fp_use:N \l__foot_spread_fp}\l__foot_font_tl}
+  {\def\baselinestretch{\fp_use:N \l__footnote_spread_fp}\l__footnote_font_tl}
 \__patch_cmd:Nnn \@makefnmark
-  {\normalfont}{\l__foot_font_tl}
-\cs_gset:Npn \marginfont{\l__margin_font_tl}
+  {\normalfont}{\l__footnote_font_tl}
+\cs_gset:Npn \marginfont{\l__marginpar_font_tl}
 
 \lstdefinestyle{mystyle}
   {
@@ -1162,10 +1164,11 @@
       \ttfamily\lst@ifdisplaystyle\small\else\color{ctex@verb}\fi,
     framexleftmargin = 0pt,
     framexrightmargin = 0pt,
-    xleftmargin = 0pt,
-    xrightmargin = 0pt,
+    xleftmargin = 3pt,
+    xrightmargin = 3pt,
+    numbersep = 10pt,
     framesep = 3pt,
-    frame = lines,
+    frame = single,
     rulecolor = \color{ctex@frame},
     commentstyle = \color{gray},
     emphstyle = \color{ctex@emph},
@@ -1189,11 +1192,11 @@
     aboveskip = 1.5ex plus .2ex minus .1ex,
     belowskip = 0.55ex plus .2ex minus .1ex,
     keepspaces = true,
-    framerule = 0.75pt,
+    framerule = \l__rule_width_dim,
     columns = flexible
   }
 \lstloadlanguages{C,C++,Java,Python,Matlab}
-\AtBeginEnvironment{verbatim}{\microtypesetup{activate=false}}
+\AtBeginEnvironment{verbatim}{\microtypesetup{activate = false}}
 
 \clist_new:N \l__hyperref_clist
 \cs_new_protected:Npn \__put_hyperref:n #1
@@ -1275,7 +1278,7 @@
         {none,      000000,000000,000000},
         {seaside,   1381b2,004986,a40000},
         {energy,    f39800,00a0e9,893895},
-        {cyberpunk, 005982,eb6877,a4005b}
+        {cyberpunk, 601986,eb6877,a4005b}
       }
       \__themecolor_set:n,
     color             .initial:n = none