summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-17 03:01:24 +0000
committerNorbert Preining <norbert@preining.info>2022-06-17 03:01:24 +0000
commitf9418ac1e9385653cfa09da311bb2d405a936334 (patch)
tree764fc072c0bea51901ba3ef3a6dd915400df47c5 /macros/latex/contrib/minimalist
parentb83d15e1ff2e551eb7391d45becd87dce59d39b8 (diff)
CTAN sync 202206170301
Diffstat (limited to 'macros/latex/contrib/minimalist')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty138
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.pdfbin104110 -> 104902 bytes
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.tex2
-rw-r--r--macros/latex/contrib/minimalist/minimalist-plain.sty158
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty27
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls22
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls22
7 files changed, 211 insertions, 158 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 5fd710c03e..cb0e3df249 100644
--- a/macros/latex/contrib/minimalist/minimalist-classical.sty
+++ b/macros/latex/contrib/minimalist/minimalist-classical.sty
@@ -1,7 +1,7 @@
%%
%% This is file `minimalist/minimalist-classical.sty',
%% generated with the docstrip utility.
-
+%%
%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the minimalist class series.
@@ -19,10 +19,10 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-classical}
- {2022/04/24} {}
+ {2022/06/16} {}
{The classical style of minimalist}
-\@ifpackageloaded { minimalist } {}
+\IfPackageLoadedTF { minimalist } {}
{
\msg_new:nnn { \@currname }
{ minimalist-not-loaded }
@@ -34,6 +34,7 @@
%%================================
%% Title fonts
%%================================
+\RequirePackage { relsize }
\RequirePackage { anyfontsize }
\NewCommandCopy \minimalist_original_bfseries: \bfseries
@@ -57,6 +58,14 @@
\cs_new:Nn \minimalist_bfseries: {}
}
+\bool_if:NTF \l__minimalist_use_scshape_bool
+ {
+ \cs_new:Nn \minimalist_scshape: { \scshape }
+ }
+ {
+ \cs_new:Nn \minimalist_scshape: {}
+ }
+
\tl_new:N \g_minimalist_title_font_common_tl
\tl_new:N \g_minimalist_title_font_part_tl
@@ -67,11 +76,11 @@
\tl_new:N \g_minimalist_title_font_paragraph_tl
\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
-\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
+\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: }
\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: }
\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: }
\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \itshape }
-\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \scshape }
+\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \minimalist_scshape: }
\bool_if:NF \l__minimalist_fast_bool
{
@@ -251,7 +260,7 @@
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
\fi
\renewcommand*{\sectionmark}[1]{
- \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
+ \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\thesection\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
}
{
\if@twoside
@@ -264,16 +273,33 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec }
+\RequirePackage [ explicit, newparttoc ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
-\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx }
-\cs_new:Nn \minimalist_apply_title_numbering_style:n
+\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n
{
#1
}
+\cs_new_protected:Nn \minimalist_apply_title_numbering_style:n
+ {
+ \group_begin:
+ \tl_set:Nx \l_tmpa_tl { #1 }
+ \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl
+ \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl
+ \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int
+ \int_case:nn { \l_tmpa_int }
+ {
+ { 0 } { \textcolor { main-text!24!paper } }
+ { 1 } { \textcolor { main-text!39!paper } }
+ { 2 } { \textcolor { main-text!39!paper } }
+ { 3 } { \smaller[2] \textcolor { main-text!24!paper } }
+ }
+ \l_tmpa_tl
+ \group_end:
+ }
+
\newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}}
\AddLanguageSetting
@@ -305,7 +331,7 @@
\g_minimalist_title_font_part_tl\filleft}
{\partstring}
{1em}
- {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
+ {\fontsize{20}{24}\selectfont\MakeUppercase{#1}}
[\ResumeLineNumbers]
\titleformat{name=\part,numberless}[display]
{\thispagestyle{part}
@@ -314,7 +340,7 @@
\g_minimalist_title_font_part_tl\filleft}
{\phantom{\MakeUppercase{\partname}}}
{1em}
- {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
+ {\fontsize{20}{24}\selectfont\MakeUppercase{#1}}
[\ResumeLineNumbers]
\titlespacing*{\part}{0pt}{5em}{6em}
%% Text after part
@@ -454,7 +480,7 @@
\titlecontents{part}
[0em]
{\addvspace{1.5pc}\filcenter\normalfont}
- { \minimalist_apply_title_numbering_style:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase}
+ { \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase}
{}
{} % without page number
[\addvspace{.5pc}]
@@ -464,25 +490,25 @@
\titlecontents{chapter}
[2em] % i.e., 0em (part) + 2em
{\addvspace{.5pc}\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2em}}
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{section}
[5em] % i.e., 2em (chapter) + 3em
{\normalfont}
- {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2.75em}}
+ {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[8em] % i.e., 5em (section) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[12em] % i.e., 8em (subsection) + 4em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}}
{\hspace*{-3.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -490,19 +516,19 @@
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{1.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}}
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[4.75em] % i.e., 2em (section) + 2.75em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.50em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.50em}}
{\hspace*{-2.50em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[8.25em] % i.e., 4.75em (subsection) + 3.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.25em}}
{\hspace*{-3.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -512,7 +538,7 @@
%%================================
\RequirePackage { enumitem }
\setlistdepth{10}
-\setlist{noitemsep, topsep=.33\topsep}
+\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
ref = \arabic*$)$}
@@ -530,8 +556,8 @@
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} }
-\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.8em}{.75pt}}} }
+\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.5em}{.75pt}}}
\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
@@ -600,16 +626,14 @@ heading_suffix "}\n"
\newcommand*{\IndexDotfill}
{
- \nobreakspace\nobreakspace
- \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}}
- \nobreakspace\nobreakspace
+ \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill
}
\newcommand*{\IndexHeading}[1]
{
\str_if_eq:nnTF { #1 } { Symbols }
{ \tl_set:Nn \l_tmpa_tl { \index_symbols_name } }
{ \tl_set:Nn \l_tmpa_tl { #1 } }
- \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style:n { \l_tmpa_tl } }
+ \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style_static:n { \l_tmpa_tl } }
\nopagebreak
\par
\vspace{.3\baselineskip}
@@ -668,7 +692,7 @@ heading_suffix "}\n"
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
\thmnote{\hspace{.4em}\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}\color{main-text!50!paper}$($#3$)$}
- }}\hbox{\strut}\vspace{-2\parskip}}}
+ }}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip}
\pushQED{\qed}
}
}
@@ -712,7 +736,7 @@ heading_suffix "}\n"
\RequirePackage { projlib-theorem }
-\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
+\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name }
{
name style = {
, heading style = {
@@ -753,7 +777,7 @@ heading_suffix "}\n"
\bool_if:NF \l__projlib_theorem_complexname_bool
{
- \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
+ \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name }
{
name style = {
, crefname style = {
@@ -783,17 +807,7 @@ heading_suffix "}\n"
, russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
, numbering style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
}
}
@@ -830,17 +844,7 @@ heading_suffix "}\n"
, russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
, numbering style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
}
}
@@ -878,7 +882,7 @@ heading_suffix "}\n"
{
\hook_gput_code:nnn { package/projlib-author/after } { minimalist }
{
- \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape }
+ \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \minimalist_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 }
@@ -909,18 +913,18 @@ heading_suffix "}\n"
\let\footnote\thanks
{\minimalist_bfseries:\@title}\\\medskip
\color{main-text!80!paper}
- {\small\scshape\@author}
+ {\small\minimalist_scshape:\@author}
\par\vspace{-\parskip}\vspace{2pt}
{\small\@date}
\end{flushright}
- % \vspace{-\parskip}
\vspace{-.5\baselineskip}
- \ifx\@date\@empty
- \vspace{\baselineskip}
- \vspace{1.2\parskip}
- \else
+ \projlib_author_if_content_empty:nTF { \@date }
+ {
+ \vspace{-.2\baselineskip}
+ }
+ {
\vspace{-.5\baselineskip}
- \fi
+ }
{\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}\par}
\ResumeLineNumbers
}
@@ -934,7 +938,7 @@ heading_suffix "}\n"
{
\LocallyStopLineNumbers
\begin{flushright}
- { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\par
+ { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\abstractname}\par
\vspace{-\parskip}
\vspace{-.25\baselineskip}
\begin{minipage}[t]{.833\textwidth}
@@ -972,7 +976,7 @@ heading_suffix "}\n"
\LocallyStopLineNumbers
\vspace{-.5\baselineskip}
\begin{flushright}
- {\minimalist_bfseries:\scshape\small\keywordname}\par
+ {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\par
\vspace{-\parskip}
\vspace{-.30\baselineskip}
\begin{minipage}[t]{.833\textwidth}
@@ -995,6 +999,18 @@ heading_suffix "}\n"
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
+%%================================
+%% Special adjustment
+%%================================
+\crefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\crefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\crefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\crefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+
\endinput
%%
%% End of file `minimalist/minimalist-classical.sty'.
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf
index f890924979..03d2289372 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.pdf
+++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex
index 199f6ca675..a59d90ca4d 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.tex
+++ b/macros/latex/contrib/minimalist/minimalist-doc.tex
@@ -97,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/24}
+\def\PackageVersion{2022/06/16}
\title{\minimalist{}, write your articles or books in a simple and clear way}
\author{Jinwen XU}
diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty
index 28dbd470e8..6afa15b14e 100644
--- a/macros/latex/contrib/minimalist/minimalist-plain.sty
+++ b/macros/latex/contrib/minimalist/minimalist-plain.sty
@@ -1,7 +1,7 @@
%%
%% This is file `minimalist/minimalist-plain.sty',
%% generated with the docstrip utility.
-
+%%
%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the minimalist class series.
@@ -19,10 +19,10 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-plain}
- {2022/04/24} {}
+ {2022/06/16} {}
{The plain style of minimalist}
-\@ifpackageloaded { minimalist } {}
+\IfPackageLoadedTF { minimalist } {}
{
\msg_new:nnn { \@currname }
{ minimalist-not-loaded }
@@ -34,6 +34,7 @@
%%================================
%% Title fonts
%%================================
+\RequirePackage { relsize }
\RequirePackage { anyfontsize }
\NewCommandCopy \minimalist_original_bfseries: \bfseries
@@ -57,6 +58,14 @@
\cs_new:Nn \minimalist_bfseries: {}
}
+\bool_if:NTF \l__minimalist_use_scshape_bool
+ {
+ \cs_new:Nn \minimalist_scshape: { \scshape }
+ }
+ {
+ \cs_new:Nn \minimalist_scshape: {}
+ }
+
\tl_new:N \g_minimalist_title_font_common_tl
\tl_new:N \g_minimalist_title_font_part_tl
@@ -67,11 +76,11 @@
\tl_new:N \g_minimalist_title_font_paragraph_tl
\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
-\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
-\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
-\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
+\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: }
+\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: }
+\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: }
\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
-\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
+\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: }
\bool_if:NF \l__minimalist_fast_bool
{
@@ -134,7 +143,7 @@
\rlap
{
\nobreakspace \nobreakspace \nobreakspace \nobreakspace
- \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ \textcolor { main-text!75!paper } { \thepage }
}
}
\fancyfoot[LE]
@@ -142,7 +151,7 @@
\leavevmode
\llap
{
- \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ \textcolor { main-text!75!paper } { \thepage }
\nobreakspace \nobreakspace \nobreakspace \nobreakspace
}
\textcolor { main-text!30!paper } { \small \l_minimalist_leftmark_tl }
@@ -154,7 +163,7 @@
\rlap
{
\nobreakspace \nobreakspace \nobreakspace \nobreakspace
- \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ \textcolor { main-text!75!paper } { \thepage }
}
}
\fi
@@ -172,7 +181,7 @@
\rlap
{
\nobreakspace \nobreakspace \nobreakspace \nobreakspace
- \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ \textcolor { main-text!75!paper } { \thepage }
}
}
\fancyfoot[LE]
@@ -180,7 +189,7 @@
\leavevmode
\llap
{
- \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ \textcolor { main-text!75!paper } { \thepage }
\nobreakspace \nobreakspace \nobreakspace \nobreakspace
}
\nobreakspace
@@ -192,7 +201,7 @@
\rlap
{
\nobreakspace \nobreakspace \nobreakspace \nobreakspace
- \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ \textcolor { main-text!75!paper } { \thepage }
}
}
\fi
@@ -237,7 +246,7 @@
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
\fi
\renewcommand*{\sectionmark}[1]{
- \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
+ \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\thesection\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
}
{
\if@twoside
@@ -250,17 +259,34 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec }
+\RequirePackage [ explicit, newparttoc ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
-\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx }
-\cs_new:Nn \minimalist_apply_title_numbering_style:n
+\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n
{
\tl_set:Nx \l_tmpa_tl { #1 }
- \regex_replace_all:nnN { (\w) } { \c{textbf}{\1} } \l_tmpa_tl
+ \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl
\regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl
- \textcolor { main-text!39!paper } { \l_tmpa_tl }
+ \textcolor { main-text!39!paper } { \normalfont \l_tmpa_tl }
+ }
+
+\cs_new_protected:Nn \minimalist_apply_title_numbering_style:n
+ {
+ \group_begin:
+ \tl_set:Nx \l_tmpa_tl { #1 }
+ \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl
+ \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl
+ \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int
+ \int_case:nn { \l_tmpa_int }
+ {
+ { 0 } { \textcolor { main-text!24!paper } }
+ { 1 } { \textcolor { main-text!39!paper } }
+ { 2 } { \textcolor { main-text!39!paper } }
+ { 3 } { \smaller[2] \textcolor { main-text!24!paper } }
+ }
+ \l_tmpa_tl
+ \group_end:
}
\newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}}
@@ -294,7 +320,7 @@
\g_minimalist_title_font_part_tl\filleft}
{\partstring}
{1em}
- {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
+ {\fontsize{20}{24}\selectfont\MakeUppercase{#1}}
[\ResumeLineNumbers]
\titleformat{name=\part,numberless}[display]
{\thispagestyle{part}
@@ -303,7 +329,7 @@
\g_minimalist_title_font_part_tl\filleft}
{\phantom{\MakeUppercase{\partname}}}
{1em}
- {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
+ {\fontsize{20}{24}\selectfont\MakeUppercase{#1}}
[\ResumeLineNumbers]
\titlespacing*{\part}{0pt}{5em}{6em}
%% Text after part
@@ -384,7 +410,7 @@
\titleformat{\section}
{\LocallyStopLineNumbers
\g_minimalist_title_font_section_tl\centering}
- {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style:n { \thesection } }}{1em}
+ {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style_static:n { \thesection } }}{1em}
{#1}
[\ResumeLineNumbers]
@@ -392,7 +418,7 @@
\titleformat{\subsection}
{\LocallyStopLineNumbers
\g_minimalist_title_font_subsection_tl}
- { \minimalist_apply_title_numbering_style:n { \thesubsection } }{.75em}
+ { \minimalist_apply_title_numbering_style_static:n { \thesubsection } }{.75em}
{#1}
[\ResumeLineNumbers]
@@ -401,14 +427,14 @@
{
\titleformat{\subsubsection}[runin]
{\g_minimalist_title_font_subsubsection_tl}
- { \minimalist_apply_title_numbering_style:n { \thesection } }{.5em}
+ { \minimalist_apply_title_numbering_style_static:n { \thesection } }{.5em}
{#1.}[\hspace*{.3em}]
}
{
\titleformat{\subsubsection}
{\LocallyStopLineNumbers
\g_minimalist_title_font_subsubsection_tl}
- { \minimalist_apply_title_numbering_style:n { \thesubsubsection } }{.5em}
+ { \minimalist_apply_title_numbering_style_static:n { \thesubsubsection } }{.5em}
{#1}
[\ResumeLineNumbers]
}
@@ -428,7 +454,7 @@
\titlecontents{part}
[0em]
{\addvspace{1.5pc}\filcenter\normalfont}
- { \minimalist_apply_title_numbering_style:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase}
+ { \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase}
{}
{} % without page number
[\addvspace{.5pc}]
@@ -438,25 +464,25 @@
\titlecontents{chapter}
[2em] % i.e., 0em (part) + 2em
{\addvspace{.5pc}\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2em}}
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{section}
[5em] % i.e., 2em (chapter) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[9em] % i.e., 5em (section) + 4em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}}
{\hspace*{-3.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[13.5em] % i.e., 9em (subsection) + 4.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{4.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{4.25em}}
{\hspace*{-4.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -464,19 +490,19 @@
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{1.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}}
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[5em] % i.e., 2em (section) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[9em] % i.e., 5em (subsection) + 4em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}}
{\hspace*{-3.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -486,7 +512,7 @@
%%================================
\RequirePackage { enumitem }
\setlistdepth{10}
-\setlist{noitemsep, topsep=.33\topsep}
+\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
ref = \arabic*$)$}
@@ -499,8 +525,8 @@
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} }
-\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.8em}{.75pt}}} }
+\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.5em}{.75pt}}}
\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
@@ -569,16 +595,14 @@ heading_suffix "}\n"
\newcommand*{\IndexDotfill}
{
- \nobreakspace\nobreakspace
- \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}}
- \nobreakspace\nobreakspace
+ \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill
}
\newcommand*{\IndexHeading}[1]
{
\str_if_eq:nnTF { #1 } { Symbols }
{ \tl_set:Nn \l_tmpa_tl { \index_symbols_name } }
{ \tl_set:Nn \l_tmpa_tl { #1 } }
- \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style:n { \l_tmpa_tl } }
+ \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style_static:n { \l_tmpa_tl } }
\nopagebreak
\par
\vspace{.3\baselineskip}
@@ -635,7 +659,7 @@ heading_suffix "}\n"
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
- }}\hbox{\strut}\vspace{-2\parskip}}}
+ }}\hbox{\strut}\vspace{0pt}}}
}
}
{
@@ -671,7 +695,7 @@ heading_suffix "}\n"
\RequirePackage { projlib-theorem }
-\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
+\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name }
{
name style = {
, heading style = {
@@ -712,7 +736,7 @@ heading_suffix "}\n"
\bool_if:NF \l__projlib_theorem_complexname_bool
{
- \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
+ \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name }
{
name style = {
, crefname style = {
@@ -742,17 +766,7 @@ heading_suffix "}\n"
, russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
, numbering style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
}
}
@@ -789,17 +803,7 @@ heading_suffix "}\n"
, russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
, numbering style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
}
}
@@ -838,7 +842,7 @@ heading_suffix "}\n"
{
\hook_gput_code:nnn { package/projlib-author/after } { minimalist }
{
- \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape }
+ \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \minimalist_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 }
@@ -863,13 +867,13 @@ heading_suffix "}\n"
\LocallyStopLineNumbers
\begin{center}
\let\footnote\thanks
- {\minimalist_bfseries:\sffamily\scshape\Large\@title}\\\bigskip
+ {\minimalist_bfseries:\sffamily\minimalist_scshape:\Large\@title}\\\bigskip
\color{main-text!80!paper}
- {\small\scshape\@author}
+ {\small\minimalist_scshape:\@author}
\par\smallskip\vspace{-\parskip}
{\small\@date}
\end{center}
- \ifx\@date\@empty\medskip\fi
+ \projlib_author_if_content_empty:nT { \@date } { \medskip }
\medskip\par
\ResumeLineNumbers
}
@@ -884,7 +888,7 @@ heading_suffix "}\n"
\LocallyStopLineNumbers
\vspace{-.5\baselineskip}
\begin{center}
- { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\\
+ { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\abstractname}\\
\vspace{-.3\baselineskip}
\begin{minipage}[t]{.833\textwidth}
\vspace{0pt}
@@ -921,7 +925,7 @@ heading_suffix "}\n"
\LocallyStopLineNumbers
\vspace{-.75\baselineskip}
\begin{center}
- {\minimalist_bfseries:\scshape\small\keywordname}\\
+ {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\\
\vspace{-.3\baselineskip}
\begin{minipage}[t]{.833\textwidth}
\vspace{0pt}
@@ -944,6 +948,18 @@ heading_suffix "}\n"
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
+%%================================
+%% Special adjustment
+%%================================
+\crefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\crefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\crefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\crefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
+
\endinput
%%
%% End of file `minimalist/minimalist-plain.sty'.
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index 7dde7289fe..910f1e7960 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/minimalist/minimalist.sty
@@ -1,7 +1,7 @@
%%
%% This is file `minimalist/minimalist.sty',
%% generated with the docstrip utility.
-
+%%
%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the minimalist class series.
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist}
- {2022/04/24} {}
+ {2022/06/16} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
@@ -30,17 +30,30 @@
, style .str_set:N = \l__minimalist_style_str
, style .initial:n = { plain }
+ , use-style .str_set:N = \l__minimalist_style_str
+ , use~style .str_set:N = \l__minimalist_style_str
+ , use style .str_set:N = \l__minimalist_style_str
, classical .meta:n = { style = classical }
, use-boldface .bool_set:N = \l__minimalist_use_boldface_bool
, use-boldface .initial:n = { false }
, use~boldface .bool_set:N = \l__minimalist_use_boldface_bool
, use boldface .bool_set:N = \l__minimalist_use_boldface_bool
- , usebf .bool_set:N = \l__minimalist_use_boldface_bool
- , allow-boldface .bool_set:N = \l__minimalist_use_boldface_bool
- , allow~boldface .bool_set:N = \l__minimalist_use_boldface_bool
- , allow boldface .bool_set:N = \l__minimalist_use_boldface_bool
- , allowbf .bool_set:N = \l__minimalist_use_boldface_bool
+ , title-in-boldface .bool_set:N = \l__minimalist_use_boldface_bool
+ , title~in~boldface .bool_set:N = \l__minimalist_use_boldface_bool
+ , title in boldface .bool_set:N = \l__minimalist_use_boldface_bool
+ , title-in-bold .bool_set:N = \l__minimalist_use_boldface_bool
+ , title~in~bold .bool_set:N = \l__minimalist_use_boldface_bool
+ , title in bold .bool_set:N = \l__minimalist_use_boldface_bool
+
+ , use-scshape .bool_set:N = \l__minimalist_use_scshape_bool
+ , use-scshape .initial:n = { false }
+ , use~scshape .bool_set:N = \l__minimalist_use_scshape_bool
+ , use scshape .bool_set:N = \l__minimalist_use_scshape_bool
+ , title-in-scshape .bool_set:N = \l__minimalist_use_scshape_bool
+ , title~in~scshape .bool_set:N = \l__minimalist_use_scshape_bool
+ , title in scshape .bool_set:N = \l__minimalist_use_scshape_bool
+
, runin .bool_set:N = \l__minimalist_runin_bool
, runin .initial:n = { false }
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index aaa62d7852..5ad7607932 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/minimalist/minimart.cls
@@ -1,7 +1,7 @@
%%
%% This is file `minimalist/minimart.cls',
%% generated with the docstrip utility.
-
+%%
%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the minimalist class series.
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimart}
- {2022/04/24} {}
+ {2022/06/16} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -190,21 +190,25 @@
}
}
+
\PassOptionsToPackage { all } { nowidow }
\RequirePackage { nowidow }
-\RequirePackage { regexpatch }
-\skip_new:N \g_minimclass_parfillskip_skip
-\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{}
-\hook_gput_code:nnn { begindocument } { minimclass }
+\sys_if_engine_xetex:T
{
- \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } }
- \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ \RequirePackage { regexpatch }
+ \skip_new:N \g_minimclass_parfillskip_skip
+ \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{}
+ \hook_gput_code:nnn { begindocument } { minimclass }
+ {
+ \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } }
+ \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ }
}
\hook_gput_code:nnn { begindocument/before } { minimclass }
{
- \@ifpackageloaded { biblatex }
+ \IfPackageLoadedTF { biblatex }
{
\PassOptionsToPackage { biblatex } { embrac }
} {}
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index 61a27b439c..f844f26ffb 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/minimalist/minimbook.cls
@@ -1,7 +1,7 @@
%%
%% This is file `minimalist/minimbook.cls',
%% generated with the docstrip utility.
-
+%%
%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the minimalist class series.
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimbook}
- {2022/04/24} {}
+ {2022/06/16} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -190,21 +190,25 @@
}
}
+
\PassOptionsToPackage { all } { nowidow }
\RequirePackage { nowidow }
-\RequirePackage { regexpatch }
-\skip_new:N \g_minimclass_parfillskip_skip
-\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{}
-\hook_gput_code:nnn { begindocument } { minimclass }
+\sys_if_engine_xetex:T
{
- \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } }
- \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ \RequirePackage { regexpatch }
+ \skip_new:N \g_minimclass_parfillskip_skip
+ \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{}
+ \hook_gput_code:nnn { begindocument } { minimclass }
+ {
+ \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } }
+ \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ }
}
\hook_gput_code:nnn { begindocument/before } { minimclass }
{
- \@ifpackageloaded { biblatex }
+ \IfPackageLoadedTF { biblatex }
{
\PassOptionsToPackage { biblatex } { embrac }
} {}