projlib (3jul22)

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

15 files changed, 275 insertions, 183 deletions

diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md
index ddf962d8961..ee8924ccc6e 100644
--- a/Master/texmf-dist/doc/latex/projlib/README.md
+++ b/Master/texmf-dist/doc/latex/projlib/README.md
@@ -6,7 +6,7 @@
 
 > **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French, meaning "*Free Project*").
 
-> **This bundle is dated 2022/06/15. Please note that the documentations are not yet up-to-date.**
+> **This bundle is dated 2022/07/03. Please note that the documentations are not yet up-to-date.**
 
 ## Introduction
 
@@ -21,7 +21,7 @@ To get started, simply put this line in your preamble:
 
 ## The modules
 
-> Each module correspond to a separate package, for example, the module `theorem` is `projlib-theorem.sty`.
+> Each module corresponds to a separate package, for example, the module `theorem` is `projlib-theorem.sty`.
 
 The modules include:
 1. module `author` - *Enhanced author information block*
@@ -36,6 +36,7 @@ The modules include:
     - Multiple input and output format available.
 1. module `draft` - *Useful commands during draft stage*
     - `\DNF` for marking unfinished part. In addition, a report of all unfinished places shall be printed at the last of your document.
+    - Reimplemented `\blindtext` to support more languages.
 1. module `font` - *Font selection and configuration*
     - Supporting Palatino, Times, Garamond, Biolinum, Noto, etc.
 1. module `language` - *Multi-language configuration*
@@ -45,10 +46,13 @@ The modules include:
 1. module `logo` - *The ProjLib logo*
     - Draw the `ProjLib` logo in colorful or colorless fashion.
 1. module `math` - *Efficient math setup*
-    - `\DefineOperator` and `\DefineShortcut` for setting up math macros efficiently
-    - `\ListOfSymbols` for printing list of symbols
+    - `\DefineOperator` and `\DefineShortcut` for setting up math macros efficiently.
+    - `\ListOfSymbols` for printing list of symbols.
 1. module `paper` - *Configuration of the paper style*
     - Paper style configuration, with the themes `yellow`, `green`, `light gray`, `gray`, `dark`, etc.
+1. module `text` - *Text-related commands*
+    - Provide a few useful commands such as `\ie`, `\eg`, `\cf`, `\etc` ; and if you have your own version defined, they won't interfere with your definition.
+    - `\ItemDescription` for writing leading description to items in `itemize` or `enumerate`.
 1. module `theorem` - *Configuration of theorem-like environments*
     - Setting up theorem-like environments based on the package `create-theorem`
         - `\CreateTheorem`, `\SetTheorem` and more...
@@ -78,6 +82,10 @@ It is recommended to use `latexmk` with option `-xelatex`:
 ```
 latexmk -xelatex ProjLib-doc-**.tex
 ```
+Here `**` should be replaced with the language identifier, such as `en`.
+
+## Automation
+All these can be done with the given script `MakeFile.sh`.
 
 # License
 
diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
index 18509f39478..1b1be1cf735 100644
--- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
+++ b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
@@ -15,82 +15,88 @@
 \ProvidesFile{ProjLib.dtx}
 %</driver>
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 %
 %<*ProjLib>
 \ProvidesExplPackage
   {ProjLib}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Collective interface of the ProjLib toolkit}
 %</ProjLib>
 %
 %<*projlib-author>
 \ProvidesExplPackage
   {projlib-author}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Enhanced author information block}
 %</projlib-author>
 %
 %<*projlib-datetime>
 \ProvidesExplPackage
   {projlib-datetime}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Convert numeric date-time string to natural language}
 %</projlib-datetime>
 %
 %<*projlib-draft>
 \ProvidesExplPackage
   {projlib-draft}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Useful commands during draft stage}
 %</projlib-draft>
 %
 %<*projlib-font>
 \ProvidesExplPackage
   {projlib-font}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Font selection and configuration}
 %</projlib-font>
 %
 %<*projlib-language>
 \ProvidesExplPackage
   {projlib-language}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Multi-language configuration}
 %</projlib-language>
 %
 %<*projlib-logo>
 \ProvidesExplPackage
   {projlib-logo}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {The ProjLib logo}
 %</projlib-logo>
 %
 %<*projlib-math>
 \ProvidesExplPackage
   {projlib-math}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Efficient math setup}
 %</projlib-math>
 %
 %<*projlib-paper>
 \ProvidesExplPackage
   {projlib-paper}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Configuration of the paper style}
 %</projlib-paper>
 %
+%<*projlib-text>
+\ProvidesExplPackage
+  {projlib-text}
+  {2022/07/03} {}
+  {Text-related commands}
+%</projlib-text>
+%
 %<*projlib-theorem>
 \ProvidesExplPackage
   {projlib-theorem}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Configuration of theorem-like environments}
 %</projlib-theorem>
 %
 %<*projlib-titlepage>
 \ProvidesExplPackage
   {projlib-titlepage}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Commands for rendering the title page}
 %</projlib-titlepage>
 
@@ -111,18 +117,20 @@
     , title~page      .bool_set:N         = \l__projlib_main_titlepage_bool
     , title page      .bool_set:N         = \l__projlib_main_titlepage_bool
     , unknown         .code:n             = {
-                                              \PassOptionsToPackage { \CurrentOption } { projlib-language }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-author }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-datetime }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-draft }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-font }
+                                              \PassOptionsToPackage { \CurrentOption } { projlib-language }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-logo }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-math }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-paper }
+                                              \PassOptionsToPackage { \CurrentOption } { projlib-text }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-theorem }
+                                              \PassOptionsToPackage { \CurrentOption } { projlib-titlepage }
                                             }
   }
-\ProcessKeysOptions { ProjLib }
+\ProcessKeyOptions [ ProjLib ]
 
 \bool_if:NT \l__projlib_main_amsfashion_bool
   {
@@ -142,6 +150,7 @@
 \RequirePackage { projlib-logo }
 \RequirePackage { projlib-math }
 \RequirePackage { projlib-paper }
+\RequirePackage { projlib-text }
 
 \bool_if:NT \l__projlib_main_titlepage_bool
   {
@@ -160,7 +169,7 @@
     , ams fashion .bool_set:N = \l__projlib_author_amsfashion_bool
     , unknown     .code:n     = {}
   }
-\ProcessKeysOptions { projlib-author }
+\ProcessKeyOptions [ projlib-author ]
 
 \cs_if_exist:NT \subjclass { \endinput }
 
@@ -487,7 +496,7 @@
     , day-month       .code:n       = { \tl_gset:Nn \g__projlib_datetime_input_format_tl { day-month-year } }
     , unknown         .code:n       = {}
   }
-\ProcessKeysOptions { projlib-datetime }
+\ProcessKeyOptions [ projlib-datetime ]
 
 \RequirePackage { relsize }
 
@@ -2137,7 +2146,7 @@
     , no report page    .bool_set:N   = \l__projlib_draft_no_report_page_bool
     , unknown           .code:n       = {}
   }
-\ProcessKeysOptions { projlib-draft }
+\ProcessKeyOptions [ projlib-draft ]
 
 \RequirePackage { projlib-language }
 \RequirePackage { xcolor }
