From f7668f7fa59f4e8cf8bd07b98e8ad6394eac2db0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Aug 2021 21:05:50 +0000 Subject: jxu (9aug21) git-svn-id: svn://tug.org/texlive/trunk@60206 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/colorist/colorart.cls | 2 +- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 2 +- Master/texmf-dist/tex/latex/colorist/colorist.sty | 56 +++++++++++----------- 3 files changed, 30 insertions(+), 30 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 4f2a247c674..446fa868add 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/08 A colorful article style] + [2021/08/09 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index cefcb450bb5..711916d8998 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/08 A colorful book style] + [2021/08/09 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index f5f9766e09e..0374aec6142 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/08 A colorful style for articles and books] + [2021/08/09 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -109,14 +109,14 @@ \fancypagestyle{fancy}{ \fancyhf{} \if@twoside - \fancyfoot[RO]{\small\textcolor{maintext!30!paper}{\lastrightmark}% - ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} - \fancyfoot[LE]{\small\leavevmode\llap{\thepage% - ~~\textcolor{maintext!27!paper}{$|$}}% - ~~\textcolor{maintext!30!paper}{\lastleftmark}} + \fancyfoot[RO]{\sffamily\textcolor{maintext!30!paper}{\small\lastrightmark}% + \rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} + \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{maintext!75!paper}{\textbf{\thepage}}% + ~~~~}% + \textcolor{maintext!30!paper}{\small\lastleftmark}} \else - \fancyfoot[R]{\small\textcolor{maintext!30!paper}{\lastrightmark}% - ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} + \fancyfoot[R]{\sffamily\textcolor{maintext!30!paper}{\small\lastrightmark}% + \rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} \fi \renewcommand{\headrulewidth}{0pt} } @@ -125,13 +125,13 @@ \fancypagestyle{plain}{ \fancyhf{} \if@twoside - \fancyfoot[RO]{\small% - ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} - \fancyfoot[LE]{\small\leavevmode\llap{\thepage% - ~~\textcolor{maintext!27!paper}{$|$}}} + \fancyfoot[RO]{% + \sffamily~\rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} + \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{maintext!75!paper}{\textbf{\thepage}}% + ~~~}} \else - \fancyfoot[R]{\small% - ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} + \fancyfoot[R]{% + ~\rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} \fi \renewcommand{\headrulewidth}{0pt} } @@ -333,8 +333,8 @@ \RequirePackage{titletoc} \titlecontents{part} [0em] - {\addvspace{1.5pc}\filcenter\colorist@sffamily} - {{\normalfont\color{maintheme}\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase} + {\addvspace{1.5pc}\large\filcenter\colorist@sffamily\conditionalbfseries} + {\textcolor{maintheme}{\bfseries\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase} {} {} % without page number [\addvspace{.5pc}] @@ -343,45 +343,45 @@ [2em] % i.e., 0em (part) + 2em {\addvspace{1pc}\normalfont\color{maintheme}\colorist@sffamily\conditionalbfseries} {\contentslabel{2em}} - {\hspace*{-2em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} + {\colorist@scshape\hspace*{-2em}} + {\titlerule*[10pt]{\parbox{2pt}{\hspace*{-.25pt}\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{section} [4em] % i.e., 2em (chapter) + 2em {\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily} {\contentslabel{1.75em}} {\hspace*{-1.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{subsection} [7em] % i.e., 4em (section) + 3em {\addvspace{.15pc}\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} \titlecontents{subsubsection} [10em] % i.e., 7em (subsection) + 3em {\normalfont\colorist@sffamily} {\contentslabel{3.25em}} {\hspace*{-3.25em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} }{ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily} {\contentslabel{1.75em}} {\hspace*{-1.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{subsection} - [5em] % i.e., 2em (section) + 3em + [4.5em] % i.e., 2em (section) + 2.5em {\addvspace{.15pc}\normalfont\colorist@sffamily} - {\contentslabel{2.25em}} - {\hspace*{-2.25em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\contentslabel{2.15em}} + {\hspace*{-2.15em}} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} \titlecontents{subsubsection} - [8em] % i.e., 5em (subsection) + 3em + [7.75em] % i.e., 5em (subsection) + 3.25em {\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} } %%================================ -- cgit v1.2.3