diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-29 19:55:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-29 19:55:56 +0000 |
commit | fbc88235914fbf18099a10ecb5690d38ba805362 (patch) | |
tree | e20ad6978549bd815865c65fdc731d0cb0e1e119 /Master/texmf-dist/tex | |
parent | bf7a2e16287074d59bd623b138e4a2bcfe1c25d6 (diff) |
easybook (29jun21)
git-svn-id: svn://tug.org/texlive/trunk@59761 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 79 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 |
2 files changed, 35 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 7c9050f9480..f9cc91ea5c3 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{etoolbox} -\ProvidesExplPackage{easybase}{2021/06/26}{1.26l}{beta} +\ProvidesExplPackage{easybase}{2021/06/28}{1.26m}{beta} \cs_generate_variant:Nn \eb_ctex_define:nn { nx } \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -317,6 +317,26 @@ \tl_if_novalue:nF {#5} { \vspace*{#5} } \group_end: } +\cs_new:Npn \eb_fnmark_counter_pifont:N #1 + { \ding{\int_eval:n { 171 + #1 }} } +\cs_new:Npn \eb_fnmark_counter_pifont_neg:N #1 + { \ding{\int_eval:n { 181 + #1 }} } +\cs_new:Npn \eb_fnmark_counter_pifont_sans:N #1 + { \ding{\int_eval:n { 191 + #1 }} } +\cs_new:Npn \eb_fnmark_counter_pifont_sans_neg:N #1 + { \ding{\int_eval:n { 201 + #1 }} } +\cs_new:Npn \eb_footnote_counter:N #1 + { + \str_case:VnF \l__eb_fnmark_number_choice_tl + { + { plain } { \int_use:N #1 } + { pifont } { \eb_fnmark_counter_pifont:N #1 } + { pifont* } { \eb_fnmark_counter_pifont_neg:N #1 } + { pifont-sans } { \eb_fnmark_counter_pifont_sans:N #1 } + { pifont-sans* } { \eb_fnmark_counter_pifont_sans_neg:N #1 } + } + { \int_use:N #1 } + } \eb_ctex_define:nn { hdrset } { head-foot .tl_set:N = \l__eb_fancyhf_content_tl, @@ -444,18 +464,19 @@ \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox } \bool_if:NT \l__eb_chap_counter_withpart_bool { \counterwithin*{chapter}{part} } - \str_case:Vn \l__eb_foot_counter_parent_choice_tl - { - { part } - { - \counterwithout*{footnote}{chapter} - \counterwithin*{footnote}{part} - } - { page } - { - \counterwithout*{footnote}{chapter} - \counterwithin*{footnote}{page} - } + \str_case:VnF \l__eb_foot_counter_parent_choice_tl + { + { part } { \use_i:nn } + { page } { \use_ii:nn } + } + { \use_none:nn } + { + \counterwithout*{footnote}{chapter} + \counterwithin*{footnote}{part} + } + { + \counterwithout*{footnote}{chapter} + \counterwithin*{footnote}{page} } \bool_if:NTF \l__eb_footnote_hang_bool { \booltrue{FN@hangfoot} } @@ -499,38 +520,6 @@ \cs_set:Npn \thefootnote { \eb_footnote_counter:N \c@footnote } \cs_set:Npn \thempfootnote { \eb_alph:n { mpfootnote } } -\cs_new_protected:Npn \eb_fnmark_number_set:nn #1#2 - { \tl_const:cn { c__eb_fnmark_number_#1_tl } {#2} } -\clist_map_inline:nn - { - { plain } { plain }, - { pifont } { pifont }, - { pifont_neg } { pifont* }, - { pifont_sans } { pifont-sans }, - { pifont_sans_neg } { pifont-sans* } - } - { \eb_fnmark_number_set:nn #1 } -\cs_new:Npn \eb_fnmark_counter_pifont:N #1 - { \ding{\int_eval:n { 171 + #1 }} } -\cs_new:Npn \eb_fnmark_counter_pifont_neg:N #1 - { \ding{\int_eval:n { 181 + #1 }} } -\cs_new:Npn \eb_fnmark_counter_pifont_sans:N #1 - { \ding{\int_eval:n { 191 + #1 }} } -\cs_new:Npn \eb_fnmark_counter_pifont_sans_neg:N #1 - { \ding{\int_eval:n { 201 + #1 }} } -\cs_new:Npn \eb_footnote_counter:N #1 - { - \str_case:VnF \l__eb_fnmark_number_choice_tl - { - { plain } { \int_use:N #1 } - { pifont } { \eb_fnmark_counter_pifont:N #1 } - { pifont* } { \eb_fnmark_counter_pifont_neg:N #1 } - { pifont-sans } { \eb_fnmark_counter_pifont_sans:N #1 } - { pifont-sans* } { \eb_fnmark_counter_pifont_sans_neg:N #1 } - } - { \int_use:N #1 } - } - \contentsuse{lstlisting}{lol} \seq_const_from_clist:Nn \c__eb_toc_heading_level_seq { part,chapter,section,subsection,figure,table,lstlisting } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 3b773a76fb3..a3134c51fae 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/06/26}{1.26l}{beta} +\ProvidesExplClass{easybook}{2021/06/28}{1.26m}{beta} \bool_set_false:N \l__eb_compile_draft_bool \bool_set_false:N \l__eb_title_newline_bool |