diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-23 22:28:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-23 22:28:36 +0000 |
commit | f6688971e4a539b11a7f7bf65e2739ed1b1bf28b (patch) | |
tree | 785c22712ade0a871dd426563ff17b59e5ec5099 /Master/texmf-dist/tex/latex | |
parent | b0b893248eb7c7047509603c71201365ef1193db (diff) |
easybook (23mar21)
git-svn-id: svn://tug.org/texlive/trunk@58665 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 118 |
1 files changed, 54 insertions, 64 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 6af14757398..2f7b207e63c 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/03/21}{1.23x}{beta} +\ProvidesExplClass{easybook}{2021/03/23}{1.23z}{beta} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -112,17 +112,16 @@ \tl_new:N \l__foot_numberwith_tl \tl_new:N \g__config_tl +\seq_const_from_clist:Nn \c__options_path_seq + { + style,link,elsefont, + spread,bibset,thmset, + geoset,hdrset,tocset + } +\seq_map_inline:Nn \c__options_path_seq + {\ctex_define:n {#1 .meta:nn = {ctex/#1}{##1}}} \ctex_define:n { - style .meta:nn = {ctex/style}{#1}, - link .meta:nn = {ctex/link}{#1}, - spread .meta:nn = {ctex/spread}{#1}, - elsefont .meta:nn = {ctex/elsefont}{#1}, - bibset .meta:nn = {ctex/bibset}{#1}, - thmset .meta:nn = {ctex/thmset}{#1}, - geoset .meta:nn = {ctex/geoset}{#1}, - hdrset .meta:nn = {ctex/hdrset}{#1}, - tocset .meta:nn = {ctex/tocset}{#1}, config .tl_set:N = \g__config_tl, lstlistlistingname .tl_set:N = \lstlistlistingname, lstlistingname .tl_set:N = \lstlistingname @@ -169,12 +168,11 @@ xcolor, footmisc,setspace, amsmath,amsthm,thmtools,cases, - chemformula,siunitx,ulem, + chemformula,siunitx,ulem,pifont, geometry,marginnote,nccfoots, pdfpages,graphicx, fancyhdr,titletoc, caption-light,subcaption, - pifont,microtype, tabularx,multirow,makecell,booktabs, tasks,enumitem, listings, @@ -387,17 +385,21 @@ headrule .tl_gset:N = \headrule, headrule .initial:n = { - \color{ctex@frame}\vspace{1.5pt} + \group_begin: + \color{ctex@frame}\vspace*{1.5pt} \hrule width \textwidth height \l__rule_width_dim + \group_end: }, footrule .tl_gset:N = \footrule, footrule .initial:n = {}, footnoterule .tl_gset:N = \footnoterule, footnoterule .initial:n = { + \group_begin: \color{ctex@frame} \hrule width 0.35\columnwidth height \l__rule_width_dim - \vspace*{2.6pt}\color{black} + \vspace*{2.6pt} + \group_end: } } \ctex_at_end_preamble:n @@ -453,58 +455,49 @@ } } -\ctex_define:n +\seq_const_from_clist:Nn \c__toc_headings_level_seq + {part,chapter,section,subsection,lists} +\seq_map_inline:Nn \c__toc_headings_level_seq { - tocset/part .meta:nn = {ctex/tocset/part}{#1}, - tocset/chapter .meta:nn = {ctex/tocset/chapter}{#1}, - tocset/section .meta:nn = {ctex/tocset/section}{#1}, - tocset/subsection .meta:nn = {ctex/tocset/subsection}{#1}, - tocset/list .meta:nn = {ctex/tocset/list}{#1}, + \ctex_define:n {tocset/#1 .meta:nn = {ctex/tocset/#1}{##1}} + \__ctex_define:nn {tocset} + { + #1/format .tl_set:c = l__toc_#1_format_tl, + #1/indent .tl_set:c = l__toc_#1_indent_tl, + #1/rule .tl_set:c = l__toc_#1_rule_tl + } } \__ctex_define:nn {tocset} { - part/format .tl_set:N = \l__toc_part_format_tl, - part/format .initial:n = \addvspace{1pc}\sffamily\large, - part/indent .tl_set:N = \l__toc_part_indent_tl, - part/indent .initial:n = 0\ccwd, - part/rule .tl_set:N = \l__toc_part_rule_tl, - part/rule .initial:n = \tocrule{}[\bfseries], - - chapter/format .tl_set:N = \l__toc_chapter_format_tl, - chapter/format .initial:n = \addvspace{1pc}\sffamily\large, - chapter/indent .tl_set:N = \l__toc_chapter_indent_tl, - chapter/indent .initial:n = 0\ccwd, - chapter/rule .tl_set:N = \l__toc_chapter_rule_tl, - chapter/rule .initial:n = \tocrule{$\cdot$}[\bfseries], - - section/format .tl_set:N = \l__toc_section_format_tl, - section/format .initial:n = \addvspace{0.35pc}, - section/indent .tl_set:N = \l__toc_section_indent_tl, - section/indent .initial:n = 1.5\ccwd, - section/rule .tl_set:N = \l__toc_section_rule_tl, - section/rule .initial:n = \tocrule{$\cdot$}, - - subsection/format .tl_set:N = \l__toc_subsection_format_tl, - subsection/format .initial:n = \addvspace{0.35pc}, - subsection/indent .tl_set:N = \l__toc_subsection_indent_tl, - subsection/indent .initial:n = 3.8\ccwd, - subsection/rule .tl_set:N = \l__toc_subsection_rule_tl, - subsection/rule .initial:n = \tocrule{$\cdot$}, - - lists/format .tl_set:N = \l__toc_lists_format_tl, - lists/format .initial:n = \addvspace{0.2pc}, - lists/indent .tl_set:N = \l__toc_lists_indent_tl, - lists/indent .initial:n = 0\ccwd, - lists/rule .tl_set:N = \l__toc_lists_rule_tl, - lists/rule .initial:n = \tocrule{$\cdot$}, lists/lolskip .skip_set:N = \l__toc_lolskip_skip, lists/lolskip .initial:n = 0.8pc, lists/belowoffset .dim_set:N = \l__toc_listsoffset_dim, lists/belowoffset .initial:n = 0pc, - belowoffset .dim_set:N = \l__toc_offset_dim, belowoffset .initial:n = -1pc } +\ctex_set:nn {tocset} + { + part/format = \addvspace{1pc}\sffamily\large, + part/indent = 0\ccwd, + part/rule = \tocrule{}[\bfseries], + + chapter/format = \addvspace{1pc}\sffamily\large, + chapter/indent = 0\ccwd, + chapter/rule = \tocrule{$\cdot$}[\bfseries], + + section/format = \addvspace{0.35pc}, + section/indent = 1.5\ccwd, + section/rule = \tocrule{$\cdot$}, + + subsection/format = \addvspace{0.35pc}, + subsection/indent = 3.8\ccwd, + subsection/rule = \tocrule{$\cdot$}, + + lists/format = \addvspace{0.2pc}, + lists/indent = 0\ccwd, + lists/rule = \tocrule{$\cdot$} + } \NewDocumentCommand{\tocrule}{O{0.7pc}D(){1.2}mO{}} { @@ -777,7 +770,7 @@ \__arabic:n {section} } \clist_map_inline:nn - {{figure},{table},{lstlisting},{equation}} + {figure,table,lstlisting,equation} {\__separator_set:n {#1}} \cs_gset_protected:Npn \appendix { @@ -1016,10 +1009,10 @@ } \clist_map_inline:nn { - {array},{matrix},{pmatrix},{bmatrix},{Bmatrix},{vmatrix},{Vmatrix}, - {matrix*},{pmatrix*},{bmatrix*},{Bmatrix*},{vmatrix*},{Vmatrix*}, - {cases},{cases*},{dcases},{dcases*},{rcases},{rcases*},{drcases},{drcases*}, - {aligned},{alignedat},{gathered},{multlined},{lgathered},{rgathered} + array,matrix,pmatrix,bmatrix,Bmatrix,vmatrix,Vmatrix, + matrix*,pmatrix*,bmatrix*,Bmatrix*,vmatrix*,Vmatrix*, + cases,cases*,dcases,dcases*,rcases,rcases*,drcases,drcases*, + aligned,alignedat,gathered,multlined,lgathered,rgathered }{\l__math_restore:n {#1}} \__patch_cmd:Nnn \start@gather {\collect@body} @@ -1248,9 +1241,7 @@ {\__put_biblatex:n {style = gb7714-2015}} \tl_if_eq:VnT \l__bib_style_tl{authoryear} {\__put_biblatex:n {style = gb7714-2015ay}} - }{ - \__put_biblatex:n {style = \l__bib_otherstyle_tl} - } + }{\__put_biblatex:n {style = \l__bib_otherstyle_tl}} \tl_if_empty:NF \l__bib_citestyle_tl {\__put_biblatex:n {citestyle = \l__bib_citestyle_tl}} \__put_biblatex:n {backend = biber} @@ -1345,7 +1336,6 @@ columns = flexible } \lstloadlanguages{C,C++,Java,Python,Matlab} -\AtBeginEnvironment{verbatim}{\microtypesetup{activate = false}} \clist_new:N \l__hyperref_clist \cs_new_protected:Npn \__put_hyperref:n #1 |