projlib (27jul21)

git-svn-id: svn://tug.org/texlive/trunk@60092 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 180 insertions, 340 deletions

diff --git a/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty b/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty
deleted file mode 100644
index 89fecc6d8a5..00000000000
--- a/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty
+++ /dev/null
@@ -1,166 +0,0 @@
-%%
-%% This is file `PJLamssim.sty',
-%% generated with the docstrip utility.
-
-%% Copyright (C) 2021 by Jinwen XU
-%% 
-%% This is part of the ProjLib Toolkit.
-%% 
-%% This work may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License, either version 1.3c of this license or (at
-%% your option) any later version. The latest version of this license is in
-%% 
-%%     http://www.latex-project.org/lppl.txt
-%% 
-%% and version 1.3c or later is part of all distributions of LaTeX version
-%% 2005/12/01 or later.
-%% 
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesPackage{PJLamssim}
-    [2021/07/23 Simulate some features of amsart]
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\ifdefined\subjclass\endinput\fi
-
-\RequirePackage{PJLauthor}
-\RequirePackage{calc}
-
-\providecommand{\conditionalbfseries}{\bfseries}
-
-\def\keywordsnameEN{\textsc{Key words and phrases}}
-\def\keywordsnameFR{\textsc{Mots et phrases clés}}
-\def\keywordsnameDE{\textsc{Schlüsselwörter und Phrasen}}
-\def\keywordsnameIT{\textsc{Parole e frasi chiave}}
-\def\keywordsnamePT{\textsc{Palavras e frases chave}}
-\def\keywordsnameBR{\textsc{Palavras e frases chave}}
-\def\keywordsnameES{\textsc{Palabras y frases clave}}
-\def\keywordsnameCN{关键词}
-\def\keywordsnameTC{關鍵詞}
-\def\keywordsnameJP{キーワード}
-\def\keywordsnameRU{Ключевые слова и фразы}
-
-\def\PJL@keywords{}
-\providecommand*{\keywords}[1]{\def\PJL@keywords{#1}}
-
-\def\PJL@dedicatory{}
-\providecommand*{\dedicatory}[1]{\def\PJL@dedicatory{#1}}
-
-\AtEndPreamble{
-\let\footnotemark@PJLoriginal\footnotemark%
-\let\footnotemark\relax%
-\let\thanks@PJLoriginal\thanks%
-\newlength\PJL@starlength
-\setlength{\PJL@starlength}{\widthof{*}}
-\newcommand*{\PJL@prethanks}[1]{\thanks@PJLoriginal{\hspace*{-\PJL@starlength}#1}}
-\renewcommand*{\thanks}[1]{%
-    \ifx#1\@empty\else%
-        \apptocmd{\@title}{%
-            \thanks@PJLoriginal{\hspace*{-\PJL@starlength}#1}%
-        }{}{\FAIL}%
-    \fi}
-\let\author@PJLoriginal\author
-\renewcommand{\author}[1]{%
-    \author@PJLoriginal{%
-        \let\footnotemark\footnotemark@PJLoriginal%
-        \let\thanks\thanks@PJLoriginal%
-        #1%
-        \let\footnotemark\relax%
-    }%
-}
-}
-
-\let\abstract@PJLoriginal\abstract%
-\let\endabstract@PJLoriginal\endabstract%
-\newif\if@PJLamssim@maketitle\@PJLamssim@maketitlefalse
-\newif\if@PJLamssim@absbefore\@PJLamssim@absbeforefalse
-\RequirePackage{fancyvrb}
-\providecommand*\protected@iwrite[3]{%
-  \begingroup
-  \let\thepage\relax
-  #2%
-  \let\protect\@unexpandable@protect
-  \edef\reserved@a{\immediate\write#1{#3}}\reserved@a
-  \endgroup
-  \if@nobreak\ifvmode\nobreak\fi\fi
-}
-\patchcmd{\FVB@VerbatimOut}
-  {\immediate\write\FV@OutFile}
-  {\protected@iwrite\FV@OutFile{}}
-  {}{}
-\renewenvironment{abstract}{%
-    \VerbatimOut{\jobname.pjlabs}%
-}{
-    \endVerbatimOut%
-    \if@PJLamssim@maketitle%
-        \begin{abstract@PJLoriginal}%
-            \input{\jobname.pjlabs}%
-        \end{abstract@PJLoriginal}%
-        % \ifx\PJL@keywords\@empty\else%
-        %     \par\smallskip\noindent{\conditionalbfseries\csname keywordsname\csname\languagename ABBR\endcsname\endcsname.}~\PJL@keywords%
-        % \fi%
-    \else%
-        \global\@PJLamssim@absbeforetrue%
-    \fi%
-}
-
-\AtEndPreamble{%
-\patchcmd{\@maketitle}{\@date}{%
-    \ifx\@date\@empty\vspace{-2\baselineskip}%
-    \else\@date\fi%
-    \ifx\PJL@dedicatory\@empty\else%
-        \ifx\@date\@empty\vspace{2\baselineskip}\fi%
-        \par\vspace{-\parskip}\bigskip%
-        {\itshape\PJL@dedicatory}%
-        \ifx\@date\@empty%
-            \vspace{-1.7\baselineskip}%
-            \vspace{-\parskip}%
-        \fi%
-    \fi%
-}{}{\FAIL}
-\pretocmd{\maketitle}{%
-    \ifx\PJL@keywords\@empty\else%
-    \PJL@prethanks{{\protect\conditionalbfseries%
-    \csname keywordsname\csname\languagename ABBR\endcsname\endcsname.}%
-    ~\PJL@keywords}%
-    \fi}{}{\FAIL}
-\apptocmd{\maketitle}{%
-    \if@PJLamssim@absbefore%
-        \begin{abstract@PJLoriginal}%
-            \input{\jobname.pjlabs}%
-            % \ifx\PJL@keywords\@empty\else%
-            %     \par\smallskip\noindent{\conditionalbfseries\csname keywordsname\csname\languagename ABBR\endcsname\endcsname.}~\PJL@keywords%
-            % \fi%
-        \end{abstract@PJLoriginal}%
-    \fi%
-    \global\let\address\relax
-    \global\let\curraddr\relax
-    \global\let\email\relax
-    \global\let\dedicatory\relax
-    \global\let\keywords\relax
-    \global\@PJLamssim@maketitletrue
-}{}{\FAIL}
-}
-
-\newcommand*\subjclass[2][2020]{%
-    \def\@subjclass{#2}%
-    \@ifundefined{subjclassname@#1}{%
-        \ClassWarning{\@currname}{Unknown edition (#1) of Mathematics
-        Subject Classification; using '2020'}%
-        \expandafter\let\expandafter\subjclassname\csname subjclassname@2020\endcsname
-    }{%
-        \expandafter\let\expandafter\subjclassname\csname subjclassname@#1\endcsname
-    }%
-    \PJL@prethanks{{\itshape\subjclassname.}\enspace\@subjclass{}.}
-}
-\@namedef{subjclassname@1991}{%
-  \textup{1991} Mathematics Subject Classification}
-\@namedef{subjclassname@2000}{%
-  \textup{2000} Mathematics Subject Classification}
-\@namedef{subjclassname@2010}{%
-  \textup{2010} Mathematics Subject Classification}
-\@namedef{subjclassname@2020}{%
-  \textup{2020} Mathematics Subject Classification}
-
-\endinput
-%%
-%% End of file `PJLamssim.sty'.
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
index f538048781c..37375470e05 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
@@ -17,11 +17,18 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLauthor}
-    [2021/07/23 Enhanced author information block]
+    [2021/07/27 Enhanced author information block]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \ifdefined\subjclass\endinput\fi
 
