summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-28 19:45:45 +0000
committerKarl Berry <karl@freefriends.org>2021-10-28 19:45:45 +0000
commit0111004510762281bf517dbd75e47123564fd541 (patch)
tree6f2798a2c47d15da235f343dbcd137d698fb7195
parent0d39df3b97aa2eb5d240cc57f440d1e963be9c6e (diff)
easybook (28oct21)
git-svn-id: svn://tug.org/texlive/trunk@60882 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin584973 -> 584984 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex4
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx16
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty12
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
6 files changed, 12 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 32b1dcb7674..be07e63f1a7 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index ebde41673ec..9544f2f8304 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.40E,
- date = 2021/10/25,
+ version = v1.40F,
+ date = 2021/10/28,
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 73196e000b6..429803c886a 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/10/25}{1.40E}
+\ProvidesExplClass{easybook}{2021/10/25}{1.40F}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/25}{1.40E}
+\ProvidesExplPackage{easybase}{2021/10/25}{1.40F}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1739,7 +1739,6 @@
unknown .code:n = \eb_msg_unknown_option:n { subfont }
}
-\fp_new:N \l__eb_spread_line_fp
\fp_new:N \l__eb_spread_table_fp
\fp_new:N \l__eb_spread_math_fp
\fp_new:N \l__eb_spread_caption_fp
@@ -1747,7 +1746,7 @@
\ctex_define:nn { spread }
{
- line .fp_set:N = \l__eb_spread_line_fp,
+ line .code:n = \AfterPreamble{\setspread{#1}},
line .initial:n = 1.3,
table .fp_set:N = \l__eb_spread_table_fp,
table .initial:n = 1.2,
@@ -1809,11 +1808,6 @@
\exp_args:Nx
\setspread { \fp_use:N \l__eb_spread_table_fp }
}
-\ctex_after_end_preamble:n
- {
- \exp_args:Nx
- \setspread { \fp_use:N \l__eb_spread_line_fp }
- }
\bool_if:NF \l__eb_float_page_bool
{
@@ -1964,7 +1958,7 @@
\cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
\cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
\RenewDocumentCommand{\declaretheorem}{O{}mO{}}
- {\AfterPreamble{\eb@declaretheorem@save[#1,#3]{#2}}}
+ {\AtBeginDocument{\eb@declaretheorem@save[#1,#3]{#2}}}
\RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
{\eb@declaretheoremsyle@save[#1,#3]{#2}}
\cs_set_eq:NN \newtheorem \declaretheorem
@@ -2451,7 +2445,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40E}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40F}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 1e98f6b9c13..98847ddd1d5 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/10/25}{1.40E}
+\ProvidesExplPackage{easybase}{2021/10/25}{1.40F}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1434,7 +1434,6 @@
unknown .code:n = \eb_msg_unknown_option:n { subfont }
}
-\fp_new:N \l__eb_spread_line_fp
\fp_new:N \l__eb_spread_table_fp
\fp_new:N \l__eb_spread_math_fp
\fp_new:N \l__eb_spread_caption_fp
@@ -1442,7 +1441,7 @@
\ctex_define:nn { spread }
{
- line .fp_set:N = \l__eb_spread_line_fp,
+ line .code:n = \AfterPreamble{\setspread{#1}},
line .initial:n = 1.3,
table .fp_set:N = \l__eb_spread_table_fp,
table .initial:n = 1.2,
@@ -1504,11 +1503,6 @@
\exp_args:Nx
\setspread { \fp_use:N \l__eb_spread_table_fp }
}
-\ctex_after_end_preamble:n
- {
- \exp_args:Nx
- \setspread { \fp_use:N \l__eb_spread_line_fp }
- }
\bool_if:NF \l__eb_float_page_bool
{
@@ -1659,7 +1653,7 @@
\cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
\cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
\RenewDocumentCommand{\declaretheorem}{O{}mO{}}
- {\AfterPreamble{\eb@declaretheorem@save[#1,#3]{#2}}}
+ {\AtBeginDocument{\eb@declaretheorem@save[#1,#3]{#2}}}
\RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
{\eb@declaretheoremsyle@save[#1,#3]{#2}}
\cs_set_eq:NN \newtheorem \declaretheorem
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 3061caecdf0..d9e43b96fb5 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/10/25}{1.40E}
+\ProvidesExplClass{easybook}{2021/10/25}{1.40F}
{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 1198408e7cf..5de460e7926 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/10/25}{1.40E}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40F}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }