beaulivre (23jun21)

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

5 files changed, 157 insertions, 84 deletions

diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
index 0ce22637370..be8d0073e0d 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
index 5e979114264..cdef90570e7 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
@@ -1,5 +1,5 @@
 %! TEX program = xelatex
-\documentclass[allowbf,puretext]{beaulivre}
+\documentclass[Chinese,English,allowbf,puretext]{beaulivre}
 
 \theoremstyle{basic}
 \CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
 %%================================
 %% 引入工具集
 %%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
 \usepackage{longtable}  % breakable tables
 \usepackage{hologo}     % more TeX logo
 
@@ -46,7 +46,7 @@
 } 
 \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
 \lstset{moretexcs=%
-    {href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
+    {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
     }
 }
 \lstnewenvironment{code}% 
@@ -104,7 +104,7 @@
     \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
     \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
     \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
-    \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/06/07}}};
+    \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/06/23}}};
     \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}};
     \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年6月，北京}};
 \end{tikzpicture}%
@@ -164,30 +164,45 @@
                 \item 启用 \ProjLib{} 工具箱的快速模式。
             \end{itemize}
         \end{itemize}
+\begin{tip}
+    在文章的撰写阶段，建议使用 \verb|fast| 选项以加快编译速度，改善写作时的流畅程度。在最后，可以把 \verb|fast| 标记去除，从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印，以提示目前处于草稿阶段。
+\end{tip}
     \item \texttt{a4paper} 或 \texttt{b5paper}
         \begin{itemize}
             \item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
         \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 字体选项。顾名思义，会加载相应名称的字体。
+            \item \texttt{useosf} 选项用来启用“旧式”数字。
         \end{itemize}
+    \clearpage
     \item \texttt{allowbf}
         \begin{itemize}
             \item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
         \end{itemize}
+    \item \texttt{runin}
+        \begin{itemize}
+            \item \lstinline|\subsubsection| 采用 ``runin'' 风格。
+        \end{itemize}
+    \item \texttt{puretext} or \texttt{nothms}
+        \begin{itemize}
+            \item 纯文本模式，不加载定理类环境。
+        \end{itemize}
+    \item \texttt{nothmnum}
+        \begin{itemize}
+            \item 定理类环境不编号。
+        \end{itemize}
+    \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French}，等等
+        \begin{itemize}
+            \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+        \end{itemize}
 \end{itemize}
 
-\begin{tip}
-    \begin{itemize}
-        \item 在文章的撰写阶段，建议使用 \verb|fast| 选项以加快编译速度，改善写作时的流畅程度。在最后，可以把 \verb|fast| 标记去除，从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印，以提示目前处于草稿阶段。
-    \end{itemize}
-\end{tip}
-
 \bigskip
 另外，排版图书时常用的 \texttt{oneside}、\texttt{twoside} 选项也是可以使用的。默认采用双页排版。
 
-\chapter{关于文档类中使用的字体}
+\chapter{关于默认字体}
 \beaulivre{} 默认使用 Palatino Linotype 作为英文字体，方正悠宋、悠黑GBK作为中文字体，并部分使用了 Neo Euler 作为数学字体。其中，Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体，需要自行购买使用。可以在方正字库网站查询详细资料：\url{https://www.foundertype.com}。
 
 \begin{tip}[字体演示]
@@ -477,7 +492,7 @@
 
 \begin{code}
 \documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
 
 \UseLanguage{French} % Use French from here
 
@@ -508,7 +523,7 @@ Référence du théorème: \cref{thm:abc}
 \documentclass{book}
 \usepackage[a4paper,margin=1in]{geometry}
 \usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
 \end{code}
 
 
@@ -519,7 +534,7 @@ Référence du théorème: \cref{thm:abc}
 
 \begin{code}
 \documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
 
 \UseLanguage{French} % Use French from here
 
@@ -557,7 +572,7 @@ Référence du théorème: \cref{thm:abc}
 \documentclass{amsbook}
 \usepackage[a4paper,margin=1in]{geometry}
 \usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
 \end{code}
 
 \blinddocument
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
index 2876e0abbe4..e03e93518e8 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
index a09b697d615..f056cd76a6d 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
@@ -1,5 +1,5 @@
 %! TEX program = xelatex
-\documentclass[allowbf,puretext]{beaulivre}
+\documentclass[English,French,allowbf,puretext]{beaulivre}
 
 \theoremstyle{basic}
 \CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
 %%================================
 %% Import toolkit
 %%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
 \usepackage{longtable}  % breakable tables
 \usepackage{hologo}     % more TeX logo
 
@@ -44,7 +44,7 @@
 } 
 \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
 \lstset{moretexcs=%
-    {href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
+    {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
     }
 }
 \lstnewenvironment{code}% 
@@ -102,7 +102,7 @@
     \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
     \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
     \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
-    \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/06/07}}};
+    \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/06/23}}};
     \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}};
     \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{June 2021, Beijing}};
 \end{tikzpicture}%
