diff options
author | Karl Berry <karl@freefriends.org> | 2022-03-07 21:55:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-03-07 21:55:57 +0000 |
commit | 7fcd56f6ca6a36d909031f089c06c3c6e08c0bf5 (patch) | |
tree | 6e688bdde6d0e38900aae7e51bebbc1b4462df12 /Master/texmf-dist/source/latex | |
parent | c764879b65e9475f5a056fe5d072c0582c3b1f29 (diff) |
easybook (7mar22) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62500 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index c767f8a5910..c7a2ae35605 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}{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 @@ -76,22 +76,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{}} { @@ -303,7 +303,7 @@ %<*package> \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 } @@ -1715,7 +1715,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, @@ -2302,7 +2307,7 @@ } %</package> %<*tcolorbox> -\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 |