diff options
Diffstat (limited to 'macros/latex/contrib/colorist/colorart.cls')
-rw-r--r-- | macros/latex/contrib/colorist/colorart.cls | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index 9c838e534d..72929ae916 100644 --- a/macros/latex/contrib/colorist/colorart.cls +++ b/macros/latex/contrib/colorist/colorart.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2022/06/16} {} + {2022/09/03} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -65,7 +64,7 @@ \PassOptionsToPackage { \CurrentOption } { colorist } } } -\ProcessKeysOptions { colorclass } +\ProcessKeyOptions [ colorclass ] \LoadClass{\l__colorclass_base_class_tl} @@ -122,9 +121,6 @@ \RequirePackage { colorist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -132,6 +128,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { colorclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -154,6 +159,7 @@ { \RequirePackage { mathpazo } \RequirePackage { newpxtext } + \bool_if:NT \l__projlib_font_useosf_bool { \useosf } \RequirePackage { amssymb } \sys_if_engine_pdftex:F { @@ -166,12 +172,40 @@ BoldItalicFont = *-bolditalic , ] } + % Adjusting the kerning of 'embrac' for 'newpxtext' + \hook_gput_code:nnn { begindocument/before } { colorclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__colorclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -185,25 +219,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { colorclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `colorist/colorart.cls'. |