diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-02 21:23:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-02 21:23:26 +0000 |
commit | a6b52c418b122f8c7f693297f90312835d4b8ce0 (patch) | |
tree | d38b846d4ce9b1bde89c33d79a269be0cd98c25b /Master/texmf-dist/tex/latex/colorist | |
parent | 298587016f189af9336278f57b0f59980cbe234e (diff) |
jxu (2jan23)
git-svn-id: svn://tug.org/texlive/trunk@65436 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/colorist')
4 files changed, 85 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 72929ae9162..c361d0847ff 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -2,7 +2,7 @@ %% This is file `colorist/colorart.cls', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the colorist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2022/09/03} {} + {2023/01/02} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -34,21 +34,24 @@ , draft .initial:n = { false } , fast .bool_set:N = \l__colorclass_fast_bool + , print .bool_set:N = \l__colorclass_print_mode_bool + , print .initial:n = { false } + , print mode .bool_set:N = \l__colorclass_print_mode_bool + , print~mode .bool_set:N = \l__colorclass_print_mode_bool + , print-mode .bool_set:N = \l__colorclass_print_mode_bool + , print version .bool_set:N = \l__colorclass_print_mode_bool + , print~version .bool_set:N = \l__colorclass_print_mode_bool + , print-version .bool_set:N = \l__colorclass_print_mode_bool + , load custom font file .code:n = { \bool_set_true:N \l__colorclass_load_custom_font_file_bool \str_set:Nn \l__colorclass_custom_font_file_str { #1 } } , load custom font file .default:n = { colorist.font } - , load~custom~font~file .code:n = { - \bool_set_true:N \l__colorclass_load_custom_font_file_bool - \str_set:Nn \l__colorclass_custom_font_file_str { #1 } - } + , load~custom~font~file .meta:n = { load custom font file = { #1 } } , load~custom~font~file .default:n = { colorist.font } - , load-custom-font-file .code:n = { - \bool_set_true:N \l__colorclass_load_custom_font_file_bool - \str_set:Nn \l__colorclass_custom_font_file_str { #1 } - } + , load-custom-font-file .meta:n = { load custom font file = { #1 } } , load-custom-font-file .default:n = { colorist.font } @@ -68,6 +71,19 @@ \LoadClass{\l__colorclass_base_class_tl} +\NewDocumentCommand \IfPrintModeTF { m m } + { + \bool_if:NTF \l__colorclass_print_mode_bool { #1 } { #2 } + } +\NewDocumentCommand \IfPrintModeT { m } + { + \bool_if:NT \l__colorclass_print_mode_bool { #1 } + } +\NewDocumentCommand \IfPrintModeF { m } + { + \bool_if:NF \l__colorclass_print_mode_bool { #1 } + } + %%================================ %% Page layout %%================================ @@ -165,6 +181,7 @@ { \setsansfont { texgyreheros } [ + Extension = .otf , Scale = MatchUppercase , UprightFont = *-regular , BoldFont = *-bold , diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 26c988c87a4..2fb2ee3445d 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -2,7 +2,7 @@ %% This is file `colorist/colorbook.cls', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the colorist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorbook} - {2022/09/03} {} + {2023/01/02} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -34,21 +34,24 @@ , draft .initial:n = { false } , fast .bool_set:N = \l__colorclass_fast_bool + , print .bool_set:N = \l__colorclass_print_mode_bool + , print .initial:n = { false } + , print mode .bool_set:N = \l__colorclass_print_mode_bool + , print~mode .bool_set:N = \l__colorclass_print_mode_bool + , print-mode .bool_set:N = \l__colorclass_print_mode_bool + , print version .bool_set:N = \l__colorclass_print_mode_bool + , print~version .bool_set:N = \l__colorclass_print_mode_bool + , print-version .bool_set:N = \l__colorclass_print_mode_bool + , load custom font file .code:n = { \bool_set_true:N \l__colorclass_load_custom_font_file_bool \str_set:Nn \l__colorclass_custom_font_file_str { #1 } } , load custom font file .default:n = { colorist.font } - , load~custom~font~file .code:n = { - \bool_set_true:N \l__colorclass_load_custom_font_file_bool - \str_set:Nn \l__colorclass_custom_font_file_str { #1 } - } + , load~custom~font~file .meta:n = { load custom font file = { #1 } } , load~custom~font~file .default:n = { colorist.font } - , load-custom-font-file .code:n = { - \bool_set_true:N \l__colorclass_load_custom_font_file_bool - \str_set:Nn \l__colorclass_custom_font_file_str { #1 } - } + , load-custom-font-file .meta:n = { load custom font file = { #1 } } , load-custom-font-file .default:n = { colorist.font } @@ -68,6 +71,19 @@ \LoadClass{\l__colorclass_base_class_tl} +\NewDocumentCommand \IfPrintModeTF { m m } + { + \bool_if:NTF \l__colorclass_print_mode_bool { #1 } { #2 } + } +\NewDocumentCommand \IfPrintModeT { m } + { + \bool_if:NT \l__colorclass_print_mode_bool { #1 } + } +\NewDocumentCommand \IfPrintModeF { m } + { + \bool_if:NF \l__colorclass_print_mode_bool { #1 } + } + %%================================ %% Page layout %%================================ @@ -165,6 +181,7 @@ { \setsansfont { texgyreheros } [ + Extension = .otf , Scale = MatchUppercase , UprightFont = *-regular , BoldFont = *-bold , diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index 409bb5b7c99..e5a3dd8a3c8 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -2,7 +2,7 @@ %% This is file `colorist/colorist-fancy.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the colorist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist-fancy} - {2022/09/03} {} + {2023/01/02} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -216,6 +216,21 @@ \fi } +\renewcommand*{\thefootnote}{\textcolor{main-text!45!paper}{\arabic{footnote}}} + +\bool_if:NT \l__colorist_is_book_bool + { + \hook_gput_code:nnn { cmd/frontmatter/before } { colorist } + { + \renewcommand*{\thefootnote}{\textcolor{main-text!45!paper}{\fnsymbol{footnote}}} + } + \hook_gput_code:nnn { cmd/mainmatter/before } { colorist } + { + \setcounter{footnote}{0} + \renewcommand*{\thefootnote}{\textcolor{main-text!45!paper}{\arabic{footnote}}} + } + } + %%================================ %% Title format %%================================ @@ -503,7 +518,7 @@ \projlib_langauge_define_multilingual_text:Nn \bl@nkpagetext { , EN = This~page~is~intentionally~left~blank - , FR = Cette~page~a~été~intentionellement~laissée~vide + , FR = Cette~page~est~intentionnellement~laissée~vide , DE = Diese~Seite~wurde~absichtlich~leer~gelassen , IT = Questa~pagina~è~stata~lasciata~vuota~intenzionalmente , PT = Esta~página~foi~intencionalmente~deixada~em~branco @@ -616,6 +631,14 @@ heading_suffix "}\n" \hspace*{20\p@} } +\hook_gput_code:nnn { begindocument/before } { colorist } + { + \bool_if:NF \l__colorist_fast_bool + { + \hook_gput_code:nnn { cmd/printindex/before } { colorist } { \bookmarksetup{startatroot} } + } + } + %%================================ %% Draft mark %%================================ @@ -697,7 +720,7 @@ heading_suffix "}\n" } \newcommand{\customqedsymbol}{ - \makebox[1em]{\color{main-text!27!paper}\rule[-0.1em]{.95em}{.95em}}} + \makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}} \let\qedsymbol\customqedsymbol \bool_if:NTF \l__colorist_theorem_in_new_line_bool @@ -742,10 +765,8 @@ heading_suffix "}\n" \bool_if:NTF \l__colorist_fast_bool { - \providecommand{\phantomsection}{} - \RequirePackage { url } - \providecommand{\href}[2]{#2} - \providecommand{\texorpdfstring}[2]{#1} + \RequirePackage { hyperref } + \hypersetup { draft } } { \RequirePackage { hyperref } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 4bbe5b57ecf..089a20b4583 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -2,7 +2,7 @@ %% This is file `colorist/colorist.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the colorist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist} - {2022/09/03} {} + {2023/01/02} {} {A colorful style for articles and books} \keys_define:nn { colorist } |