@@ -2156,8 +2165,8 @@
 
   \bool_if:NTF \l__projlib_draft_fast_bool
   {
-    \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { $[$ }
-    \tl_const:Nn \l_projlib_draft_plain_box_after_tl { $]$ }
+    \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { [ }
+    \tl_const:Nn \l_projlib_draft_plain_box_after_tl { ] }
   }
   {
     \RequirePackage { tikz }
@@ -2248,23 +2257,23 @@
 \NewDocumentCommand \DNF { s D<>{} }
   {
     \noindent
-    \group_begin:
-    \projlib_draft_DNF_font
-    \stepcounter { projlib_draft_DNF_counter }
-    \raisebox{\baselineskip}{
-      \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {}
-      \label { DNF. \arabic { projlib_draft_DNF_counter } }
-    }
-    \nobreak
-    \projlib_draft_plain_box:nn { projlib_draft_DNF_color }
-      {
-        \IfBooleanF { #1 } { \projlib_draft_DNF_text \nobreakspace }
-        \group_begin: \ttfamily
-        \# \theprojlib_draft_DNF_counter
-        \group_end:
-        \tl_if_blank:nF { #2 } { : \nobreakspace }
-        \tl_trim_spaces:n { #2 }
+    \group_begin: \projlib_draft_DNF_font
+      \stepcounter { projlib_draft_DNF_counter }
+      \raisebox{\baselineskip}{
+        \cs_if_exist:cT { hypertarget }
+          {
+            \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {}
+          }
+        \label { DNF. \arabic { projlib_draft_DNF_counter } }
       }
+      \nobreak
+      \projlib_draft_plain_box:nn { projlib_draft_DNF_color }
+        {
+          \IfBooleanF { #1 } { \projlib_draft_DNF_text \nobreakspace }
+          \texttt { \# \theprojlib_draft_DNF_counter }
+          \tl_if_blank:nF { #2 } { : \nobreakspace }
+          \tl_trim_spaces:n { #2 }
+        }
     \group_end:
     \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
       {
@@ -2414,7 +2423,7 @@
     , biolinum         .initial:n    = { false }
     , unknown          .code:n       = {}
   }
-\ProcessKeysOptions { projlib-font }
+\ProcessKeyOptions [ projlib-font ]
 
 \bool_new:N \g_projlib_font_already_set_bool
 \bool_gset_false:N \g_projlib_font_already_set_bool
@@ -2659,7 +2668,7 @@
     , Russian             .meta:n       = { russian }
     , unknown             .code:n       = {}
   }
-\ProcessKeysOptions { projlib-language }
+\ProcessKeyOptions [ projlib-language ]
 
 \cs_new_protected:Nn \projlib_language_clear_global_option:n
   {
@@ -3202,7 +3211,7 @@
     , fast    .bool_set:N   = \l__projlib_logo_fast_bool
     , unknown .code:n       = {}
   }
-\ProcessKeysOptions { projlib-logo }
+\ProcessKeyOptions [ projlib-logo ]
 
 \bool_if:NT \l__projlib_logo_fast_bool
   {
@@ -3221,79 +3230,6 @@
     \endinput
   }
 
-%<*projlib-logo-old>
-\cs_if_exist:cTF { fontspec }
-  {
-    \newfontface \__projlib_logo_font: { LinBiolinum_R.otf }
-  }
-  {
-    \RequirePackage [T1] { fontenc }
-    \cs_gset:Nn \__projlib_logo_font:
-      { \fontfamily { LinuxBiolinumT-TLF } \selectfont }
-  }
-
-\tl_new:N   \g__projlib_logo_sigma_j_tl
-\tl_gset:Nn \g__projlib_logo_sigma_j_tl
-  {
-    \vbox:n
-      {
-        \offinterlineskip
-        \hbox_overlap_center:n
-          {
-            \skip_horizontal:n { 0.75ex }
-            \hbox_set:Nn    \l_tmpa_box { \usefont{U}{zeur}{b}{n} \symbol{"06} }
-            \box_rotate:Nn  \l_tmpa_box { -10 }
-            \box_scale:Nnn  \l_tmpa_box {.4} {.4}
-            \box_use:N      \l_tmpa_box
-          }
-        \skip_vertical:n { 0.15ex }
-        \hbox:n { \j }
-      }
-  }
-
-% \cs_new_protected:Nn \projlib_logo_generic:n
-%   {
-%     \group_begin:
-%       \normalfont
-%       \__projlib_logo_font:
-%       \color_group_begin:
-%         \color_select:n { blue!60!cyan }      { P }
-%         \color_select:n { blue!45!cyan }      { r }
-%         \color_select:n { blue!30!cyan }      { o }
-%         \color_select:n { green!70!black!70 } { #1 }
-%         \color_select:n { red!20!yellow }     { L }
-%         \color_select:n { red!40!yellow }     { i }
-%         \color_select:n { red!60!yellow }     { b }
-%       \color_group_end:
-%     \group_end:
-%   }
-\cs_new_protected:Nn \projlib_logo_generic:n
-  {
-    \group_begin:
-      \normalfont
-      \__projlib_logo_font:
-      \color_group_begin:
-        \color_select:n { blue!50!cyan!30!black } { P }
-        \color_select:n { blue!50!cyan!55!black } { r }
-        \color_select:n { blue!50!cyan!75!black } { o }
-        \color_select:n { blue!50!cyan!90!black } { #1 }
-        \color_select:n { blue!50!cyan!75!black } { L }
-        \color_select:n { blue!50!cyan!55!black } { i }
-        \color_select:n { blue!50!cyan!30!black } { b }
-      \color_group_end:
-    \group_end:
-  }
-
-\DeclareRobustCommand * \ProjLib
-  {
-    \projlib_logo_generic:n { \g__projlib_logo_sigma_j_tl }
-  }
-\DeclareRobustCommand * \ProjLibText
-  {
-    \projlib_logo_generic:n { j }
-  }
-%</projlib-logo-old>
-
 \RequirePackage { tikz }
 
 \cs_new_protected:Nn \projlib_logo_generic:nn
@@ -3350,7 +3286,7 @@
   {
     , unknown     .code:n     = {}
   }
-\ProcessKeysOptions { projlib-math }
+\ProcessKeyOptions [ projlib-math ]
 
 \RequirePackage { mathtools }
 \RequirePackage { mathrsfs }
@@ -3605,7 +3541,7 @@
     , dark paper        .meta:n             = { paperstyle = dark       }
     , unknown           .code:n             = {}
   }
-\ProcessKeysOptions { projlib-paper }
+\ProcessKeyOptions [ projlib-paper ]
 
 \cs_new:Nn \projlib_paper_preview_disable:
   {
@@ -3684,6 +3620,67 @@
   }
 %</projlib-paper>
 %
+%<*projlib-text>
+\keys_define:nn { projlib-text }
+  {
+    , unknown .code:n       = {}
+  }
+\ProcessKeyOptions [ projlib-text ]
+
+\RequirePackage { projlib-paper }
+
+\ProvideDocumentCommand \ItemDescription { m }
+  {
+    \textcolor { main-text!50!paper } { $($ #1 $)$  }
+    \nobreakspace
+    \ignorespaces
+  }
+
+\cs_new_protected:Nn \projlib_text_abbreviation_generic:nn
+  % #1 is the text
+  % #2 is usually some spacing adjustment
+  {
+    #1
+    % if followed by a dot, then remove that dot and adjust the spacing
+    \peek_meaning_ignore_spaces:NTF .
+      { #2 \use_none:n }
+      {
+        % if followed by a comma, then act like nothing happens
+        % otherwise adjust the spacing
+        \peek_meaning_ignore_spaces:NTF ,
+          { \prg_do_nothing: }
+          { #2 }
+      }
+  }
+
+\hook_gput_code:nnn { begindocument/before } { projlib-text }
+  {
+    % i.e.
+    \ProvideDocumentCommand { \ie } { }
+      {
+        \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.25ex } }
+      }
+
+    % e.g.
+    \ProvideDocumentCommand { \eg } { }
+      {
+        \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.25ex } }
+      }
+
+    % cf.
+    \ProvideDocumentCommand { \cf } { }
+      {
+        \projlib_text_abbreviation_generic:nn { \textit{cf.} } { }
+      }
+
+    % etc.
+    \ProvideDocumentCommand { \etc } { }
+      {
+        \projlib_text_abbreviation_generic:nn { etc. } { }
+      }
+  }
+%</projlib-text>
+%
 %<*projlib-theorem>
 \keys_define:nn { projlib-theorem }
   {
@@ -3725,7 +3722,7 @@
     , no preset names       .bool_set_inverse:N = \l__projlib_theorem_presetname_bool
     , unknown               .code:n             = { \PassOptionsToPackage { \CurrentOption } { create-theorem } }
   }
-\ProcessKeysOptions { projlib-theorem }
+\ProcessKeyOptions [ projlib-theorem ]
 
 \clist_const:Nn \c_projlib_theorem_supported_clist
   {
@@ -3755,8 +3752,10 @@
     recall                    ,
     remark                    ,
     theorem                   ,
+    definition-corollary      ,
     definition-proposition    ,
     definition-theorem        ,
+    corollary-definition      ,
     proposition-definition    ,
     theorem-definition        ,
   }
@@ -5160,9 +5159,11 @@
                   }
   }
 
+\NameTheorem { definition-corollary } { combined = { definition ; corollary } }
 \NameTheorem { definition-proposition } { combined = { definition ; proposition } }
 \NameTheorem { definition-theorem } { combined = { definition ; theorem } }
 
+\NameTheorem { corollary-definition } { combined = { corollary ; definition } }
 \NameTheorem { proposition-definition } { combined = { proposition ; definition } }
 \NameTheorem { theorem-definition } { combined = { theorem ; definition } }
 %</projlib-theorem>
@@ -5172,7 +5173,7 @@
   {
     , unknown           .code:n             = {}
   }
-\ProcessKeysOptions { projlib-titlepage }
+\ProcessKeyOptions [ projlib-titlepage ]
 
 \RequirePackage { projlib-paper }
 
diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.ins b/Master/texmf-dist/source/latex/projlib/ProjLib.ins
index 6aac97bf776..d79b6710036 100644
--- a/Master/texmf-dist/source/latex/projlib/ProjLib.ins
+++ b/Master/texmf-dist/source/latex/projlib/ProjLib.ins
@@ -18,6 +18,7 @@
 \obeyspaces%
 \gdef\copyright{%
 \ds@heading% This is file... generated with the docstrip utility.
+\MetaPrefix%
 
 Copyright (C) 2021-2022 by Jinwen XU
 
@@ -48,6 +49,7 @@ and version 1.3c or later is part of all distributions of LaTeX version
 \generate{\file{projlib-logo.sty}{\from{ProjLib.dtx}{projlib-logo}}}
 \generate{\file{projlib-math.sty}{\from{ProjLib.dtx}{projlib-math}}}
 \generate{\file{projlib-paper.sty}{\from{ProjLib.dtx}{projlib-paper}}}
+\generate{\file{projlib-text.sty}{\from{ProjLib.dtx}{projlib-text}}}
 \generate{\file{projlib-theorem.sty}{\from{ProjLib.dtx}{projlib-theorem}}}
 \generate{\file{projlib-titlepage.sty}{\from{ProjLib.dtx}{projlib-titlepage}}}
 
@@ -66,6 +68,7 @@ and version 1.3c or later is part of all distributions of LaTeX version
 \Msg{*     projlib-logo.sty                                      *}
 \Msg{*     projlib-math.sty                                      *}
 \Msg{*     projlib-paper.sty                                     *}
+\Msg{*     projlib-text.sty                                      *}
 \Msg{*     projlib-theorem.sty                                   *}
 \Msg{*     projlib-titlepage.sty                                 *}
 \Msg{*                                                           *}
diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
index d2a7ad69144..d488e3ea503 100644
--- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
+++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `ProjLib.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {ProjLib}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Collective interface of the ProjLib toolkit}
 
 \keys_define:nn { ProjLib }
@@ -38,18 +37,20 @@
     , title~page      .bool_set:N         = \l__projlib_main_titlepage_bool
     , title page      .bool_set:N         = \l__projlib_main_titlepage_bool
     , unknown         .code:n             = {
-                                              \PassOptionsToPackage { \CurrentOption } { projlib-language }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-author }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-datetime }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-draft }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-font }
+                                              \PassOptionsToPackage { \CurrentOption } { projlib-language }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-logo }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-math }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-paper }
+                                              \PassOptionsToPackage { \CurrentOption } { projlib-text }
                                               \PassOptionsToPackage { \CurrentOption } { projlib-theorem }
+                                              \PassOptionsToPackage { \CurrentOption } { projlib-titlepage }
                                             }
   }
-\ProcessKeysOptions { ProjLib }
+\ProcessKeyOptions [ ProjLib ]
 
 \bool_if:NT \l__projlib_main_amsfashion_bool
   {
@@ -69,6 +70,7 @@
 \RequirePackage { projlib-logo }
 \RequirePackage { projlib-math }
 \RequirePackage { projlib-paper }
+\RequirePackage { projlib-text }
 
 \bool_if:NT \l__projlib_main_titlepage_bool
   {
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
index a081ba1d925..86d5291c5dc 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-author.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-author}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Enhanced author information block}
 
 \keys_define:nn { projlib-author }
@@ -30,7 +29,7 @@
     , ams fashion .bool_set:N = \l__projlib_author_amsfashion_bool
     , unknown     .code:n     = {}
   }
-\ProcessKeysOptions { projlib-author }
+\ProcessKeyOptions [ projlib-author ]
 
 \cs_if_exist:NT \subjclass { \endinput }
 
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
index fc052ec20b8..ac0bc629edb 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-datetime.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-datetime}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Convert numeric date-time string to natural language}
 
 \tl_new:N   \g__projlib_datetime_input_format_tl
@@ -38,7 +37,7 @@
     , day-month       .code:n       = { \tl_gset:Nn \g__projlib_datetime_input_format_tl { day-month-year } }
     , unknown         .code:n       = {}
   }
-\ProcessKeysOptions { projlib-datetime }
+\ProcessKeyOptions [ projlib-datetime ]
 
 \RequirePackage { relsize }
 
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
index 30a0013d084..2c11df948ec 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-draft.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-draft}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Useful commands during draft stage}
 
 \keys_define:nn { projlib-draft }
@@ -33,7 +32,7 @@
     , no report page    .bool_set:N   = \l__projlib_draft_no_report_page_bool
     , unknown           .code:n       = {}
   }
-\ProcessKeysOptions { projlib-draft }
+\ProcessKeyOptions [ projlib-draft ]
 
 \RequirePackage { projlib-language }
 \RequirePackage { xcolor }
@@ -52,8 +51,8 @@
 
   \bool_if:NTF \l__projlib_draft_fast_bool
   {
-    \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { $[$ }
-    \tl_const:Nn \l_projlib_draft_plain_box_after_tl { $]$ }
+    \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { [ }
+    \tl_const:Nn \l_projlib_draft_plain_box_after_tl { ] }
   }
   {
     \RequirePackage { tikz }
@@ -143,23 +142,23 @@
 \NewDocumentCommand \DNF { s D<>{} }
   {
     \noindent
-    \group_begin:
-    \projlib_draft_DNF_font
-    \stepcounter { projlib_draft_DNF_counter }
-    \raisebox{\baselineskip}{
-      \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {}
-      \label { DNF. \arabic { projlib_draft_DNF_counter } }
-    }
-    \nobreak
-    \projlib_draft_plain_box:nn { projlib_draft_DNF_color }
-      {
-        \IfBooleanF { #1 } { \projlib_draft_DNF_text \nobreakspace }
-        \group_begin: \ttfamily
-        \# \theprojlib_draft_DNF_counter
-        \group_end:
-        \tl_if_blank:nF { #2 } { : \nobreakspace }
-        \tl_trim_spaces:n { #2 }
+    \group_begin: \projlib_draft_DNF_font
+      \stepcounter { projlib_draft_DNF_counter }
+      \raisebox{\baselineskip}{
+        \cs_if_exist:cT { hypertarget }
+          {
+            \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {}
+          }
+        \label { DNF. \arabic { projlib_draft_DNF_counter } }
       }
+      \nobreak
+      \projlib_draft_plain_box:nn { projlib_draft_DNF_color }
+        {
+          \IfBooleanF { #1 } { \projlib_draft_DNF_text \nobreakspace }
+          \texttt { \# \theprojlib_draft_DNF_counter }
+          \tl_if_blank:nF { #2 } { : \nobreakspace }
+          \tl_trim_spaces:n { #2 }
+        }
     \group_end:
     \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
       {
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
index cfa1d6bb5e5..fdc257e8d20 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-font.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-font}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Font selection and configuration}
 
 \keys_define:nn { projlib-font }
@@ -46,7 +45,7 @@
     , biolinum         .initial:n    = { false }
     , unknown          .code:n       = {}
   }
-\ProcessKeysOptions { projlib-font }
+\ProcessKeyOptions [ projlib-font ]
 
 \bool_new:N \g_projlib_font_already_set_bool
 \bool_gset_false:N \g_projlib_font_already_set_bool
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
index 8fb7702aeea..122581ebde6 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-language.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-language}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Multi-language configuration}
 
 \clist_const:Nn \c__projlib_language_supported_clist
@@ -118,7 +117,7 @@
     , Russian             .meta:n       = { russian }
     , unknown             .code:n       = {}
   }
-\ProcessKeysOptions { projlib-language }
+\ProcessKeyOptions [ projlib-language ]
 
 \cs_new_protected:Nn \projlib_language_clear_global_option:n
   {
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
index fc2407cefe5..644c43b7a17 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-logo.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-logo}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {The ProjLib logo}
 
 \keys_define:nn { projlib-logo }
@@ -29,7 +28,7 @@
     , fast    .bool_set:N   = \l__projlib_logo_fast_bool
     , unknown .code:n       = {}
   }
-\ProcessKeysOptions { projlib-logo }
+\ProcessKeyOptions [ projlib-logo ]
 
 \bool_if:NT \l__projlib_logo_fast_bool
   {
@@ -48,7 +47,6 @@
     \endinput
   }
 
-
 \RequirePackage { tikz }
 
 \cs_new_protected:Nn \projlib_logo_generic:nn
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
index 2b2d8c975b3..6855645669f 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-math.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,17 +16,16 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-math}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Efficient math setup}
 
 \keys_define:nn { projlib-math }
   {
     , unknown     .code:n     = {}
   }
-\ProcessKeysOptions { projlib-math }
+\ProcessKeyOptions [ projlib-math ]
 
 \RequirePackage { mathtools }
 \RequirePackage { mathrsfs }
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
index 09129a2ae6f..8d28af0ae43 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-paper.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-paper}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Configuration of the paper style}
 
 \keys_define:nn { projlib-paper }
@@ -56,7 +55,7 @@
     , dark paper        .meta:n             = { paperstyle = dark       }
     , unknown           .code:n             = {}
   }
-\ProcessKeysOptions { projlib-paper }
+\ProcessKeyOptions [ projlib-paper ]
 
 \cs_new:Nn \projlib_paper_preview_disable:
   {
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty
new file mode 100644
index 00000000000..179ed1d1568
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty
@@ -0,0 +1,85 @@
+%%
+%% This is file `projlib-text.sty',
+%% generated with the docstrip utility.
+%%
+%% Copyright (C) 2021-2022 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}[2022-06-01]
+\ProvidesExplPackage
+  {projlib-text}
+  {2022/07/03} {}
+  {Text-related commands}
+
+\keys_define:nn { projlib-text }
+  {
+    , unknown .code:n       = {}
+  }
+\ProcessKeyOptions [ projlib-text ]
+
+\RequirePackage { projlib-paper }
+
+\ProvideDocumentCommand \ItemDescription { m }
+  {
+    \textcolor { main-text!50!paper } { $($ #1 $)$  }
+    \nobreakspace
+    \ignorespaces
+  }
+
+\cs_new_protected:Nn \projlib_text_abbreviation_generic:nn
+  % #1 is the text
+  % #2 is usually some spacing adjustment
+  {
+    #1
+    % if followed by a dot, then remove that dot and adjust the spacing
+    \peek_meaning_ignore_spaces:NTF .
+      { #2 \use_none:n }
+      {
+        % if followed by a comma, then act like nothing happens
+        % otherwise adjust the spacing
+        \peek_meaning_ignore_spaces:NTF ,
+          { \prg_do_nothing: }
+          { #2 }
+      }
+  }
+
+\hook_gput_code:nnn { begindocument/before } { projlib-text }
+  {
+    % i.e.
+    \ProvideDocumentCommand { \ie } { }
+      {
+        \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.25ex } }
+      }
+
+    % e.g.
+    \ProvideDocumentCommand { \eg } { }
+      {
+        \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.25ex } }
+      }
+
+    % cf.
+    \ProvideDocumentCommand { \cf } { }
+      {
+        \projlib_text_abbreviation_generic:nn { \textit{cf.} } { }
+      }
+
+    % etc.
+    \ProvideDocumentCommand { \etc } { }
+      {
+        \projlib_text_abbreviation_generic:nn { etc. } { }
+      }
+  }
+
+\endinput
+%%
+%% End of file `projlib-text.sty'.
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
index 45fed9d1393..60f3514dc73 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-theorem.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,10 +16,9 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-theorem}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Configuration of theorem-like environments}
 
 \keys_define:nn { projlib-theorem }
@@ -62,7 +61,7 @@
     , no preset names       .bool_set_inverse:N = \l__projlib_theorem_presetname_bool
     , unknown               .code:n             = { \PassOptionsToPackage { \CurrentOption } { create-theorem } }
   }
-\ProcessKeysOptions { projlib-theorem }
+\ProcessKeyOptions [ projlib-theorem ]
 
 \clist_const:Nn \c_projlib_theorem_supported_clist
   {
@@ -92,8 +91,10 @@
     recall                    ,
     remark                    ,
     theorem                   ,
+    definition-corollary      ,
     definition-proposition    ,
     definition-theorem        ,
+    corollary-definition      ,
     proposition-definition    ,
     theorem-definition        ,
   }
@@ -1488,9 +1489,11 @@
                   }
   }
 
+\NameTheorem { definition-corollary } { combined = { definition ; corollary } }
 \NameTheorem { definition-proposition } { combined = { definition ; proposition } }
 \NameTheorem { definition-theorem } { combined = { definition ; theorem } }
 
+\NameTheorem { corollary-definition } { combined = { corollary ; definition } }
 \NameTheorem { proposition-definition } { combined = { proposition ; definition } }
 \NameTheorem { theorem-definition } { combined = { theorem ; definition } }
 
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
index a79e5ff329a..5b84bbc6838 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file `projlib-titlepage.sty',
 %% generated with the docstrip utility.
-
+%%
 %% Copyright (C) 2021-2022 by Jinwen XU
 %% 
 %% This is part of the ProjLib Toolkit.
@@ -16,17 +16,16 @@
 %% 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {projlib-titlepage}
-  {2022/06/15} {}
+  {2022/07/03} {}
   {Commands for rendering the title page}
 
 \keys_define:nn { projlib-titlepage }
   {
     , unknown           .code:n             = {}
   }
-\ProcessKeysOptions { projlib-titlepage }
+\ProcessKeyOptions [ projlib-titlepage ]
 
 \RequirePackage { projlib-paper }