libertinus-otf (12jan21)

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

5 files changed, 168 insertions, 56 deletions

diff --git a/Master/texmf-dist/doc/fonts/libertinus-otf/Changes b/Master/texmf-dist/doc/fonts/libertinus-otf/Changes
index 3eb3c95b41c..51d2605bf65 100644
--- a/Master/texmf-dist/doc/fonts/libertinus-otf/Changes
+++ b/Master/texmf-dist/doc/fonts/libertinus-otf/Changes
@@ -1,3 +1,4 @@
+0.28  2021-01-11  - added support for StylisticSet 08 (slanted integrals)
 0.27  2020-10-13  - fix bug for missing + sign in RawFeature=+ssxx
 0.26  2020-07-31  - fix bug for using Small Caps
 0.25  2020-04-25  - added text font macros \textsup, \textsfb, and \textinit
diff --git a/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.pdf b/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.pdf
index c6e6f2ed4ca..2d9c1d4917a 100644
--- a/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.tex b/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.tex
index 9a94f6ba5c6..e0fefdcff44 100644
--- a/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.tex
+++ b/Master/texmf-dist/doc/fonts/libertinus-otf/libertinus-otf-doc.tex
@@ -2,7 +2,7 @@
 \listfiles
 \documentclass[ngerman,spanish,polish,english,a4paper]{article}
 \usepackage{libertinus-otf}
-\newfontfamily\NotoMono{DejaVu Sans Mono}[Scale=MatchLowercase,FakeStretch=0.9]
+\newfontfamily\Mono{LibertinusMono-Regular.otf}[FakeStretch=0.85,Scale=MakeLowercase]
 \usepackage{babel}
 \usepackage{geometry}
 \usepackage{booktabs}
@@ -18,6 +18,7 @@
 \newcommand\textstyleVariable[1]{\texttt{#1}}
 \newcommand\textgerman[1]{\foreignlanguage{ngerman}{\texttt{#1}}}
 \usepackage{dtk-extern}
+\setkeys{dtk}{lstOptions={basicstyle=\Mono\small,columns=fixed}}
 
 \usepackage[imakeidx]{xindex}
 \makeindex[title=Index]
@@ -55,12 +56,13 @@
 
 \begin{abstract}
 The font family Libertinus is derived from the Linux Libertine and enhanced with a
-math font by Khaled Hosny.
+math font by Khaled Hosny and Caleb Maclennan.
 \end{abstract}
 
 \vfill
 Thanks to:\\
 Khaled Hosny;\\
+Caleb Maclennan;\\
 Nelson Posse Lago;\\
 Keno Wehr
 
@@ -100,7 +102,6 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
 
 
 \begin{verbatim}
-\RequirePackage{unicode-math}
 \setmainfont{LibertinusSerif}[ 
   RawFeature     = {\libertinus@figurealign;\libertinus@figurestyle},
   Scale          = \libertinusRM@scale ,
@@ -116,9 +117,11 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldSlantedFont= *-\libertinus@boldstyle,
   BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-\libertinus@boldstyle },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps}, 
   Extension      = .otf  
 ]
+
 \newfontfamily\LibertinusSerifSB{LibertinusSerif}[
   RawFeature        = {\libertinus@figurealign;\libertinus@figurestyle},
   Scale          = \libertinusRM@scale,
@@ -134,9 +137,11 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldSlantedFont= *-Semibold,
   BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Semibold },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps}, 
   Extension      = .otf  
 ]
+
 \newfontfamily\LibertinusSerifOsF{LibertinusSerif}[
   RawFeature     = {+onum},
   Scale          = \libertinusRM@scale ,
@@ -152,9 +157,11 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldSlantedFont= *-\libertinus@boldstyle,
   BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-\libertinus@boldstyle },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps}, 
   Extension      = .otf  
 ]
+
 \newfontfamily\LibertinusSerifTLF{LibertinusSerif}[
   RawFeature        = {+tnum;-onum},
   Scale          = \libertinusRM@scale ,
@@ -170,13 +177,15 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldSlantedFont= *-\libertinus@boldstyle,
   BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-\libertinus@boldstyle },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps}, 
   Extension      = .otf  
 ]
