diff options
Diffstat (limited to 'macros/latex/contrib/colorist/colorart.cls')
-rw-r--r-- | macros/latex/contrib/colorist/colorart.cls | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index c0040549ce..3e07d9b5aa 100644 --- a/macros/latex/contrib/colorist/colorart.cls +++ b/macros/latex/contrib/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'. |