diff options
Diffstat (limited to 'macros/latex/contrib/minimalist/minimalist.sty')
-rw-r--r-- | macros/latex/contrib/minimalist/minimalist.sty | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 9f972f569d..295019f1c9 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/07/30 A simple and clear style for articles and books] + [2021/08/08 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -81,15 +81,15 @@ \if@minimalist@classical \newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape} -\else -\newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\secfont}{\conditionalbfseries} \newcommand{\subsecfont}{\conditionalbfseries} \newcommand{\subsubsecfont}{\conditionalbfseries\itshape} +\else +\newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape} \fi %%================================ @@ -252,7 +252,7 @@ \gappto{\PJLlang@langconfig@common}{% \renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}% } -\gappto{\PJLlang@langconfig@chinese}{% +\gappto{\PJLlang@langconfig@schinese}{% \renewcommand{\partstring}{第~\thepart~部分}% } \gappto{\PJLlang@langconfig@tchinese}{% @@ -344,14 +344,6 @@ %% Section \if@minimalist@classical -\newcommand\sec@decochar{} -\titleformat{\section} - {\LocallyStopLineNumbers% - \secfont\centering} - {\thesection}{.75em} - {#1} - [\ResumeLineNumbers] -\else \renewcommand\thesection{\arabic{section}} \newcommand\seculine{\bgroup\markoverwith{\color{maintext!27!paper}% \rule[-0.9ex]{2pt}{.6pt}\hspace{-2pt}\rule[-1.2ex]{2pt}{.6pt}}\ULon} @@ -370,17 +362,18 @@ \secfont\centering}{}{0em} {\seculine{#1}} [\ResumeLineNumbers] +\else +\newcommand\sec@decochar{} +\titleformat{\section} + {\LocallyStopLineNumbers% + \secfont\centering} + {\thesection}{.75em} + {#1} + [\ResumeLineNumbers] \fi %% Subsection \if@minimalist@classical -\titleformat{\subsection} - {\LocallyStopLineNumbers% - \subsecfont} - {\thesubsection}{.75em} - {#1} - [\ResumeLineNumbers] -\else \renewcommand\thesubsection{% \ifnum\c@section=0\else\arabic{section}.\fi\arabic{subsection}} \newcommand\subseculine{\bgroup\markoverwith{\color{maintext!27!paper}% @@ -395,6 +388,13 @@ \subsecfont}{}{0em} {\subseculine{#1}} [\ResumeLineNumbers] +\else +\titleformat{\subsection} + {\LocallyStopLineNumbers% + \subsecfont} + {\thesubsection}{.75em} + {#1} + [\ResumeLineNumbers] \fi %% Subsubsection @@ -519,6 +519,23 @@ %%================================ \RequirePackage{amsthm} \if@minimalist@classical +\def\simpleqedsymbol{% + \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} +\newtheoremstyle{simple}% + {}{}% + {\normalfont}{}% + {\normalfont}{}% + {0pt}% + {\global\let\qedsymbol\simpleqedsymbol% + {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}% + \textcolor{maintext!27!paper}{$|$}\hspace{.4em}% + \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}% + \pushQED{\qed}% + } +\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol% + \popQED\endtrivlist\@endpefalse + \global\let\qedsymbol\qedsymbolOriginal} +\else \newtheoremstyle{simple}% {}{}% {\normalfont}{}% @@ -526,23 +543,6 @@ {0pt}% {{\conditionalbfseries\minimalist@titlefontshape\thmname{#1}\thmnumber{ #2}}% {\color{maintext!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}~~{\normalfont---}~~} -\else - \def\simpleqedsymbol{% - \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} - \newtheoremstyle{simple}% - {}{}% - {\normalfont}{}% - {\normalfont}{}% - {0pt}% - {\global\let\qedsymbol\simpleqedsymbol% - {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}% - \textcolor{maintext!27!paper}{$|$}\hspace{.4em}% - \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}% - \pushQED{\qed}% - } - \def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol% - \popQED\endtrivlist\@endpefalse - \global\let\qedsymbol\qedsymbolOriginal} \fi \renewcommand{\qedsymbol}{% @@ -788,19 +788,6 @@ \if@minimalist@classical \renewcommand{\@maketitle}{% \LocallyStopLineNumbers% - \begin{center}% - {\conditionalbfseries\minimalist@titlefontshape\large\@title}\\\bigskip% - \color{maintext!80!paper}% - {\small\scshape\@author}\\[2pt]% - {\small\@date}% - \end{center}% - \ifx\@date\@empty\bigskip\fi% - \bigskip\par% - \ResumeLineNumbers% -} -\else -\renewcommand{\@maketitle}{% - \LocallyStopLineNumbers% \noindent% {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}}% % \vspace{-\parskip}% @@ -823,6 +810,19 @@ {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}\par}% \ResumeLineNumbers% } +\else +\renewcommand{\@maketitle}{% + \LocallyStopLineNumbers% + \begin{center}% + {\conditionalbfseries\minimalist@titlefontshape\large\@title}\\\bigskip% + \color{maintext!80!paper}% + {\small\scshape\@author}\\[2pt]% + {\small\@date}% + \end{center}% + \ifx\@date\@empty\bigskip\fi% + \bigskip\par% + \ResumeLineNumbers% +} \fi \apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL} @@ -832,10 +832,10 @@ \if@minimalist@classical \renewenvironment{abstract}{% \LocallyStopLineNumbers% - \vspace{-\baselineskip}% - \begin{center}% - \textsc{\conditionalbfseries\small\abstractname}\\% - \vspace{-.3\baselineskip}% + \begin{flushright}% + \textsc{\conditionalbfseries\small\abstractname}\par% + \vspace{-\parskip}% + \vspace{-.25\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% @@ -843,17 +843,17 @@ \parindent=2em }{% \end{minipage}% - \end{center}% - \medskip% + \end{flushright}% + \bigskip% \ResumeLineNumbers% } \else \renewenvironment{abstract}{% \LocallyStopLineNumbers% - \begin{flushright}% - \textsc{\conditionalbfseries\small\abstractname}\par% - \vspace{-\parskip}% - \vspace{-.25\baselineskip}% + \vspace{-\baselineskip}% + \begin{center}% + \textsc{\conditionalbfseries\small\abstractname}\\% + \vspace{-.3\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% @@ -861,8 +861,8 @@ \parindent=2em }{% \end{minipage}% - \end{flushright}% - \bigskip% + \end{center}% + \medskip% \ResumeLineNumbers% } \fi @@ -881,41 +881,41 @@ \if@minimalist@classical \newenvironment{keyword}{% \LocallyStopLineNumbers% - \vspace{-.75\baselineskip}% - \begin{center}% - {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\\% - \vspace{-.3\baselineskip}% + \vspace{-.5\baselineskip}% + \begin{flushright}% + {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\par% + \vspace{-\parskip}% + \vspace{-.30\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% \footnotesize% \parindent=2em - \begin{center}% + \raggedleft% }{% - \end{center}% \end{minipage}% - \end{center}% - \medskip% + \end{flushright}% + \bigskip% \ResumeLineNumbers% } \else \newenvironment{keyword}{% \LocallyStopLineNumbers% - \vspace{-.5\baselineskip}% - \begin{flushright}% - {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\par% - \vspace{-\parskip}% - \vspace{-.30\baselineskip}% + \vspace{-.75\baselineskip}% + \begin{center}% + {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\\% + \vspace{-.3\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% \footnotesize% \parindent=2em - \raggedleft% + \begin{center}% }{% + \end{center}% \end{minipage}% - \end{flushright}% - \bigskip% + \end{center}% + \medskip% \ResumeLineNumbers% } \fi |