@@ -160,30 +160,46 @@ as the first line to use the \beaulivre{} class.
                 \item Enable the fast mode of \ProjLib{} toolkit.
             \end{itemize}
         \end{itemize}
+\begin{tip}
+    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.
+\end{tip}
+\medskip
     \item \texttt{a4paper} or \texttt{b5paper}
         \begin{itemize}
             \item Optional paper size. The default paper size is 8.5in $\times$ 11in.
         \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{allowbf}
         \begin{itemize}
             \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
         \end{itemize}
+    \item \texttt{runin}
+        \begin{itemize}
+            \item Use the ``runin'' style for \lstinline|\subsubsection|
+        \end{itemize}
+    \clearpage
+    \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}
 
-\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.
-    \end{itemize}
-\end{tip}
-
 \bigskip
 In addition, the commonly used \texttt{oneside} and \texttt{twoside} options are also available. Two-page layout is used by default.
 
-\chapter{On the fonts}
+\chapter{On the default fonts}
 By default, \beaulivre{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
 
 \medskip
@@ -467,7 +483,7 @@ If you want to write in the standard way, you can refer to the following example
 
 \begin{code}
 \documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
 
 \UseLanguage{French} % Use French from here
 
@@ -498,7 +514,7 @@ If you wish to switch to the standard class later, just replace the first two li
 \documentclass{article}
 \usepackage[a4paper,margin=1in]{geometry}
 \usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
 \end{code}
 
 
@@ -509,7 +525,7 @@ If you intend to switch to the journal template in the future and thus want to u
 
 \begin{code}
 \documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
 
 \UseLanguage{French} % Use French from here
 
@@ -548,7 +564,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
 \documentclass{amsart}
 \usepackage[a4paper,margin=1in]{geometry}
 \usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
 \end{code}
 
 \blinddocument
diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
index 68555495d24..00882136005 100644
--- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
+++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesClass{beaulivre}
-    [2021/06/07 A colorful book style]
+    [2021/06/23 A colorful book style]
 \def\colorclass@baseclass{book}
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
@@ -27,6 +27,7 @@
 }
 \DeclareBoolOption[false]{draft}
 \DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{useosf}
 \DeclareBoolOption[false]{palatino}
 \DeclareBoolOption[false]{times}
 \DeclareBoolOption[false]{garamond}
@@ -94,7 +95,7 @@
 \if@colorclass@fast
     \PassOptionsToPackage{fast}{colorist}
     \RequirePackage{draftwatermark}
-    \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+    \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
 \fi
 \RequirePackage{colorist}
 
@@ -113,11 +114,13 @@
 \RequirePackage{fontspec}
 \IfFontExistsTF{Palatino Linotype}{%
     \setmainfont{Palatino Linotype}
+        [\if@colorclass@useosf Numbers = OldStyle\fi]
 }{
     \setmainfont{TeXGyrePagellaX-Regular.otf}[
         BoldFont       = TeXGyrePagellaX-Bold.otf ,
         ItalicFont     = TeXGyrePagellaX-Italic.otf ,
-        BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
+        BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
+        \if@colorclass@useosf Numbers = OldStyle\fi ]
 }
     \setsansfont{SourceSansPro-Regular.otf}[
         Scale          = MatchLowercase ,
@@ -193,59 +196,92 @@
 \unimathsetup{math-style=ISO, partial=upright, nabla=upright}
 \setmathfont{Asana-Math.otf}
 \IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler}
