From 42f4f28953152c5d59a8932b80c2edf592f4f5b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Jul 2021 20:01:19 +0000 Subject: jxu (15jul21) git-svn-id: svn://tug.org/texlive/trunk@59941 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/colorist/colorist.sty | 67 +++++++++++++++-------- 1 file changed, 44 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex/latex/colorist/colorist.sty') diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index eb00dcd4647..3a610e4943c 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/30 A colorful style for articles and books] + [2021/07/15 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -56,6 +56,7 @@ %% Title fonts %%================================ \RequirePackage{anyfontsize} + \newcommand{\partfont}{\conditionalbfseries\colorist@sffamily} \newcommand{\chapfont}{\conditionalbfseries\colorist@sffamily} \newcommand{\secfont}{\conditionalbfseries\colorist@sffamily} @@ -80,7 +81,9 @@ \RequirePackage{geometry} \RequirePackage{fancyhdr} \RequirePackage{extramarks} + \AtEndPreamble{\fancyhfoffset{0pt}} + \fancypagestyle{fancy}{ \fancyhf{} \if@twoside @@ -96,6 +99,7 @@ \renewcommand{\headrulewidth}{0pt} } \pagestyle{fancy} + \fancypagestyle{plain}{ \fancyhf{} \if@twoside @@ -109,6 +113,7 @@ \fi \renewcommand{\headrulewidth}{0pt} } + \ifbool{IsBook}{ \if@twoside \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}} @@ -125,7 +130,7 @@ \fi } %%================================ -%% Line spacing +%% Languages and line spacing %%================================ \RequirePackage{PJLlang} \PJLsetlinespacing{\setstretch{1.07}} @@ -310,7 +315,7 @@ \titlecontents{part} [0em] {\addvspace{1.5pc}\filcenter\colorist@sffamily} - {\thecontentslabel\\\uppercase} + {\thecontentslabel\nopagebreak\\\nopagebreak\uppercase} {} {} % without page number [\addvspace{.5pc}] @@ -364,11 +369,21 @@ %% Lists %%================================ \RequirePackage{enumitem} -\setlist{noitemsep,leftmargin=2em} -\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{*}}} +\setlist{noitemsep} +\setlist[enumerate]{labelsep=*, leftmargin=*} +\setlist[enumerate,1]{label = \arabic*., + ref = \arabic*} +\setlist[enumerate,2]{label = \emph{\alph*}), + ref = \theenumi.\emph{\alph*}} +\setlist[enumerate,3]{label = (\roman*), + ref = \theenumii.\roman*} +\setlist[description]{font=\normalfont\conditionalbfseries} + +\setlist[itemize]{leftmargin=*} +\gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} +\gappto{\PJLlang@langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} +\setlist[itemize,2]{label=\textcolor{maintext!27}{--}} +\setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}} %%================================ %% Blank page @@ -440,8 +455,9 @@ \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}% \pushQED{\qed}% } -\def\@endtheorem{\popQED\endtrivlist\@endpefalse -\global\let\qedsymbol\qedsymbolOriginal} +\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol% + \popQED\endtrivlist\@endpefalse + \global\let\qedsymbol\qedsymbolOriginal} \renewcommand{\qedsymbol}{% \makebox[1em]{\color{maintext!27!paper}\rule[-0.1em]{.95em}{.95em}}} @@ -470,7 +486,6 @@ \PassOptionsToPackage{nothms}{PJLthm} \RequirePackage{PJLthm} -%% Adjust English theorems names \pretocmd{\theoremnameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -493,7 +508,6 @@ \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} -%% Adjust French theorems names \pretocmd{\theoremnameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -516,7 +530,6 @@ \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} -%% Adjust German theorems names \pretocmd{\theoremnameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -539,7 +552,6 @@ \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} -%% Adjust Italian theorems names \pretocmd{\theoremnameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -562,7 +574,6 @@ \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} -%% Adjust Portuguese theorems names \pretocmd{\theoremnamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -585,7 +596,6 @@ \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} -%% Adjust Brazilian theorems names \pretocmd{\theoremnameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -608,7 +618,6 @@ \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} -%% Adjust Spanish theorems names \pretocmd{\theoremnameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\lemmanameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} \pretocmd{\propositionnameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL} @@ -631,7 +640,6 @@ \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} -%% Adjust Chinese theorems names \pretocmd{\theoremnameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\lemmanameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propositionnameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -676,7 +684,6 @@ \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} -%% Adjust Japanese theorems names \pretocmd{\theoremnameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\lemmanameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propositionnameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -699,7 +706,6 @@ \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} -%% Adjust Russian theorems names \pretocmd{\theoremnameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\lemmanameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} \pretocmd{\propositionnameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL} @@ -722,7 +728,6 @@ \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} -%% Theorem environments \theoremstyle{basic} \ifbool{IsBook}{ \newaliascnt{highest}{chapter} @@ -808,7 +813,6 @@ \numberwithin{equation}{highest} -%% Cref label format \creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLlemma}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLproposition}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -1049,7 +1053,6 @@ \creflabelformat{definition-theoremRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{definition-propositionRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} -%% Icons on the margin \RequirePackage{marginnote} \RequirePackage{ifoddpage} \newcommand{\mparadjust}[1]{\renewcommand*{\marginnotevadjust}{#1}} @@ -1282,12 +1285,30 @@ {enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper, boxrule=0pt,frame hidden,arc=.7mm} +\tcolorboxenvironment{question} + {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + opacityframe=0,opacityback=0,lines before break=3} +\tcolorboxenvironment{question*} + {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + opacityframe=0,opacityback=0,lines before break=3} +\tcolorboxenvironment{exercise} + {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + opacityframe=0,opacityback=0,lines before break=3} +\tcolorboxenvironment{exercise*} + {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{remark} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{remark*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, opacityframe=0,opacityback=0,lines before break=3} +\tcolorboxenvironment{observation} + {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + opacityframe=0,opacityback=0,lines before break=3} +\tcolorboxenvironment{observation*} + {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + opacityframe=0,opacityback=0,lines before break=3} \ExplSyntaxOn \NewDocumentCommand \AfterEnvEnd { +m } -- cgit v1.2.3