+
 \setsansfont{LibertinusSans}[ 
   Extension      = .otf,  
-  RawFeature     = {\libertinus@figurealign;\libertinus@figurestyle} ,
-  Scale          = \libertinusSF@scale ,
+  RawFeature     = {\libertinus@figurealign;\libertinus@figurestyle},
+  Scale          = \libertinusSF@scale,
   UprightFont    = *-Regular,
   ItalicFont     = *-Italic,
   ItalicFeatures = { SmallCapsFont = *-Italic },
@@ -185,12 +194,14 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldFont       = *-Bold, 
   BoldFeatures   = { SmallCapsFont = *-Bold },
   BoldItalicFont = *-Italic,
-  BoldItalicFeatures = {RawFeature={embolden=3}}, 
+  BoldItalicFeatures = {RawFeature={embolden=3},SmallCapsFont = *-Italic }, 
   BoldSlantedFont= *-Bold,
   BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Bold },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps},
 ]
+
 \newfontfamily\LibertinusSansOsF{LibertinusSans}[
   RawFeature   = {+onum;+pnum},
   Scale     = \libertinusSF@scale ,
@@ -206,9 +217,11 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldSlantedFont= *-Bold,
   BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Bold },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps},
   Extension      = .otf  
 ]
+
 \newfontfamily\LibertinusSansTLF{LibertinusSans}[
   RawFeature   = {+lnum;-onum;+tnum} ,
   Scale     = \libertinusSF@scale ,
@@ -224,14 +237,16 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   BoldSlantedFont= *-Bold,
   BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Bold },
   SmallCapsFont  = *-Regular,
-  SmallCapsFeatures={RawFeature=+smcp},
+%  SmallCapsFeatures={RawFeature=+smcp},
+  SmallCapsFeatures={Letters=SmallCaps},
   Extension      = .otf  
 ]
+
 \iflibertinus@mono
 \setmonofont{LibertinusMono}[ 
   RawFeature   = {\libertinus@figurealign; \libertinus@figurestyle},
-  Scale     = \libertinusTT@scale,
-  FakeStretch    = 0.8,
+  Scale          = \libertinusTT@scale,
+  FakeStretch    = \libertinusTT@stretch,
   UprightFont    = *-Regular,
   ItalicFont     = *-Regular,
   ItalicFeatures = {FakeSlant=0.2},
@@ -244,13 +259,12 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
   Extension      = .otf, 
 ]
 
-
 \iflibertinus@nomath\else
   \typeout{*************************************^^J%
            * Using libertinus math              *^^J%
            *************************************}%
-  \setmathfont{LibertinusMath-Regular.otf}%[BoldFont=LibertinusMath-Bold.otf]
-  \setmathfont[version=bold,RawFeature={embolden=3}]{LibertinusMath-Regular.otf}
+  \setmathfont{LibertinusMath-Regular.otf}[RawFeature=\libertinusMM@feature]
+  \setmathfont[version=bold,RawFeature={embolden=3,\libertinusMM@feature}]{LibertinusMath-Regular.otf}
 \fi
 
 \newfontfamily\LibertinusKeyboard{libertinuskeyboard-regular.otf}
@@ -259,6 +273,8 @@ as usual. With the optional argument \verb|nomath| there will be no loading of p
 \end{verbatim}
 
 
+\subsection{Math mode}
+
 \noindent\fbox{%
 \begin{minipage}{\dimexpr\textwidth-2\fboxsep-2\fboxrule}
 \textbf{Theorem 1 (Residue Theorem).}
@@ -301,6 +317,63 @@ $xyz \infty \propto \emptyset y=f(x)$
 \end{minipage}}
 
 
