From f6bbe90c82a89c41229b1aa9707b0bcecc767206 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Oct 2021 21:02:12 +0000 Subject: jxu (24oct21) git-svn-id: svn://tug.org/texlive/trunk@60863 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/colorist/colorart.cls | 25 ++++++++++++++++++---- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 25 ++++++++++++++++++---- Master/texmf-dist/tex/latex/colorist/colorist.sty | 14 ++++++------ 3 files changed, 49 insertions(+), 15 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 e44367a8cab..52dd155072a 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/08/11 A colorful article style] + [2021/10/23 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -120,6 +127,16 @@ \fi \RequirePackage{amssymb} +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \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 e07b345a91a..e2064dd0ee6 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/08/11 A colorful book style] + [2021/10/23 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -120,6 +127,16 @@ \fi \RequirePackage{amssymb} +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \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 348f23ee1a7..13aadd2605f 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/08/11 A colorful style for articles and books] + [2021/10/23 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -391,12 +391,12 @@ \RequirePackage{enumitem} \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[enumerate,1]{label=\arabic*$)$, + ref = \arabic*$)$} +\setlist[enumerate,2]{label=\emph{\roman*}$)$, + ref = \arabic{enumi}.\emph{\roman*}$)$} +\setlist[enumerate,3]{label=\emph{\alph*}$)$, + ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} \setlist[itemize]{leftmargin=*} -- cgit v1.2.3