diff options
author | Karl Berry <karl@freefriends.org> | 2022-04-21 20:13:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-04-21 20:13:21 +0000 |
commit | 44b32b2d63a16a1cea0784e31a91d6acfdd06dcb (patch) | |
tree | ea435f460a1391867eb3c0a361155b7cd5e4a1d5 /Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty | |
parent | 535f726c3859c39187f594666ae9d9ea846e188a (diff) |
jxu (21apr22)
git-svn-id: svn://tug.org/texlive/trunk@63098 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty | 218 |
1 files changed, 81 insertions, 137 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index 5f69f0857ab..f604f3ff475 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {colorist-fancy} - {2022/04/03} {} + {2022/04/17} {} {The fancy style of colorist} \@ifpackageloaded { colorist } {} @@ -36,9 +36,22 @@ %%================================ \RequirePackage { anyfontsize } +\NewCommandCopy \colorist_original_bfseries: \bfseries +\bool_new:N \l_colorist_is_under_bfseries_bool +\bool_set_false:N \l_colorist_is_under_bfseries_bool +\RenewDocumentCommand \bfseries { } + { + \bool_if:NF \l_colorist_is_under_bfseries_bool + { + \colorlet{colorist-temp-color}{.} + \color{colorist-temp-color!90!paper} + } + \colorist_original_bfseries: + \bool_set_true:N \l_colorist_is_under_bfseries_bool + } \bool_if:NTF \l__colorist_use_boldface_bool { - \cs_new:Nn \colorist_bfseries: { \bfseries \colorlet{colorist-temp-color}{.} \color{colorist-temp-color!90!paper} } + \cs_new:Nn \colorist_bfseries: { \bfseries } } { \cs_new:Nn \colorist_bfseries: {} @@ -198,7 +211,7 @@ %%================================ %% Title format %%================================ -\RequirePackage [ explicit, newparttoc ] { titlesec } +\RequirePackage [ explicit, newparttoc, nobottomtitles ] { titlesec } \PassOptionsToPackage { normalem } { ulem } \RequirePackage { ulem } @@ -408,22 +421,22 @@ {\hspace*{-2em}} {\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage} \titlecontents{section} - [4em] % i.e., 2em (chapter) + 2em + [5em] % i.e., 2em (chapter) + 3em {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily} - {\contentslabel{1.75em}} - {\hspace*{-1.75em}} + {\contentslabel{2.75em}} + {\hspace*{-2.75em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{subsection} - [7em] % i.e., 4em (section) + 3em + [8.75em] % i.e., 5em (section) + 3.75em {\addvspace{.15pc}\normalfont\sffamily} - {\contentslabel{2.75em}} - {\hspace*{-2.75em}} + {\contentslabel{3.50em}} + {\hspace*{-3.50em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} \titlecontents{subsubsection} - [10em] % i.e., 7em (subsection) + 3em + [12.75em] % i.e., 8.75em (subsection) + 4em {\normalfont\sffamily} - {\contentslabel{3.25em}} - {\hspace*{-3.25em}} + {\contentslabel{3.75em}} + {\hspace*{-3.75em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} } { @@ -451,7 +464,8 @@ %% Lists %%================================ \RequirePackage { enumitem } -\setlist{noitemsep} +\setlistdepth{10} +\setlist{noitemsep, topsep=.33\topsep} \setlist[enumerate]{labelsep=*, leftmargin=*} \setlist[enumerate,1]{label=\arabic*$)$, ref = \arabic*$)$} @@ -461,11 +475,13 @@ ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\colorist_bfseries:} -\setlist[itemize]{leftmargin=*} +\renewlist{itemize}{itemize}{10} +\setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}} \AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!55!paper}{---}} } +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} } \setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}} -\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}} +\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}} +\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}} %%================================ %% Blank page @@ -555,10 +571,28 @@ heading_suffix "}\n" \par \vspace{.3\baselineskip} } + \renewcommand*{\indexspace} { \par - \vspace{2pc~plus~.5pc~minus~.3pc} + \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc} + } + +\bool_new:N \l__colorist_if_first_subitem_bool +\renewcommand*{\@idxitem} + { + \par\hangindent40\p@ + \bool_set_true:N \l__colorist_if_first_subitem_bool + } +\renewcommand*{\subitem} + { + \par\hangindent40\p@ + \bool_if:NT \l__colorist_if_first_subitem_bool + { + \nobreak + \bool_set_false:N \l__colorist_if_first_subitem_bool + } + \hspace*{20\p@} } %%================================ @@ -621,7 +655,7 @@ heading_suffix "}\n" {\normalfont}{} {\newline} {{\thmname{#1}\nobreakspace\thmnumber{#2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\smallskip} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\smallskip} } { \newtheoremstyle{simple} @@ -630,7 +664,7 @@ heading_suffix "}\n" {\normalfont}{} {0pt} {{\thmname{#1}\nobreakspace\thmnumber{#2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} } \renewcommand{\qedsymbol}{ @@ -698,6 +732,8 @@ heading_suffix "}\n" \RequirePackage { projlib-theorem } +\tl_gset:Nn \g_crthm_combined_name_sep_tl { \textcolor{main-text}{-} } + \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, definition-theorem, definition-proposition } { name style = { @@ -712,7 +748,7 @@ heading_suffix "}\n" } } -\SetTheorem { fact, example, problem, question, exercise } +\SetTheorem { application, fact, example, problem, question, exercise } { name style = { heading style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc } @@ -726,44 +762,6 @@ heading_suffix "}\n" } } -\SetTheorem { definition-proposition } - { - name = { - heading = { - , english = \color{forestgreen}Definition\color{main-text}-\color{orange}Proposition - , french = \color{forestgreen}Définition\color{main-text}-\color{orange}Proposition - , ngerman = \color{forestgreen}Definition\color{main-text}-\color{orange}Proposition - , italian = \color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione - , portuguese = \color{forestgreen}Definição\color{main-text}-\color{orange}Proposição - , brazilian = \color{forestgreen}Definição\color{main-text}-\color{orange}Proposição - , spanish = \color{forestgreen}Definición\color{main-text}-\color{orange}Proposición - , schinese = \color{forestgreen}定义\color{main-text}-\color{orange}命题 - , tchinese = \color{forestgreen}定義\color{main-text}-\color{orange}命題 - , japanese = \color{forestgreen}定義\color{main-text}-\color{orange}命題 - , russian = \color{forestgreen}Определение\color{main-text}-\color{orange}Предложение - } - } - } - -\SetTheorem { definition-theorem } - { - name = { - heading = { - , english = \color{forestgreen}Definition\color{main-text}-\color{orange}Theorem - , french = \color{forestgreen}Définition\color{main-text}-\color{orange}Théorème - , ngerman = \color{forestgreen}Definition\color{main-text}-\color{orange}Satz - , italian = \color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema - , portuguese = \color{forestgreen}Definição\color{main-text}-\color{orange}Teorema - , brazilian = \color{forestgreen}Definição\color{main-text}-\color{orange}Teorema - , spanish = \color{forestgreen}Definición\color{main-text}-\color{orange}Teorema - , schinese = \color{forestgreen}定义\color{main-text}-\color{orange}定理 - , tchinese = \color{forestgreen}定義\color{main-text}-\color{orange}定理 - , japanese = \color{forestgreen}定義\color{main-text}-\color{orange}定理 - , russian = \color{forestgreen}Определение\color{main-text}-\color{orange}Теорема - } - } - } - \bool_if:NF \l__projlib_theorem_complexname_bool { \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, definition-theorem, definition-proposition } @@ -784,7 +782,7 @@ heading_suffix "}\n" } } - \SetTheorem { fact, example, problem, question, exercise } + \SetTheorem { application, fact, example, problem, question, exercise } { name style = { , crefname style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc } @@ -801,70 +799,6 @@ heading_suffix "}\n" , numbering style = { \color{purple}\colorist_bfseries:\g_colorist_title_font_common_tl } } } - - \SetTheorem { definition-proposition } - { - name = { - , crefname = { - , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition} - , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition} - , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition} - , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione} - , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição} - , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição} - , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición} - , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}命题}{\color{forestgreen}定义\color{main-text}-\color{orange}命题} - , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題} - , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題} - , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}{\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение} - } - , Crefname = { - , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition} - , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition} - , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition} - , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione} - , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição} - , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição} - , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición} - , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}命题}{\color{forestgreen}定义\color{main-text}-\color{orange}命题} - , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題} - , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題} - , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}{\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение} - } - } - } - - \SetTheorem { definition-theorem } - { - name = { - , crefname = { - , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}{\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem} - , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème} - , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}{\color{forestgreen}Definition\color{main-text}-\color{orange}Satz} - , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema} - , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema} - , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema} - , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema} - , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}定理}{\color{forestgreen}定义\color{main-text}-\color{orange}定理} - , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理} - , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理} - , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}{\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема} - } - , Crefname = { - , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}{\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem} - , french = [La]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}[Les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème} - , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}{\color{forestgreen}Definition\color{main-text}-\color{orange}Satz} - , italian = [La]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}[Le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema} - , portuguese = [A]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[As]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema} - , brazilian = [A]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[As]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema} - , spanish = [La]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}[Las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema} - , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}定理}{\color{forestgreen}定义\color{main-text}-\color{orange}定理} - , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理} - , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理} - , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}{\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема} - } - } - } } \RequirePackage { marginnote } @@ -968,53 +902,47 @@ heading_suffix "}\n" \colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, definition-proposition, definition-theorem } { - enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3, + enhanced~jigsaw, breakable, lines~before~break=3, left=3.5mm, right=3.5mm, - before=\par\medskip\noindent, colback=main-text!3!paper, opacityframe=0.9, colframe=orange, arc=.7mm } -\colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation } + \colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation, proposition-definition, theorem-definition } { - enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3, + enhanced~jigsaw, breakable, lines~before~break=3, left=4mm, right=4mm, top=1mm, bottom=1mm, - before=\par\medskip\noindent, colback=lightorange!10!paper, boxrule=0pt, frame~hidden, borderline~west={1.5mm}{0mm}{forestgreen}, arc=.7mm } -\colorist_add_colorbox:nn { fact, example } +\colorist_add_colorbox:nn { application, fact, example } { - enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3, + enhanced~jigsaw, breakable, lines~before~break=3, colback=main-text!5!paper, - before=\par\medskip\noindent, boxrule=0pt, frame~hidden, arc=.7mm } \colorist_add_colorbox:nn { conjecture } { - enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3, + enhanced~jigsaw, breakable, lines~before~break=3, left=3.5mm, right=3.5mm, - before=\par\medskip\noindent, colback=main-text!3!paper, opacityframe=0.7, colframe=purple, arc=.7mm } \colorist_add_colorbox:nn { problem } { - enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3, + enhanced~jigsaw, breakable, lines~before~break=3, colback=yellow!25!paper, - before=\par\medskip\noindent, boxrule=0pt, frame~hidden, arc=.7mm } \colorist_add_colorbox:nn { question, exercise, remark, observation } { - enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3, + enhanced~jigsaw, breakable, lines~before~break=3, oversize, top=0mm, bottom=0mm, - before=\par\medskip\noindent, opacityframe=0, opacityback=0 } @@ -1100,6 +1028,22 @@ heading_suffix "}\n" \theoremstyle{simple} +\NewDocumentEnvironment { emphasis } { } + { + \enlargethispage{2mm} + \begin{tcolorbox} + [ + enhanced ~ jigsaw, enforce~breakable, oversize, + % nobeforeafter, + left = 1em, right=0mm, top=.5mm, bottom=0mm, boxrule=0pt, + colback=maintheme!3!paper, frame ~ hidden, + borderline ~ west = {.3em} {0mm} {maintheme!90!paper}, arc = 0.2mm, + ] + } + { + \end{tcolorbox} + } + \hook_gput_code:nnn { env/quote/begin } { colorist } { \small } %%================================ |