+There exists an optional argument \texttt{math} for setting features only for the math fonts,
+for example \texttt{+ss08} for different integral signs:
+
+
+
+\begin{externalDocument}[
+%  grfOptions={width=0.5\linewidth},
+  frame,compiler=lualatex,
+  crop,
+  force=true,
+  runs=2,code,docType=latex,
+  frame,
+%  showFilename,
+%  align=\centering,
+  lstOptions={columns=flexible}
+]{Libertinus}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage{libertinus-otf}
+%StopVisiblePreamble
+\begin{document}
+The default: $\int_1^\infty\frac1{x^2}\symup d x = 1$
+\[ \int_1^\infty\frac1{x^2}\symup d x = 1 \]
+\[ \int\limits_1^\infty\frac1{x^2}\symup d x = 1 \]
+\end{document}
+\end{externalDocument}
+
+
+
+
+\begin{externalDocument}[
+%  grfOptions={width=0.5\linewidth},
+  frame,compiler=lualatex,
+  crop,
+  force=true,
+  runs=2,code,docType=latex,
+  frame,
+%  showFilename,
+%  align=\centering,
+  lstOptions={columns=flexible}
+]{Libertinus}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage[math=+ss08]{libertinus-otf}
+%StopVisiblePreamble
+\begin{document}
+With math=+ss08: $\int_1^\infty\frac1{x^2}\symup d x = 1$
+\[ \int_1^\infty\frac1{x^2}\symup d x = 1 \]
+\[ \int\limits_1^\infty\frac1{x^2}\symup d x = 1 \]
+\end{document}
+\end{externalDocument}
+
+
+
+
 \subsection{The serif font}
 
 \selectlanguage{polish}
@@ -523,7 +596,18 @@ Taka Albo tace Usta pęk ucha.
 If you do not like the monofont, you can use the package option
 \texttt{mono=false}, then no mono font is defined 
 and the default Latin Modern Mono will be used unless no one other will be defined.
-However, by default the package loads the Libertinus Mono font:
+However, by default the package loads the Libertinus Mono font with the default features:
+
+\begin{verbatim}
+\setmonofont{LibertinusMono-Regular.otf[Scale=MatchLowercase,FakeStretch=0.9]
+\end{verbatim}
+
+These values can be changed with for example:
+
+\begin{verbatim}
+\usepackage[ScaleTT=MatchUppercase,StretchTT=0.95]{libertinus-otf}
+\end{verbatim}
+
 
 \small\ttfamily
 -.,mnbvcxy<\#äölkjhgfdsa+üpoiuztrewq\textasciicircum{}234567890ß'`?=)(/\&\%\$§"!°QWERTZUIOPÜ*'ÄÖLKJHGFDSA>YXCVBNM;:\_\\
@@ -575,6 +659,8 @@ ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Ni
 Taka Albo tace Usta pęk ucha.
 
 
+
+
 \normalfont\normalsize
 \selectlanguage{english}
 
@@ -582,7 +668,7 @@ Taka Albo tace Usta pęk ucha.
 
 \section{Features}
 \subsection{Serif fonts}
-\begin{lstlisting}[basicstyle=\NotoMono\small]
+\begin{lstlisting}[basicstyle=\ttfamily\small]
 otfinfo --features LibertinusSerif-Regular.otf 
 c2sc	Small Capitals From Capitals
 calt	Contextual Alternates
@@ -616,7 +702,7 @@ zero	Slashed Zero
 \end{lstlisting}
 
 \subsection{Sans Serif fonts}
-\begin{lstlisting}[basicstyle=\NotoMono\small]
+\begin{lstlisting}[basicstyle=\ttfamily\small]
 otfinfo --features LibertinusSans-Regular.otf 
 c2sc	Small Capitals From Capitals
 calt	Contextual Alternates
@@ -647,6 +733,11 @@ zero	Slashed Zero
 \end{lstlisting}
 
 %$
+\subsection{Math font}
+\begin{lstlisting}[basicstyle=\ttfamily\small]
+ss08	Stylistic Set 8 (slanted integral symbols)
+\end{lstlisting}
+
 
 
 \normalfont
@@ -664,24 +755,30 @@ semibold, sb    & semibold version\\
 bold            & bold version (default)\\\hline
 ScaleRM         & scaling for the serif font, preset to 1\\
 ScaleSF         & scaling for the sans serif font, preset to 1\\
-ScaleTT         & scaling for the mono font, preset to \texttt{MatchLowercase}\\\hline
+ScaleTT         & scaling for the mono font, preset to \texttt{MatchLowercase}\\
+StretchTT       & value (0..1) for the mono font stretch (FakeStretch)\\\hline
 defaultfeatures & valid for all fonts\\
 \end{tabular}
 
 
-\lstset{basicstyle=\NotoMono\small,backgroundcolor=white,extendedchars}
 
 
+%\lstset{extendedchars}
+
 \begin{externalDocument}[
 %  grfOptions={width=0.5\linewidth},
-  frame,compiler=lualatex,
+  frame,
+  compiler=lualatex,
   crop,
   force=true,
-  runs=2,code,docType=latex,
+  runs=2,
+  code,
+  docType=latex,
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}
+]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -698,11 +795,14 @@ defaultfeatures & valid for all fonts\\
   compiler=lualatex,
   crop,
   force=true,
