From ce07680b939eecc96f42a3ee4e777c5c183503de Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 25 Oct 2021 03:03:38 +0000 Subject: CTAN sync 202110250303 --- macros/latex/contrib/colorist/colorart.cls | 25 +++++++++++++++++++++---- macros/latex/contrib/colorist/colorbook.cls | 25 +++++++++++++++++++++---- macros/latex/contrib/colorist/colorist-doc.pdf | Bin 93927 -> 94512 bytes macros/latex/contrib/colorist/colorist-doc.tex | 5 +++-- macros/latex/contrib/colorist/colorist.sty | 14 +++++++------- 5 files changed, 52 insertions(+), 17 deletions(-) (limited to 'macros/latex/contrib/colorist') diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index e44367a8ca..52dd155072 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/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/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls index e07b345a91..e2064dd0ee 100644 --- a/macros/latex/contrib/colorist/colorbook.cls +++ b/macros/latex/contrib/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/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf index b803b85010..763ab08460 100644 Binary files a/macros/latex/contrib/colorist/colorist-doc.pdf and b/macros/latex/contrib/colorist/colorist-doc.pdf differ diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex index c6da8832a0..321a22d5b7 100644 --- a/macros/latex/contrib/colorist/colorist-doc.tex +++ b/macros/latex/contrib/colorist/colorist-doc.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\colorist{}}\\write your articles or books in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\colorist{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\colorist{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle @@ -656,6 +656,7 @@ The author information can contain multiple groups, written as: Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important. \bigskip +\clearpage \LevelOneTitle{Known issues} \begin{itemize}[itemsep=.6em] diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty index 348f23ee1a..13aadd2605 100644 --- a/macros/latex/contrib/colorist/colorist.sty +++ b/macros/latex/contrib/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