diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-08 20:57:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-08 20:57:38 +0000 |
commit | 5d3b115984aef62cb01cd4660eab9d515b577ba3 (patch) | |
tree | 6857681f8d992a38b41ac0ac40f402dee9526bdc | |
parent | 1f7f32b389e54eea4a436928bf9dc90e149584f0 (diff) |
colorist (7jan23)
git-svn-id: svn://tug.org/texlive/trunk@65490 c570f23f-e606-0410-a88d-b1316a301751
4 files changed, 33 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 041d38111f8..16858b67a99 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2023/01/05} {} + {2023/01/08} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index f4f8e267b63..913e17590d1 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorbook} - {2023/01/05} {} + {2023/01/08} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index 76b7acf3a15..0d620fed422 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist-fancy} - {2023/01/05} {} + {2023/01/08} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -451,19 +451,19 @@ {\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage} \titlecontents{section} [5.25em] % i.e., 2em (chapter) + 2.75em + 0.5em - {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily} + {\addvspace{.3pc}\normalfont\color{main-text}\sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage} + {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text}\contentspage} \titlecontents{subsection} - [9.5em] % i.e., 5.25em (section) + 3.5em + 0.75em - {\addvspace{.15pc}\normalfont\sffamily} + [9em] % i.e., 5.25em (section) + 3.5em + 0.25em + {\addvspace{.15pc}\normalfont\color{main-text!60!paper}\sffamily} {\contentslabel{3.50em}} {\hspace*{-3.50em}} - {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!60!paper}\contentspage} \titlecontents{subsubsection} - [14em] % i.e., 9.5em (subsection) + 3.75em + 0.75em - {\normalfont\sffamily} + [13em] % i.e., 9em (subsection) + 3.75em + 0.25em + {\normalfont\color{main-text!45!paper}\sffamily} {\contentslabel{3.75em}} {\hspace*{-3.75em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} @@ -776,10 +776,19 @@ heading_suffix "}\n" \renewcommand\Hy@numberline[1]{#1.~} % https://tex.stackexchange.com/a/1821 % Add the bookmark of ToC - \hook_gput_code:nnn { cmd/tableofcontents/before } { colorist } + \bool_if:NTF \l__colorist_is_book_bool + { + \hook_gput_code:nnn { cmd/tableofcontents/before } { colorist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } + } { - \if@openright\cleardoublepage\else\clearpage\fi - \pdfbookmark[0]{\contentsname}{toc} + \hook_gput_code:nnn { cmd/tableofcontents/before } { colorist } + { + \pdfbookmark[1]{\contentsname}{toc} + } } } @@ -1133,16 +1142,15 @@ heading_suffix "}\n" } \RequirePackage { projlib-titlepage } - \renewcommand{\maketitle}{ - \LocallyStopLineNumbers - \ProjLibTitlePage - { - , title = \@title - , author = \@author - , date = \@date - } - \ResumeLineNumbers - } + \RenewDocumentCommand \maketitle { O{} } + { + \ProjLibTitlePage[#1] + { + , title = \@title + , author = \@author + , date = \@date + } + } } { \renewcommand{\@maketitle} @@ -1186,7 +1194,7 @@ heading_suffix "}\n" } \newenvironment{keyword} - {\small\centerline{{ \colorist_bfseries: \keywordname}}\vspace{-0.3\baselineskip} + {\small\centerline{{ \colorist_bfseries: \sffamily\keywordname}}\vspace{-0.3\baselineskip} \color{main-text!80!paper}\begin{center}} {\end{center}\medskip} } % end of \bool_if:NTF \l__colorist_is_book_bool diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index d85b7638934..551a9add41d 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist} - {2023/01/05} {} + {2023/01/08} {} {A colorful style for articles and books} \keys_define:nn { colorist } |