-  runs=2,code,docType=latex,
+  runs=1,
+  code,
+  docType=latex,
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+lstOptions={columns=flexible}
+]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -716,17 +816,19 @@ defaultfeatures & valid for all fonts\\
 
 
 
-
 \begin{externalDocument}[
-%  grfOptions={width=0.5\linewidth},
-  frame,compiler=lualatex,
+  frame,
+  compiler=lualatex,
   crop,
   force=true,
-  runs=2,code,docType=latex,
+  runs=1,
+  code,
+  docType=latex,
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+lstOptions={columns=flexible}
+  ]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -740,6 +842,10 @@ defaultfeatures & valid for all fonts\\
 \end{externalDocument}
 
 
+
+
+
+
 \begin{externalDocument}[
 %  grfOptions={width=0.5\linewidth},
   frame,compiler=lualatex,
@@ -749,7 +855,7 @@ defaultfeatures & valid for all fonts\\
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -778,7 +884,7 @@ a global change of capitals to small caps.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -812,7 +918,7 @@ a global change of capitals to small caps.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -846,7 +952,7 @@ a global change of capitals to small caps relative to the current group.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -893,7 +999,7 @@ a global change of case sensitive forms.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -929,7 +1035,7 @@ a global change of case sensitive forms.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -968,7 +1074,7 @@ the alternate characters.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -1000,7 +1106,7 @@ and \textit{text} the local argument:
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -1031,7 +1137,7 @@ is again the number of the set.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -1050,7 +1156,7 @@ is again the number of the set.
   force=true,
   runs=2,code,docType=latex,
   frame,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -1071,7 +1177,7 @@ JKR \LSS02 JKR
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -1094,7 +1200,7 @@ JKR \LSS02 JKR
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -1117,7 +1223,7 @@ W {\LSS05 W} \qquad  \WikipediaW \qquad \Wikipedia
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -1145,7 +1251,7 @@ setting relative to the current group.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 \parindent=0pt
@@ -1176,7 +1282,7 @@ setting relative to the current group.
   frame,
 %  showFilename,
 %  align=\centering,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
@@ -1429,7 +1535,7 @@ a Libertinus font, one can use a predefinded command:
   force=true,
   runs=2,code,docType=latex,
   frame,
-  lstOptions={columns=fixed}]{Libertinus}
+  lstOptions={columns=flexible}]{Libertinus}
 \documentclass{article}
 \pagestyle{empty}
 %StartVisiblePreamble
