From ca01412cea74957c871e91b0cd41d6d16deb5d56 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Jun 2021 19:43:54 +0000 Subject: colorist (23jun21) git-svn-id: svn://tug.org/texlive/trunk@59684 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/colorist/colorist-doc.pdf | Bin 82011 -> 82469 bytes .../texmf-dist/doc/latex/colorist/colorist-doc.tex | 55 ++- Master/texmf-dist/tex/latex/colorist/colorart.cls | 31 +- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 31 +- Master/texmf-dist/tex/latex/colorist/colorist.sty | 434 ++++++++++++--------- 5 files changed, 312 insertions(+), 239 deletions(-) diff --git a/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf b/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf index cb99ee3a3a9..8ba3ed32956 100644 Binary files a/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf and b/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex b/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex index 38db3b3d8cc..a6b226644b2 100644 --- a/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex +++ b/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex @@ -1,5 +1,5 @@ %! TEX program = xelatex -\documentclass[allowbf,puretext]{colorart} +\documentclass[English,French,allowbf,puretext]{colorart} \theoremstyle{basic} \CreateTheorem{definition} @@ -16,7 +16,7 @@ %%================================ %% Import toolkit %%================================ -\usepackage{PJLtoolkit} +\usepackage{ProjLib} \usepackage{longtable} % breakable tables \usepackage{hologo} % more TeX logo @@ -44,7 +44,7 @@ } \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% - {linenumbers,nolinenumbers,subsection,href, + {linenumbers,nolinenumbers,subsection,subsubsection,href, color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib } } @@ -88,7 +88,7 @@ \title{{\normalfont\textbf{\textsf{colorist}}}, write your articles or books in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\colorist{} 2021/06/07a}} +\thanks{Corresponding to: \texttt{\colorist{} 2021/06/23}} \date{June 2021, Beijing} \maketitle @@ -143,6 +143,22 @@ And of course, you can also use the default classes \textsf{article} or \textsf{ \begin{itemize} \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded. \end{itemize} + \item \texttt{runin} + \begin{itemize} + \item Use the ``runin'' style for \lstinline|\subsubsection| + \end{itemize} + \item \texttt{puretext} or \texttt{nothms} + \begin{itemize} + \item Pure text mode. Does not load theorem-like environments. + \end{itemize} + \item \texttt{nothmnum} + \begin{itemize} + \item Theorem-like environments will not be numbered. + \end{itemize} + \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. + \begin{itemize} + \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. + \end{itemize} \end{itemize} \begin{tip} @@ -158,10 +174,11 @@ Additionally, \colorart{} and \colorbook{} offers the following options: \begin{itemize} \item Optional paper size. The default paper size is 8.5in $\times$ 11in. \end{itemize} - \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} - \begin{itemize} - \item Font options. As the name suggest, font with corresponding name will be loaded. - \end{itemize} + \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf} + \begin{itemize} + \item Font options. As the name suggest, font with corresponding name will be loaded. + \item The \texttt{useosf} option is used to enable the old-style figures. + \end{itemize} \end{itemize} @@ -308,7 +325,6 @@ And then define this environment in one of following five ways: \begin{itemize} \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within} \end{itemize} - \clearpage \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)| \begin{itemize} @@ -321,7 +337,7 @@ And then define this environment in one of following five ways: \end{itemize} \end{itemize} -\medskip +% \medskip \begin{tip} This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions. \end{tip} @@ -331,7 +347,7 @@ And then define this environment in one of following five ways: \CreateTheorem*{proofidea*} \CreateTheorem{proofidea} -\bigskip +\medskip Here is an example. The following code: \begin{code} \NameTheorem[EN]{proofidea}{Idea} @@ -348,7 +364,7 @@ defines an unnumbered environment \lstinline|proofidea*| and a numbered environm The \lstinline|proofidea| environment. \end{proofidea} -\bigskip +\smallskip \subsection{Draft mark} You can use \lstinline|\dnf| to mark the unfinished part. For example: @@ -358,10 +374,10 @@ You can use \lstinline|\dnf| to mark the unfinished part. For example: Similarly, there is \lstinline|\needgraph| : \begin{itemize} - \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph} + \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \vspace{-.3\baselineskip}\needgraph \vspace{-.5\baselineskip} or \vspace{-.5\baselineskip} \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph} \end{itemize} -\clearpage +% \clearpage \subsection{On the title, abstract and keywords} \colorart{} has both the features of standard classes and that of the \AmS{} classes. @@ -423,7 +439,8 @@ Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \ls \item There are still many things that can be optimized in the code. \end{itemize} -\clearpage +% \clearpage +\medskip \section{Document templates} \subsection{The standard way} @@ -432,7 +449,7 @@ If you want to write in the standard way, you can refer to the following example \begin{code} \documentclass{colorart} -\usepackage{PJLtoolkit} % Load ProjLib toolkit +\usepackage{ProjLib} % Load ProjLib toolkit \UseLanguage{French} % Use French from here @@ -470,7 +487,7 @@ If you wish to switch to the standard class later, just replace the first two li \documentclass{article} \usepackage[a4paper,margin=1in]{geometry} \usepackage[hidelinks]{hyperref} -\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit +\usepackage[palatino]{ProjLib} % Load ProjLib toolkit \end{code} @@ -481,7 +498,7 @@ If you intend to switch to the journal template in the future and thus want to u \begin{code} \documentclass{colorart} -\usepackage{PJLtoolkit} % Load ProjLib toolkit +\usepackage{ProjLib} % Load ProjLib toolkit \UseLanguage{French} % Use French from here @@ -523,7 +540,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first \documentclass{amsart} \usepackage[a4paper,margin=1in]{geometry} \usepackage[hidelinks]{hyperref} -\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit +\usepackage[palatino]{ProjLib} % Load ProjLib toolkit \end{code} \end{document} diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index c0040549ce7..3e07d9b5aa5 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/07a A colorful article style] + [2021/06/23 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -27,6 +27,7 @@ } \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} +\DeclareBoolOption[false]{useosf} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -94,7 +95,7 @@ \if@colorclass@fast \PassOptionsToPackage{fast}{colorist} \RequirePackage{draftwatermark} - \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95} + \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper} \fi \RequirePackage{colorist} @@ -112,17 +113,15 @@ \fi \RequirePackage{amssymb} -\let\colorist@sffamily\sffamily -\let\colorist@textsc\textsc - \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} \PassOptionsToPackage{defaultsups}{newpxtext} \RequirePackage{newpxtext} - \RequirePackage{newpxmath} + % \RequirePackage{newpxmath} \let\openbox\relax \PJLsetlinespacing{\setstretch{1.07}} + \if@colorclass@useosf\useosf\fi \fi \if@colorclass@times @@ -132,12 +131,15 @@ \RequirePackage{newtxmath} \let\openbox\relax \PJLsetlinespacing{\setstretch{1.00}} + \if@colorclass@useosf\useosf\fi \let\colorist@textsc\relax \fi \if@colorclass@garamond \RequirePackage{amssymb} - \PassOptionsToPackage{lining}{ebgaramond} + \if@colorclass@useosf\else + \PassOptionsToPackage{lining}{ebgaramond} + \fi \RequirePackage{ebgaramond-maths} \RequirePackage{ebgaramond} % \RequirePackage{garamondlibre} @@ -150,6 +152,9 @@ % \RequirePackage{mathpazo} % \RequirePackage[sansmath]{libertinust1math} \ifPDFTeX + \if@colorclass@useosf + \PassOptionsToPackage{osf}{biolinum} + \fi \RequirePackage{biolinum} \renewcommand*\familydefault{\biolinum@family} \else @@ -158,7 +163,8 @@ \setmainfont{LinBiolinum_R.otf}[ BoldFont = LinBiolinum_RB.otf , ItalicFont = LinBiolinum_RI.otf , - BoldItalicFont = LinBiolinum_RBO.otf ] + BoldItalicFont = LinBiolinum_RBO.otf, + \if@colorclass@useosf Numbers = OldStyle\fi ] \fi \PJLsetlinespacing{\setstretch{1.05}} \RequirePackage[italic,defaultmathsizes]{mathastext} @@ -166,8 +172,12 @@ \def\PJL@font@alreadyset{} +%% Minor improvements \PassOptionsToPackage{verbose=silent}{microtype} \RequirePackage{microtype} +\PassOptionsToPackage{all}{nowidow} +\RequirePackage{nowidow} +\RequirePackage{embrac} %%================================ %% Graphics @@ -179,11 +189,6 @@ \RequirePackage{caption} \captionsetup{font=small} -%%================================ -%% Index -%%================================ -\RequirePackage{imakeidx} - \endinput %% %% End of file `colorist/colorart.cls'. diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 78d7969e64f..e99f6730511 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/07a A colorful book style] + [2021/06/23 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -27,6 +27,7 @@ } \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} +\DeclareBoolOption[false]{useosf} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -94,7 +95,7 @@ \if@colorclass@fast \PassOptionsToPackage{fast}{colorist} \RequirePackage{draftwatermark} - \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95} + \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper} \fi \RequirePackage{colorist} @@ -112,17 +113,15 @@ \fi \RequirePackage{amssymb} -\let\colorist@sffamily\sffamily -\let\colorist@textsc\textsc - \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} \PassOptionsToPackage{defaultsups}{newpxtext} \RequirePackage{newpxtext} - \RequirePackage{newpxmath} + % \RequirePackage{newpxmath} \let\openbox\relax \PJLsetlinespacing{\setstretch{1.07}} + \if@colorclass@useosf\useosf\fi \fi \if@colorclass@times @@ -132,12 +131,15 @@ \RequirePackage{newtxmath} \let\openbox\relax \PJLsetlinespacing{\setstretch{1.00}} + \if@colorclass@useosf\useosf\fi \let\colorist@textsc\relax \fi \if@colorclass@garamond \RequirePackage{amssymb} - \PassOptionsToPackage{lining}{ebgaramond} + \if@colorclass@useosf\else + \PassOptionsToPackage{lining}{ebgaramond} + \fi \RequirePackage{ebgaramond-maths} \RequirePackage{ebgaramond} % \RequirePackage{garamondlibre} @@ -150,6 +152,9 @@ % \RequirePackage{mathpazo} % \RequirePackage[sansmath]{libertinust1math} \ifPDFTeX + \if@colorclass@useosf + \PassOptionsToPackage{osf}{biolinum} + \fi \RequirePackage{biolinum} \renewcommand*\familydefault{\biolinum@family} \else @@ -158,7 +163,8 @@ \setmainfont{LinBiolinum_R.otf}[ BoldFont = LinBiolinum_RB.otf , ItalicFont = LinBiolinum_RI.otf , - BoldItalicFont = LinBiolinum_RBO.otf ] + BoldItalicFont = LinBiolinum_RBO.otf, + \if@colorclass@useosf Numbers = OldStyle\fi ] \fi \PJLsetlinespacing{\setstretch{1.05}} \RequirePackage[italic,defaultmathsizes]{mathastext} @@ -166,8 +172,12 @@ \def\PJL@font@alreadyset{} +%% Minor improvements \PassOptionsToPackage{verbose=silent}{microtype} \RequirePackage{microtype} +\PassOptionsToPackage{all}{nowidow} +\RequirePackage{nowidow} +\RequirePackage{embrac} %%================================ %% Graphics @@ -179,11 +189,6 @@ \RequirePackage{caption} \captionsetup{font=small} -%%================================ -%% Index -%%================================ -\RequirePackage{imakeidx} - \endinput %% %% End of file `colorist/colorbook.cls'. diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 5ced409d176..6875a1596c8 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/07a A colorful style for articles and books] + [2021/06/23 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -28,7 +28,9 @@ \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} +\DeclareBoolOption[false]{nothmnum} \DeclareBoolOption[false]{allowbf} +\DeclareBoolOption[false]{runin} \ProcessKeyvalOptions*\relax \if@colorist@draft @@ -47,6 +49,9 @@ \newif\ifIsBook \ifdefined\c@chapter\IsBooktrue\else\IsBookfalse\fi +\let\colorist@sffamily\sffamily +\let\colorist@textsc\textsc + %%================================ %% Title fonts %%================================ @@ -79,14 +84,14 @@ \fancypagestyle{fancy}{ \fancyhf{} \if@twoside - \fancyfoot[RO]{\small\textcolor{black!30!paper}{\lastrightmark}% - ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}} + \fancyfoot[RO]{\small\textcolor{maintext!30!paper}{\lastrightmark}% + ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} \fancyfoot[LE]{\small\leavevmode\llap{\thepage% - ~~\textcolor{gray!55!paper}{$|$}}% - ~~\textcolor{black!30!paper}{\lastleftmark}} + ~~\textcolor{maintext!27!paper}{$|$}}% + ~~\textcolor{maintext!30!paper}{\lastleftmark}} \else - \fancyfoot[R]{\small\textcolor{black!30!paper}{\lastrightmark}% - ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}} + \fancyfoot[R]{\small\textcolor{maintext!30!paper}{\lastrightmark}% + ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} \fi \renewcommand{\headrulewidth}{0pt} } @@ -95,12 +100,12 @@ \fancyhf{} \if@twoside \fancyfoot[RO]{\small% - ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}} + ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} \fancyfoot[LE]{\small\leavevmode\llap{\thepage% - ~~\textcolor{gray!55!paper}{$|$}}} + ~~\textcolor{maintext!27!paper}{$|$}}} \else \fancyfoot[R]{\small% - ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}} + ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} \fi \renewcommand{\headrulewidth}{0pt} } @@ -168,7 +173,7 @@ \vfill% \begin{flushright}% \begin{minipage}{0.833\textwidth}% - \color{black!80!paper}\raggedleft#1% + \color{maintext!80!paper}\raggedleft#1% \end{minipage}% \end{flushright}% \vfill\vfill% @@ -262,7 +267,7 @@ \newcommand{\parttext}[1]{% \begin{flushright}% \begin{minipage}{0.833\textwidth}% - \color{black!80!paper}\raggedleft#1% + \color{maintext!80!paper}\raggedleft#1% \end{minipage}% \end{flushright}% } @@ -280,9 +285,19 @@ } %% Subsubsection +\if@colorist@runin +\titleformat{\subsubsection}[runin] + {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em} + {#1.}[\hspace*{.3em}] +\else \titleformat{\subsubsection} - {\color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{.5em} + {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em} {#1} +\fi + +%% Paragraph +\titleformat{\paragraph}[runin] + {\conditionalbfseries\scshape}{\theparagraph}{1em}{#1} \titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip} \titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip} @@ -305,44 +320,44 @@ {\addvspace{1pc}\normalfont\color{maintheme}\colorist@sffamily\conditionalbfseries} {\contentslabel{2em}} {\hspace*{-2em}} - {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} \titlecontents{section} [4em] % i.e., 2em (chapter) + 2em {\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily} {\contentslabel{1.75em}} {\hspace*{-1.75em}} - {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} \titlecontents{subsection} [7em] % i.e., 4em (section) + 3em {\addvspace{.15pc}\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!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} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} }{ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily} {\contentslabel{1.75em}} {\hspace*{-1.75em}} - {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} \titlecontents{subsection} [5em] % i.e., 2em (section) + 3em {\addvspace{.15pc}\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!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} + {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} } %%================================ @@ -350,9 +365,10 @@ %%================================ \RequirePackage{enumitem} \setlist{noitemsep,leftmargin=2em} -\renewcommand\labelitemi{\color{gray!50}$\bullet$} -\renewcommand\labelitemii{\color{gray!55}--} -\renewcommand\labelitemiii{\color{gray!55}\texttt{*}} +\gappto{\PJLlang@langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}} +\gappto{\PJLlang@langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}} +\renewcommand\labelitemii{\textcolor{maintext!27}{--}} +\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}} %%================================ %% Blank page @@ -365,7 +381,7 @@ \AddToHookNext{shipout/background} {% \put(0.5\paperwidth,-0.5\paperheight){% - \makebox[0pt]{\large\color{gray!20!paper}\blinkpagetext}}} + \makebox[0pt]{\large\color{maintext!10!paper}\blinkpagetext}}} \null\newpage\fi\fi} %%================================ @@ -412,7 +428,7 @@ \RequirePackage{mathtools} \RequirePackage{amsthm} \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}}} + \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} \newtheoremstyle{simple}% {}{}% {\normalfont}{}% @@ -420,26 +436,26 @@ {0pt}% {\global\let\qedsymbol\simpleqedsymbol% {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}% - \textcolor{gray!55!paper}{$|$}\hspace{.4em}% - \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}% + \textcolor{maintext!27!paper}{$|$}\hspace{.4em}% + \color{maintext!50!paper}\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}}} + \makebox[1em]{\color{maintext!27!paper}\rule[-0.1em]{.95em}{.95em}}} \let\qedsymbolOriginal\qedsymbol \newtheoremstyle{basic} {0pt}{0pt}{\normalfont}{0pt} {}{\;}{0.25em} {{\thmname{#1}~\thmnumber{\textup{#2}}} - \thmnote{\normalfont\colorist@sffamily\color{black}~(#3)}} + \thmnote{\normalfont\colorist@sffamily\color{maintext}~(#3)}} \newtheoremstyle{emphasis} {0pt}{0pt}{\itshape}{0pt}{}{}{0pt} - {\thmnote{\normalfont\colorist@sffamily\color{black}#3\hspace*{0.5em}}} + {\thmnote{\normalfont\colorist@sffamily\color{maintext}#3\hspace*{0.5em}}} \if@colorist@fast \providecommand{\phantomsection}{} @@ -460,7 +476,7 @@ \pretocmd{\propositionnameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenameEN}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -468,12 +484,12 @@ \pretocmd{\conventionnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnameEN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\propositionnameEN} \expandafter\def\csname definition-theoremnameEN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\theoremnameEN} @@ -483,7 +499,7 @@ \pretocmd{\propositionnameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenameFR}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -491,12 +507,12 @@ \pretocmd{\conventionnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnameFR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Définition}-\propositionnameFR} \expandafter\def\csname definition-theoremnameFR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Définition}-\theoremnameFR} @@ -506,7 +522,7 @@ \pretocmd{\propositionnameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenameDE}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -514,12 +530,12 @@ \pretocmd{\conventionnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnameDE\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\propositionnameDE} \expandafter\def\csname definition-theoremnameDE\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\theoremnameDE} @@ -529,7 +545,7 @@ \pretocmd{\propositionnameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenameIT}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -537,12 +553,12 @@ \pretocmd{\conventionnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnameIT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definizione}-\propositionnameIT} \expandafter\def\csname definition-theoremnameIT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definizione}-\theoremnameIT} @@ -552,7 +568,7 @@ \pretocmd{\propositionnamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenamePT}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -560,12 +576,12 @@ \pretocmd{\conventionnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnamePT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\propositionnamePT} \expandafter\def\csname definition-theoremnamePT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\theoremnamePT} @@ -575,7 +591,7 @@ \pretocmd{\propositionnameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenameBR}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -583,12 +599,12 @@ \pretocmd{\conventionnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnameBR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\propositionnameBR} \expandafter\def\csname definition-theoremnameBR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\theoremnameBR} @@ -598,7 +614,7 @@ \pretocmd{\propositionnameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\corollarynameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propertynameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\factnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\factnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\conjecturenameES}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\definitionnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\axiomnameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -606,12 +622,12 @@ \pretocmd{\conventionnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\hypothesisnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\notationnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\examplenameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\problemnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\questionnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\exercisenameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\remarknameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} -\pretocmd{\observationnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\examplenameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\problemnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\questionnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\exercisenameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\remarknameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} +\pretocmd{\observationnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL} \expandafter\def\csname definition-propositionnameES\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\propositionnameES} \expandafter\def\csname definition-theoremnameES\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\theoremnameES} @@ -621,7 +637,7 @@ \pretocmd{\propositionnameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\corollarynameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propertynameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} -\pretocmd{\factnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\factnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \pretocmd{\conjecturenameCN}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL} \pretocmd{\definitionnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\axiomnameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -629,12 +645,12 @@ \pretocmd{\conventionnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\hypothesisnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\notationnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} -\pretocmd{\examplenameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\problemnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\questionnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\exercisenameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\remarknameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\observationnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\examplenameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\problemnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\questionnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\exercisenameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\remarknameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\observationnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \expandafter\def\csname definition-propositionnameCN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定义}-\propositionnameCN} \expandafter\def\csname definition-theoremnameCN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定义}-\theoremnameCN} @@ -643,7 +659,7 @@ \pretocmd{\propositionnameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\corollarynameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propertynameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} -\pretocmd{\factnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\factnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \pretocmd{\conjecturenameTC}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL} \pretocmd{\definitionnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\axiomnameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -651,12 +667,12 @@ \pretocmd{\conventionnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\hypothesisnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\notationnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} -\pretocmd{\examplenameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\problemnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\questionnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\exercisenameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\remarknameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\observationnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\examplenameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\problemnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\questionnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\exercisenameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\remarknameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\observationnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \expandafter\def\csname definition-propositionnameTC\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\propositionnameTC} \expandafter\def\csname definition-theoremnameTC\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\theoremnameTC} @@ -666,7 +682,7 @@ \pretocmd{\propositionnameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\corollarynameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propertynameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} -\pretocmd{\factnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\factnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \pretocmd{\conjecturenameJP}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL} \pretocmd{\definitionnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\axiomnameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -674,12 +690,12 @@ \pretocmd{\conventionnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\hypothesisnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\notationnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} -\pretocmd{\examplenameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\problemnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\questionnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\exercisenameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\remarknameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\observationnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\examplenameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\problemnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\questionnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\exercisenameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\remarknameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\observationnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \expandafter\def\csname definition-propositionnameJP\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\propositionnameJP} \expandafter\def\csname definition-theoremnameJP\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\theoremnameJP} @@ -689,7 +705,7 @@ \pretocmd{\propositionnameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\corollarynameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propertynameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} -\pretocmd{\factnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\factnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \pretocmd{\conjecturenameRU}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL} \pretocmd{\definitionnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\axiomnameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -697,12 +713,12 @@ \pretocmd{\conventionnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\hypothesisnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} \pretocmd{\notationnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL} -\pretocmd{\examplenameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\problemnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\questionnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\exercisenameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\remarknameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} -\pretocmd{\observationnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL} +\pretocmd{\examplenameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\problemnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\questionnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\exercisenameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\remarknameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} +\pretocmd{\observationnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL} \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} @@ -714,6 +730,17 @@ \newaliascnt{highest}{section} } \if@colorist@nothms\else +\if@colorist@nothmnum +\CreateTheorem*{theorem} +\CreateTheorem*{lemma} +\CreateTheorem*{proposition} +\CreateTheorem*{corollary} +\CreateTheorem*{definition-proposition} +\CreateTheorem*{definition-theorem} +\CreateTheorem*{property} +\CreateTheorem*{fact} +\CreateTheorem*{conjecture} +\else \CreateTheorem{theorem} \CreateTheorem{lemma}[theorem] \CreateTheorem{proposition}[theorem] @@ -723,6 +750,7 @@ \CreateTheorem{property}[theorem] \CreateTheorem{fact}[theorem] \CreateTheorem{conjecture}[theorem] +\fi \CreateTheorem*{theorem*} \CreateTheorem*{lemma*} \CreateTheorem*{proposition*} @@ -732,6 +760,18 @@ \CreateTheorem*{property*} \CreateTheorem*{fact*} \CreateTheorem*{conjecture*} +\if@colorist@nothmnum +\CreateTheorem*{definition} +\CreateTheorem*{axiom} +\CreateTheorem*{assumption} +\CreateTheorem*{convention} +\CreateTheorem*{hypothesis} +\CreateTheorem*{notation} +\CreateTheorem*{example} +\CreateTheorem*{problem} +\CreateTheorem*{question} +\CreateTheorem*{exercise} +\else \CreateTheorem{definition}[theorem] \CreateTheorem{axiom}[theorem] \CreateTheorem{assumption}[theorem] @@ -742,6 +782,7 @@ \CreateTheorem{problem}[theorem] \CreateTheorem{question}[theorem] \CreateTheorem{exercise}[theorem] +\fi \CreateTheorem*{definition*} \CreateTheorem*{axiom*} \CreateTheorem*{assumption*} @@ -754,9 +795,14 @@ \CreateTheorem*{exercise*} \theoremstyle{emphasis} +\if@colorist@nothmnum +\CreateTheorem*{remark} +\CreateTheorem*{observation} +\else \CreateTheorem{remark} -\CreateTheorem*{remark*} \CreateTheorem{observation} +\fi +\CreateTheorem*{remark*} \CreateTheorem*{observation*} \fi @@ -768,7 +814,7 @@ \creflabelformat{PJLproposition}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLcorollary}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLproperty}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{PJLfact}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{PJLfact}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{PJLconjecture}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{PJLdefinition}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{PJLaxiom}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -776,10 +822,10 @@ \creflabelformat{PJLconvention}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{PJLhypothesis}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{PJLnotation}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{PJLexample}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{PJLproblem}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{PJLquestion}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{PJLexercise}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{PJLexample}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{PJLproblem}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{PJLquestion}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{PJLexercise}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{PJLdefinition-theorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLdefinition-proposition}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -788,7 +834,7 @@ \creflabelformat{propositionEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureEN}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -796,10 +842,10 @@ \creflabelformat{conventionEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -808,7 +854,7 @@ \creflabelformat{propositionFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureFR}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -816,10 +862,10 @@ \creflabelformat{conventionFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -828,7 +874,7 @@ \creflabelformat{propositionDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureDE}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -836,10 +882,10 @@ \creflabelformat{conventionDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -848,7 +894,7 @@ \creflabelformat{propositionIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureIT}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -856,10 +902,10 @@ \creflabelformat{conventionIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -868,7 +914,7 @@ \creflabelformat{propositionPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factPT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factPT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjecturePT}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -876,10 +922,10 @@ \creflabelformat{conventionPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{examplePT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemPT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionPT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exercisePT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{examplePT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemPT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionPT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exercisePT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -888,7 +934,7 @@ \creflabelformat{propositionBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureBR}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -896,10 +942,10 @@ \creflabelformat{conventionBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -908,7 +954,7 @@ \creflabelformat{propositionES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureES}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -916,10 +962,10 @@ \creflabelformat{conventionES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -928,7 +974,7 @@ \creflabelformat{propositionCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureCN}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -936,10 +982,10 @@ \creflabelformat{conventionCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -948,7 +994,7 @@ \creflabelformat{propositionTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureTC}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -956,10 +1002,10 @@ \creflabelformat{conventionTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -968,7 +1014,7 @@ \creflabelformat{propositionJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureJP}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -976,10 +1022,10 @@ \creflabelformat{conventionJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -988,7 +1034,7 @@ \creflabelformat{propositionRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{corollaryRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{propertyRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -\creflabelformat{factRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{factRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{conjectureRU}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3} \creflabelformat{definitionRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{axiomRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -996,10 +1042,10 @@ \creflabelformat{conventionRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{hypothesisRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} \creflabelformat{notationRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3} -\creflabelformat{exampleRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{problemRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{questionRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} -\creflabelformat{exerciseRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3} +\creflabelformat{exampleRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{problemRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{questionRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} +\creflabelformat{exerciseRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3} \creflabelformat{definition-theoremRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -1081,7 +1127,7 @@ \item[\hskip\labelsep \itshape #1\hspace{.4em}% - \textcolor{gray!55!paper}{$|$}]\ignorespaces + \textcolor{maintext!27!paper}{$|$}]\ignorespaces }{% \popQED\endtrivlist\@endpefalse } @@ -1091,83 +1137,83 @@ \tcbstartdraftmode \fi \tcolorboxenvironment{theorem} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{theorem*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{lemma} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{lemma*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{proposition} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{proposition*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{corollary} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{corollary*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{property} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{property*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{axiom} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{axiom*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{definition-proposition} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{definition-proposition*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{definition-theorem} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{definition-theorem*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.9,colframe=orange,arc=.7mm} \tcolorboxenvironment{fact} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper, boxrule=0pt,frame hidden,arc=.7mm} \tcolorboxenvironment{fact*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper, boxrule=0pt,frame hidden,arc=.7mm} \tcolorboxenvironment{conjecture} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.7,colframe=purple,arc=.7mm} \tcolorboxenvironment{conjecture*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper, left=3.5mm,right=3.5mm, opacityframe=0.7,colframe=purple,arc=.7mm} @@ -1223,10 +1269,10 @@ borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm} \tcolorboxenvironment{example} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper, boxrule=0pt,frame hidden,arc=.7mm,lines before break=3} \tcolorboxenvironment{example*} - {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper, + {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper, boxrule=0pt,frame hidden,arc=.7mm,lines before break=3} \tcolorboxenvironment{problem} @@ -1356,7 +1402,7 @@ \begin{center}% \color{maintheme}% {\Large\colorist@sffamily\scshape\conditionalbfseries\@title}\\\bigskip% - \color{black!80!paper}% + \color{maintext!80!paper}% {\scshape\@author}\\\smallskip% {\@date}% \end{center}% @@ -1370,7 +1416,7 @@ %%================================ \renewenvironment{abstract} {\small{\centerline{\textsc{\conditionalbfseries\abstractname}}\vspace{-0.3\baselineskip}} - \color{black!80!paper}\begin{quotation}} + \color{maintext!80!paper}\begin{quotation}} {\end{quotation}\medskip} %%================================ @@ -1386,7 +1432,7 @@ \newenvironment{keyword} {\small{\centerline{{\conditionalbfseries\csname keywordname\csname\languagename ABBR\endcsname\endcsname}}\vspace{-0.3\baselineskip}} - \color{black!80!paper}\begin{center}} + \color{maintext!80!paper}\begin{center}} {\end{center}\medskip} %%================================ -- cgit v1.2.3