summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/colorist
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-03-29 03:00:35 +0000
committerNorbert Preining <norbert@preining.info>2022-03-29 03:00:35 +0000
commitfed9dbe9efe10955aefb7687a15de45404cc76f4 (patch)
tree056a7157fcf92e74592f51aebfa3cd17da8645ca /macros/latex/contrib/colorist
parent5f80d92d8bebc775b30e2b212e33b08089517654 (diff)
CTAN sync 202203290300
Diffstat (limited to 'macros/latex/contrib/colorist')
-rw-r--r--macros/latex/contrib/colorist/colorart.cls13
-rw-r--r--macros/latex/contrib/colorist/colorbook.cls13
-rw-r--r--macros/latex/contrib/colorist/colorist-doc.pdfbin99093 -> 101019 bytes
-rw-r--r--macros/latex/contrib/colorist/colorist-doc.tex10
-rw-r--r--macros/latex/contrib/colorist/colorist-fancy.sty216
-rw-r--r--macros/latex/contrib/colorist/colorist.sty2
6 files changed, 177 insertions, 77 deletions
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls
index cbacee3853..fd6bc08f62 100644
--- a/macros/latex/contrib/colorist/colorart.cls
+++ b/macros/latex/contrib/colorist/colorart.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{colorart}
- {2022/03/19} {}
+ {2022/03/28} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
@@ -151,6 +151,17 @@
\RequirePackage { mathpazo }
\RequirePackage { newpxtext }
\RequirePackage { amssymb }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
}
}
diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls
index ce2d27ce8b..07389ebc5c 100644
--- a/macros/latex/contrib/colorist/colorbook.cls
+++ b/macros/latex/contrib/colorist/colorbook.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{colorbook}
- {2022/03/19} {}
+ {2022/03/28} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
@@ -151,6 +151,17 @@
\RequirePackage { mathpazo }
\RequirePackage { newpxtext }
\RequirePackage { amssymb }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
}
}
diff --git a/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf
index 6320e9f13e..e187bcbc51 100644
--- a/macros/latex/contrib/colorist/colorist-doc.pdf
+++ b/macros/latex/contrib/colorist/colorist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex
index 98804ad9b3..064648846c 100644
--- a/macros/latex/contrib/colorist/colorist-doc.tex
+++ b/macros/latex/contrib/colorist/colorist-doc.tex
@@ -1,13 +1,5 @@
\documentclass[English,Chinese,French,use boldface,simple name]{colorart}
-\setsansfont{texgyreheros}[
- Scale=MatchUppercase,
- UprightFont=*-regular,
- BoldFont=*-bold,
- ItalicFont=*-italic,
- BoldItalicFont=*-bolditalic,
-]
-
%%================================
%% Import toolkit
%%================================
@@ -99,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/03/28}
\title{{\normalfont\bfseries\color{main-text}\colorist{}}\\write your articles or books in a colorful way}
\author{Jinwen XU}
diff --git a/macros/latex/contrib/colorist/colorist-fancy.sty b/macros/latex/contrib/colorist/colorist-fancy.sty
index 2161c7065d..cb625ce8ac 100644
--- a/macros/latex/contrib/colorist/colorist-fancy.sty
+++ b/macros/latex/contrib/colorist/colorist-fancy.sty
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{colorist-fancy}
- {2022/03/19} {}
+ {2022/03/28} {}
{The fancy style of colorist}
\@ifpackageloaded { colorist } {}
@@ -99,34 +99,82 @@
\fancypagestyle { fancy }
{
- \fancyhf{}
+ \fancyhf { }
\if@twoside
- \fancyfoot[RO]{\sffamily\textcolor{main-text!30!paper}{ \small \l_colorist_rightmark_tl }
- \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
- \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{main-text!75!paper}{\textbf{\thepage}}
- \nobreakspace\nobreakspace\nobreakspace\nobreakspace}
- \textcolor{main-text!30!paper}{ \l_colorist_leftmark_tl }}
+ \fancyfoot[RO]
+ {
+ \sffamily
+ \textcolor { main-text!30!paper } { \small \l_colorist_rightmark_tl }
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
+ \fancyfoot[LE]
+ {
+ \leavevmode
+ \sffamily
+ \llap
+ {
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ }
+ \textcolor { main-text!30!paper } { \l_colorist_leftmark_tl }
+ }
\else
- \fancyfoot[R]{\textcolor{main-text!30!paper}{ \l_colorist_rightmark_tl }
- \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fancyfoot[R]
+ {
+ \sffamily
+ \textcolor { main-text!30!paper } { \small \l_colorist_rightmark_tl }
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
-\pagestyle{fancy}
+\pagestyle { fancy }
\fancypagestyle { plain }
{
- \fancyhf{}
+ \fancyhf { }
\if@twoside
- \fancyfoot[RO]{\sffamily
- \nobreakspace\rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
- \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{main-text!75!paper}{\textbf{\thepage}}
- \nobreakspace\nobreakspace}}
+ \fancyfoot[RO]
+ {
+ \sffamily
+ \nobreakspace
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
+ \fancyfoot[LE]
+ {
+ \leavevmode
+ \sffamily
+ \llap
+ {
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ }
+ }
\else
- \fancyfoot[R]{\sffamily
- \nobreakspace\nobreakspace\nobreakspace\rlap{\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fancyfoot[R]
+ {
+ \sffamily
+ \nobreakspace
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
\bool_if:NTF \l__colorist_is_book_bool
@@ -220,8 +268,10 @@
}
%% Chapter
- % Numbered chapter title: \TheChapter{<number>}{<title>}
- \newcommand{\TheChapter}[2]
+ % Numbered chapter title
+ \cs_new_protected:Nn \colorist_chapter_inner:nn
+ % #1 = number
+ % #2 = title
{
\tcbsidebyside[enhanced,sidebyside~adapt=right,sidebyside~align=bottom,
colback=paper,frame~hidden,
@@ -232,8 +282,9 @@
-- (segmentation.south);}
]{\filleft#2}{\normalfont\textcolor{maintheme}{\scalebox{4}{#1}}}
}
- % Numberless chapter title: \TheChapterSingle{<title>}
- \newcommand{\TheChapterSingle}[1]
+ % Numberless chapter title
+ \cs_new_protected:Nn \colorist_chapter_inner:n
+ % #1 = title
{
\begin{tcolorbox}[
enhanced,
@@ -254,7 +305,7 @@
{ \g_colorist_title_font_chapter_tl \scshape\huge} % Format
{} % Label
{0mm} % Sep
- {\TheChapter{\thechapter}{#1}} % Before-code
+ { \colorist_chapter_inner:nn { \thechapter } { #1 } } % Before-code
\titlespacing*{name=\chapter}
{0em}{*2}{0em} % {left}{before-sep}{after-sep}
@@ -262,7 +313,7 @@
{\filcenter \g_colorist_title_font_chapter_tl \scshape\huge}
{}
{0mm}
- {\TheChapterSingle{#1}}
+ { \colorist_chapter_inner:n { #1 } }
\titlespacing*{name=\chapter, numberless}
{0em}{*2}{0em}
@@ -419,7 +470,20 @@
%%================================
%% Blank page
%%================================
-\newcommand{\blinkpagetext}{This~page~is~intentionally~left~blank}
+\projlib_langauge_define_multilingual_text:Nn \bl@nkpagetext
+ {
+ , EN = This~page~is~intentionally~left~blank
+ , FR = Cette~page~a~été~intentionellement~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
+ , BR = Esta~página~foi~intencionalmente~deixada~em~branco
+ , ES = Esta~página~se~ha~dejado~intencionadamente~en~blanco
+ , CN = 此页为有意留为空白
+ , TC = 此頁為有意留為空白
+ , JP = このページは意図的に空白にしてあります
+ , RU = Эта~страница~намеренно~оставлена~пустой
+ }
\renewcommand{\cleardoublepage}{
\relax
\clearpage
@@ -428,7 +492,7 @@
\hook_gput_next_code:nn { shipout/background }
{
\put(0.5\paperwidth,-0.5\paperheight){
- \makebox[0pt]{\large\color{main-text!10!paper}\blinkpagetext}}
+ \makebox[0pt]{\large\color{main-text!10!paper}\bl@nkpagetext}}
}
\null\newpage\fi\fi
}
@@ -963,55 +1027,79 @@
\theoremstyle{simple}
-\bool_if:NF \l__colorist_is_book_bool {
-
%%================================
%% Title block style
%%================================
-\renewcommand{\@maketitle}{
-\begin{center}
- \color{maintheme}
- {\Large\sffamily\scshape \colorist_bfseries: \@title}\\\bigskip
- \color{main-text!80!paper}
- {\scshape\@author}\par\smallskip
- {\@date}
-\end{center}
-\ifx\@date\@empty\bigskip\fi
-\medskip
-}
+\bool_if:NTF \l__colorist_is_book_bool
+ {
+ \hook_gput_code:nnn { package/projlib-author/after } { colorist }
+ {
+ \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape }
+ \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont }
+ \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_email_tl { \large \normalfont \ttfamily }
+ }
-\hook_gput_code:nnn { cmd/maketitle/after } { colorist } { \thispagestyle{fancy} }
+ \RequirePackage { projlib-titlepage }
+ \renewcommand{\maketitle}{
+ \LocallyStopLineNumbers
+ \ProjLibTitlePage
+ {
+ , title = \@title
+ , author = \@author
+ , date = \@date
+ }
+ \ResumeLineNumbers
+ }
+ }
+ {
+ \renewcommand{\@maketitle}
+ {
+ \begin{center}
+ \color{maintheme}
+ {\Large\sffamily\scshape \colorist_bfseries: \@title}\\\bigskip
+ \color{main-text!80!paper}
+ {\scshape\@author}\par\smallskip
+ {\@date}
+ \end{center}
+ \ifx\@date\@empty\bigskip\fi
+ \medskip
+ }
+
+ \hook_gput_code:nnn { cmd/maketitle/after } { colorist } { \thispagestyle{fancy} }
%%================================
%% Abstract style
%%================================
-\renewenvironment{abstract}
-{\small{\centerline{\textsc{ \colorist_bfseries: \sffamily\abstractname}}\vspace{-0.3\baselineskip}}
- \color{main-text!80!paper}\begin{quotation}}
-{\end{quotation}\medskip}
+ \renewenvironment{abstract}
+ {\small{\centerline{\textsc{ \colorist_bfseries: \sffamily\abstractname}}\vspace{-0.3\baselineskip}}
+ \color{main-text!80!paper}\begin{quotation}}
+ {\end{quotation}\medskip}
%%================================
%% Keyword environment
%%================================
-\DefineMultilingualText { \keywordname }
- {
- EN = Keywords ,
- FR = Mots~clés ,
- DE = Schlüsselwörter ,
- IT = Parole~chiave ,
- PT = Palavras~chave ,
- BR = Palavras~chave ,
- ES = Palabras~clave ,
- CN = 关键词 ,
- TC = 關鍵詞 ,
- JP = キーワード ,
- RU = Ключевые~слова ,
- }
+ \DefineMultilingualText { \keywordname }
+ {
+ EN = Keywords ,
+ FR = Mots~clés ,
+ DE = Schlüsselwörter ,
+ IT = Parole~chiave ,
+ PT = Palavras~chave ,
+ BR = Palavras~chave ,
+ ES = Palabras~clave ,
+ CN = 关键词 ,
+ TC = 關鍵詞 ,
+ JP = キーワード ,
+ RU = Ключевые~слова ,
+ }
-\newenvironment{keyword}
-{\small\centerline{{ \colorist_bfseries: \keywordname}}\vspace{-0.3\baselineskip}
- \color{main-text!80!paper}\begin{center}}
-{\end{center}\medskip}
+ \newenvironment{keyword}
+ {\small\centerline{{ \colorist_bfseries: \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
%%================================
%% Simulate features of amsart
@@ -1019,8 +1107,6 @@
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
-}
-
\endinput
%%
%% End of file `colorist/colorist-fancy.sty'.
diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty
index 6da2938455..ad936a1081 100644
--- a/macros/latex/contrib/colorist/colorist.sty
+++ b/macros/latex/contrib/colorist/colorist.sty
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{colorist}
- {2022/03/19} {}
+ {2022/03/28} {}
{A colorful style for articles and books}
\keys_define:nn { colorist }