From 7fcd56f6ca6a36d909031f089c06c3c6e08c0bf5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Mar 2022 21:55:57 +0000 Subject: easybook (7mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62500 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybase.sty | 9 +++++++-- Master/texmf-dist/tex/latex/easybook/easybook.cls | 16 ++++++++-------- Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 6bbfe348545..678873a9439 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}{2022/03/06}{1.64} +\ProvidesExplPackage{easybase}{2022/03/06}{1.641} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1432,7 +1432,12 @@ \ctex_define:nn { spread } { line .code:n = \AfterPreamble{\setspread{#1}}, - line .initial:n = 1.354, + line .initial:n = + { + \fp_if_nan:nTF { \l__ctex_line_spread_fp } + { 1.354 } + { \fp_use:N \l__ctex_line_spread_fp } + }, table .fp_set:N = \l__eb_spread_table_fp, table .initial:n = 1.354, math .fp_set:N = \l__eb_spread_math_fp, diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 2dc5be02ccb..3752602a4b1 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}{2022/03/06}{1.64} +\ProvidesExplClass{easybook}{2022/03/06}{1.641} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -81,22 +81,22 @@ \cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n } \cs_new_protected:Npn \eb_setmainfont:nn #1#2 - { \__fontspec_main_setmainfont:nn {#2} {#1} } + { \__fontspec_main_setmainfont:nn {#1} {#2} } \cs_new_protected:Npn \eb_setsansfont:nn #1#2 - { \__fontspec_main_setsansfont:nn {#2} {#1} } + { \__fontspec_main_setsansfont:nn {#1} {#2} } \cs_new_protected:Npn \eb_setmonofont:nn #1#2 - { \__fontspec_main_setmonofont:nn {#2} {#1} } + { \__fontspec_main_setmonofont:nn {#1} {#2} } \cs_new_protected:Npn \eb_setCJKmainfont:nn #1#2 - { \eb_set_family:nnn { \CJKrmdefault } {#2} {#1} } + { \eb_set_family:nnn { \CJKrmdefault } {#1} {#2} } \cs_new_protected:Npn \eb_setCJKsansfont:nn #1#2 - { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} } + { \eb_set_family:nnn { \CJKsfdefault } {#1} {#2} } \cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2 - { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} } + { \eb_set_family:nnn { \CJKttdefault } {#1} {#2} } \eb_seq_map_inline:nn { 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 } {##1,##3} {##2}} } \RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}} { diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 2075d8d6771..7ca9c8d55d5 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}{2022/03/06}{1.64} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.641} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3