From d51594c5e7ede77367a50e2be6d41634018de32b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Jul 2021 20:18:00 +0000 Subject: jxu (30jul21) git-svn-id: svn://tug.org/texlive/trunk@60121 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/colorist/colorart.cls | 16 +++++++- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 16 +++++++- Master/texmf-dist/tex/latex/colorist/colorist.sty | 46 ++++++++++++++++------ 3 files changed, 65 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/colorist') diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 64c68139bd4..5d45070c7ac 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/07/27 A colorful article style] + [2021/07/30 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -31,6 +31,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -55,6 +56,9 @@ \if@colorclass@garamond \@colorclass@customfonttrue \fi +\if@colorclass@noto + \@colorclass@customfonttrue +\fi \if@colorclass@biolinum \@colorclass@customfonttrue \fi @@ -149,6 +153,16 @@ \let\colorist@textsc\relax \fi +\if@colorclass@noto + \RequirePackage{amssymb} + \if@colorclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 45efb1360c5..798ec0bcb3d 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/07/27 A colorful book style] + [2021/07/30 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -31,6 +31,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -55,6 +56,9 @@ \if@colorclass@garamond \@colorclass@customfonttrue \fi +\if@colorclass@noto + \@colorclass@customfonttrue +\fi \if@colorclass@biolinum \@colorclass@customfonttrue \fi @@ -149,6 +153,16 @@ \let\colorist@textsc\relax \fi +\if@colorclass@noto + \RequirePackage{amssymb} + \if@colorclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index ddc6055a053..354006dc4b2 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{colorist} - [2021/07/27 A colorful style for articles and books] + [2021/07/30 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -29,10 +29,16 @@ \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} \DeclareBoolOption[false]{nothmnum} +\DeclareStringOption{thmnum}[colorist@thmnum@default] +\DeclareBoolOption[true]{regionalref} +\DeclareBoolOption[false]{originalref} \DeclareBoolOption[false]{allowbf} \DeclareBoolOption[false]{runin} \ProcessKeyvalOptions*\relax +\if@colorist@originalref + \@colorist@regionalreffalse +\fi \if@colorist@draft \@colorist@fasttrue \fi @@ -40,6 +46,21 @@ \@colorist@nothmstrue \fi +\if@colorist@fast + \PassOptionsToPackage{fast}{PJLdraft} + \PassOptionsToPackage{fast}{PJLthm} +\fi +\expandafter\ifstrempty\expandafter{\@colorist@thmnum}{}{ + \expandafter\ifstrequal\expandafter{\@colorist@thmnum}{colorist@thmnum@default}{ + \PassOptionsToPackage{thmnum}{PJLthm} + }{ + \PassOptionsToPackage{thmnum=\@colorist@thmnum}{PJLthm} + } +} +\if@colorist@regionalref\else + \PassOptionsToPackage{originalref}{PJLthm} +\fi + \if@colorist@allowbf \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!90!paper}} \else @@ -728,12 +749,8 @@ \expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\propositionnameRU} \expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU} +\AtEndPreamble{ \theoremstyle{basic} -\ifbool{IsBook}{ - \newaliascnt{highest}{chapter} -}{ - \newaliascnt{highest}{section} -} \if@colorist@nothms\else \if@colorist@nothmnum \CreateTheorem*{theorem} @@ -746,7 +763,7 @@ \CreateTheorem*{fact} \CreateTheorem*{conjecture} \else -\CreateTheorem{theorem} +\CreateTheorem@thmnum{theorem} \CreateTheorem{lemma}[theorem] \CreateTheorem{proposition}[theorem] \CreateTheorem{corollary}[theorem] @@ -804,14 +821,13 @@ \CreateTheorem*{remark} \CreateTheorem*{observation} \else -\CreateTheorem{remark} -\CreateTheorem{observation} +\CreateTheorem@thmnum{remark} +\CreateTheorem@thmnum{observation} \fi \CreateTheorem*{remark*} \CreateTheorem*{observation*} \fi - -\numberwithin{equation}{highest} +} \creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLlemma}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -1287,27 +1303,35 @@ \tcolorboxenvironment{question} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{question*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{exercise} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{exercise*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{remark} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{remark*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{observation} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{observation*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \ExplSyntaxOn -- cgit v1.2.3