easybook (21feb21)

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

5 files changed, 12 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
index 4f348762ada..2a5217e816b 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
index 7feeac246f5..5502281ec25 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
@@ -95,7 +95,7 @@
         \github~\url{https://github.com/texl3/easybook} \\
         \edge~\url{https://latexstudio.net}
       }
-    \date{2021/02/20\hskip\ccwd\relax v1.23e}
+    \date{2021/02/21\hskip\ccwd\relax v1.23f}
   }
 
 \begin{document}
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index fd7a95f3bcf..cb8064b6a54 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 6fd6415b4f2..15507624965 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -3,7 +3,7 @@
 
 \title{\sffamily easybook书籍文档类}
 \author{瞿毅}
-\date{2021/02/20\hskip\ccwd\relax v1.23e\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/21\hskip\ccwd\relax v1.23f\thanks{\url{https://gitee.com/texl3/easybook}}}
 
 \begin{document}
 \maketitle
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 475920142e5..16ae60d7a78 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -9,7 +9,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/20}{1.23e}{}
+\ProvidesExplClass{easybook}{2021/02/21}{1.23f}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -652,9 +652,9 @@
 
 \DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}}
 \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
-\DeclareCaptionFont{tablefont}{\l__table_font_tl}
-\DeclareCaptionFont{figurefont}{\l__figure_font_tl}
-\DeclareCaptionFont{listingfont}{\l__listing_font_tl}
+\DeclareCaptionFont{table@font}{\l__table_font_tl}
+\DeclareCaptionFont{figure@font}{\l__figure_font_tl}
+\DeclareCaptionFont{listing@font}{\l__listing_font_tl}
 \captionsetup
   {
     format = hang,
@@ -665,13 +665,13 @@
     labelsep = ccwd,
     belowskip = 0pt,aboveskip = 10pt
   }
-\captionsetup[table]{font += tablefont}
-\captionsetup[figure]{font += figurefont}
-\captionsetup[lstlisting]{singlelinecheck = false,font += listingfont}
+\captionsetup[table]{font += table@font}
+\captionsetup[figure]{font += figure@font}
+\captionsetup[lstlisting]{singlelinecheck = false,font += listing@font}
 \captionsetup[subfigure]
   {
     labelformat = parens,
-    font += figurefont,
+    font += figure@font,
     belowskip = 2pt,aboveskip = 6pt
   }
 \captionsetup[figure][bi-second]{name = Figure}
@@ -875,8 +875,8 @@
     detect-inline-family = math,
     detect-inline-weight = math,
     detect-display-math,
-    unit-math-rm = \mathrm,
-    number-math-rm = \mathrm,
+    range-phrase = \ensuremath{\sim},
+    range-units = single,
     table-parse-only,
     group-digits = false
   }