diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf | bin | 82444 -> 84066 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist.sty | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimart.cls | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimbook.cls | 4 |
5 files changed, 39 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf Binary files differindex be01de81a57..3d851d2c4fa 100644 --- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf +++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex index 3cd02c792ec..92bf11fcd82 100644 --- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex +++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex @@ -38,7 +38,7 @@ \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% {linenumbers,nolinenumbers,subsection,subsubsection,href, - color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib + color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere } } \lstnewenvironment{code}% @@ -85,8 +85,8 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/30}} -\date{June 2021, Beijing} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/07/05}} +\date{July 2021, Beijing} \maketitle @@ -334,6 +334,7 @@ The effect is as follows: The \lstinline|proofidea| environment. \end{proofidea} +\clearpage \subsection{Draft mark} You can use \lstinline|\dnf| to mark the unfinished part. For example: @@ -382,7 +383,7 @@ or written in the way of \AmS{} classes: \maketitle \end{code} -\medskip +\clearpage The author information can contain multiple groups, written as: \begin{code} @@ -409,6 +410,9 @@ In \lstinline|\section| or \lstinline|\subsection| , if you wish to add footnote \end{itemize} This is a disadvantage brought about by the underline decoration of the title. +\subsection{On the QED symbols} +Since the font in the theorem-like environments is the same as that of the main text, in order to indicate where the environments end, a hollow QED symbol \simpleqedsymbol{} is placed at the end of the theorem-like environments. However, if your theorem ends with an equation or list (itemize, enumerate, description, etc.), this symbol cannot be automatically placed in the correct position. In this case, you need to manually add a \lstinline|\qedhere| at the end of your equation or the last entry of your list to make the QED symbol appear at the end of the line. + \section{Known issues} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index e4bdbcd605d..6b11172530f 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/06/30 A simple and clear style for articles and books] + [2021/07/05 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -50,12 +50,13 @@ \newif\ifIsBook \ifdefined\c@chapter\IsBooktrue\else\IsBookfalse\fi -\def\minimalist@titlefontshape{} - %%================================ %% Title fonts %%================================ \RequirePackage{anyfontsize} + +\def\minimalist@titlefontshape{} + \if@minimalist@classical \newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} @@ -81,7 +82,9 @@ \RequirePackage{geometry} \RequirePackage{fancyhdr} \RequirePackage{extramarks} + \AtEndPreamble{\fancyhfoffset{0pt}} + \fancypagestyle{fancy}{ \fancyhf{} \if@twoside @@ -97,6 +100,7 @@ \renewcommand{\headrulewidth}{0pt} } \pagestyle{fancy} + \fancypagestyle{plain}{ \fancyhf{} \if@twoside @@ -161,7 +165,7 @@ \fi } %%================================ -%% Line spacing +%% Languages and line spacing %%================================ \RequirePackage{PJLlang} \PJLsetlinespacing{\setstretch{1.07}} @@ -210,6 +214,7 @@ \def\LocallyStopLineNumbers{\LNturnsONfalse% \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers} \def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi} + \pretocmd{\tableofcontents}{\LocallyStopLineNumbers}{}{\FAIL} \apptocmd{\tableofcontents}{\ResumeLineNumbers}{}{\FAIL} \pretocmd{\thebibliography}{\LocallyStopLineNumbers}{}{\FAIL} @@ -453,11 +458,21 @@ %% Lists %%================================ \RequirePackage{enumitem} -\setlist{noitemsep,leftmargin=2em} -\gappto{\PJLlang@langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}} -\gappto{\PJLlang@langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}} -\renewcommand\labelitemii{\textcolor{maintext!27}{--}} -\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}} +\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[description]{font=\normalfont\conditionalbfseries} + +\setlist[itemize]{leftmargin=*} +\gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} +\gappto{\PJLlang@langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} +\setlist[itemize,2]{label=\textcolor{maintext!27}{--}} +\setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}} %%================================ %% Blank page @@ -504,8 +519,9 @@ \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}% \pushQED{\qed}% } - \def\@endtheorem{\popQED\endtrivlist\@endpefalse - \global\let\qedsymbol\qedsymbolOriginal} + \def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol% + \popQED\endtrivlist\@endpefalse + \global\let\qedsymbol\qedsymbolOriginal} \fi \renewcommand{\qedsymbol}{% @@ -525,7 +541,6 @@ \PassOptionsToPackage{nothms}{PJLthm} \RequirePackage{PJLthm} -%% Adjust English theorems names \pretocmd{\theoremnameEN}{\textsc}{}{\FAIL} \pretocmd{\lemmanameEN}{\textsc}{}{\FAIL} \pretocmd{\propositionnameEN}{\textsc}{}{\FAIL} @@ -546,7 +561,6 @@ \pretocmd{\remarknameEN}{\itshape}{}{\FAIL} \pretocmd{\observationnameEN}{\itshape}{}{\FAIL} -%% Adjust French theorems names \pretocmd{\theoremnameFR}{\textsc}{}{\FAIL} \pretocmd{\lemmanameFR}{\textsc}{}{\FAIL} \pretocmd{\propositionnameFR}{\textsc}{}{\FAIL} @@ -567,7 +581,6 @@ \pretocmd{\remarknameFR}{\itshape}{}{\FAIL} \pretocmd{\observationnameFR}{\itshape}{}{\FAIL} -%% Adjust German theorems names \pretocmd{\theoremnameDE}{\textsc}{}{\FAIL} \pretocmd{\lemmanameDE}{\textsc}{}{\FAIL} \pretocmd{\propositionnameDE}{\textsc}{}{\FAIL} @@ -588,7 +601,6 @@ \pretocmd{\remarknameDE}{\itshape}{}{\FAIL} \pretocmd{\observationnameDE}{\itshape}{}{\FAIL} -%% Adjust Italian theorems names \pretocmd{\theoremnameIT}{\textsc}{}{\FAIL} \pretocmd{\lemmanameIT}{\textsc}{}{\FAIL} \pretocmd{\propositionnameIT}{\textsc}{}{\FAIL} @@ -609,7 +621,6 @@ \pretocmd{\remarknameIT}{\itshape}{}{\FAIL} \pretocmd{\observationnameIT}{\itshape}{}{\FAIL} -%% Adjust Portuguese theorems names \pretocmd{\theoremnamePT}{\textsc}{}{\FAIL} \pretocmd{\lemmanamePT}{\textsc}{}{\FAIL} \pretocmd{\propositionnamePT}{\textsc}{}{\FAIL} @@ -630,7 +641,6 @@ \pretocmd{\remarknamePT}{\itshape}{}{\FAIL} \pretocmd{\observationnamePT}{\itshape}{}{\FAIL} -%% Adjust Brazilian theorems names \pretocmd{\theoremnameBR}{\textsc}{}{\FAIL} \pretocmd{\lemmanameBR}{\textsc}{}{\FAIL} \pretocmd{\propositionnameBR}{\textsc}{}{\FAIL} @@ -651,7 +661,6 @@ \pretocmd{\remarknameBR}{\itshape}{}{\FAIL} \pretocmd{\observationnameBR}{\itshape}{}{\FAIL} -%% Adjust Spanish theorems names \pretocmd{\theoremnameES}{\textsc}{}{\FAIL} \pretocmd{\lemmanameES}{\textsc}{}{\FAIL} \pretocmd{\propositionnameES}{\textsc}{}{\FAIL} @@ -672,7 +681,6 @@ \pretocmd{\remarknameES}{\itshape}{}{\FAIL} \pretocmd{\observationnameES}{\itshape}{}{\FAIL} -%% Theorem environments \theoremstyle{simple} \ifbool{IsBook}{ \newaliascnt{highest}{chapter} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index 2b5878477cc..592cd146a2b 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/06/30 A simple and clear article style] + [2021/07/05 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -44,6 +44,7 @@ \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\minimclass@baseclass}} \ProcessKeyvalOptions*\relax \LoadClass{\minimclass@baseclass} + \if@minimclass@draft \@minimclass@fasttrue \fi @@ -178,7 +179,6 @@ \def\PJL@font@alreadyset{} -%% Minor improvements \PassOptionsToPackage{verbose=silent}{microtype} \RequirePackage{microtype} \PassOptionsToPackage{all}{nowidow} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 5c57b174b1f..7f5ed517508 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/06/30 A simple and clear book style] + [2021/07/05 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -44,6 +44,7 @@ \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\minimclass@baseclass}} \ProcessKeyvalOptions*\relax \LoadClass{\minimclass@baseclass} + \if@minimclass@draft \@minimclass@fasttrue \fi @@ -178,7 +179,6 @@ \def\PJL@font@alreadyset{} -%% Minor improvements \PassOptionsToPackage{verbose=silent}{microtype} \RequirePackage{microtype} \PassOptionsToPackage{all}{nowidow} |