summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-26 03:02:04 +0000
committerNorbert Preining <norbert@preining.info>2022-04-26 03:02:04 +0000
commit6f7554fc6cab67e3dc397ce7a942889eedbc4967 (patch)
treecd63f9ed43b147e44b3f1981bf7bda23680416b1 /macros/latex/contrib/minimalist
parent4688b855bb6f8b817901a7c777e8aecd1a189622 (diff)
CTAN sync 202204260302
Diffstat (limited to 'macros/latex/contrib/minimalist')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty63
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.pdfbin103724 -> 104110 bytes
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.tex2
-rw-r--r--macros/latex/contrib/minimalist/minimalist-plain.sty66
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty2
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls24
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls24
7 files changed, 75 insertions, 106 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 5851a6b92f..5fd710c03e 100644
--- a/macros/latex/contrib/minimalist/minimalist-classical.sty
+++ b/macros/latex/contrib/minimalist/minimalist-classical.sty
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-classical}
- {2022/04/17} {}
+ {2022/04/24} {}
{The classical style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -264,7 +264,7 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc, nobottomtitles ] { titlesec }
+\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
@@ -511,7 +511,7 @@
%% Lists
%%================================
\RequirePackage { enumitem }
-\setlistdepth{9}
+\setlistdepth{10}
\setlist{noitemsep, topsep=.33\topsep}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
@@ -527,17 +527,13 @@
\hspace{\labelsep}\normalfont\desculine{#1}
}
-\setlist[itemize]{leftmargin=*}
+\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}{--}}
\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
-\setlist[itemize,5]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
-\setlist[itemize,6]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
-\setlist[itemize,7]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
-
-\renewlist{itemize}{itemize}{9}
%%================================
%% Blank page
@@ -669,9 +665,10 @@ heading_suffix "}\n"
{\normalfont}{}
{\newline}
{ \global\let\qedsymbol\simpleqedsymbol
- {\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$)$}
- \smallskip
+ \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}}}
\pushQED{\qed}
}
}
@@ -853,41 +850,6 @@ heading_suffix "}\n"
\RequirePackage { tcolorbox }
\bool_if:NT \l__minimalist_fast_bool { \tcbstartdraftmode }
-\bool_if:NF \l__minimalist_fast_bool
- {
- \bool_if:NT \l__minimalist_theorem_in_new_line_bool
- {
- \cs_new_protected:Nn \minimclass_box_environment:n
- {
- \hook_gput_code:nnn { env/#1/before } { minimalist }
- {
- \LocallyStopLineNumbers
- \begin { tcolorbox }
- [
- enhanced~jigsaw,
- frame~hidden,
- interior~hidden,
- top = 0pt, bottom = 0pt,
- left = 0pt, right = 0pt,
- boxrule = 0pt, boxsep = 0pt,
- before~skip = \parskip+\topsep+.25\baselineskip,
- after~skip = \parskip+\topsep+.25\baselineskip,
- enforce~breakable, lines~before~break=3,
- ]
- }
- \hook_gput_code:nnn { env/#1/after } { minimalist }
- {
- \end { tcolorbox }
- \ResumeLineNumbers
- }
- }
- \exp_args:No \clist_map_inline:nn { \c_projlib_theorem_supported_clist }
- {
- \minimclass_box_environment:n { #1 }
- \minimclass_box_environment:n { #1 * }
- }
- }
- }
\NewDocumentEnvironment { emphasis } { }
{
@@ -895,11 +857,12 @@ heading_suffix "}\n"
\enlargethispage{2mm}
\begin{tcolorbox}
[
- enhanced ~ jigsaw, enforce~breakable, oversize,
+ enhanced ~ jigsaw, breakable, oversize,
% nobeforeafter,
left = .5em, right=0mm, top=0.5mm, bottom=0mm, boxrule=0pt,
- colback=main-text!2!paper, frame ~ hidden,
- borderline ~ west = {.3em} {0mm} {main-text!25!paper}, arc = 0.2mm,
+ colback = paper, frame ~ hidden,
+ borderline ~ west = {.125em} {-.5mm} {main-text!25!paper, double, double ~ distance=.1em},
+ arc = 0.2mm,
]
}
{
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf
index e79171997e..f890924979 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 abf1a3528a..199f6ca675 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/17}
+\def\PackageVersion{2022/04/24}
\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 5be7970316..28dbd470e8 100644
--- a/macros/latex/contrib/minimalist/minimalist-plain.sty
+++ b/macros/latex/contrib/minimalist/minimalist-plain.sty
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-plain}
- {2022/04/17} {}
+ {2022/04/24} {}
{The plain style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -250,7 +250,7 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc, nobottomtitles ] { titlesec }
+\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
@@ -485,7 +485,7 @@
%% Lists
%%================================
\RequirePackage { enumitem }
-\setlistdepth{9}
+\setlistdepth{10}
\setlist{noitemsep, topsep=.33\topsep}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
@@ -496,17 +496,13 @@
ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$}
\setlist[description]{font=\normalfont\minimalist_bfseries:}
-\setlist[itemize]{leftmargin=*}
+\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}{--}}
\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
-\setlist[itemize,5]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
-\setlist[itemize,6]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
-\setlist[itemize,7]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
-
-\renewlist{itemize}{itemize}{9}
%%================================
%% Blank page
@@ -631,12 +627,16 @@ heading_suffix "}\n"
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
{
\newtheoremstyle{simple}
- {}{}
+ {.75\baselineskip}{}
{\normalfont}{}
{\normalfont}{}
- {\newline}
- {{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\smallskip}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ }}\hbox{\strut}\vspace{-2\parskip}}}
+ }
}
{
\newtheoremstyle{simple}
@@ -809,41 +809,6 @@ heading_suffix "}\n"
\RequirePackage { tcolorbox }
\bool_if:NT \l__minimalist_fast_bool { \tcbstartdraftmode }
-\bool_if:NF \l__minimalist_fast_bool
- {
- \bool_if:NT \l__minimalist_theorem_in_new_line_bool
- {
- \cs_new_protected:Nn \minimclass_box_environment:n
- {
- \hook_gput_code:nnn { env/#1/before } { minimalist }
- {
- \LocallyStopLineNumbers
- \begin { tcolorbox }
- [
- enhanced~jigsaw,
- frame~hidden,
- interior~hidden,
- top = 0pt, bottom = 0pt,
- left = 0pt, right = 0pt,
- boxrule = 0pt, boxsep = 0pt,
- before~skip = \parskip+\topsep+.25\baselineskip,
- after~skip = \parskip+\topsep+.25\baselineskip,
- enforce~breakable, lines~before~break=3,
- ]
- }
- \hook_gput_code:nnn { env/#1/after } { minimalist }
- {
- \end { tcolorbox }
- \ResumeLineNumbers
- }
- }
- \exp_args:No \clist_map_inline:nn { \c_projlib_theorem_supported_clist }
- {
- \minimclass_box_environment:n { #1 }
- \minimclass_box_environment:n { #1 * }
- }
- }
- }
\NewDocumentEnvironment { emphasis } { }
{
@@ -851,11 +816,12 @@ heading_suffix "}\n"
\enlargethispage{2mm}
\begin{tcolorbox}
[
- enhanced ~ jigsaw, enforce~breakable, oversize,
+ enhanced ~ jigsaw, breakable, oversize,
% nobeforeafter,
left = .5em, right=0mm, top=0.5mm, bottom=0mm, boxrule=0pt,
colback=main-text!2!paper, frame ~ hidden,
- borderline ~ west = {.3em} {0mm} {main-text!25!paper}, arc = 0.2mm,
+ borderline ~ west = {.3em} {0mm} {main-text!25!paper},
+ arc = 0.2mm,
]
}
{
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index cb3875ea42..7dde7289fe 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/minimalist/minimalist.sty
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist}
- {2022/04/17} {}
+ {2022/04/24} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index 547db8a3c5..aaa62d7852 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/minimalist/minimart.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimart}
- {2022/04/17} {}
+ {2022/04/24} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -96,6 +96,7 @@
total = { 5.535in, 8.300in },
centering,
footnotesep = 2em plus 2pt minus 2pt,
+ footskip = .5in,
}
\bool_if:NT \l__minimclass_b_five_paper_bool
@@ -106,6 +107,7 @@
total = { 5.535in, 8.160in },
centering,
footnotesep = 2em plus 2pt minus 2pt,
+ footskip = .5in,
}
}
@@ -117,6 +119,7 @@
total = { 6.500in, 9.685in },
centering,
footnotesep = 2em plus 2pt minus 2pt,
+ footskip = .5in,
}
}
@@ -189,7 +192,24 @@
\PassOptionsToPackage { all } { nowidow }
\RequirePackage { nowidow }
-\RequirePackage { embrac }
+
+\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 - 2\parindent } }
+ \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ }
+
+\hook_gput_code:nnn { begindocument/before } { minimclass }
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \PassOptionsToPackage { biblatex } { embrac }
+ } {}
+ \RequirePackage { embrac }
+ }
%%================================
%% Graphics
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index 03068626d6..61a27b439c 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/minimalist/minimbook.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimbook}
- {2022/04/17} {}
+ {2022/04/24} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -96,6 +96,7 @@
total = { 5.535in, 8.300in },
centering,
footnotesep = 2em plus 2pt minus 2pt,
+ footskip = .5in,
}
\bool_if:NT \l__minimclass_b_five_paper_bool
@@ -106,6 +107,7 @@
total = { 5.535in, 8.160in },
centering,
footnotesep = 2em plus 2pt minus 2pt,
+ footskip = .5in,
}
}
@@ -117,6 +119,7 @@
total = { 6.500in, 9.685in },
centering,
footnotesep = 2em plus 2pt minus 2pt,
+ footskip = .5in,
}
}
@@ -189,7 +192,24 @@
\PassOptionsToPackage { all } { nowidow }
\RequirePackage { nowidow }
-\RequirePackage { embrac }
+
+\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 - 2\parindent } }
+ \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ }
+
+\hook_gput_code:nnn { begindocument/before } { minimclass }
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \PassOptionsToPackage { biblatex } { embrac }
+ } {}
+ \RequirePackage { embrac }
+ }
%%================================
%% Graphics