texlive[59686] Master/texmf-dist: minimalist (23jun21)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 23 21:44:27 CEST 2021
Revision: 59686
http://tug.org/svn/texlive?view=revision&revision=59686
Author: karl
Date: 2021-06-23 21:44:27 +0200 (Wed, 23 Jun 2021)
Log Message:
-----------
minimalist (23jun21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
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
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2021-06-23 19:44:08 UTC (rev 59685)
+++ trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2021-06-23 19:44:27 UTC (rev 59686)
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[puretext]{minimart}
+\documentclass[English,French,puretext]{minimart}
\CreateTheorem{definition}<highest>
\CreateTheorem{theorem}<highest>
@@ -9,7 +9,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -37,7 +37,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,subsection,href,
+ {linenumbers,nolinenumbers,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
@@ -85,7 +85,7 @@
\title{\minimalist{}, write your articles or books in a simple and clear way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/07a}}
+\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/23}}
\date{June 2021, Beijing}
\maketitle
@@ -146,8 +146,25 @@
\begin{itemize}
\item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
\end{itemize}
+\medskip
\begin{tip}
\begin{itemize}
\item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
@@ -155,7 +172,7 @@
\end{itemize}
\end{tip}
-\bigskip
+\clearpage
Additionally, \minimart{} and \minimbook{} offers the following options:
\begin{itemize}
\item \texttt{a4paper} or \texttt{b5paper}
@@ -162,10 +179,15 @@
\begin{itemize}
\item Optional paper size. The default paper size is 7in $\times$ 10in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
+ \item \texttt{useindent}
+ \begin{itemize}
+ \item Use paragraph indentation instead of inter-paragraph spacing.
+ \end{itemize}
\end{itemize}
@@ -269,7 +291,6 @@
\begin{itemize}
\item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
\end{itemize}
- \clearpage
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
\item Define a numbered environment \meta{name of environment}, numbered within the counter \meta{numbered within}
@@ -408,7 +429,7 @@
\begin{code}
\documentclass{minimart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -446,7 +467,7 @@
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -457,7 +478,7 @@
\begin{code}
\documentclass{minimart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -499,7 +520,7 @@
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2021-06-23 19:44:08 UTC (rev 59685)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2021-06-23 19:44:27 UTC (rev 59686)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{minimalist}
- [2021/06/07a A simple and clear style for articles and books]
+ [2021/06/23 A simple and clear style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -28,8 +28,10 @@
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{puretext}
\DeclareBoolOption[false]{nothms}
+\DeclareBoolOption[false]{nothmnum}
\DeclareBoolOption[false]{allowbf}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{runin}
\ProcessKeyvalOptions*\relax
\if at minimalist@draft
@@ -48,22 +50,24 @@
\newif\ifIsBook
\ifdefined\c at chapter\IsBooktrue\else\IsBookfalse\fi
+\def\minimalist at titlefontshape{}
+
%%================================
%% Title fonts
%%================================
\RequirePackage{anyfontsize}
\if at minimalist@classical
-\newcommand{\partfont}{\conditionalbfseries\sffamily}
-\newcommand{\chapfont}{\conditionalbfseries\sffamily}
-\newcommand{\secfont}{\conditionalbfseries\sffamily}
-\newcommand{\subsecfont}{\conditionalbfseries\sffamily}
-\newcommand{\subsubsecfont}{\conditionalbfseries\sffamily}
+\newcommand{\partfont}{\conditionalbfseries\minimalist at titlefontshape}
+\newcommand{\chapfont}{\conditionalbfseries\minimalist at titlefontshape}
+\newcommand{\secfont}{\conditionalbfseries\minimalist at titlefontshape}
+\newcommand{\subsecfont}{\conditionalbfseries\minimalist at titlefontshape}
+\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist at titlefontshape\itshape}
\else
-\newcommand{\partfont}{\conditionalbfseries\sffamily}
-\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\partfont}{\conditionalbfseries\minimalist at titlefontshape}
+\newcommand{\chapfont}{\conditionalbfseries\minimalist at titlefontshape}
\newcommand{\secfont}{\conditionalbfseries}
\newcommand{\subsecfont}{\conditionalbfseries}
-\newcommand{\subsubsecfont}{\conditionalbfseries}
+\newcommand{\subsubsecfont}{\conditionalbfseries\itshape}
\fi
%%================================
@@ -81,14 +85,14 @@
\fancypagestyle{fancy}{
\fancyhf{}
\if at twoside
- \fancyfoot[RO]{\small\textcolor{black!30!paper}{\lastrightmark}%
- ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ \fancyfoot[RO]{\small\textcolor{maintext!30!paper}{\lastrightmark}%
+ ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fancyfoot[LE]{\small\leavevmode\llap{\thepage%
- ~~\textcolor{gray!55!paper}{$|$}}%
- ~~\textcolor{black!30!paper}{\lastleftmark}}
+ ~~\textcolor{maintext!27!paper}{$|$}}%
+ ~~\textcolor{maintext!30!paper}{\lastleftmark}}
\else
- \fancyfoot[R]{\small\textcolor{black!30!paper}{\lastrightmark}%
- ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ \fancyfoot[R]{\small\textcolor{maintext!30!paper}{\lastrightmark}%
+ ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -97,12 +101,12 @@
\fancyhf{}
\if at twoside
\fancyfoot[RO]{\small%
- ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fancyfoot[LE]{\small\leavevmode\llap{\thepage%
- ~~\textcolor{gray!55!paper}{$|$}}}
+ ~~\textcolor{maintext!27!paper}{$|$}}}
\else
\fancyfoot[R]{\small%
- ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -121,12 +125,12 @@
+(-\i*0.5em-.025em,-10pt+\i*1.1pt)$)
rectangle ($(current page text area.south east)
+(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
- \shade[top color=paper,bottom color=black,opacity=0.12-0.02*\i]
+ \shade[top color=paper,bottom color=maintext,opacity=0.12-0.02*\i]
($(current page text area.north east)
+(-\i*0.5em-.025em,2pt)$)
rectangle ($(current page text area.north east)
+(-\i*0.5em+.025em,-10pt+\i*1.1pt)$);
- \shade[top color=black,bottom color=paper,opacity=0.12-0.02*\i]
+ \shade[top color=maintext,bottom color=paper,opacity=0.12-0.02*\i]
($(current page text area.south east)
+(-\i*0.5em-.025em,-2pt)$)
rectangle ($(current page text area.south east)
@@ -169,7 +173,7 @@
%%================================
\PassOptionsToPackage{pagewise,mathlines}{lineno}
\RequirePackage{lineno}
-\renewcommand\linenumberfont{\ttfamily\color{gray!15!paper}\footnotesize}
+\renewcommand\linenumberfont{\ttfamily\color{maintext!7!paper}\footnotesize}
\setlength\linenumbersep{1em}
\RequirePackage{mathtools}
@@ -259,7 +263,7 @@
\LocallyStopLineNumbers%
\begin{flushright}%
\begin{minipage}{0.833\textwidth}%
- \color{black!80!paper}\raggedleft#1%
+ \color{maintext!80!paper}\raggedleft#1%
\end{minipage}%
\end{flushright}%
\ResumeLineNumbers%
@@ -271,8 +275,8 @@
\titleformat{\chapter}
{\thispagestyle{fancy}%
\LocallyStopLineNumbers%
- \color{black!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
- {\rlap{\hspace*{-.5em}{\color{gray!25!paper}%
+ \color{maintext!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
+ {\rlap{\hspace*{-.5em}{\color{maintext!12!paper}%
\fontsize{80}{0}\selectfont\raisebox{-7pt}{\thechapter}}}#1}
[\ResumeLineNumbers]
\titleformat{name=\chapter,numberless}
@@ -279,8 +283,8 @@
{\thispagestyle{fancy}%
\LocallyStopLineNumbers%
% \phantomsection\addcontentsline{toc}{chapter}{#1}%
- \color{black!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
- {\rlap{\hspace*{-.5em}{\color{gray!25!paper}%
+ \color{maintext!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
+ {\rlap{\hspace*{-.5em}{\color{maintext!12!paper}%
\fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{*}}}#1}
[\ResumeLineNumbers]
}{
@@ -305,7 +309,7 @@
\LocallyStopLineNumbers%
\begin{flushright}%
\begin{minipage}{0.833\textwidth}%
- \color{black!80!paper}\raggedleft#1%
+ \color{maintext!80!paper}\raggedleft#1%
\end{minipage}%
\end{flushright}%
\ResumeLineNumbers%
@@ -323,15 +327,15 @@
{#1}
[\ResumeLineNumbers]
\else
-\newcommand\seculine{\bgroup\markoverwith{\color{gray!55!paper}%
+\newcommand\seculine{\bgroup\markoverwith{\color{maintext!27!paper}%
\rule[-0.9ex]{2pt}{.6pt}\hspace{-2pt}\rule[-1.2ex]{2pt}{.6pt}}\ULon}
\newcommand\sec at decochar{\raisebox{.03em}{\normalfont\footnotesize/}}
\titleformat{\section}
{\LocallyStopLineNumbers%
\secfont\centering}{}{0em}
- {{\small\textcolor{gray!55!paper}{\sec at decochar}%
- \,\,\textcolor{black!90!paper}{\conditionalbfseries\arabic{section}}%
- \,\,\textcolor{gray!55!paper}{\sec at decochar}}\\
+ {{\small\textcolor{maintext!27!paper}{\sec at decochar}%
+ \,\,\textcolor{maintext!90!paper}{\conditionalbfseries\arabic{section}}%
+ \,\,\textcolor{maintext!27!paper}{\sec at decochar}}\\
\seculine{#1}}
[\ResumeLineNumbers]
\titleformat{name=\section,numberless}
@@ -353,12 +357,12 @@
{#1}
[\ResumeLineNumbers]
\else
-\newcommand\subseculine{\bgroup\markoverwith{\color{gray!55!paper}%
+\newcommand\subseculine{\bgroup\markoverwith{\color{maintext!27!paper}%
\rule[-1ex]{2pt}{.75pt}}\ULon}
\titleformat{\subsection}
{\LocallyStopLineNumbers%
\subsecfont}{}{0em}
- {\subseculine{\thesubsection~\textcolor{gray!55!paper}{$|$}~#1}}
+ {\subseculine{\thesubsection~\textcolor{maintext!27!paper}{$|$}~#1}}
[\ResumeLineNumbers]
\titleformat{name=\subsection,numberless}
{\LocallyStopLineNumbers%
@@ -368,12 +372,22 @@
\fi
%% Subsubsection
+\if at minimalist@runin
+\titleformat{\subsubsection}[runin]
+ {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
+ {#1.}[\hspace*{.3em}]
+\else
\titleformat{\subsubsection}
{\LocallyStopLineNumbers%
- \color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{.6em}
+ \color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
{#1}
[\ResumeLineNumbers]
+\fi
+%% Paragraph
+\titleformat{\paragraph}[runin]
+ {\scshape}{\theparagraph}{1em}{#1}
+
\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.2\baselineskip}
@@ -395,25 +409,25 @@
{\addvspace{.5pc}\normalfont}
{\contentslabel{2em}}
{\hspace*{-2em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
{\normalfont}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [7em] % i.e., 4em (section) + 3em
+ [6.5em] % i.e., 4em (section) + 2.5em
{\normalfont}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\contentslabel{2.25em}}
+ {\hspace*{-2.25em}}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [9em] % i.e., 7em (subsection) + 2em
+ [8.5em] % i.e., 6.5em (subsection) + 3em
{\normalfont}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
}{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
@@ -420,19 +434,19 @@
{\normalfont}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [5em] % i.e., 2em (section) + 3em
+ [4.5em] % i.e., 2em (section) + 2.5em
{\normalfont}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\contentslabel{2.25em}}
+ {\hspace*{-2.25em}}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [7em] % i.e., 5em (subsection) + 2em
+ [7.5em] % i.e., 4.5em (subsection) + 3em
{\normalfont}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
}
%%================================
@@ -440,9 +454,10 @@
%%================================
\RequirePackage{enumitem}
\setlist{noitemsep,leftmargin=2em}
-\renewcommand\labelitemi{\color{gray!50}$\bullet$}
-\renewcommand\labelitemii{\color{gray!55}--}
-\renewcommand\labelitemiii{\color{gray!55}\texttt{*}}
+\gappto{\PJLlang at langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}}
+\gappto{\PJLlang at langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}}
+\renewcommand\labelitemii{\textcolor{maintext!27}{--}}
+\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}}
%%================================
%% Blank page
@@ -455,7 +470,7 @@
\AddToHookNext{shipout/background}
{%
\put(0.5\paperwidth,-0.5\paperheight){%
- \makebox[0pt]{\large\color{gray!20!paper}\blinkpagetext}}}
+ \makebox[0pt]{\large\color{maintext!10!paper}\blinkpagetext}}}
\null\newpage\fi\fi}
%%================================
@@ -468,45 +483,33 @@
%%================================
\RequirePackage{amsthm}
\if at minimalist@classical
- \if at minimalist@allowbf
\newtheoremstyle{simple}%
{}{}%
{\normalfont}{}%
{\normalfont}{}%
{0pt}%
- {{\conditionalbfseries\sffamily\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
- {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
- \else
- \newcommand\thmuline{\bgroup\markoverwith{\color{gray!55!paper}%
- \rule[-.6ex]{2pt}{.5pt}}\ULon}
+ {{\conditionalbfseries\minimalist at 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}%
- {{\sffamily\thmuline{\thmname{\textsc{#1}}\thmnumber{ #2}}}\hspace{.4em}%
- {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
- \fi
-\else
-\def\simpleqedsymbol{%
- \makebox[1em]{\rlap{\textcolor{gray!25!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{gray!55!paper}{$|$}\hspace{.4em}%
- \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}%
- \pushQED{\qed}%
- }
-\def\@endtheorem{\popQED\endtrivlist\@endpefalse
-\global\let\qedsymbol\qedsymbolOriginal}
+ {\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{\popQED\endtrivlist\@endpefalse
+ \global\let\qedsymbol\qedsymbolOriginal}
\fi
\renewcommand{\qedsymbol}{%
- \makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
+ \makebox[1em]{\color{maintext!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbolOriginal\qedsymbol
\if at minimalist@fast
@@ -540,8 +543,8 @@
\pretocmd{\problemnameEN}{\textsc}{}{\FAIL}
\pretocmd{\questionnameEN}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameEN}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameEN}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameEN}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameEN}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameEN}{\itshape}{}{\FAIL}
%% Adjust French theorems names
\pretocmd{\theoremnameFR}{\textsc}{}{\FAIL}
@@ -561,8 +564,8 @@
\pretocmd{\problemnameFR}{\textsc}{}{\FAIL}
\pretocmd{\questionnameFR}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameFR}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameFR}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameFR}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameFR}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameFR}{\itshape}{}{\FAIL}
%% Adjust German theorems names
\pretocmd{\theoremnameDE}{\textsc}{}{\FAIL}
@@ -582,8 +585,8 @@
\pretocmd{\problemnameDE}{\textsc}{}{\FAIL}
\pretocmd{\questionnameDE}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameDE}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameDE}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameDE}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameDE}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameDE}{\itshape}{}{\FAIL}
%% Adjust Italian theorems names
\pretocmd{\theoremnameIT}{\textsc}{}{\FAIL}
@@ -603,8 +606,8 @@
\pretocmd{\problemnameIT}{\textsc}{}{\FAIL}
\pretocmd{\questionnameIT}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameIT}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameIT}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameIT}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameIT}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameIT}{\itshape}{}{\FAIL}
%% Adjust Portuguese theorems names
\pretocmd{\theoremnamePT}{\textsc}{}{\FAIL}
@@ -624,8 +627,8 @@
\pretocmd{\problemnamePT}{\textsc}{}{\FAIL}
\pretocmd{\questionnamePT}{\textsc}{}{\FAIL}
\pretocmd{\exercisenamePT}{\textsc}{}{\FAIL}
-\pretocmd{\remarknamePT}{\textsc}{}{\FAIL}
-\pretocmd{\observationnamePT}{\textsc}{}{\FAIL}
+\pretocmd{\remarknamePT}{\itshape}{}{\FAIL}
+\pretocmd{\observationnamePT}{\itshape}{}{\FAIL}
%% Adjust Brazilian theorems names
\pretocmd{\theoremnameBR}{\textsc}{}{\FAIL}
@@ -645,8 +648,8 @@
\pretocmd{\problemnameBR}{\textsc}{}{\FAIL}
\pretocmd{\questionnameBR}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameBR}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameBR}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameBR}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameBR}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameBR}{\itshape}{}{\FAIL}
%% Adjust Spanish theorems names
\pretocmd{\theoremnameES}{\textsc}{}{\FAIL}
@@ -666,8 +669,8 @@
\pretocmd{\problemnameES}{\textsc}{}{\FAIL}
\pretocmd{\questionnameES}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameES}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameES}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameES}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameES}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameES}{\itshape}{}{\FAIL}
%% Theorem environments
\theoremstyle{simple}
@@ -677,6 +680,17 @@
\newaliascnt{highest}{section}
}
\if at minimalist@nothms\else
+\if at minimalist@nothmnum
+\CreateTheorem*{theorem}
+\CreateTheorem*{lemma}
+\CreateTheorem*{proposition}
+\CreateTheorem*{corollary}
+\CreateTheorem*{definition-proposition}
+\CreateTheorem*{definition-theorem}
+\CreateTheorem*{property}
+\CreateTheorem*{fact}
+\CreateTheorem*{conjecture}
+\else
\CreateTheorem{theorem}<highest>
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
@@ -686,6 +700,7 @@
\CreateTheorem{property}[theorem]
\CreateTheorem{fact}[theorem]
\CreateTheorem{conjecture}[theorem]
+\fi
\CreateTheorem*{theorem*}
\CreateTheorem*{lemma*}
\CreateTheorem*{proposition*}
@@ -695,6 +710,18 @@
\CreateTheorem*{property*}
\CreateTheorem*{fact*}
\CreateTheorem*{conjecture*}
+\if at minimalist@nothmnum
+\CreateTheorem*{definition}
+\CreateTheorem*{axiom}
+\CreateTheorem*{assumption}
+\CreateTheorem*{convention}
+\CreateTheorem*{hypothesis}
+\CreateTheorem*{notation}
+\CreateTheorem*{example}
+\CreateTheorem*{problem}
+\CreateTheorem*{question}
+\CreateTheorem*{exercise}
+\else
\CreateTheorem{definition}[theorem]
\CreateTheorem{axiom}[theorem]
\CreateTheorem{assumption}[theorem]
@@ -705,6 +732,7 @@
\CreateTheorem{problem}[theorem]
\CreateTheorem{question}[theorem]
\CreateTheorem{exercise}[theorem]
+\fi
\CreateTheorem*{definition*}
\CreateTheorem*{axiom*}
\CreateTheorem*{assumption*}
@@ -715,14 +743,17 @@
\CreateTheorem*{problem*}
\CreateTheorem*{question*}
\CreateTheorem*{exercise*}
+\if at minimalist@nothmnum
+\CreateTheorem*{remark}
+\CreateTheorem*{observation}
+\else
\CreateTheorem{remark}<highest>
+\CreateTheorem{observation}<highest>
+\fi
\CreateTheorem*{remark*}
-\CreateTheorem{observation}<highest>
\CreateTheorem*{observation*}
\fi
-\setlength{\parindent}{2em}
-
\ifbool{IsBook}{}{%
%%================================
@@ -732,8 +763,8 @@
\renewcommand{\@maketitle}{%
\LocallyStopLineNumbers%
\begin{center}%
- {\conditionalbfseries\sffamily\large\@title}\\\bigskip%
- \color{black!80!paper}%
+ {\conditionalbfseries\minimalist at titlefontshape\large\@title}\\\bigskip%
+ \color{maintext!80!paper}%
{\small\scshape\@author}\\[2pt]%
{\small\@date}%
\end{center}%
@@ -745,12 +776,12 @@
\renewcommand{\@maketitle}{%
\LocallyStopLineNumbers%
\noindent%
- {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}}%
+ {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}}%
% \vspace{-\parskip}%
\vspace{-.5\baselineskip}%
\begin{flushright}%
{\conditionalbfseries\@title}\\\medskip%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
{\small\scshape\@author}%
\par\vspace{-\parskip}\vspace{2pt}%
{\small\@date}%
@@ -758,11 +789,12 @@
% \vspace{-\parskip}%
\vspace{-.5\baselineskip}%
\ifx\@date\@empty%
- \vspace{1.6\baselineskip}%
+ \vspace{\baselineskip}%
+ \vspace{1.2\parskip}%
\else%
\vspace{-.5\baselineskip}%
\fi%
- {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}\par}%
+ {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}\par}%
\ResumeLineNumbers%
}
\fi
@@ -780,7 +812,7 @@
\vspace{-.3\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
}{%
@@ -798,7 +830,7 @@
\vspace{-.25\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
}{%
@@ -829,7 +861,7 @@
\vspace{-.3\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
\begin{center}%
@@ -850,7 +882,7 @@
\vspace{-.30\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
\raggedleft%
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2021-06-23 19:44:08 UTC (rev 59685)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2021-06-23 19:44:27 UTC (rev 59686)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{minimart}
- [2021/06/07a A simple and clear article style]
+ [2021/06/23 A simple and clear article style]
\def\minimclass at baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -28,6 +28,8 @@
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{useindent}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -45,6 +47,9 @@
\if at minimclass@draft
\@minimclass at fasttrue
\fi
+\if at minimclass@classical
+ \@minimclass at useindenttrue
+\fi
\if at minimclass@palatino
\@minimclass at customfonttrue
\fi
@@ -93,9 +98,9 @@
\if at minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
-\if at minimclass@classical
+\if at minimclass@useindent
\RequirePackage{indentfirst}
\else
\AtEndPreamble{\RequirePackage{parskip}}
@@ -121,9 +126,10 @@
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if at minimclass@useosf\useosf\fi
\fi
\if at minimclass@times
@@ -133,11 +139,14 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if at minimclass@useosf\useosf\fi
\fi
\if at minimclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if at minimclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -149,6 +158,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if at minimclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum at family}
\else
@@ -157,7 +169,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if at minimclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -165,8 +178,12 @@
\def\PJL at font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -181,9 +198,10 @@
%%================================
%% Index
%%================================
-\RequirePackage{imakeidx}
-\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
-\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
+\AtEndPreamble{
+\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{}
+\apptocmd{\printindex}{\ResumeLineNumbers}{}{}
+}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2021-06-23 19:44:08 UTC (rev 59685)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2021-06-23 19:44:27 UTC (rev 59686)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{minimbook}
- [2021/06/07a A simple and clear book style]
+ [2021/06/23 A simple and clear book style]
\def\minimclass at baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -28,6 +28,8 @@
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{useindent}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -45,6 +47,9 @@
\if at minimclass@draft
\@minimclass at fasttrue
\fi
+\if at minimclass@classical
+ \@minimclass at useindenttrue
+\fi
\if at minimclass@palatino
\@minimclass at customfonttrue
\fi
@@ -93,9 +98,9 @@
\if at minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
-\if at minimclass@classical
+\if at minimclass@useindent
\RequirePackage{indentfirst}
\else
\AtEndPreamble{\RequirePackage{parskip}}
@@ -121,9 +126,10 @@
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if at minimclass@useosf\useosf\fi
\fi
\if at minimclass@times
@@ -133,11 +139,14 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if at minimclass@useosf\useosf\fi
\fi
\if at minimclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if at minimclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -149,6 +158,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if at minimclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum at family}
\else
@@ -157,7 +169,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if at minimclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -165,8 +178,12 @@
\def\PJL at font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -181,9 +198,10 @@
%%================================
%% Index
%%================================
-\RequirePackage{imakeidx}
-\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
-\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
+\AtEndPreamble{
+\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{}
+\apptocmd{\printindex}{\ResumeLineNumbers}{}{}
+}
\endinput
%%
More information about the tex-live-commits
mailing list.