summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/colorist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/colorist')
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorart.cls2
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorbook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty59
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorist.sty21
4 files changed, 72 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls
index 278cf0f3358..4153a79860c 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorart.cls
+++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{colorart}
- {2023/07/14} {}
+ {2023/09/26} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
index 1c39ab987f7..9a27ceb8962 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls
+++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{colorbook}
- {2023/07/14} {}
+ {2023/09/26} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
index 1fddb04d17c..5323c9b8811 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
+++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{colorist-fancy}
- {2023/07/14} {}
+ {2023/09/26} {}
{The fancy style of colorist}
\IfPackageLoadedTF { colorist } {}
@@ -498,17 +498,21 @@
\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$}
-\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$}
+ ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$,
+ leftmargin= \l__colorist_item_indentation_dim + \maxof{\parindent}{1.5em} }
+ % labelindent= \l__colorist_item_indentation_dim }
+\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$,
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman*$\mskip-.5mu\big)$}
\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$}
-\setlist[description]{font=\normalfont\colorist_bfseries:}
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$}
+
+\setlist[description]{font=\normalfont\colorist_bfseries: ,
+ labelindent= \l__colorist_item_indentation_dim }
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}}
-\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} }
+\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__colorist_item_indentation_dim + \maxof{\parindent}{1.5em}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__colorist_item_indentation_dim + \maxof{\parindent}{1.5em} } }
\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}}
\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}}
@@ -709,6 +713,17 @@ heading_suffix "}\n"
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
}}\hbox{\strut}\vspace{0pt}}}
}
+ \newtheoremstyle{simple-var}
+ {}{}
+ { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ }}\hbox{\strut}\vspace{0pt}}}
+ }
}
{
\newtheoremstyle{simple}
@@ -718,6 +733,13 @@ heading_suffix "}\n"
{0pt}
{{\thmname{#1}\nobreakspace\thmnumber{#2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ \newtheoremstyle{simple-var}
+ {}{}
+ { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {0pt}
+ {{\thmname{#1}\nobreakspace\thmnumber{#2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
}
\newcommand{\customqedsymbol}{
@@ -737,10 +759,28 @@ heading_suffix "}\n"
\thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}
}}\hbox{\strut}\vspace{0pt}}}
}
+ \newtheoremstyle{basic-var}
+ {}{}
+ { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {}{}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}}
+ \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}
+ }}\hbox{\strut}\vspace{0pt}}}
+ }
}
{
\newtheoremstyle{basic}
- {0pt}{0pt}{\normalfont}{0pt}
+ {0pt}{0pt}
+ {\normalfont}{0pt}
+ {}{\;}{0.25em}
+ {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}}
+ \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}}
+ \newtheoremstyle{basic-var}
+ {0pt}{0pt}
+ { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{0pt}
{}{\;}{0.25em}
{{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}}
\thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}}
@@ -799,6 +839,7 @@ heading_suffix "}\n"
theorem style = {
, remark = emphasis
, observation = emphasis
+ , theorem = basic-var, lemma = basic-var, proposition = basic-var, corollary = basic-var, property = basic-var, axiom = basic-var, construction = basic-var, theorem-with-name = basic-var
}
}
{ projlib-theorem }
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty
index b750f4d1ef4..d9019557c23 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorist.sty
+++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{colorist}
- {2023/07/14} {}
+ {2023/09/26} {}
{A colorful style for articles and books}
\keys_define:nn { colorist }
@@ -56,6 +56,25 @@
, runin .bool_set:N = \l__colorist_runin_bool
, runin .initial:n = { false }
+ , indent-items .dim_set:N = \l__colorist_item_indentation_dim
+ , indent-items .initial:n = { 0pt }
+ , indent-items .default:n = { \parindent }
+ , indent~items .dim_set:N = \l__colorist_item_indentation_dim
+ , indent~items .default:n = { \parindent }
+ , indent items .dim_set:N = \l__colorist_item_indentation_dim
+ , indent items .default:n = { \parindent }
+ , indent-lists .dim_set:N = \l__colorist_item_indentation_dim
+ , indent-lists .default:n = { \parindent }
+ , indent~lists .dim_set:N = \l__colorist_item_indentation_dim
+ , indent~lists .default:n = { \parindent }
+ , indent lists .dim_set:N = \l__colorist_item_indentation_dim
+ , indent lists .default:n = { \parindent }
+
+ , emphasis-theorems .bool_set:N = \l__colorist_emphasis_theorem_bool
+ , emphasis-theorems .initial:n = { false }
+ , emphasis~theorems .bool_set:N = \l__colorist_emphasis_theorem_bool
+ , emphasis theorems .bool_set:N = \l__colorist_emphasis_theorem_bool
+
, theorem-in-new-line .bool_set:N = \l__colorist_theorem_in_new_line_bool
, theorem-in-new-line .initial:n = { false }
, theorem~in~new~line .bool_set:N = \l__colorist_theorem_in_new_line_bool