1 files changed, 297 insertions, 193 deletions

diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
index 2648a34701c..12a4b334079 100644
--- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
+++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
@@ -17,22 +17,29 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{minimalist}
-    [2021/03/15 A simple and clear style for articles and books]
-\RequirePackage{etoolbox}
+    [2021/05/23 A simple and clear style for articles and books]
 \RequirePackage{kvoptions}
+\RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
     family = @minimalist,
     prefix = @minimalist@
 }
 \DeclareBoolOption[false]{draft}
 \DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{polyglossia}
+\DeclareBoolOption[false]{allowbf}
+\DeclareBoolOption[false]{classical}
 \ProcessKeyvalOptions*\relax
 
 \if@minimalist@draft
   \@minimalist@fasttrue
 \fi
 
+\if@minimalist@allowbf
+    \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!83!paper}}
+\else
+    \newcommand{\conditionalbfseries}{}
+\fi
+
 \newif\ifIsBook
 \ifdefined\chapter\IsBooktrue\else\IsBookfalse\fi
 
@@ -40,17 +47,24 @@
 %% Title fonts
 %%================================
 \RequirePackage{anyfontsize}
-\newcommand{\partfont}{\sffamily}
-\newcommand{\chapfont}{\sffamily}
-\newcommand{\secfont}{}
-\newcommand{\subsecfont}{}
-\newcommand{\subsubsecfont}{}
+\if@minimalist@classical
+\newcommand{\partfont}{\conditionalbfseries\sffamily}
+\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\secfont}{\conditionalbfseries\sffamily}
+\newcommand{\subsecfont}{\conditionalbfseries\sffamily}
+\newcommand{\subsubsecfont}{\conditionalbfseries\sffamily}
+\else
+\newcommand{\partfont}{\conditionalbfseries\sffamily}
+\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\secfont}{\conditionalbfseries}
+\newcommand{\subsecfont}{\conditionalbfseries}
+\newcommand{\subsubsecfont}{\conditionalbfseries}
+\fi
 
 %%================================
-%% Color
+%% Paper configuration
 %%================================
-\RequirePackage{xcolor}
-\definecolor{paper}{RGB}{255,255,255}
+\RequirePackage{PJLpaper}
 
 %%================================
 %% Footer
@@ -58,6 +72,7 @@
 \RequirePackage{geometry}
 \RequirePackage{fancyhdr}
 \RequirePackage{extramarks}