-    [range={"0000-"0001,"0020-"007E,
-            "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
-            "00D7,"00F7,
-            "0131,
-            "0237,"02C6-"02C7,"02D8-"02DA,"02DC,
-            "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338,
-            "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB,
-            "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5,
-            "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044,
-            "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF,
-            "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128,
-            "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199,
-            "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5,
-            "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E,
-            "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D,
-            "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E,
-            "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5,
-            "22DC-"22DD,"22EF,"22F0-"22F1,
-            "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE,
-            "23DC-"23DF,
-            "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A,
-            "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,
-            "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505,
-            "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
-            "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
-            "1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
-\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+\setmathfont[range={up/{Latin,latin,Greek,greek},
+                    bfup/{Latin,latin,Greek,greek},
+                    cal, bfcal, frak, bffrak,
+                    `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash,
+                    \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
+                    \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
+                    \sum,\prod,\coprod,
+                    \sqrt,\int,\iint,\iiint,\oint},
+              script-features={},
+              sscript-features={},
+              Scale = 1.05,
             ]{Neo Euler}
-\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
-            ]{Neo Euler}
-\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
-             script-features={}, sscript-features={}
-            ]{Neo Euler}
-\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
-                    sfup, sfit, bfsfup, bfsfit, tt}
-            ]{Asana-Math.otf}
-\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
 }{}
+\setmathfont[range={up/num, bfup/num}
+            ]{texgyrepagella-math.otf}
+
+\newbox\xratbelow
+\newbox\xratabove
+\renewcommand{\xrightarrow}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
+\renewcommand{\xleftarrow}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
+\renewcommand{\xleftrightarrow}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
+\renewcommand{\xhookrightarrow}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
+\renewcommand{\xhookleftarrow}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
+\renewcommand{\xmapsto}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
+\newcommand{\xlongequal}[2][]{%
+    \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+    \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+    \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+    \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+        \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
+        node[above=2pt] {\box\xratabove}
+        (\xratlen,0) ;}}
 \fi
 \fi
 
-\let\colorist@sffamily\sffamily
-\let\colorist@textsc\textsc
-
 \if@colorclass@palatino
     \RequirePackage{amssymb}
     \RequirePackage{mathpazo}
     \PassOptionsToPackage{defaultsups}{newpxtext}
     \RequirePackage{newpxtext}
-    \RequirePackage{newpxmath}
+    % \RequirePackage{newpxmath}
     \let\openbox\relax
     \PJLsetlinespacing{\setstretch{1.07}}
+    \if@colorclass@useosf\useosf\fi
 \fi
 
 \if@colorclass@times
@@ -255,12 +291,15 @@
     \RequirePackage{newtxmath}
     \let\openbox\relax
     \PJLsetlinespacing{\setstretch{1.00}}
+    \if@colorclass@useosf\useosf\fi
     \let\colorist@sffamily\relax
 \fi
 
 \if@colorclass@garamond
     \RequirePackage{amssymb}
-    \PassOptionsToPackage{lining}{ebgaramond}
+    \if@colorclass@useosf\else
+        \PassOptionsToPackage{lining}{ebgaramond}
+    \fi
     \RequirePackage{ebgaramond-maths}
     \RequirePackage{ebgaramond}
     % \RequirePackage{garamondlibre}
@@ -273,6 +312,9 @@
     % \RequirePackage{mathpazo}
     % \RequirePackage[sansmath]{libertinust1math}
     \ifPDFTeX
+        \if@colorclass@useosf
+            \PassOptionsToPackage{osf}{biolinum}
+        \fi
         \RequirePackage{biolinum}
         \renewcommand*\familydefault{\biolinum@family}
     \else
@@ -281,7 +323,8 @@
         \setmainfont{LinBiolinum_R.otf}[
             BoldFont       = LinBiolinum_RB.otf ,
             ItalicFont     = LinBiolinum_RI.otf ,
-            BoldItalicFont = LinBiolinum_RBO.otf ]
+            BoldItalicFont = LinBiolinum_RBO.otf,
+            \if@colorclass@useosf Numbers = OldStyle\fi ]
     \fi
     \PJLsetlinespacing{\setstretch{1.05}}
     \RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -289,8 +332,12 @@
 
 \def\PJL@font@alreadyset{}
 
+%% Minor improvements
 \PassOptionsToPackage{verbose=silent}{microtype}
 \RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
 
 %%================================
 %% Graphics
@@ -302,11 +349,6 @@
 \RequirePackage{caption}
 \captionsetup{font=small}
 
-%%================================
-%% Index
-%%================================
-\RequirePackage{imakeidx}
-
 \endinput
 %%
 %% End of file `beaulivre/beaulivre.cls'.