texlive[71566] Master/texmf-dist: easybook (19jun24)

commits+karl at tug.org commits+karl at tug.org
Wed Jun 19 21:38:19 CEST 2024


Revision: 71566
          https://tug.org/svn/texlive?view=revision&revision=71566
Author:   karl
Date:     2024-06-19 21:38:18 +0200 (Wed, 19 Jun 2024)
Log Message:
-----------
easybook (19jun24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/easybook/README.md
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
    trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
    trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
    trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
    trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg

Modified: trunk/Master/texmf-dist/doc/latex/easybook/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/README.md	2024-06-19 19:38:07 UTC (rev 71565)
+++ trunk/Master/texmf-dist/doc/latex/easybook/README.md	2024-06-19 19:38:18 UTC (rev 71566)
@@ -1,5 +1,5 @@
 # `easybook` document class
-Easily typesetting Chinese theses or books (v2024ce)
+Easily typesetting Chinese theses or books (v2024cf)
 
 ## Abstract
 `easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2024-06-19 19:38:07 UTC (rev 71565)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2024-06-19 19:38:18 UTC (rev 71566)
@@ -23,8 +23,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK使用手册,
-    version         = v2024ce,
-    date            = 2024/06/16,
+    version         = v2024cf,
+    date            = 2024/06/18,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
     email           = toquyi at 163.com,
@@ -294,7 +294,7 @@
   \newCJKfontfamily[song]\songti{SimSun}
   \end{ctexexam}
   \keychoice{font}{noto,times,times*,ebgaramond,libertine,palatino,\fbox{auto}}\dtag
-  预置的英文字体相关配置方案如\ref{table:english font} 所示。这些字体已经包含在了 \hologo{TeXLive} 发行版中,所以通常不需要再专门安装。如果您想使用其它英文字体,可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
+  预置的英文字体相关配置方案如\ref{table:english font} 所示。这些字体已经包含在了 \hologo{TeXLive} 发行版中,所以通常不需要再专门安装。如果您想使用默认的Latin Modern或其它英文字体,可以使用 \code{auto} 选项配合 \pkg*{fontspec} 宏包的相关命令进行设置。
   \begin{longtblr}
   [
   caption = 英文字体预设方案,

Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx	2024-06-19 19:38:07 UTC (rev 71565)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx	2024-06-19 19:38:18 UTC (rev 71566)
@@ -14,7 +14,7 @@
 % This work has the LPPL maintenance status `maintained'.
 %<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15]
 %<*class>
