From 90aa3f51059655d86adb9f9f4b0286f883972949 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Aug 2021 21:13:36 +0000 Subject: easybook (10aug21) git-svn-id: svn://tug.org/texlive/trunk@60212 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 584706 -> 584709 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 4 ++-- .../texmf-dist/source/latex/easybook/easybook.dtx | 26 ++++++++++----------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 22 ++++++++--------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 3d0183b3245..a9f86a74873 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index 34b22931d25..5266be103c8 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -11,8 +11,8 @@ { name = easybook, title = EASYBOOK 使用手册, - version = v1.28H, - date = 2021/08/09, + version = v1.28K, + date = 2021/08/10, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = quee123@foxmail.com, diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 6a32dd2f6d7..9d4005db902 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -8,7 +8,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/08/09}{1.28H} +\ProvidesExplClass{easybook}{2021/08/10}{1.28K} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -292,7 +292,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/08/09}{1.28H} +\ProvidesExplPackage{easybase}{2021/08/10}{1.28K} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_add:Nn { NV,Nv } @@ -363,7 +363,7 @@ } { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} } } -\cs_new_protected:Npn \eb_package_reload_check:nn #1#2 +\cs_new_protected:Npn \eb_if_package_reload:nF #1#2 { \@ifpackageloaded{#1} {\msg_warning:nnn { easybase } { package-reload } {#1}} @@ -381,7 +381,7 @@ \PassOptionsToPackage{#1}{#2} \eb_clist_map_inline:nn {#2} { - \eb_package_reload_check:nn {##1} + \eb_if_package_reload:nF {##1} { \eb@usepackage@save{##1} } } } @@ -619,7 +619,7 @@ \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout } {O{\use:c { CTEXthe#1 }}m} {\tl_set:cn { eb@mark@#1@label } {##1##2}} - \cs_new:cpn { eb_mark_#1_name_bool:n } ##1 + \cs_new:cpn { eb_mark_#1_if_name:n } ##1 { \tl_if_in:nnTF {##1} { [ } { \use:c { eb@mark@#1@label@layout }##1 } @@ -664,11 +664,11 @@ subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1, subsec-mark .initial:n = { \CTEXifname{\eb@mark@subsection@label}{}#1 }, - chap-label .code:n = \eb_mark_chapter_name_bool:n {#1}, + chap-label .code:n = \eb_mark_chapter_if_name:n {#1}, chap-label .initial:n = \hspace{1em}, - sec-label .code:n = \eb_mark_section_name_bool:n {#1}, + sec-label .code:n = \eb_mark_section_if_name:n {#1}, sec-label .initial:n = \hspace{0.5em}, - subsec-label .code:n = \eb_mark_subsection_name_bool:n {#1}, + subsec-label .code:n = \eb_mark_subsection_if_name:n {#1}, subsec-label .initial:n = \hspace{0.5em}, headrule .tl_gset:N = \headrule, @@ -682,7 +682,7 @@ \cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n \cs_set_eq:NN \eb_mark_nouppercase:n \text_titlecase_first:n -\cs_new:Npn \eb_mark_uppercase_bool:nn #1#2 +\cs_new:Npn \eb_mark_if_uppercase:nn #1#2 { \bool_if:NTF \l__eb_mark_uppercase_bool { \eb_mark_uppercase:n } @@ -692,11 +692,11 @@ \cs_new:Npn \eb@level@markdouble #1#2 { \markboth - {\eb_mark_uppercase_bool:nn {#1} {#2}} - {\ifbool{@twoside}{\eb_mark_uppercase_bool:nn {#1} {#2}}{}} + {\eb_mark_if_uppercase:nn {#1} {#2}} + {\ifbool{@twoside}{\eb_mark_if_uppercase:nn {#1} {#2}}{}} } \cs_new:Npn \eb@level@markright #1#2 - { \markright{\eb_mark_uppercase_bool:nn {#1} {#2}} } + { \markright{\eb_mark_if_uppercase:nn {#1} {#2}} } \cs_new:Npn \eb@level@section@mark #1 { \bool_if:NTF \l__eb_class_book_bool @@ -2396,7 +2396,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/09}{1.28H} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/10}{1.28K} {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 a46baa8c8a8..c390702cc8b 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -13,7 +13,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/08/09}{1.28H} +\ProvidesExplPackage{easybase}{2021/08/10}{1.28K} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_add:Nn { NV,Nv } @@ -84,7 +84,7 @@ } { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} } } -\cs_new_protected:Npn \eb_package_reload_check:nn #1#2 +\cs_new_protected:Npn \eb_if_package_reload:nF #1#2 { \@ifpackageloaded{#1} {\msg_warning:nnn { easybase } { package-reload } {#1}} @@ -102,7 +102,7 @@ \PassOptionsToPackage{#1}{#2} \eb_clist_map_inline:nn {#2} { - \eb_package_reload_check:nn {##1} + \eb_if_package_reload:nF {##1} { \eb@usepackage@save{##1} } } } @@ -340,7 +340,7 @@ \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout } {O{\use:c { CTEXthe#1 }}m} {\tl_set:cn { eb@mark@#1@label } {##1##2}} - \cs_new:cpn { eb_mark_#1_name_bool:n } ##1 + \cs_new:cpn { eb_mark_#1_if_name:n } ##1 { \tl_if_in:nnTF {##1} { [ } { \use:c { eb@mark@#1@label@layout }##1 } @@ -385,11 +385,11 @@ subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1, subsec-mark .initial:n = { \CTEXifname{\eb@mark@subsection@label}{}#1 }, - chap-label .code:n = \eb_mark_chapter_name_bool:n {#1}, + chap-label .code:n = \eb_mark_chapter_if_name:n {#1}, chap-label .initial:n = \hspace{1em}, - sec-label .code:n = \eb_mark_section_name_bool:n {#1}, + sec-label .code:n = \eb_mark_section_if_name:n {#1}, sec-label .initial:n = \hspace{0.5em}, - subsec-label .code:n = \eb_mark_subsection_name_bool:n {#1}, + subsec-label .code:n = \eb_mark_subsection_if_name:n {#1}, subsec-label .initial:n = \hspace{0.5em}, headrule .tl_gset:N = \headrule, @@ -403,7 +403,7 @@ \cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n \cs_set_eq:NN \eb_mark_nouppercase:n \text_titlecase_first:n -\cs_new:Npn \eb_mark_uppercase_bool:nn #1#2 +\cs_new:Npn \eb_mark_if_uppercase:nn #1#2 { \bool_if:NTF \l__eb_mark_uppercase_bool { \eb_mark_uppercase:n } @@ -413,11 +413,11 @@ \cs_new:Npn \eb@level@markdouble #1#2 { \markboth - {\eb_mark_uppercase_bool:nn {#1} {#2}} - {\ifbool{@twoside}{\eb_mark_uppercase_bool:nn {#1} {#2}}{}} + {\eb_mark_if_uppercase:nn {#1} {#2}} + {\ifbool{@twoside}{\eb_mark_if_uppercase:nn {#1} {#2}}{}} } \cs_new:Npn \eb@level@markright #1#2 - { \markright{\eb_mark_uppercase_bool:nn {#1} {#2}} } + { \markright{\eb_mark_if_uppercase:nn {#1} {#2}} } \cs_new:Npn \eb@level@section@mark #1 { \bool_if:NTF \l__eb_class_book_bool diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 6632e1838bf..49b530d7ab4 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -13,7 +13,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/08/09}{1.28H} +\ProvidesExplClass{easybook}{2021/08/10}{1.28K} {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 36832045c23..013612b0a38 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -11,7 +11,7 @@ %% conditions of the CC-BY 4.0 License. %% The latest version of this license is in %% https://creativecommons.org/licenses/by/4.0/legalcode -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/09}{1.28H} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/10}{1.28K} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } -- cgit v1.2.3