+\SetupKeyvalOptions{
+    family = @PJLauthor,
+    prefix = @PJLauthor@,
+}
+\DeclareBoolOption[false]{amsfashion}
+\ProcessKeyvalOptions*\relax
+
 %%================================
 %% Font and style
 %%================================
@@ -90,6 +97,149 @@
     }{}{\FAIL}%
 }{}{\FAIL}
 
+\if@PJLauthor@amsfashion
+
+\RequirePackage{PJLlang}
+\RequirePackage{calc}
+
+\providecommand{\conditionalbfseries}{\bfseries}
+
+\def\keywordsnameEN{\textsc{Key words and phrases}}
+\def\keywordsnameFR{\textsc{Mots et phrases clés}}
+\def\keywordsnameDE{\textsc{Schlüsselwörter und Phrasen}}
+\def\keywordsnameIT{\textsc{Parole e frasi chiave}}
+\def\keywordsnamePT{\textsc{Palavras e frases chave}}
+\def\keywordsnameBR{\textsc{Palavras e frases chave}}
+\def\keywordsnameES{\textsc{Palabras y frases clave}}
+\def\keywordsnameCN{关键词}
+\def\keywordsnameTC{關鍵詞}
+\def\keywordsnameJP{キーワード}
+\def\keywordsnameRU{Ключевые слова и фразы}
+
+\def\PJL@keywords{}
+\providecommand*{\keywords}[1]{\def\PJL@keywords{#1}}
+
+\def\PJL@dedicatory{}
+\providecommand*{\dedicatory}[1]{\def\PJL@dedicatory{#1}}
+
+\AtEndPreamble{
+\let\footnotemark@PJLoriginal\footnotemark%
+\let\footnotemark\relax%
+\let\thanks@PJLoriginal\thanks%
+\newlength\PJL@starlength
+\setlength{\PJL@starlength}{\widthof{*}}
+\newcommand*{\PJL@prethanks}[1]{\thanks@PJLoriginal{\hspace*{-\PJL@starlength}#1}}
+\renewcommand*{\thanks}[1]{%
+    \ifx#1\@empty\else%
+        \apptocmd{\@title}{%
+            \thanks@PJLoriginal{\hspace*{-\PJL@starlength}#1}%
+        }{}{\FAIL}%
+    \fi}
+\let\author@PJLoriginal\author
+\renewcommand{\author}[1]{%
+    \author@PJLoriginal{%
+        \let\footnotemark\footnotemark@PJLoriginal%
+        \let\thanks\thanks@PJLoriginal%
+        #1%
+        \let\footnotemark\relax%
+    }%
+}
+}
+
+\let\abstract@PJLoriginal\abstract%
+\let\endabstract@PJLoriginal\endabstract%
+\newif\if@PJLamssim@maketitle\@PJLamssim@maketitlefalse
+\newif\if@PJLamssim@absbefore\@PJLamssim@absbeforefalse
+\RequirePackage{fancyvrb}
+\providecommand*\protected@iwrite[3]{%
+  \begingroup
+  \let\thepage\relax
+  #2%
+  \let\protect\@unexpandable@protect
+  \edef\reserved@a{\immediate\write#1{#3}}\reserved@a
+  \endgroup
+  \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\patchcmd{\FVB@VerbatimOut}
+  {\immediate\write\FV@OutFile}
+  {\protected@iwrite\FV@OutFile{}}
+  {}{}
+\renewenvironment{abstract}{%
+    \VerbatimOut{\jobname.pjlabs}%
+}{
+    \endVerbatimOut%
+    \if@PJLamssim@maketitle%
+        \begin{abstract@PJLoriginal}%
+            \input{\jobname.pjlabs}%
+        \end{abstract@PJLoriginal}%
+        % \ifx\PJL@keywords\@empty\else%
+        %     \par\smallskip\noindent{\conditionalbfseries\csname keywordsname\csname\languagename ABBR\endcsname\endcsname.}~\PJL@keywords%
+        % \fi%
+    \else%
+        \global\@PJLamssim@absbeforetrue%
+    \fi%
+}
+
+\AtEndPreamble{%
+\patchcmd{\@maketitle}{\@date}{%
+    \ifx\@date\@empty\vspace{-2\baselineskip}%
+    \else\@date\fi%
+    \ifx\PJL@dedicatory\@empty\else%
+        \ifx\@date\@empty\vspace{2\baselineskip}\fi%
+        \par\vspace{-\parskip}\bigskip%
+        {\itshape\PJL@dedicatory}%
+        \ifx\@date\@empty%
+            \vspace{-1.7\baselineskip}%
+            \vspace{-\parskip}%
+        \fi%
+    \fi%
+}{}{\FAIL}
+\pretocmd{\maketitle}{%
+    \ifx\PJL@keywords\@empty\else%
+    \PJL@prethanks{{\protect\conditionalbfseries%
+    \csname keywordsname\csname\languagename ABBR\endcsname\endcsname.}%
+    ~\PJL@keywords}%
+    \fi}{}{\FAIL}
+\apptocmd{\maketitle}{%
+    \if@PJLamssim@absbefore%
+        \begin{abstract@PJLoriginal}%
+            \input{\jobname.pjlabs}%
+            % \ifx\PJL@keywords\@empty\else%
+            %     \par\smallskip\noindent{\conditionalbfseries\csname keywordsname\csname\languagename ABBR\endcsname\endcsname.}~\PJL@keywords%
+            % \fi%
+        \end{abstract@PJLoriginal}%
+    \fi%
+    \global\let\address\relax
+    \global\let\curraddr\relax
+    \global\let\email\relax
+    \global\let\dedicatory\relax
+    \global\let\keywords\relax
+    \global\@PJLamssim@maketitletrue
+}{}{\FAIL}
+}
+
+\newcommand*\subjclass[2][2020]{%
+    \def\@subjclass{#2}%
+    \@ifundefined{subjclassname@#1}{%
+        \ClassWarning{\@currname}{Unknown edition (#1) of Mathematics
+        Subject Classification; using '2020'}%
+        \expandafter\let\expandafter\subjclassname\csname subjclassname@2020\endcsname
+    }{%
+        \expandafter\let\expandafter\subjclassname\csname subjclassname@#1\endcsname
+    }%
+    \PJL@prethanks{{\itshape\subjclassname.}\enspace\@subjclass{}.}
+}
+\@namedef{subjclassname@1991}{%
+  \textup{1991} Mathematics Subject Classification}
+\@namedef{subjclassname@2000}{%
+  \textup{2000} Mathematics Subject Classification}
+\@namedef{subjclassname@2010}{%
+  \textup{2010} Mathematics Subject Classification}
+\@namedef{subjclassname@2020}{%
+  \textup{2020} Mathematics Subject Classification}
+
+\fi
+
 \endinput
 %%
 %% End of file `PJLauthor.sty'.
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLdate.sty b/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
index ca34721f997..5d18eb54348 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLdate}
-    [2021/07/23 Convert yyyy-mm-dd to normal datetime format]
+    [2021/07/27 Convert yyyy-mm-dd to normal datetime format]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty b/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
index ec8d5897f0b..7495eb199b7 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLdraft}
-    [2021/07/23 Some useful macros for the draft stage]
+    [2021/07/27 Some useful macros for the draft stage]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlang.sty b/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
index fde720894d0..55d9e18c8f3 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLlang}
-    [2021/07/23 Multi-language configuration]
+    [2021/07/27 Multi-language configuration]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
index 3d2069b4cd5..cd4801f1400 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLlogo}
-    [2021/07/23 The ProjLib logo]
+    [2021/07/27 The ProjLib logo]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLmath.sty b/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
index 885698b50a1..2efa17c67e7 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLmath}
-    [2021/07/23 Useful math macros and shortcuts]
+    [2021/07/27 Useful math macros and shortcuts]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \RequirePackage{mathtools}
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty b/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
index 275409eca09..04bf6082170 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLpaper}
-    [2021/07/23 Paper style configuration]
+    [2021/07/27 Paper style configuration]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLthm.sty b/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
index 0c19be81cc6..bd9fb06472a 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{PJLthm}
-    [2021/07/23 Theorem setup and configuration]
+    [2021/07/27 Theorem setup and configuration]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty b/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty
deleted file mode 100644
index a9b83beaa6a..00000000000
--- a/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty
+++ /dev/null
@@ -1,141 +0,0 @@
-%%
-%% This is file `PJLtoolkit.sty',
-%% generated with the docstrip utility.
-
-%% Copyright (C) 2021 by Jinwen XU
-%% 
-%% This is part of the ProjLib Toolkit.
-%% 
-%% This work may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License, either version 1.3c of this license or (at
-%% your option) any later version. The latest version of this license is in
-%% 
-%%     http://www.latex-project.org/lppl.txt
-%% 
-%% and version 1.3c or later is part of all distributions of LaTeX version
-%% 2005/12/01 or later.
-%% 
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesPackage{PJLtoolkit}
-    [2021/07/23 Collective interface of ProjLib Toolkit]
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{
-    family = @PJLtoolkit,
-    prefix = @PJLtoolkit@,
-}
-\DeclareBoolOption[false]{draft}
-\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{author}
-\DeclareBoolOption[false]{amsfashion}
-\DeclareBoolOption[false]{amssim}
-\DeclareBoolOption[false]{nothms}
-\DeclareBoolOption[false]{nothmnum}
-\DeclareBoolOption[false]{regionalref}
-\DeclareBoolOption[false]{useosf}
-\DeclareBoolOption[false]{palatino}
-\DeclareBoolOption[false]{times}
-\DeclareBoolOption[false]{garamond}
-\DeclareBoolOption[false]{biolinum}
-\ProcessKeyvalOptions*\relax
-
-\if@PJLtoolkit@draft
-    \@PJLtoolkit@fasttrue
-\fi
-\if@PJLtoolkit@amsfashion
-    \@PJLtoolkit@amssimtrue
-\fi
-
-\if@PJLtoolkit@fast
-    \PassOptionsToPackage{fast}{PJLdate}
-    \PassOptionsToPackage{fast}{PJLdraft}
-    \PassOptionsToPackage{fast}{PJLlogo}
-    \PassOptionsToPackage{fast}{PJLthm}
-\fi
-\if@PJLtoolkit@nothms
-    \PassOptionsToPackage{nothms}{PJLthm}
-\fi
-\if@PJLtoolkit@nothmnum
-    \PassOptionsToPackage{nothmnum}{PJLthm}
-\fi
-\if@PJLtoolkit@regionalref
-    \PassOptionsToPackage{regionalref}{PJLthm}
-\fi
-
-\if@PJLtoolkit@author
-    \RequirePackage{PJLauthor}
-\fi
-\if@PJLtoolkit@amssim
-    \RequirePackage{PJLamssim}
-\fi
-\RequirePackage{PJLdate}
-\RequirePackage{PJLdraft}
-\RequirePackage{PJLlogo}
-\RequirePackage{PJLmath}
-\RequirePackage{PJLpaper}
-\RequirePackage{PJLthm}
-
-\ifdefined\PJL@font@alreadyset\else
-
-\if@PJLtoolkit@palatino
-    % \RequirePackage{amssymb}
-    \RequirePackage{mathpazo}
-    \PassOptionsToPackage{defaultsups}{newpxtext}
-    \RequirePackage{newpxtext}
-    % \RequirePackage{newpxmath}
-    \let\openbox\relax
-    \PJLsetlinespacing{\setstretch{1.07}}
-    \if@PJLtoolkit@useosf\useosf\fi
-\fi
-
-\if@PJLtoolkit@times
-    % \RequirePackage{amssymb}
-    \PassOptionsToPackage{defaultsups}{newtxtext}
-    \RequirePackage{newtxtext}
-    \RequirePackage{newtxmath}
-    \let\openbox\relax
-    \PJLsetlinespacing{\setstretch{1.00}}
-    \if@PJLtoolkit@useosf\useosf\fi
-\fi
-
-\if@PJLtoolkit@garamond
-    % \RequirePackage{amssymb}
-    \if@PJLtoolkit@useosf\else
-        \PassOptionsToPackage{lining}{ebgaramond}
-    \fi
-    \RequirePackage{ebgaramond-maths}
-    \RequirePackage{ebgaramond}
-    % \RequirePackage{garamondlibre}
-    \PJLsetlinespacing{\setstretch{1.00}}
-\fi
-
-\if@PJLtoolkit@biolinum
-    % \RequirePackage{amssymb}
-    % \RequirePackage{mathpazo}
-    % \RequirePackage[sansmath]{libertinust1math}
-    \ifPDFTeX
-        \if@PJLtoolkit@useosf
-            \PassOptionsToPackage{osf}{biolinum}
-        \fi
-        \RequirePackage{biolinum}
-        \renewcommand*\familydefault{\biolinum@family}
-    \else
-        \PassOptionsToPackage{no-math}{fontspec}
-        \RequirePackage{fontspec}
-        \setmainfont{LinBiolinum_R.otf}[
-            BoldFont       = LinBiolinum_RB.otf ,
-            ItalicFont     = LinBiolinum_RI.otf ,
-            BoldItalicFont = LinBiolinum_RBO.otf,
-            \if@PJLtoolkit@useosf Numbers = OldStyle\fi ]
-    \fi
-    \PJLsetlinespacing{\setstretch{1.05}}
-    \RequirePackage[italic,defaultmathsizes]{mathastext}
-\fi
-
-\fi
-
-\RequirePackage{microtype}
-
-\endinput
-%%
-%% End of file `PJLtoolkit.sty'.
diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
index 1a978d4d478..041ef32ba4f 100644
--- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
+++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
@@ -17,18 +17,17 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{ProjLib}
-    [2021/07/23 The collective interface of ProjLib toolkit]
+    [2021/07/27 The collective interface of ProjLib toolkit]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{
-    family = @PJLtoolkit,
-    prefix = @PJLtoolkit@,
+    family = @ProjLib,
+    prefix = @ProjLib@,
 }
 \DeclareBoolOption[false]{draft}
 \DeclareBoolOption[false]{fast}
 \DeclareBoolOption[false]{author}
 \DeclareBoolOption[false]{amsfashion}
-\DeclareBoolOption[false]{amssim}
 \DeclareBoolOption[false]{nothms}
 \DeclareBoolOption[false]{nothmnum}
 \DeclareBoolOption[false]{regionalref}
@@ -39,34 +38,32 @@
 \DeclareBoolOption[false]{biolinum}
 \ProcessKeyvalOptions*\relax
 
-\if@PJLtoolkit@draft
-    \@PJLtoolkit@fasttrue
-\fi
-\if@PJLtoolkit@amsfashion
-    \@PJLtoolkit@amssimtrue
+\if@ProjLib@draft
+    \@ProjLib@fasttrue
 \fi
 
-\if@PJLtoolkit@fast
+\if@ProjLib@fast
     \PassOptionsToPackage{fast}{PJLdate}
     \PassOptionsToPackage{fast}{PJLdraft}
     \PassOptionsToPackage{fast}{PJLlogo}
     \PassOptionsToPackage{fast}{PJLthm}
 \fi
-\if@PJLtoolkit@nothms
+\if@ProjLib@nothms
     \PassOptionsToPackage{nothms}{PJLthm}
 \fi
-\if@PJLtoolkit@nothmnum
+\if@ProjLib@nothmnum
     \PassOptionsToPackage{nothmnum}{PJLthm}
 \fi
-\if@PJLtoolkit@regionalref
+\if@ProjLib@regionalref
     \PassOptionsToPackage{regionalref}{PJLthm}
 \fi
 
-\if@PJLtoolkit@author
+\if@ProjLib@amsfashion
+    \PassOptionsToPackage{amsfashion}{PJLauthor}
     \RequirePackage{PJLauthor}
 \fi
-\if@PJLtoolkit@amssim
-    \RequirePackage{PJLamssim}
+\if@ProjLib@author
+    \RequirePackage{PJLauthor}
 \fi
 \RequirePackage{PJLdate}
 \RequirePackage{PJLdraft}
@@ -77,7 +74,7 @@
 
 \ifdefined\PJL@font@alreadyset\else
 
-\if@PJLtoolkit@palatino
+\if@ProjLib@palatino
     % \RequirePackage{amssymb}
     \RequirePackage{mathpazo}
     \PassOptionsToPackage{defaultsups}{newpxtext}
@@ -85,22 +82,22 @@
     % \RequirePackage{newpxmath}
     \let\openbox\relax
     \PJLsetlinespacing{\setstretch{1.07}}
-    \if@PJLtoolkit@useosf\useosf\fi
+    \if@ProjLib@useosf\useosf\fi
 \fi
 
-\if@PJLtoolkit@times
+\if@ProjLib@times
     % \RequirePackage{amssymb}
     \PassOptionsToPackage{defaultsups}{newtxtext}
     \RequirePackage{newtxtext}
     \RequirePackage{newtxmath}
     \let\openbox\relax
     \PJLsetlinespacing{\setstretch{1.00}}
-    \if@PJLtoolkit@useosf\useosf\fi
+    \if@ProjLib@useosf\useosf\fi
 \fi
 
-\if@PJLtoolkit@garamond
+\if@ProjLib@garamond
     % \RequirePackage{amssymb}
-    \if@PJLtoolkit@useosf\else
+    \if@ProjLib@useosf\else
         \PassOptionsToPackage{lining}{ebgaramond}
     \fi
     \RequirePackage{ebgaramond-maths}
@@ -109,12 +106,12 @@
     \PJLsetlinespacing{\setstretch{1.00}}
 \fi
 
-\if@PJLtoolkit@biolinum
+\if@ProjLib@biolinum
     % \RequirePackage{amssymb}
     % \RequirePackage{mathpazo}
     % \RequirePackage[sansmath]{libertinust1math}
     \ifPDFTeX
-        \if@PJLtoolkit@useosf
+        \if@ProjLib@useosf
             \PassOptionsToPackage{osf}{biolinum}
         \fi
         \RequirePackage{biolinum}
@@ -126,7 +123,7 @@
             BoldFont       = LinBiolinum_RB.otf ,
             ItalicFont     = LinBiolinum_RI.otf ,
             BoldItalicFont = LinBiolinum_RBO.otf,
-            \if@PJLtoolkit@useosf Numbers = OldStyle\fi ]
+            \if@ProjLib@useosf Numbers = OldStyle\fi ]
     \fi
     \PJLsetlinespacing{\setstretch{1.05}}
     \RequirePackage[italic,defaultmathsizes]{mathastext}