texlive[68337] Master/texmf-dist: jxu (21sep23)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 21 21:52:58 CEST 2023
Revision: 68337
https://tug.org/svn/texlive?view=revision&revision=68337
Author: karl
Date: 2023-09-21 21:52:58 +0200 (Thu, 21 Sep 2023)
Log Message:
-----------
jxu (21sep23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/minimalist/README.md
trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/minimalist/README.md 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/doc/latex/minimalist/README.md 2023-09-21 19:52:58 UTC (rev 68337)
@@ -12,9 +12,10 @@
- Main part:
- `minimalist.sty` : interface of the main style
- - `minimalist-plain.sty` : the style "plain"
+ - `minimalist-default.sty` : the default style
- `minimalist-classical.sty` : the style "classical"
- `minimalist-flow.sty` : the style "flow"
+ - `minimalist-plain.sty` : the style "plain"
- `minimalist-stream.sty` : the style "stream"
- ... and more styles to come (currently on schedule: "modern")
- `minimart.cls` : class for typesetting articles
Modified: trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{einfart}
- {2023/07/14} {}
+ {2023/09/21} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -51,9 +51,6 @@
, print~version .bool_set:N = \l__minimclass_print_mode_bool
, print-version .bool_set:N = \l__minimclass_print_mode_bool
- , classical .bool_set:N = \l__minimclass_classical_bool
- , classical .initial:n = { false }
-
, use indent .bool_set:N = \l__minimclass_useindent_bool
, use indent .initial:n = { true }
, use~indent .bool_set:N = \l__minimclass_useindent_bool
@@ -124,11 +121,6 @@
\LoadClass{\l__minimclass_base_class_tl}
-\bool_if:NT \l__minimclass_classical_bool
- {
- \bool_set_false:N \l__minimclass_useindent_bool
- }
-
\NewDocumentCommand \IfPrintModeTF { m m }
{
\bool_if:NTF \l__minimclass_print_mode_bool { #1 } { #2 }
@@ -191,6 +183,13 @@
\DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
}
+\RequirePackage { minimalist }
+
+\str_if_eq:onT { \l__minimalist_style_str } { classical }
+ {
+ \bool_set_false:N \l__minimclass_useindent_bool
+ }
+
\bool_if:NTF \l__minimclass_useindent_bool
{
\RequirePackage { indentfirst }
@@ -202,9 +201,7 @@
}
}
-\RequirePackage { minimalist }
-
%%================================
%% Fonts
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-classical}
- {2023/07/14} {}
+ {2023/09/21} {}
{The "classical" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -312,7 +312,7 @@
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
-\cs_new:Nn \minimalist_title_numbering_apply_font:n { { \usefont{U}{zeur}{b}{n} #1 } }
+\cs_new:Nn \minimalist_title_numbering_apply_font:n { #1 }
\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n
{
@@ -570,12 +570,16 @@
\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$}
-\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$}
+ ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$,
+ leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} }
+ % labelindent= \l__minimalist_item_indentation_dim }
+\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$,
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman*$\mskip-.5mu\big)$}
\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$}
-\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:}
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$}
+
+\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily: ,
+ labelindent= \l__minimalist_item_indentation_dim }
\newcommand\desculine{\bgroup\markoverwith{\color{.!55!paper}
\rule[-.45ex]{2pt}{.75pt}}\ULon}
\renewcommand{\descriptionlabel}[1]{
@@ -584,8 +588,8 @@
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}}
-\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} }
+\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} } }
\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}}
\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}}
@@ -741,6 +745,18 @@
}}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip}
\pushQED{\qed}
}
+ \newtheoremstyle{simple-var}
+ {.5\baselineskip}{.5\baselineskip}
+ { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {\newline}
+ { \global\let\qedsymbol\simpleqedsymbol
+ \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{0pt}}}\vspace{-2\parskip}
+ \pushQED{\qed}
+ }
}
{
\newtheoremstyle{simple}
@@ -754,10 +770,21 @@
\color{main-text!50!paper}\thmnote{$($#3$)$\nobreakspace\nobreakspace}
\pushQED{\qed}
}
+ \newtheoremstyle{simple-var}
+ {.5\baselineskip}{.5\baselineskip}
+ { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {0pt}
+ { \global\let\qedsymbol\simpleqedsymbol
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}\hspace{.4em}
+ \textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}
+ \color{main-text!50!paper}\thmnote{$($#3$)$\nobreakspace\nobreakspace}
+ \pushQED{\qed}
+ }
}
\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol
\popQED\endtrivlist\@endpefalse
- \global\let\qedsymbol\qedsymbolOriginal}
+ \global\let\qedsymbol\customqedsymbol}
\theoremstyle{simple}
@@ -795,6 +822,7 @@
}
+\PassOptionsToPackage { theorem-style = { theorem = simple-var, lemma = simple-var, proposition = simple-var, corollary = simple-var, property = simple-var, axiom = simple-var, construction = simple-var, theorem-with-name = simple-var } } { projlib-theorem }
\RequirePackage { projlib-theorem }
@@ -1078,14 +1106,6 @@
%%================================
%% Special adjustment
%%================================
-\crefformat { chapter } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { section } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { subsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { subsubsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-flow}
- {2023/07/14} {}
+ {2023/09/21} {}
{The "flow" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -313,6 +313,7 @@
{ 0 } { \textcolor { main-text!39!paper } }
{ 1 } { \textcolor { main-text!39!paper } }
{ 2 } { \textcolor { main-text!39!paper } }
+ { 3 } { \textcolor { main-text!39!paper } }
}
\l_tmpa_tl
\group_end:
@@ -564,17 +565,21 @@
\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$}
-\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$}
+ ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$,
+ leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} }
+ % labelindent= \l__minimalist_item_indentation_dim }
+\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$,
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman*$\mskip-.5mu\big)$}
\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$}
-\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:}
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$}
+\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily: ,
+ labelindent= \l__minimalist_item_indentation_dim }
+
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}}
-\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} }
+\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} } }
\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}}
\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}}
@@ -731,6 +736,21 @@
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
}}\hbox{\strut}\vspace{0pt}}}
}
+ \newtheoremstyle{simple-var}
+ {.75\baselineskip}{}
+ {
+ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont }
+ \parindent=0pt
+ \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip
+ }{}
+ {\normalfont}{}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ }}\hbox{\strut}\vspace{0pt}}}
+ }
}
{
\newtheoremstyle{simple}
@@ -744,6 +764,17 @@
{0pt}
{{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ \newtheoremstyle{simple-var}
+ {}{}
+ {
+ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont }
+ \parindent=0pt
+ \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip
+ }{}
+ {\normalfont}{}
+ {0pt}
+ {{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
}
\theoremstyle{simple}
@@ -782,6 +813,7 @@
}
+\PassOptionsToPackage { theorem-style = { theorem = simple-var, lemma = simple-var, proposition = simple-var, corollary = simple-var, property = simple-var, axiom = simple-var, construction = simple-var, theorem-with-name = simple-var } } { projlib-theorem }
\RequirePackage { projlib-theorem }
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-plain}
- {2023/07/14} {}
+ {2023/09/21} {}
{The "plain" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -286,36 +286,16 @@
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
-\cs_new:Nn \minimalist_title_numbering_apply_font:n { { \usefont{U}{zeur}{b}{n} #1 } }
+\cs_new:Nn \minimalist_title_numbering_apply_font:n { #1 }
\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n
{
- \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{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl
- % \textcolor { .!39!paper } { \normalfont \l_tmpa_tl }
- \bool_if:NF \l_minimalist_is_under_bfseries_bool
- {
- \colorlet{minimalist-temp-color}{.}
- }
- \textcolor { minimalist-temp-color!39!paper } { \normalfont \l_tmpa_tl }
+ #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{minimalist_title_numbering_apply_font: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!39!paper } }
- { 1 } { \textcolor { main-text!39!paper } }
- { 2 } { \textcolor { main-text!39!paper } }
- }
- \l_tmpa_tl
- \group_end:
+ #1
}
\newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}}
@@ -382,12 +362,7 @@
\LocallyStopLineNumbers
\color{main-text!80!paper}\g_minimalist_title_font_chapter_tl\fontsize{16}{0}\selectfont}{}{0em}
{
- \rlap
- {
- \hspace*{-.5em}
- \color{main-text!10!paper}
- \fontsize{90}{0}\selectfont\raisebox{-10pt}{ \minimalist_title_numbering_apply_font:n { \thechapter } }
- }
+ {\fontsize{30}{0}\selectfont\minimalist_title_numbering_apply_font:n { \thechapter }}\\[1em]
#1
}
[\ResumeLineNumbers]
@@ -440,7 +415,7 @@
\titleformat{\section}
{\LocallyStopLineNumbers
\g_minimalist_title_font_section_tl\centering}
- {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style:n { \thesection } }}{1em}
+ { \minimalist_apply_title_numbering_style:n { \thesection } }{1em}
{#1}
[\ResumeLineNumbers]
@@ -553,17 +528,21 @@
\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$}
-\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$}
+ ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$,
+ leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} }
+ % labelindent= \l__minimalist_item_indentation_dim }
+\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$,
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman*$\mskip-.5mu\big)$}
\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$}
-\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:}
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$}
+\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily: ,
+ labelindent= \l__minimalist_item_indentation_dim }
+
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}}
-\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} }
+\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} } }
\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}}
\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}}
@@ -720,6 +699,21 @@
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
}}\hbox{\strut}\vspace{0pt}}}
}
+ \newtheoremstyle{simple-var}
+ {.75\baselineskip}{}
+ {
+ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont }
+ \parindent=0pt
+ \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip
+ }{}
+ {\normalfont}{}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ }}\hbox{\strut}\vspace{0pt}}}
+ }
}
{
\newtheoremstyle{simple}
@@ -732,8 +726,24 @@
{\normalfont}{}
{0pt}
{{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}.\nobreakspace\nobreakspace}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ \minimalist_bfseries:\minimalist_sffamily: .
+ \nobreakspace\nobreakspace}
% {\normalfont\textcolor{main-text!27!paper}{---}}
+ \newtheoremstyle{simple-var}
+ {}{}
+ {
+ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont }
+ \parindent=0pt
+ \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip
+ }{}
+ {\normalfont}{}
+ {0pt}
+ {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ \minimalist_bfseries:\minimalist_sffamily: .
+ \nobreakspace\nobreakspace}
+ % {\normalfont\textcolor{main-text!27!paper}{---}}
}
\theoremstyle{simple}
@@ -772,6 +782,7 @@
}
+\PassOptionsToPackage { theorem-style = { theorem = simple-var, lemma = simple-var, proposition = simple-var, corollary = simple-var, property = simple-var, axiom = simple-var, construction = simple-var, theorem-with-name = simple-var } } { projlib-theorem }
\RequirePackage { projlib-theorem }
@@ -1045,14 +1056,6 @@
%%================================
%% Special adjustment
%%================================
-\crefformat { chapter } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { section } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { subsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { subsubsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-stream}
- {2023/07/14} {}
+ {2023/09/21} {}
{The "stream" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -634,17 +634,21 @@
\setlist{noitemsep, topsep=.33\topsep-.5\parskip}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$}
-\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$}
+ ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$,
+ leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} }
+ % labelindent= \l__minimalist_item_indentation_dim }
+\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$,
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman*$\mskip-.5mu\big)$}
\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$,
- ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$}
-\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:}
+ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$}
+\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily: ,
+ labelindent= \l__minimalist_item_indentation_dim }
+
\renewlist{itemize}{itemize}{10}
\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}}
-\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} }
+\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} } }
\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}}
\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}}
\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}}
@@ -802,6 +806,24 @@
\phantom{q} % To provide something below the baseline
}}\hbox{\strut}\vspace{0pt}}}
}
+\newtheoremstyle{simple-newline-var}
+ {-.2\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip}
+ { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ \llap{
+ \phantom{\rule{0pt}{\baselineskip}}
+ \minimalist_apply_title_numbering_style:n { \thmnumber{#2} }
+ \skip_horizontal:n { \l_minimalist_title_sep_dim }
+ }
+ \vspace*{-\baselineskip}
+ {\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ \phantom{q} % To provide something below the baseline
+ }}\hbox{\strut}\vspace{0pt}}}
+ }
\dim_new:N \l_minimalist_space_before_inline_theorem_dim
\AtBeginDocument
@@ -828,6 +850,22 @@
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
. \hspace{.5em}
}
+\newtheoremstyle{simple-inline-var}
+ % {.3\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip}
+ {\l_minimalist_space_before_inline_theorem_dim}{\l_minimalist_space_before_inline_theorem_dim}
+ { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {0pt}
+ {
+ \llap{
+ \minimalist_apply_title_numbering_style:n { \thmnumber{#2} }
+ \skip_horizontal:n { \l_minimalist_title_sep_dim }
+ }
+ % \minimalist_bfseries:\minimalist_sffamily:
+ {\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ . \hspace{.5em}
+ }
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
{
@@ -897,7 +935,15 @@
}
-\PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof } } { projlib-theorem }
+\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
+ {
+ \PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof,
+ theorem = simple-newline-var, lemma = simple-newline-var, proposition = simple-newline-var, corollary = simple-newline-var, property = simple-newline-var, axiom = simple-newline-var, construction = simple-newline-var, theorem-with-name = simple-newline-var } } { projlib-theorem }
+ }
+ {
+ \PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof,
+ theorem = simple-inline-var, lemma = simple-inline-var, proposition = simple-inline-var, corollary = simple-inline-var, property = simple-inline-var, axiom = simple-inline-var, construction = simple-inline-var, theorem-with-name = simple-inline-var } } { projlib-theorem }
+ }
\RequirePackage { projlib-theorem }
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist}
- {2023/07/14} {}
+ {2023/09/21} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
@@ -28,12 +28,13 @@
, fast .bool_set:N = \l__minimalist_fast_bool
, style .str_set:N = \l__minimalist_style_str
- , style .initial:n = { plain }
+ , style .initial:n = { default }
, 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 }
, flow .meta:n = { style = flow }
+ , plain .meta:n = { style = plain }
, stream .meta:n = { style = stream }
, use-boldface .bool_set:N = \l__minimalist_use_boldface_bool
@@ -66,6 +67,25 @@
, runin .bool_set:N = \l__minimalist_runin_bool
, runin .initial:n = { false }
+ , indent-items .dim_set:N = \l__minimalist_item_indentation_dim
+ , indent-items .initial:n = { 0pt }
+ , indent-items .default:n = { \parindent }
+ , indent~items .dim_set:N = \l__minimalist_item_indentation_dim
+ , indent~items .default:n = { \parindent }
+ , indent items .dim_set:N = \l__minimalist_item_indentation_dim
+ , indent items .default:n = { \parindent }
+ , indent-lists .dim_set:N = \l__minimalist_item_indentation_dim
+ , indent-lists .default:n = { \parindent }
+ , indent~lists .dim_set:N = \l__minimalist_item_indentation_dim
+ , indent~lists .default:n = { \parindent }
+ , indent lists .dim_set:N = \l__minimalist_item_indentation_dim
+ , indent lists .default:n = { \parindent }
+
+ , emphasis-theorems .bool_set:N = \l__minimalist_emphasis_theorem_bool
+ , emphasis-theorems .initial:n = { false }
+ , emphasis~theorems .bool_set:N = \l__minimalist_emphasis_theorem_bool
+ , emphasis theorems .bool_set:N = \l__minimalist_emphasis_theorem_bool
+
, theorem-in-new-line .bool_set:N = \l__minimalist_theorem_in_new_line_bool
, theorem-in-new-line .initial:n = { false }
, theorem~in~new~line .bool_set:N = \l__minimalist_theorem_in_new_line_bool
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimart}
- {2023/07/14} {}
+ {2023/09/21} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -43,9 +43,6 @@
, print~version .bool_set:N = \l__minimclass_print_mode_bool
, print-version .bool_set:N = \l__minimclass_print_mode_bool
- , classical .bool_set:N = \l__minimclass_classical_bool
- , classical .initial:n = { false }
-
, use indent .bool_set:N = \l__minimclass_useindent_bool
, use indent .initial:n = { true }
, use~indent .bool_set:N = \l__minimclass_useindent_bool
@@ -81,11 +78,6 @@
\LoadClass{\l__minimclass_base_class_tl}
-\bool_if:NT \l__minimclass_classical_bool
- {
- \bool_set_false:N \l__minimclass_useindent_bool
- }
-
\NewDocumentCommand \IfPrintModeTF { m m }
{
\bool_if:NTF \l__minimclass_print_mode_bool { #1 } { #2 }
@@ -148,6 +140,13 @@
\DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
}
+\RequirePackage { minimalist }
+
+\str_if_eq:onT { \l__minimalist_style_str } { classical }
+ {
+ \bool_set_false:N \l__minimclass_useindent_bool
+ }
+
\bool_if:NTF \l__minimclass_useindent_bool
{
\RequirePackage { indentfirst }
@@ -159,9 +158,7 @@
}
}
-\RequirePackage { minimalist }
-
%%================================
%% Fonts
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimbook}
- {2023/07/14} {}
+ {2023/09/21} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -43,9 +43,6 @@
, print~version .bool_set:N = \l__minimclass_print_mode_bool
, print-version .bool_set:N = \l__minimclass_print_mode_bool
- , classical .bool_set:N = \l__minimclass_classical_bool
- , classical .initial:n = { false }
-
, use indent .bool_set:N = \l__minimclass_useindent_bool
, use indent .initial:n = { true }
, use~indent .bool_set:N = \l__minimclass_useindent_bool
@@ -81,11 +78,6 @@
\LoadClass{\l__minimclass_base_class_tl}
-\bool_if:NT \l__minimclass_classical_bool
- {
- \bool_set_false:N \l__minimclass_useindent_bool
- }
-
\NewDocumentCommand \IfPrintModeTF { m m }
{
\bool_if:NTF \l__minimclass_print_mode_bool { #1 } { #2 }
@@ -148,6 +140,13 @@
\DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
}
+\RequirePackage { minimalist }
+
+\str_if_eq:onT { \l__minimalist_style_str } { classical }
+ {
+ \bool_set_false:N \l__minimclass_useindent_bool
+ }
+
\bool_if:NTF \l__minimclass_useindent_bool
{
\RequirePackage { indentfirst }
@@ -159,9 +158,7 @@
}
}
-\RequirePackage { minimalist }
-
%%================================
%% Fonts
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2023-09-21 19:52:09 UTC (rev 68336)
+++ trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2023-09-21 19:52:58 UTC (rev 68337)
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{simplivre}
- {2023/07/14} {}
+ {2023/09/21} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -51,9 +51,6 @@
, print~version .bool_set:N = \l__minimclass_print_mode_bool
, print-version .bool_set:N = \l__minimclass_print_mode_bool
- , classical .bool_set:N = \l__minimclass_classical_bool
- , classical .initial:n = { false }
-
, use indent .bool_set:N = \l__minimclass_useindent_bool
, use indent .initial:n = { true }
, use~indent .bool_set:N = \l__minimclass_useindent_bool
@@ -124,11 +121,6 @@
\LoadClass{\l__minimclass_base_class_tl}
-\bool_if:NT \l__minimclass_classical_bool
- {
- \bool_set_false:N \l__minimclass_useindent_bool
- }
-
\NewDocumentCommand \IfPrintModeTF { m m }
{
\bool_if:NTF \l__minimclass_print_mode_bool { #1 } { #2 }
@@ -191,6 +183,13 @@
\DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
}
+\RequirePackage { minimalist }
+
+\str_if_eq:onT { \l__minimalist_style_str } { classical }
+ {
+ \bool_set_false:N \l__minimclass_useindent_bool
+ }
+
\bool_if:NTF \l__minimclass_useindent_bool
{
\RequirePackage { indentfirst }
@@ -202,9 +201,7 @@
}
}
-\RequirePackage { minimalist }
-
%%================================
%% Fonts
%%================================
More information about the tex-live-commits
mailing list.