+\AtEndPreamble{\fancyhfoffset{0pt}}
 \fancypagestyle{fancy}{
     \fancyhf{}
     \if@twoside
@@ -128,8 +143,7 @@
         \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
     \fi
     \renewcommand*{\sectionmark}[1]{%
-        \markright{\raisebox{.03em}{\footnotesize/}%
-        ~\thesection~\raisebox{.03em}{\footnotesize/}~~~#1}}
+        \markright{\sec@decochar~\thesection~\sec@decochar~~~#1}}
 }{
     \if@twoside
         \renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{}}
@@ -137,11 +151,12 @@
         \renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
     \fi
 }
-%%===============================
+%%================================
 %% Line spacing
 %%================================
-\RequirePackage{setspace}
-\setstretch{1.07}
+\RequirePackage{PJLlang}
+\PJLsetlinespacing{\setstretch{1.07}}
+\PJLsetCJKlinespacing{\onehalfspacing}
 \raggedbottom
 
 %%================================
@@ -154,11 +169,12 @@
 
 \RequirePackage{mathtools}
 
+\ifdefined\linenomathpatch\else
 \newcommand*\linenomathpatch[1]{%
     \cspreto{#1}{\linenomath}%
     \cspreto{#1*}{\linenomath}%
-    \cspreto{end#1}{\endlinenomath}%
-    \cspreto{end#1*}{\endlinenomath}%
+    \csappto{end#1}{\endlinenomath}%
+    \csappto{end#1*}{\endlinenomath}%
 }
 \newcommand*\linenomathpatchAMS[1]{%
     \cspreto{#1}{\linenomathAMS}%
@@ -179,6 +195,7 @@
 \linenomathpatchAMS{align}
 \linenomathpatchAMS{alignat}
 \linenomathpatchAMS{flalign}
+\fi
 
 \newif\ifLNturnsON
 \def\LocallyStopLineNumbers{\LNturnsONfalse%
@@ -196,6 +213,20 @@
 \PassOptionsToPackage{normalem}{ulem}
 \RequirePackage{ulem}
 
+\newcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}
+\gappto{\PJLlang@langconfig@common}{%
+\renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}%
+}
+\gappto{\PJLlang@langconfig@chinese}{%
+\renewcommand{\partstring}{第~\thepart~部分}%
+}
+\gappto{\PJLlang@langconfig@tchinese}{%
+\renewcommand{\partstring}{第~\thepart~部分}%
+}
+\gappto{\PJLlang@langconfig@japanese}{%
+\renewcommand{\partstring}{第~\thepart~部}%
+}
+
 \ifbool{IsBook}{
     %% Part
     \titleclass{\part}{top} % make part like a chapter
@@ -203,7 +234,7 @@
         {\thispagestyle{part}%
         \LocallyStopLineNumbers%
         \partfont\filleft}
-        {\MakeUppercase{\partname~\protect\thepart}}
+        {\partstring}
         {1em}
         {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
         [\ResumeLineNumbers]
@@ -252,7 +283,7 @@
     \titleformat{\part}[display]
         {\LocallyStopLineNumbers%
         \partfont\filleft}
-        {\MakeUppercase{\partname~\protect\thepart}}
+        {\partstring}
         {.3em}
         {\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
         [\ResumeLineNumbers]
@@ -277,15 +308,25 @@
 }
 
 %% Section
+\renewcommand\thesection{\arabic{section}}
+\if@minimalist@classical
+\newcommand\sec@decochar{}
+\titleformat{\section}
+    {\LocallyStopLineNumbers%
+    \secfont\centering}
+    {\thesection}{.75em}
+    {#1}
+    [\ResumeLineNumbers]
+\else
 \newcommand\seculine{\bgroup\markoverwith{\color{gray!55!paper}%
     \rule[-0.9ex]{2pt}{.6pt}\hspace{-2pt}\rule[-1.2ex]{2pt}{.6pt}}\ULon}
-\renewcommand\thesection{\arabic{section}}
+\newcommand\sec@decochar{\raisebox{.03em}{\normalfont\footnotesize/}}
 \titleformat{\section}
     {\LocallyStopLineNumbers%
     \secfont\centering}{}{0em}
-    {{\small\textcolor{gray!55!paper}{\raisebox{.03em}{\footnotesize/}}%
-        \,\,\textcolor{black!80!paper}{\arabic{section}}%
-        \,\,\textcolor{gray!55!paper}{\raisebox{.03em}{\footnotesize/}}}\\
+    {{\small\textcolor{gray!55!paper}{\sec@decochar}%
+        \,\,\textcolor{black!90!paper}{\conditionalbfseries\arabic{section}}%
+        \,\,\textcolor{gray!55!paper}{\sec@decochar}}\\
         \seculine{#1}}
     [\ResumeLineNumbers]
 \titleformat{name=\section,numberless}
@@ -294,12 +335,21 @@
     \secfont\centering}{}{0em}
     {\seculine{#1}}
     [\ResumeLineNumbers]
+\fi
 
 %% Subsection
-\newcommand\subseculine{\bgroup\markoverwith{\color{gray!55!paper}%
-    \rule[-1ex]{2pt}{.75pt}}\ULon}
 \renewcommand\thesubsection{%
     \ifnum\c@section=0\else\arabic{section}.\fi\arabic{subsection}}
+\if@minimalist@classical
+\titleformat{\subsection}
+    {\LocallyStopLineNumbers%
+    \subsecfont}
+    {\thesubsection}{.75em}
+    {#1}
+    [\ResumeLineNumbers]
+\else
+\newcommand\subseculine{\bgroup\markoverwith{\color{gray!55!paper}%
+    \rule[-1ex]{2pt}{.75pt}}\ULon}
 \titleformat{\subsection}
     {\LocallyStopLineNumbers%
     \subsecfont}{}{0em}
@@ -310,22 +360,26 @@
     \subsecfont}{}{0em}
     {\subseculine{#1}}
     [\ResumeLineNumbers]
+\fi
 
 %% Subsubsection
 \titleformat{\subsubsection}
     {\LocallyStopLineNumbers%
-    \subsubsecfont}{\thesubsubsection}{1em}
+    \color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{1em}
     {#1}
     [\ResumeLineNumbers]
-\titlespacing{\subsubsection}{0pt}{.8\baselineskip}{.5\baselineskip}
+
+\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
+\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
+\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.2\baselineskip}
 
 %%================================
-%% TOC format
+%% ToC format
 %%================================
 \RequirePackage{titletoc}
 \titlecontents{part}
     [0em]
-    {\addvspace{1.5pc}\filcenter\partfont}
+    {\addvspace{1.5pc}\filcenter\normalfont}
     {\thecontentslabel\\\uppercase}
     {}
     {} % without page number
@@ -333,32 +387,32 @@
 \ifbool{IsBook}{
     \titlecontents{chapter}
         [2em] % i.e., 0em (part) + 2em
-        {\addvspace{.5pc}\chapfont}
+        {\addvspace{.5pc}\normalfont}
         {\contentslabel{2em}}
         {\hspace*{-2em}}
-        {\normalfont\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+        {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
     \titlecontents{section}
         [4em] % i.e., 2em (chapter) + 2em
-        {\secfont}
+        {\normalfont}
         {\contentslabel{1.75em}}
         {\hspace*{-1.75em}}
         {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
     \titlecontents{subsection}
         [7em] % i.e., 4em (section) + 3em
-        {\subsecfont}
+        {\normalfont}
         {\contentslabel{2.75em}}
         {\hspace*{-2.75em}}
         {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
 }{
     \titlecontents{section}
         [2em] % i.e., 0em (part) + 2em
-        {\secfont}
+        {\normalfont}
         {\contentslabel{1.75em}}
         {\hspace*{-1.75em}}
         {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
     \titlecontents{subsection}
         [5em] % i.e., 2em (section) + 3em
-        {\subsecfont}
+        {\normalfont}
         {\contentslabel{2.75em}}
         {\hspace*{-2.75em}}
         {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
@@ -370,6 +424,8 @@
 \RequirePackage{enumitem}
 \setlist{noitemsep,leftmargin=2em}
 \renewcommand\labelitemi{\color{gray!50}$\bullet$}
+\renewcommand\labelitemii{\color{gray!55}--}
+\renewcommand\labelitemiii{\color{gray!55}\texttt{*}}
 
 %%================================
 %% Blank page
@@ -386,136 +442,120 @@
     \null\newpage\fi\fi}
 
 %%================================
+%% Draft mark
+%%================================
+\RequirePackage{PJLdraft}
+
+%%================================
 %% Theorems
 %%================================
 \RequirePackage{amsthm}
+\if@minimalist@classical
+    \if@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}
+    \newtheoremstyle{simple}%
+        {}{}%
+        {\normalfont}{}%
+        {\normalfont}{}%
+        {0pt}%
+        {{\sffamily\thmuline{\thmname{\textsc{#1}}\thmnumber{ #2}}}\hspace{.4em}%
+            {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
+    \fi
+\else
 \newtheoremstyle{simple}%
     {}{}%
     {\normalfont}{}%
     {\normalfont}{}%
     {0pt}%
-    {\thmname{\textsc{#1}}\thmnumber{ #2}\hspace{.4em}%
+    {{\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 }
+\fi
 
 \renewcommand{\qedsymbol}{%
     \makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
 
-\if@minimalist@fast\else
+\if@minimalist@fast
+    \providecommand{\phantomsection}{}
+    \RequirePackage{url}
+    \newcommand{\href}[2]{#2}
+\else
     \PassOptionsToPackage{hidelinks,linktoc=all}{hyperref}
     \RequirePackage{bookmark}
     \RequirePackage{hyperref}
 \fi
-\RequirePackage{aliascnt}
-\PassOptionsToPackage{nameinlink}{cleveref}
-\RequirePackage{cleveref}
-
-\newcommand\englishABBR{EN}
-\newcommand\frenchABBR{FR}
-\newcommand\chineseABBR{CN}
-
-\RequirePackage{xstring}
-\newcommand\PassFirstToSecond[2]{#2{#1}}%
-\NewDocumentCommand{\CreateTheorem}{sm}{%
-    \begingroup
-    \protected@edef\temp{#2}%
-    \expandafter\IfEndWith\expandafter{\temp}{*}{%
-        \expandafter\StrGobbleRight\expandafter{\temp}{1}[\temp]%
-        \PassFirstToSecond{*}%
-    }{%
-        \PassFirstToSecond{}%
-    }%
-    {\expandafter\PassFirstToSecond%
-        \expandafter{\temp}{\endgroup\InnerCreateTheorem{#1}}}%
-}%
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>}{%
-    \IfBooleanTF{#1}{%
-        \IfValueTF{#4}
-            {\@firstoftwo}
-            {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}%
-    }{%
-        \IfValueTF{#4}
-            {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}{
-            \@secondoftwo}
-    }%
-    {%
-        \GenericError{}%
-        {\string\CreateTheorem\space syntax error\on@line}{%
-        You cannot call the starred variant with optional argument,\MessageBreak
-        nor call the unstarred variant with several optional arguments.}%
-        {}%
-    }{%
-        \IfBooleanTF{#1}{%
-            \newtheorem*{#2EN#3}{\csname#2nameEN\endcsname}
-            \newtheorem*{#2FR#3}{\csname#2nameFR\endcsname}
-            \newtheorem*{#2CN#3}{\csname#2nameCN\endcsname}
-        }{%
-            \IfValueTF{#5}{%
-                \newcounter{#2#3}[{#5}]%
-                \expandafter\renewcommand\expandafter*%
-                    \csname the#2#3\expandafter\endcsname%
-                    \expandafter{\csname the#5\endcsname.\arabic{#2#3}}%
-            }{%
-                \IfValueTF{#4}
-                    {\newaliascnt{#2#3}{#4}}
-                    {\newcounter{#2#3}}%
-            }%
-            %-------------------------------------------------------------------
-            \CreateTheoremNumberedLikeAliasCounter{#2}{EN}{#3}%
-            \CreateTheoremNumberedLikeAliasCounter{#2}{FR}{#3}%
-            \CreateTheoremNumberedLikeAliasCounter{#2}{CN}{#3}%
-            %-------------------------------------------------------------------
-        }%
-        \NewDocumentEnvironment{#2#3}{}
-            {\csname#2\csname\languagename ABBR\endcsname#3\endcsname}%
-            {\csname end#2\csname\languagename ABBR\endcsname#3\endcsname}%
-    }%
-}%
-\NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
-    \newaliascnt{#1#2#3}{#1#3}%
-    \newtheorem{#1#2#3}[{#1#2#3}]{\csname#1name#2\endcsname}%
-    \aliascntresetthe{#1#2#3}%
-    \crefname{#1#2#3}%
-        {\csname#1name#2\endcsname}%
-        {\csname#1name#2\endcsname}%
-}%
-
-%% English theorems names
+
+\RequirePackage[nothms]{PJLthm}
+
+%% Redefine English theorems names
 \def\theoremnameEN{\textsc{Theorem}}
 \def\lemmanameEN{\textsc{Lemma}}
 \def\propositionnameEN{\textsc{Proposition}}
 \def\corollarynameEN{\textsc{Corollary}}
+\def\propertynameEN{\textsc{Property}}
 \def\factnameEN{\textsc{Fact}}
 \def\conjecturenameEN{\textsc{Conjecture}}
 \def\definitionnameEN{\textsc{Definition}}
+\def\axiomnameEN{\textsc{Axiom}}
+\def\assumptionnameEN{\textsc{Assumption}}
+\def\conventionnameEN{\textsc{Convention}}
+\def\hypothesisnameEN{\textsc{Hypothesis}}
+\def\notationnameEN{\textsc{Notation}}
 \def\examplenameEN{\textsc{Example}}
 \def\problemnameEN{\textsc{Problem}}
+\def\questionnameEN{\textsc{Question}}
+\def\exercisenameEN{\textsc{Exercise}}
 \def\remarknameEN{\textsc{Remark}}
 
-%% French theorems names
+%% Redefine French theorems names
 \def\theoremnameFR{\textsc{Théorème}}
 \def\lemmanameFR{\textsc{Lemme}}
 \def\propositionnameFR{\textsc{Proposition}}
 \def\corollarynameFR{\textsc{Corollaire}}
+\def\propertynameFR{\textsc{Propriété}}
 \def\factnameFR{\textsc{Fait}}
 \def\conjecturenameFR{\textsc{Conjecture}}
 \def\definitionnameFR{\textsc{Définition}}
+\def\axiomnameFR{\textsc{Axiome}}
+\def\assumptionnameFR{\textsc{Supposition}}
+\def\conventionnameFR{\textsc{Convention}}
+\def\hypothesisnameFR{\textsc{Hypothèse}}
+\def\notationnameFR{\textsc{Notation}}
 \def\examplenameFR{\textsc{Exemple}}
 \def\problemnameFR{\textsc{Problème}}
+\def\questionnameFR{\textsc{Question}}
+\def\exercisenameFR{\textsc{Exercice}}
 \def\remarknameFR{\textsc{Remarque}}
 
-%% Chinese theorems names
-\def\theoremnameCN{定理}
-\def\lemmanameCN{引理}
-\def\propositionnameCN{命题}
-\def\corollarynameCN{推论}
-\def\factnameCN{事实}
-\def\conjecturenameCN{猜想}
-\def\definitionnameCN{定义}
-\def\examplenameCN{例}
-\def\problemnameCN{问题}
-\def\remarknameCN{备注}
+%% Redefine German theorems names
+\def\theoremnameDE{\textsc{Satz}}
+\def\lemmanameDE{\textsc{Lemma}}
+\def\propositionnameDE{\textsc{Proposition}}
+\def\corollarynameDE{\textsc{Korollar}}
+\def\propertynameDE{\textsc{Eigenschaft}}
+\def\factnameDE{\textsc{Fakt}}
+\def\conjecturenameDE{\textsc{Vermutung}}
+\def\definitionnameDE{\textsc{Definition}}
+\def\axiomnameDE{\textsc{Axiom}}
+\def\assumptionnameDE{\textsc{Annahme}}
+\def\conventionnameDE{\textsc{Konvention}}
+\def\hypothesisnameDE{\textsc{Hypothese}}
+\def\notationnameDE{\textsc{Notation}}
+\def\examplenameDE{\textsc{Beispiel}}
+\def\problemnameDE{\textsc{Problem}}
+\def\questionnameDE{\textsc{Frage}}
+\def\exercisenameDE{\textsc{Übung}}
+\def\remarknameDE{\textsc{Bemerkung}}
 
 %% Theorem environments
 \theoremstyle{simple}
@@ -528,113 +568,117 @@
 \CreateTheorem{lemma}[theorem]
 \CreateTheorem{proposition}[theorem]
 \CreateTheorem{corollary}[theorem]
+\CreateTheorem{definition-proposition}[theorem]
+\CreateTheorem{definition-theorem}[theorem]
+\CreateTheorem{property}[theorem]
 \CreateTheorem{fact}[theorem]
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{conjecture}[theorem]
 \CreateTheorem*{theorem*}
 \CreateTheorem*{lemma*}
 \CreateTheorem*{proposition*}
 \CreateTheorem*{corollary*}
+\CreateTheorem*{definition-proposition*}
+\CreateTheorem*{definition-theorem*}
+\CreateTheorem*{property*}
 \CreateTheorem*{fact*}
 \CreateTheorem*{conjecture*}
 \CreateTheorem{definition}[theorem]
-\CreateTheorem{example}<highest>
-\CreateTheorem{problem}<highest>
+\CreateTheorem{axiom}[theorem]
+\CreateTheorem{assumption}[theorem]
+\CreateTheorem{convention}[theorem]
+\CreateTheorem{hypothesis}[theorem]
+\CreateTheorem{notation}[theorem]
+\CreateTheorem{example}[theorem]
+\CreateTheorem{problem}[theorem]
+\CreateTheorem{question}[theorem]
+\CreateTheorem{exercise}[theorem]
 \CreateTheorem*{definition*}
+\CreateTheorem*{axiom*}
+\CreateTheorem*{assumption*}
+\CreateTheorem*{convention*}
+\CreateTheorem*{hypothesis*}
+\CreateTheorem*{notation*}
 \CreateTheorem*{example*}
 \CreateTheorem*{problem*}
+\CreateTheorem*{question*}
+\CreateTheorem*{exercise*}
 \CreateTheorem{remark}<highest>
 \CreateTheorem*{remark*}
 
-%%================================
-%% Language configuration
-%%================================
-\if@minimalist@polyglossia
-    \RequirePackage{polyglossia}
-    \setdefaultlanguage{english}
-    \setotherlanguage[frenchpart=false]{french}
-\else
-    \PassOptionsToPackage{french,english}{babel}
-    \RequirePackage{babel}
-    \frenchsetup{PartNameFull=false}
-\fi
-\newcommand{\minimalist@langconfig@chinese}{%
-    \def\abstractname{摘要}%
-    \def\proofname{证明}%
-    \def\contentsname{目录}%
-    \def\listfigurename{插图}%
-    \def\listtablename{表格}%
-    \def\figurename{图}%
-    \def\tablename{表}%
-    \def\indexname{索引}%
-    \def\appendixname{附录}%
-    \def\bibname{参考文献}%
-    \renewcommand{\languagename}{chinese}%
-}
-\newcommand{\minimalist@langconfig@english}{%
-    \selectlanguage{english}%
-}
-\newcommand{\minimalist@langconfig@french}{%
-    \selectlanguage{french}%
-    \def\frenchpartname{Partie}%
-}
-\newcommand{\UseLanguageCORE}[1]{%
-    \ifstrequal{#1}{chinese}{\onehalfspacing\minimalist@langconfig@chinese}{}%
-    \ifstrequal{#1}{Chinese}{\onehalfspacing\minimalist@langconfig@chinese}{}%
-    \ifstrequal{#1}{english}{\setstretch{1.07}\minimalist@langconfig@english}{}%
-    \ifstrequal{#1}{English}{\setstretch{1.07}\minimalist@langconfig@english}{}%
-    \ifstrequal{#1}{french}{\setstretch{1.07}\minimalist@langconfig@french}{}%
-    \ifstrequal{#1}{French}{\setstretch{1.07}\minimalist@langconfig@french}{}%
-}
-\newcommand{\UseLanguage}[1]{%
-    \ifx\@onlypreamble\@notprerr%
-        \UseLanguageCORE{#1}%
-    \else%
-        \AfterEndPreamble{\UseLanguageCORE{#1}}%
-    \fi%
-}
-\newcommand{\UseOtherLanguage}[2]{%
-\begingroup%
-    \ifstrequal{#1}{chinese}{\minimalist@langconfig@chinese}{}%
-    \ifstrequal{#1}{Chinese}{\minimalist@langconfig@chinese}{}%
-    \ifstrequal{#1}{english}{\minimalist@langconfig@english}{}%
-    \ifstrequal{#1}{English}{\minimalist@langconfig@english}{}%
-    \ifstrequal{#1}{french}{\minimalist@langconfig@french}{}%
-    \ifstrequal{#1}{French}{\minimalist@langconfig@french}{}%
-    #2%
-\endgroup%
-}
+\setlength{\parindent}{2em}
 
-\ifbool{IsBook}{}{
+\ifbool{IsBook}{}{%
 
 %%================================
 %% Title block style
 %%================================
+\if@minimalist@classical
+\renewcommand{\@maketitle}{%
+    \LocallyStopLineNumbers%
+    \begin{center}%
+        {\conditionalbfseries\sffamily\large\@title}\\\bigskip%
+        \color{black!80!paper}%
+        {\small\scshape\@author}\\[2pt]%
+        {\small\@date}%
+    \end{center}%
+    \bigskip\par%
+    \ResumeLineNumbers%
+}
+\else
 \renewcommand{\@maketitle}{%
     \LocallyStopLineNumbers%
     \noindent%
     {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}}%
-    \vspace{-\parskip}%
+    % \vspace{-\parskip}%
+    \vspace{-.5\baselineskip}%
     \begin{flushright}%
-        {\@title}\\\medskip%
+        {\conditionalbfseries\@title}\\\medskip%
         \color{black!80!paper}%
-        {\small\scshape\@author}\\[2pt]%
+        {\small\scshape\@author}%
+        \par\vspace{-\parskip}\vspace{2pt}%
         {\small\@date}%
     \end{flushright}%
-    \vspace{-\parskip}%
+    % \vspace{-\parskip}%
     \vspace{-.5\baselineskip}%
+    \ifx\@date\@empty%
+        \vspace{-.2\baselineskip}%
+    \else%
+        \vspace{-.5\baselineskip}%
+    \fi%
     {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}\par}%
     \ResumeLineNumbers%
 }
+\fi
 \apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL}
 
 %%================================
 %% Abstract style
 %%================================
+\if@minimalist@classical
+\renewenvironment{abstract}{%
+    \LocallyStopLineNumbers%
+    \vspace{-\baselineskip}%
+    \begin{center}%
+        \textsc{\conditionalbfseries\small\abstractname}\\%
+        \vspace{-.3\baselineskip}%
+        \begin{minipage}[t]{.833\textwidth}%
+            \vspace{0pt}%
+            \color{black!80!paper}%
+            \footnotesize%
+            \parindent=2em
+}{%
+        \end{minipage}%
+    \end{center}%
+    \medskip%
+    \ResumeLineNumbers%
+}
+\else
 \renewenvironment{abstract}{%
     \LocallyStopLineNumbers%
     \begin{flushright}%
-        \textsc{\small\abstractname}\par%
-        \vspace{-.75\baselineskip}%
+        \textsc{\conditionalbfseries\small\abstractname}\par%
+        \vspace{-\parskip}%
+        \vspace{-.25\baselineskip}%
         \begin{minipage}[t]{.833\textwidth}%
             \vspace{0pt}%
             \color{black!80!paper}%
@@ -643,8 +687,68 @@
 }{%
         \end{minipage}%
     \end{flushright}%
+    \bigskip%
     \ResumeLineNumbers%
 }
+\fi
+
+%%================================
+%% Keyword environment
+%%================================
+\def\keywordnameEN{\textsc{Keywords}}
+\def\keywordnameFR{\textsc{Mots clés}}
+\def\keywordnameDE{\textsc{Schlüsselwörter}}
+\def\keywordnameCN{关键词}
+\def\keywordnameTC{關鍵詞}
+\def\keywordnameJP{キーワード}
+\def\keywordnameRU{Ключевые слова}
+
+\if@minimalist@classical
+\newenvironment{keyword}{%
+    \LocallyStopLineNumbers%
+    \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{black!80!paper}%
+            \footnotesize%
+            \parindent=2em
+            \begin{center}%
+}{%
+            \end{center}%
+        \end{minipage}%
+    \end{center}%
+    \medskip%
+    \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}%
+        \begin{minipage}[t]{.833\textwidth}%
+            \vspace{0pt}%
+            \color{black!80!paper}%
+            \footnotesize%
+            \parindent=2em
+            \raggedleft%
+}{%
+        \end{minipage}%
+    \end{flushright}%
+    \bigskip%
+    \ResumeLineNumbers%
+}
+\fi
+
+%%================================
+%% Simulate features of amsart
+%%================================
+\RequirePackage{PJLamssim}
 
 }