-\ProvidesExplClass{easybook}{2024/06/16}{2024ce}
+\ProvidesExplClass{easybook}{2024/06/18}{2024cf}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
@@ -89,13 +89,13 @@
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
   {
     \exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
-      {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
+      {\use:c { eb_set#1font:nn } {##2} { ##1,##3 }}
   }
 \RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
   {
     \tl_set:Nx \l_tmpa_tl { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
     \cs_new_protected:Npx #2 { \eb_switch_family:n { \l_tmpa_tl } }
-    \eb_set_family:xnn { \l_tmpa_tl } {#3,#5} {#4}
+    \eb_set_family:xnn { \l_tmpa_tl } { #3,#5 } {#4}
   }
 
 \cs_new_protected:Npn \eb at font@load at noto
@@ -261,8 +261,8 @@
               { \par\nobreak\vskip 1.5pc }
               { \hspace{1em} }
           },
-        beforeskip  = -1.5ex,
-        afterskip   = 4ex
+        beforeskip  = 0pt,
+        afterskip   = 25pt
       },
     section         =
       {
@@ -300,7 +300,7 @@
 %</class>
 %<*package>
 \RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/06/16}{2024ce}
+\ProvidesExplPackage{easybase}{2024/06/18}{2024cf}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -375,7 +375,7 @@
 \cs_new_protected:Npn \ebloadpackage #1
   {
     \int_compare:nTF { \clist_count:n {#1} <= 1 }
-      { \RequirePackage }
+      { \RequirePackage{#1} }
       {
         \clist_map_inline:nn {#1}
           { \eb_match_load_package:n {##1} }
@@ -558,7 +558,15 @@
     tagform .code:n       = \eb_assign_tagform:n {#1},
     tagform .initial:n    = { (,) },
     brackets .meta:n      = { tagform = {#1} },
-    figurepath .tl_set:N  = \l_eb_graphics_path_tl
+    figurepath .code:n    =
+      {
+        \tl_if_blank:nF {#1}
+          {
+            \regex_match:nnTF { \cB. } {#1}
+              { \graphicspath{#1} }
+              { \graphicspath{{#1}} }
+          }
+      }
   }
 
 \includepdfset{fitpaper = true}
@@ -728,12 +736,6 @@
 \ctex_at_end_preamble:n
   {
     \bool_if:NF \l__eb_ps_used_bool { \pagestyle{fancy} }
-    \tl_if_blank:VF \l_eb_graphics_path_tl
-      {
-        \regex_match:nVTF { \cB. } \l_eb_graphics_path_tl
-          { \exp_args:NV \graphicspath \l_eb_graphics_path_tl }
-          { \exp_args:Nx \graphicspath { {\l_eb_graphics_path_tl} } }
-      }
     \providecommand{\kaishu}{\itshape}
   }
 
@@ -2623,7 +2625,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/16}{2024ce}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/18}{2024cf}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty	2024-06-19 19:38:07 UTC (rev 71565)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty	2024-06-19 19:38:18 UTC (rev 71566)
@@ -20,7 +20,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2021/11/15]
 \RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/06/16}{2024ce}
+\ProvidesExplPackage{easybase}{2024/06/18}{2024cf}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -95,7 +95,7 @@
 \cs_new_protected:Npn \ebloadpackage #1
   {
     \int_compare:nTF { \clist_count:n {#1} <= 1 }
-      { \RequirePackage }
+      { \RequirePackage{#1} }
       {
         \clist_map_inline:nn {#1}
           { \eb_match_load_package:n {##1} }
@@ -278,7 +278,15 @@
     tagform .code:n       = \eb_assign_tagform:n {#1},
     tagform .initial:n    = { (,) },
     brackets .meta:n      = { tagform = {#1} },
-    figurepath .tl_set:N  = \l_eb_graphics_path_tl
+    figurepath .code:n    =
+      {
+        \tl_if_blank:nF {#1}
+          {
+            \regex_match:nnTF { \cB. } {#1}
+              { \graphicspath{#1} }
+              { \graphicspath{{#1}} }
+          }
+      }
   }
 
 \includepdfset{fitpaper = true}
@@ -448,12 +456,6 @@
 \ctex_at_end_preamble:n
   {
     \bool_if:NF \l__eb_ps_used_bool { \pagestyle{fancy} }
-    \tl_if_blank:VF \l_eb_graphics_path_tl
-      {
-        \regex_match:nVTF { \cB. } \l_eb_graphics_path_tl
-          { \exp_args:NV \graphicspath \l_eb_graphics_path_tl }
-          { \exp_args:Nx \graphicspath { {\l_eb_graphics_path_tl} } }
-      }
     \providecommand{\kaishu}{\itshape}
   }
 

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2024-06-19 19:38:07 UTC (rev 71565)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2024-06-19 19:38:18 UTC (rev 71566)
@@ -19,7 +19,7 @@
 %% 
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/06/16}{2024ce}
+\ProvidesExplClass{easybook}{2024/06/18}{2024cf}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
@@ -94,13 +94,13 @@
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
   {
     \exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
-      {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
+      {\use:c { eb_set#1font:nn } {##2} { ##1,##3 }}
   }
 \RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
   {
     \tl_set:Nx \l_tmpa_tl { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
     \cs_new_protected:Npx #2 { \eb_switch_family:n { \l_tmpa_tl } }
-    \eb_set_family:xnn { \l_tmpa_tl } {#3,#5} {#4}
+    \eb_set_family:xnn { \l_tmpa_tl } { #3,#5 } {#4}
   }
 
 \cs_new_protected:Npn \eb at font@load at noto
@@ -266,8 +266,8 @@
               { \par\nobreak\vskip 1.5pc }
               { \hspace{1em} }
           },
-        beforeskip  = -1.5ex,
-        afterskip   = 4ex
+        beforeskip  = 0pt,
+        afterskip   = 25pt
       },
     section         =
       {

Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg	2024-06-19 19:38:07 UTC (rev 71565)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg	2024-06-19 19:38:18 UTC (rev 71566)
@@ -18,7 +18,7 @@
 %% LaTeX version 2005/12/01 or later.
 %% 
 %% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/16}{2024ce}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/18}{2024cf}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2



More information about the tex-live-commits mailing list.