summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/colorist/colorist.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/colorist/colorist.sty')
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorist.sty46
1 files changed, 35 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty
index ddc6055a053..354006dc4b2 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/07/27 A colorful style for articles and books]
+ [2021/07/30 A colorful style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -29,10 +29,16 @@
\DeclareBoolOption[false]{puretext}
\DeclareBoolOption[false]{nothms}
\DeclareBoolOption[false]{nothmnum}
+\DeclareStringOption{thmnum}[colorist@thmnum@default]
+\DeclareBoolOption[true]{regionalref}
+\DeclareBoolOption[false]{originalref}
\DeclareBoolOption[false]{allowbf}
\DeclareBoolOption[false]{runin}
\ProcessKeyvalOptions*\relax
+\if@colorist@originalref
+ \@colorist@regionalreffalse
+\fi
\if@colorist@draft
\@colorist@fasttrue
\fi
@@ -40,6 +46,21 @@
\@colorist@nothmstrue
\fi
+\if@colorist@fast
+ \PassOptionsToPackage{fast}{PJLdraft}
+ \PassOptionsToPackage{fast}{PJLthm}
+\fi
+\expandafter\ifstrempty\expandafter{\@colorist@thmnum}{}{
+ \expandafter\ifstrequal\expandafter{\@colorist@thmnum}{colorist@thmnum@default}{
+ \PassOptionsToPackage{thmnum}{PJLthm}
+ }{
+ \PassOptionsToPackage{thmnum=\@colorist@thmnum}{PJLthm}
+ }
+}
+\if@colorist@regionalref\else
+ \PassOptionsToPackage{originalref}{PJLthm}
+\fi
+
\if@colorist@allowbf
\newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!90!paper}}
\else
@@ -728,12 +749,8 @@
\expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\propositionnameRU}
\expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU}
+\AtEndPreamble{
\theoremstyle{basic}
-\ifbool{IsBook}{
- \newaliascnt{highest}{chapter}
-}{
- \newaliascnt{highest}{section}
-}
\if@colorist@nothms\else
\if@colorist@nothmnum
\CreateTheorem*{theorem}
@@ -746,7 +763,7 @@
\CreateTheorem*{fact}
\CreateTheorem*{conjecture}
\else
-\CreateTheorem{theorem}<highest>
+\CreateTheorem@thmnum{theorem}
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
\CreateTheorem{corollary}[theorem]
@@ -804,14 +821,13 @@
\CreateTheorem*{remark}
\CreateTheorem*{observation}
\else
-\CreateTheorem{remark}<highest>
-\CreateTheorem{observation}<highest>
+\CreateTheorem@thmnum{remark}
+\CreateTheorem@thmnum{observation}
\fi
\CreateTheorem*{remark*}
\CreateTheorem*{observation*}
\fi
-
-\numberwithin{equation}{highest}
+}
\creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{PJLlemma}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -1287,27 +1303,35 @@
\tcolorboxenvironment{question}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{question*}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{exercise}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{exercise*}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{remark}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{remark*}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{observation}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{observation*}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ top=0mm,bottom=0mm,
opacityframe=0,opacityback=0,lines before break=3}
\ExplSyntaxOn