diff options
author | Norbert Preining <norbert@preining.info> | 2021-10-25 03:03:38 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-10-25 03:03:38 +0000 |
commit | ce07680b939eecc96f42a3ee4e777c5c183503de (patch) | |
tree | 7128b5cbde1df1ccd06fd06c861b799ae335f835 /macros/latex/contrib/minimalist | |
parent | 40f406b1e0017bdecc0890738274fc8e88c08486 (diff) |
CTAN sync 202110250303
Diffstat (limited to 'macros/latex/contrib/minimalist')
-rw-r--r-- | macros/latex/contrib/minimalist/minimalist-doc.pdf | bin | 98049 -> 97986 bytes | |||
-rw-r--r-- | macros/latex/contrib/minimalist/minimalist-doc.tex | 4 | ||||
-rw-r--r-- | macros/latex/contrib/minimalist/minimalist.sty | 21 | ||||
-rw-r--r-- | macros/latex/contrib/minimalist/minimart.cls | 25 | ||||
-rw-r--r-- | macros/latex/contrib/minimalist/minimbook.cls | 25 |
5 files changed, 58 insertions, 17 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf Binary files differindex 4beabecc19..3f494eeb60 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.pdf +++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex index 6238f7b93b..594fc99d4e 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/minimalist/minimalist-doc.tex @@ -98,9 +98,9 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 1892b05e4a..953342a21c 100644 --- a/macros/latex/contrib/minimalist/minimalist.sty +++ b/macros/latex/contrib/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/08/11 A simple and clear style for articles and books] + [2021/10/23 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -482,13 +482,20 @@ \RequirePackage{enumitem} \setlist{noitemsep} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label = \arabic*., - ref = \arabic*} -\setlist[enumerate,2]{label = \emph{\alph*}), - ref = \theenumi.\emph{\alph*}} -\setlist[enumerate,3]{label = (\roman*), - ref = \theenumii.\roman*} +\setlist[enumerate,1]{label=\arabic*$)$, + ref = \arabic*$)$} +\setlist[enumerate,2]{label=\emph{\roman*}$)$, + ref = \arabic{enumi}.\emph{\roman*}$)$} +\setlist[enumerate,3]{label=\emph{\alph*}$)$, + ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} +\if@minimalist@classical +\newcommand\desculine{\bgroup\markoverwith{\color{maintext!27!paper}% + \rule[-.45ex]{2pt}{.75pt}}\ULon} +\renewcommand{\descriptionlabel}[1]{% + \hspace{\labelsep}\normalfont\desculine{#1}% +} +\fi \setlist[itemize]{leftmargin=*} \gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index b35e37468c..11e5e07d42 100644 --- a/macros/latex/contrib/minimalist/minimart.cls +++ b/macros/latex/contrib/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/08/11 A simple and clear article style] + [2021/10/23 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -127,6 +134,16 @@ \fi \RequirePackage{amssymb} +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index 0c50b2bb81..e7bb0d8bb8 100644 --- a/macros/latex/contrib/minimalist/minimbook.cls +++ b/macros/latex/contrib/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/08/11 A simple and clear book style] + [2021/10/23 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -127,6 +134,16 @@ \fi \RequirePackage{amssymb} +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} |