summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/colorist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-07 20:05:15 +0000
committerKarl Berry <karl@freefriends.org>2021-06-07 20:05:15 +0000
commita2cabd85e48439f9b0c9649311521767770b5546 (patch)
tree2b68a32da2f704a0f8a55060a94f9dbee96d537a /Master/texmf-dist/tex/latex/colorist
parentb7c959ab679d0c4d215d107e70832ba79a6e7c76 (diff)
colorist (7jun21)
git-svn-id: svn://tug.org/texlive/trunk@59509 c570f23f-e606-0410-a88d-b1316a301751
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.sty33
3 files changed, 28 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls
index 8e6fd2d020b..c0040549ce7 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorart.cls
+++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorart}
- [2021/06/07 A colorful article style]
+ [2021/06/07a A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
index 8f246785962..78d7969e64f 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls
+++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorbook}
- [2021/06/07 A colorful book style]
+ [2021/06/07a A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty
index af8050fe4db..5ced409d176 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorist.sty
+++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{colorist}
- [2021/06/07 A colorful style for articles and books]
+ [2021/06/07a A colorful style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -318,6 +318,12 @@
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage}
+ \titlecontents{subsubsection}
+ [9em] % i.e., 7em (subsection) + 2em
+ {\normalfont\colorist@sffamily}
+ {\contentslabel{2.75em}}
+ {\hspace*{-2.75em}}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
}{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
@@ -331,6 +337,12 @@
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage}
+ \titlecontents{subsubsection}
+ [7em] % i.e., 5em (subsection) + 2em
+ {\normalfont\colorist@sffamily}
+ {\contentslabel{2.75em}}
+ {\hspace*{-2.75em}}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
}
%%================================
@@ -399,19 +411,25 @@
%%================================
\RequirePackage{mathtools}
\RequirePackage{amsthm}
-\def\simpleqed{\hfill\makebox[1em]{\rlap{\textcolor{gray!25!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\def\simpleqedsymbol{%
+ \makebox[1em]{\rlap{\textcolor{gray!25!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
\newtheoremstyle{simple}%
{}{}%
{\normalfont}{}%
{\normalfont}{}%
{0pt}%
- {\conditionalbfseries\thmname{#1}\thmnumber{ #2}\hspace{.4em}%
+ {\global\let\qedsymbol\simpleqedsymbol%
+ {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
\textcolor{gray!55!paper}{$|$}\hspace{.4em}%
- \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}\pushQED{\simpleqed}}
-\def\@endtheorem{\popQED\endtrivlist\@endpefalse }
+ \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}%
+ \pushQED{\qed}%
+ }
+\def\@endtheorem{\popQED\endtrivlist\@endpefalse
+\global\let\qedsymbol\qedsymbolOriginal}
\renewcommand{\qedsymbol}{%
\makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
+\let\qedsymbolOriginal\qedsymbol
\newtheoremstyle{basic}
{0pt}{0pt}{\normalfont}{0pt}
@@ -1004,7 +1022,7 @@
\hspace*{-.5em}%
\fi%
}\normalmarginpar%
-}{}{\FAIL}
+}{}{}
\pretocmd{\conjecture}{%
\if@twoside\checkoddpage%
\ifoddpage\reversemarginpar\fi%
@@ -1019,7 +1037,7 @@
\hspace*{-.5em}%
\fi%
}\normalmarginpar%
-}{}{\FAIL}
+}{}{}
}
\RequirePackage{iftex}
@@ -1342,6 +1360,7 @@
{\scshape\@author}\\\smallskip%
{\@date}%
\end{center}%
+\ifx\@date\@empty\bigskip\fi%
\medskip%
}
\apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL}