summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-02 19:58:00 +0000
committerKarl Berry <karl@freefriends.org>2021-07-02 19:58:00 +0000
commitca323ed8610cf4a6cc08774a0752db4a78750994 (patch)
tree7085fc06968d73974aa166ee1c60cecb3aa1a889 /Master/texmf-dist/tex
parenta449f2bac72ba0e839b94a0a40556314d9b86e73 (diff)
easybook (2jul21)
git-svn-id: svn://tug.org/texlive/trunk@59810 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty60
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
2 files changed, 33 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 68532f2467c..fcd7942c197 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/07/01}{1.26o}
+\ProvidesExplPackage{easybase}{2021/07/02}{1.26p}
{Typeset Chinese books or notes}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
@@ -186,18 +186,18 @@
footwith .value_required:n = true,
footwith .initial:n = chapter,
- figure-sep .tl_set:N = \l__eb_figure_separator_tl,
- table-sep .tl_set:N = \l__eb_table_separator_tl,
- listing-sep .tl_set:N = \l__eb_lstlisting_separator_tl,
- equation-sep .tl_set:N = \l__eb_equation_separator_tl,
- number-sep .meta:n =
- {
- figure-sep = #1,
- table-sep = #1,
- listing-sep = #1,
- equation-sep = #1
+ figure-con .tl_set:N = \l__eb_figure_connector_tl,
+ table-con .tl_set:N = \l__eb_table_connector_tl,
+ listing-con .tl_set:N = \l__eb_lstlisting_connector_tl,
+ equation-con .tl_set:N = \l__eb_equation_connector_tl,
+ number-con .meta:n =
+ {
+ figure-con = #1,
+ table-con = #1,
+ listing-con = #1,
+ equation-con = #1
},
- number-sep .initial:n = { . }
+ number-con .initial:n = { . }
}
\eb@package@load
@@ -487,20 +487,21 @@
\eb_patch_cmd:nnn { \H@@footnotemark,\@footnotemark }
{ \@makefnmark }
{
- \group_begin:
- \tl_use:N \l__eb_subfont_footnote_tl
- \tl_use:N \l__eb_fnmark_format_tl
- {\hbox:n { \super{\@thefnmark}[0pt] }}
- \group_end:
+ \hbox:n
+ {
+ \tl_use:N \l__eb_subfont_footnote_tl
+ \tl_use:N \l__eb_fnmark_format_tl
+ {\super{\@thefnmark}[0pt]}
+ }
}
\ExplSyntaxOff\char_set_catcode_other:N \@
}
\cs_set:Npn \@makefnmark
{
- \tl_use:N \l__eb_subfont_footnote_tl
- \tl_use:N \l__eb_fnmark_format_tl
+ \hbox:n
{
- \hbox:n
+ \tl_use:N \l__eb_subfont_footnote_tl
+ \tl_use:N \l__eb_fnmark_format_tl
{
\tl_if_eq:NnT \l__eb_fnmark_position_tl { super }
{ \spb@textsuperscript@save }{\@thefnmark}
@@ -774,7 +775,7 @@
\int_compare:nNnT { \c@chapter } > { 0 }
{
\thechapter
- \tl_use:c { l__eb_#1_separator_tl }
+ \tl_use:c { l__eb_#1_connector_tl }
}
\eb_arabic:n {#1}
}
@@ -1215,12 +1216,12 @@
\SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*}
\setlist
{
- labelsep = .75\ccwd,listparindent = 2\ccwd,leftmargin = *,
+ labelsep = 0.75\ccwd,listparindent = 2\ccwd,leftmargin = *,
itemsep = 0.75ex plus .1ex,topsep = 0.75ex plus .1ex,
partopsep = 0ex,parsep = 0ex
}
\newlist{eb@outline@list}{itemize}{1}
-\setlist[eb@outline@list]{label = outline,itemsep = .5ex plus .1ex}
+\setlist[eb@outline@list]{label = outline,itemsep = 0.5ex plus .1ex}
\setlist[itemize,1]{label = bullet}
\setlist[itemize,2]{label = endash}
\setlist[itemize,3]{label = asterisk}
@@ -1406,6 +1407,7 @@
enhanced~jigsaw,pad~at~break* = 3pt,
opacityback = 0,
colframe = ctex@emph,
+ sharpish~corners,
left = 6pt,right = 6pt,top = 8pt,bottom = 8pt,middle= 8pt
},
tc-outline/.style =
@@ -1417,19 +1419,19 @@
fonttitle = \large\sffamily,fontupper = \itshape,
boxed~title~style = {size = normal,opacityframe = 0,boxrule = 0pt},
attach~boxed~title~to~top~center = {yshift = -\tcboxedtitleheight/2},
- arc = 3pt,boxsep = 5pt,
after~skip = 3ex,
- left = 1.5pc,right = 1.5pc,top = 1pc,bottom = 0.5pc
+ sharpish~corners,
+ left = 2pc,right = 2pc,top = 1.5pc,bottom = 1pc
},
tc-exercise/.style =
{
blank,on~line,center,
+ sharpish~corners,
fontupper = \Large\sffamily,
before~skip = 3.75ex,after~skip = 2.5ex
},
breakable,
boxsep = 0pt,
- arc = 0pt,
fonttitle = \sffamily,
boxrule = \l__eb_rule_width_dim
}
@@ -1495,7 +1497,7 @@
\end{enumerate}
\tl_gclear:N \eb@tc@list@prologue
}{}
- \DeclareTColorBox{easybox}{sO{DarkCyan}d()O{}}
+ \DeclareTColorBox{easybox}{sO{Khaki}d()O{}}
{
enhanced~jigsaw,pad~at~break* = 3pt,
IfBooleanTF = {#1}
@@ -1505,13 +1507,14 @@
colback = #2,colbacktitle = #2,
opacityback = 0.12,opacitybacktitle = 0.12,
coltitle = black,colframe = black,
+ sharpish~corners,
left = 6pt,right = 6pt,bottom = 8pt,middle= 8pt,
bottomtitle = 8pt,
beforeafter~skip = 2ex,
halign~upper = left,halign~lower = left,
center~title,#4
}
- \DeclareTColorBox{ebparbox}{sO{Purple}d()O{}}
+ \DeclareTColorBox{ebparbox}{sO{DarkSlateBlue}d()O{}}
{
frame~hidden,
enhanced~jigsaw,pad~at~break* = 3pt,
@@ -1529,6 +1532,7 @@
bottom = 8pt,toptitle = 8pt
},
left = 8pt,right = 8pt,middle= 8pt,
+ sharpish~corners,
bottomtitle = 8pt,
beforeafter~skip = 1.5ex,
colframe = #2,coltitle = #2,#4
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index e7c80c31094..88515d710dc 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/07/01}{1.26o}
+\ProvidesExplClass{easybook}{2021/07/02}{1.26p}
{Typeset Chinese books or notes}
\bool_set_false:N \l__eb_compile_draft_bool