From c10857d5176043583649dec41eb40f76c55d9090 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 Sep 2023 21:19:40 +0000 Subject: jxu (28sep23) git-svn-id: svn://tug.org/texlive/trunk@68391 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/colorist/colorart.cls | 2 +- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 2 +- .../tex/latex/colorist/colorist-fancy.sty | 31 +++++++++++++++------- Master/texmf-dist/tex/latex/colorist/colorist.sty | 2 +- 4 files changed, 25 insertions(+), 12 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 4153a79860c..289de77adc4 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/09/26} {} + {2023/09/28} {} {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 9a27ceb8962..51dacaee11b 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/09/26} {} + {2023/09/28} {} {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 5323c9b8811..75e8f0eecd7 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/09/26} {} + {2023/09/28} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -696,6 +696,19 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } +\tl_const:Nn \c_colorist_l_mathparen_latin_tl { $($ } +\tl_const:Nn \c_colorist_r_mathparen_latin_tl { $)$ } +\tl_const:Nn \c_colorist_l_mathparen_cjk_tl { \!\,( } +\tl_const:Nn \c_colorist_r_mathparen_cjk_tl { )\!\, } +\cs_new:Nn \colorist_insert_l_mathparen: + { + \tl_use:c { c_colorist_l_mathparen_ \l_projlib_language_current_languagetype_tl _tl } + } +\cs_new:Nn \colorist_insert_r_mathparen: + { + \tl_use:c { c_colorist_r_mathparen_ \l_projlib_language_current_languagetype_tl _tl } + } + \def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} \PassOptionsToPackage { nopatch = eqnum } { microtype } @@ -710,7 +723,7 @@ heading_suffix "}\n" { \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\thmnumber{\nobreakspace #2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} + {\color{main-text!50!paper}\thmnote{\hspace{.4em} \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: }} }}\hbox{\strut}\vspace{0pt}}} } \newtheoremstyle{simple-var} @@ -721,7 +734,7 @@ heading_suffix "}\n" { \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\thmnumber{\nobreakspace #2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} + {\color{main-text!50!paper}\thmnote{\hspace{.4em} \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: }} }}\hbox{\strut}\vspace{0pt}}} } } @@ -732,14 +745,14 @@ heading_suffix "}\n" {\normalfont}{} {0pt} {{\thmname{#1}\nobreakspace\thmnumber{#2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} + {\color{main-text!50!paper}\thmnote{\hspace{.4em} \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} \newtheoremstyle{simple-var} {}{} { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{} {\normalfont}{} {0pt} {{\thmname{#1}\nobreakspace\thmnumber{#2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} + {\color{main-text!50!paper}\thmnote{\hspace{.4em} \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} } \newcommand{\customqedsymbol}{ @@ -756,7 +769,7 @@ heading_suffix "}\n" { \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} - \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)} + \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: } }}\hbox{\strut}\vspace{0pt}}} } \newtheoremstyle{basic-var} @@ -767,7 +780,7 @@ heading_suffix "}\n" { \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} - \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)} + \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: } }}\hbox{\strut}\vspace{0pt}}} } } @@ -777,13 +790,13 @@ heading_suffix "}\n" {\normalfont}{0pt} {}{\;}{0.25em} {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} - \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}} + \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: }} \newtheoremstyle{basic-var} {0pt}{0pt} { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{0pt} {}{\;}{0.25em} {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} - \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}} + \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace \colorist_insert_l_mathparen: #3 \colorist_insert_r_mathparen: }} } \theoremstyle{basic} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index d9019557c23..6a89f9d6e73 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/09/26} {} + {2023/09/28} {} {A colorful style for articles and books} \keys_define:nn { colorist } -- cgit v1.2.3