summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/colorist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-08-11 20:17:23 +0000
committerKarl Berry <karl@freefriends.org>2021-08-11 20:17:23 +0000
commitd1d6cfcf29eb1210b0af247a208dc064ce7411de (patch)
treee077d197c68aed66e7e3f0e09449fb03300a62b0 /Master/texmf-dist/tex/latex/colorist
parentd5306793142bf27a6875dab479aeeb00a598e9e9 (diff)
jxu (11aug21)
git-svn-id: svn://tug.org/texlive/trunk@60223 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/colorist')
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorart.cls3
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorbook.cls3
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorist.sty19
3 files changed, 17 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls
index 446fa868add..e44367a8cab 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/08/09 A colorful article style]
+ [2021/08/11 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -34,6 +34,7 @@
\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
+\DeclareStringOption{thmnum}[PJL@thmnum@default]
\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
index 711916d8998..e07b345a91a 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/08/09 A colorful book style]
+ [2021/08/11 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -34,6 +34,7 @@
\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
+\DeclareStringOption{thmnum}[PJL@thmnum@default]
\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty
index 0374aec6142..348f23ee1a7 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/08/09 A colorful style for articles and books]
+ [2021/08/11 A colorful style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -28,6 +28,7 @@
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{puretext}
\DeclareBoolOption[false]{nothms}
+\DeclareBoolOption[false]{delaythms}
\DeclareBoolOption[false]{nothmnum}
\DeclareStringOption{thmnum}[colorist@thmnum@default]
\DeclareBoolOption[true]{regionalref}
@@ -170,13 +171,13 @@
\gappto{\PJLlang@langconfig@common}{%
\renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}%
}
-\gappto{\PJLlang@langconfig@schinese}{%
+\gappto{\PJLlang@langconfig@CN}{%
\renewcommand{\partstring}{第~\thepart~部分}%
}
-\gappto{\PJLlang@langconfig@tchinese}{%
+\gappto{\PJLlang@langconfig@TC}{%
\renewcommand{\partstring}{第~\thepart~部分}%
}
-\gappto{\PJLlang@langconfig@japanese}{%
+\gappto{\PJLlang@langconfig@JP}{%
\renewcommand{\partstring}{第~\thepart~部}%
}
@@ -400,7 +401,7 @@
\setlist[itemize]{leftmargin=*}
\gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}}
-\gappto{\PJLlang@langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}}
+\gappto{\PJLlang@langconfig@FR}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}}
\setlist[itemize,2]{label=\textcolor{maintext!27}{--}}
\setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}}
@@ -747,7 +748,7 @@
\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{
+\def\colorist@definethms{
\if@colorist@nothms\else
\theoremstyle{basic}
\if@colorist@nothmnum
@@ -829,6 +830,12 @@
\fi
}
+\if@colorist@delaythms
+ \AtEndPreamble{\colorist@definethms}
+\else
+ \colorist@definethms
+\fi
+
\theoremstyle{simple}
\creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}