diff --git a/Master/texmf-dist/tex/latex/libertinus-otf/libertinus-otf.sty b/Master/texmf-dist/tex/latex/libertinus-otf/libertinus-otf.sty
index 03eaf948e17..5ec65e8c716 100644
--- a/Master/texmf-dist/tex/latex/libertinus-otf/libertinus-otf.sty
+++ b/Master/texmf-dist/tex/latex/libertinus-otf/libertinus-otf.sty
@@ -8,7 +8,7 @@
 % Copyright 2020 Herbert Voss hvoss@tug.org
 %
 \ProvidesPackage{libertinus-otf}[%
-  2020/10/13 v. 0.27 (Herbert Voss) Supports libertinus fonts for lualatex and xelatex.] 
+  2021/01/11 v. 0.28 (Herbert Voss) Supports libertinus fonts for lualatex and xelatex.] 
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 %\RequirePackage[no-math]{fontspec}
@@ -27,6 +27,8 @@
 \DeclareOptionX{osf}[true]{\@nameuse{if#1}\libertinus@liningfalse\else\libertinus@liningtrue\fi}
 
 \DeclareOptionX{usefilenames}[true]{\@nameuse{libertinus@usefilenames#1}}
+\newcommand*\libertinusMM@feature{}
+\DeclareOptionX{math}[]{\renewcommand*\libertinusMM@feature{#1}}
 \DeclareOptionX{nomath}[true]{\@nameuse{libertinus@nomath#1}}
 \DeclareOptionX{mono}[true]{\@nameuse{libertinus@mono#1}}
 
@@ -43,10 +45,12 @@
 \newcommand*\libertinusDisplayT@scale{1} 
 \newcommand*\libertinusSF@scale{1}
 \newcommand*\libertinusTT@scale{MatchLowercase}  
+\newcommand*\libertinusTT@stretch{0.9}  
 \newcommand*\libertinusInitialsT@scale{1}  
 \DeclareOptionX{ScaleRM}{\renewcommand*{\libertinusRM@scale}{#1}}
 \DeclareOptionX{ScaleSF}{\renewcommand*{\libertinusSF@scale}{#1}}
 \DeclareOptionX{ScaleTT}{\renewcommand*{\libertinusTT@scale}{#1}}
+\DeclareOptionX{StretchTT}{\renewcommand*{\libertinusTT@stretch}{#1}}
 
 \def\libertinus@defaultfeatures{}
 \DeclareOptionX{defaultfeatures}{\def\libertinus@defaultfeatures{#1}}
@@ -231,8 +235,8 @@
 \iflibertinus@mono
 \setmonofont{LibertinusMono}[ 
   RawFeature   = {\libertinus@figurealign; \libertinus@figurestyle},
-  Scale     = \libertinusTT@scale,
-  FakeStretch    = 0.8,
+  Scale          = \libertinusTT@scale,
+  FakeStretch    = \libertinusTT@stretch,
   UprightFont    = *-Regular,
   ItalicFont     = *-Regular,
   ItalicFeatures = {FakeSlant=0.2},
@@ -400,8 +404,8 @@
 \iflibertinus@mono
 \setmonofont{Libertinus Mono}[ 
 %  RawFeature   = {\libertinus@figurealign, \libertinus@figurestyle},
-  Scale     = \libertinusTT@scale,
-  FakeStretch    = 0.8,
+  Scale          = \libertinusTT@scale,
+  FakeStretch    = \libertinusTT@stretch,
   UprightFont    = * Regular,
   ItalicFont     = * Regular,
   ItalicFeatures = {FakeSlant=0.2},
@@ -421,8 +425,8 @@
   \typeout{*************************************^^J%
            * Using libertinus math              *^^J%
            *************************************}%
-  \setmathfont{LibertinusMath-Regular.otf}%[BoldFont=LibertinusMath-Bold.otf]
-  \setmathfont[version=bold,RawFeature={embolden=3}]{LibertinusMath-Regular.otf}
+  \setmathfont{LibertinusMath-Regular.otf}[RawFeature=\libertinusMM@feature]
+  \setmathfont[version=bold,RawFeature={embolden=3,\libertinusMM@feature}]{LibertinusMath-Regular.otf}
 \fi
 
 \ifluatex
diff --git a/Master/tlpkg/tlpsrc/forest.tlpsrc b/Master/tlpkg/tlpsrc/forest.tlpsrc
index a39a3aee099..6d4cdd77d47 100644
--- a/Master/tlpkg/tlpsrc/forest.tlpsrc
+++ b/Master/tlpkg/tlpsrc/forest.tlpsrc
@@ -3,4 +3,5 @@ depend environ
 depend etoolbox
 depend inlinedef
 depend l3packages
+depend pgf
 depend pgfopts