libertinust1math (21sep17)

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

6 files changed, 161 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/latex/libertinust1math/libertinust1math.sty b/Master/texmf-dist/tex/latex/libertinust1math/libertinust1math.sty
index 619f0385c89..5d8c0aaeb65 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/libertinust1math.sty
+++ b/Master/texmf-dist/tex/latex/libertinust1math/libertinust1math.sty
@@ -1,20 +1,49 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\def\fileversion{1.0.3}
-\def\filedate{2016/08/21}
+\def\fileversion{1.1}
+\def\filedate{2017/08/16}
 \ProvidesPackage{libertinust1math}
     [\filedate\space v\fileversion---latex support for LibertinusT1Math (msharpe)]
 
+\RequirePackage{xkeyval}
 \newif\iflibus@upint %\libus@upintfalse
+\newif\iflibus@ams % amsfonts
 \newif\iflibus@frenchm
-\newif\iflibus@slantedG
+\newif\iflibus@slantedG % slanted capital Greek
+\newif\iflibus@sansmath %substitute sans for letters and operators
+\newif\iflibus@ISO % 
+\newif\iflibus@nosans % do not load sans math, \mathsf excepted
+\newif\iflibus@reuseMathAlphabets
+\newif\iflibus@mathsfit % 
 \let\libus@lcgc\mathord
-\DeclareOption{lcgreekalpha}{\let\libus@lcgc\mathalpha}
-\DeclareOption{upint}       {\libus@upinttrue}
-\DeclareOption{frenchmath}       {\libus@frenchmtrue}
-\DeclareOption{slantedGreek}       {\libus@slantedGtrue}
-\DeclareOption{uprightGreek}     {\libus@slantedGfalse}
-\ProcessOptions\relax
+
+\DeclareOptionX{lcgreekalpha}{\let\libus@lcgc\mathalpha}
+\DeclareOptionX{upint}       {\libus@upinttrue}
+\DeclareOptionX{frenchmath}       {\libus@frenchmtrue}
+\DeclareOptionX{slantedGreek}       {\libus@slantedGtrue}
+\DeclareOptionX{uprightGreek}     {\libus@slantedGfalse}
+\DeclareOptionX{ISO}       {\libus@ISOtrue}
+\DeclareOptionX{nosans}       {\libus@nosanstrue}
+\DeclareOptionX{sansmath}       {\libus@sansmathtrue}
+\DeclareOptionX{reuseMathAlphabets}  {\libus@reuseMathAlphabetstrue}
+\DeclareOptionX{mathsfit}       {\libus@mathsfittrue}
+\DeclareOptionX{scale}       {\def\libus@scale{#1}}
+\DeclareOptionX{scaled}       {\def\libus@scale{#1}}
+\ProcessOptionsX\relax
+
 \iflibus@frenchm\libus@slantedGfalse\fi
+\iflibus@sansmath\libus@nosanstrue\fi
+\iflibus@mathsfit\libus@nosansfalse\fi
+\iflibus@ISO\libus@sansmathfalse%
+ \let\libus@lcgc\mathalpha\libus@slantedGtrue\fi
+\iflibus@reuseMathAlphabets\libus@nosansfalse\fi
+
+\iflibus@reuseMathAlphabets
+  \PackageWarningNoLine{libertinust1math}{%
+    Re-using math alphabet `mathsf' for \protect \mathsfbfit
+    \MessageBreak and `mathbf' for \protect \mathbfit
+  }
+\fi
+
 \RequirePackage{amsmath}
 \def\libus@undefine#1{%
     \if\relax\noexpand#1\let#1=\@undefined\fi}
@@ -41,6 +70,17 @@
 \DeclareSymbolFont{symbolsbb}      {LS1}{libertinust1mathbb}   {m} {n}
 \DeclareSymbolFont{symbols}       {LS2}{libertinust1mathsym}  {m} {n}
 \DeclareSymbolFont{largesymbols}  {LS2}{libertinust1mathex}   {m} {n}
+\DeclareMathAlphabet{\mathsf}{LS1}{libertinust1mathsf}   {m} {n}
+\DeclareMathAlphabet{\mathsfbf}   {LS1}{libertinust1mathsf}   {b} {n}
+\iflibus@nosans
+\else
+%  \DeclareSymbolFont{sans}       {LS1}{libertinust1mathsf}  {m} {n}
+%  \DeclareSymbolFont{sansi}       {LS1}{libertinust1mathsf}  {m} {it}
+%  \SetSymbolFont{sans}       {bold}{LS1}{libertinust1mathsf}  {b} {n}
+%  \SetSymbolFont{sansi}       {bold}{LS1}{libertinust1mathsf}  {b} {it}
+  \DeclareMathAlphabet{\mathsfbfit}  {LS1}{libertinust1mathsf} {b} {it}
+  \DeclareMathAlphabet{\mathsfbf}  {LS1}{libertinust1mathsf} {b} {n}
+\fi
 \SetSymbolFont{letters}     {bold}{LS1}{libertinust1math}     {b}{it}
 \SetSymbolFont{operators}   {bold}{LS1}{libertinust1math}     {b} {n}
 \DeclareSymbolFont{bold-operators}{LS1}{libertinust1math}     {b} {n}
@@ -48,8 +88,42 @@
 \DeclareSymbolFontAlphabet{\mathit}  {letters}
 \DeclareSymbolFontAlphabet{\mathrm}  {operators}
 \DeclareSymbolFontAlphabet{\mathbf}  {bold-operators}
-\DeclareMathAlphabet{\mathbfit}   {LS1}{libertinust1math}     {b}{it}
+\iflibus@reuseMathAlphabets
+  \DeclareSymbolFontAlphabet{\mathbf}  {bold-letters}
+  \def\mathbfit{\mathbf}
+\else
+  \DeclareSymbolFontAlphabet{\mathbfit}{bold-letters}
+\fi
+\iflibus@nosans
+\else
+  \iflibus@ISO
+    %\DeclareSymbolFontAlphabet{\mathsf}  {sans}
+    \iflibus@mathsfit
+      %\DeclareSymbolFontAlphabet{\mathsfit}  {sansi}
+      \DeclareMathAlphabet{\mathsfit}{LS1}{libertinust1mathsf}{m}{it}		  \SetMathAlphabet{\mathsfit}{bold}{LS1}{libertinust1mathsf}{b}{it}
+  	  \def\mathsans{\mathsfit}
+    \fi
+	\iflibus@reuseMathAlphabets
+  	  \DeclareMathAlphabet{\mathsf}{LS1}{libertinust1mathsf}{b}{it}
+  	  \def\mathsfbfit{\mathsf}
+	\fi    
+	%\DeclareMathAlphabet{\mathsfbfit}{LS1}{libertinust1mathsf} {b}{it}
+	\def\mathboldsans{\mathsfbfit}
+	\def\mathbold{\mathbfit}
+	\providecommand*{\vectorsym}{\mathbfit}
+	\providecommand*{\matrixsym}{\mathbfit}
+	\providecommand*{\tensorsym}{\mathsfbfit}
 
+  \else % not ISO
+    \SetMathAlphabet{\mathsf}{bold}{LS1}{libertinust1mathsf}{b}{n}
+    \def\mathboldsans{\mathsfbfit}
+	\iflibus@mathsfit
+      %\DeclareSymbolFontAlphabet{\mathsfit}  {sansi}
+      \DeclareMathAlphabet{\mathsfit}{LS1}{libertinust1mathsf}{m}{it}		  \SetMathAlphabet{\mathsfit}{bold}{LS1}{libertinust1mathsf}{b}{it}
+  	  \def\mathsans{\mathsfit}
+    \fi
+  \fi
+\fi
 \DeclareFontFamily{U}{stixcal}{\skewchar\font127 }
 \DeclareFontShape{U}{stixcal}{m}{n} {<->  stix-mathcal}{}
 \DeclareFontShape{U}{stixcal}{b}{n} {<->  stix-mathcal-bold}{}
@@ -58,6 +132,9 @@
 \DeclareMathAlphabet{\mathbcal} {U}{stixcal}{b}{n}
 \DeclareSymbolFontAlphabet{\mathbb}  {symbolsbb}
 
+
+
+
 \libus@MathSymbol{\upGamma}      {\mathalpha}{operators}{"00}
 \libus@MathSymbol{\upDelta}      {\mathalpha}{operators}{"01}
 \libus@MathSymbol{\upTheta}      {\mathalpha}{operators}{"02}
@@ -634,8 +711,8 @@
 \libus@MathSymbol{\bracketlu}{\mathord}{letters}{"B6}
 \libus@MathSymbol{\bracketru}{\mathord}{letters}{"B7}
 \libus@MathSymbol{\bracketex}{\mathord}{symbols}{"89}
-\libus@MathSymbol{\parenex}{\mathord}{symbols}{"90}
-\def\libus@braceglue{\hskip -.10em plus .05em}
+\libus@MathSymbol{\parenex}{\mathord}{symbols}{"8A}
+\def\libus@braceglue{\hskip -.1em plus .05em}
 \def\downbracefill{$\m@th%
     \braceld\libus@braceglue%
     \cleaders\hbox{$\braceex$}\hfill%
@@ -648,7 +725,7 @@
     \libus@braceglue\bracemd\libus@braceglue%
     \cleaders\hbox{$\braceex$}\hfill%
     \libus@braceglue\braceru$}
-\def\libus@parenglue{\hskip -.2em plus .2em}
+\def\libus@parenglue{\hskip -.15em plus .05em}
 \def\downparenfill{$\m@th%
     \parenld\libus@parenglue%
     \cleaders\hbox{$\parenex$}\hfill%
@@ -1271,6 +1348,9 @@
 \txf@ntname{letters}
 \txf@ntname{bold-operators}
 \txf@ntname{bold-letters}
+\txf@ntname{symbolsbb}
+\txf@ntname{sans}
+\txf@ntname{sansi}
   \typeout{*** Mathgroups ***}
   \count@\z@
   \loop\ifnum\count@<16
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd
index d37e1a4bd53..7e8a900bfac 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd
@@ -7,32 +7,41 @@
 \ProvidesFile{ls1libertinust1math.fd}
    [2016/03/23 Fontinst v1.933 font definitions for LS1/libertinust1math.]
 
-\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
-    \let\LinuxLibertineT@@scale\@empty
+\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
+    \let\LinuxLibertine@@scale\@empty
 \else
-    \edef\LinuxLibertineT@@scale{s*[\csname LinuxLibertineT@scale\endcsname]}%
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
 \fi
 
+\expandafter\ifx\csname libus@scale\endcsname\relax
+%    \let\LinuxLibertine@@scale\@empty
+\else
+    \edef\LinuxLibertine@@scale{s*[\csname libus@scale\endcsname]}%
+\fi
+
+\edef\libus@sf{}
+\iflibus@sansmath\edef\libus@sf{sf}\fi
+
 \DeclareFontFamily{LS1}{libertinust1math}{\skewchar \font =127}
 
 \DeclareFontShape{LS1}{libertinust1math}{m}{it}{
-   <-> \LinuxLibertineT@@scale
- libertinust1-mathit
+   <-> \LinuxLibertine@@scale
+ libertinust1-math\libus@sf it
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{b}{it}{
-   <-> \LinuxLibertineT@@scale
- libertinust1-mathit-bold
+   <-> \LinuxLibertine@@scale
+ libertinust1-math\libus@sf it-bold
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{m}{n}{
-   <-> \LinuxLibertineT@@scale
- libertinust1-mathrm
+   <-> \LinuxLibertine@@scale
+ libertinust1-math\libus@sf rm
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{b}{n}{
-   <-> \LinuxLibertineT@@scale
- libertinust1-mathrm-bold
+   <-> \LinuxLibertine@@scale
+ libertinust1-math\libus@sf rm-bold
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{m}{sl}{<->ssub * libertinust1math/m/it}{}
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd
index 6f1f72a0f81..94212b41db5 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd
@@ -1,15 +1,22 @@
 \ProvidesFile{ls1libertinust1mathbb.fd}
 [2016/08/22 latex LibertinusT1Mathbb LS1 font definitions]
 
-\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
-    \let\LinuxLibertineT@@scale\@empty
+\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
+    \let\LinuxLibertine@@scale\@empty
 \else
-    \edef\LinuxLibertineT@@scale{s*[\csname LinuxLibertineT@scale\endcsname]}%
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
 \fi
 
+\expandafter\ifx\csname libus@scale\endcsname\relax
+%    \let\LinuxLibertine@@scale\@empty
+\else
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+\fi
+
+
 \DeclareFontFamily{LS1}{libertinust1mathbb}{\skewchar\font127 }
 
-\DeclareFontShape{LS1}{libertinust1mathbb}{m}{n} {<-> \LinuxLibertineT@@scale libertinust1-mathbb}{}
+\DeclareFontShape{LS1}{libertinust1mathbb}{m}{n} {<-> \LinuxLibertine@@scale libertinust1-mathbb}{}
 
 \DeclareFontShape{LS1}{libertinust1mathbb}{b}{n}{<->ssub * libertinust1mathbb/m/n}{}
 \DeclareFontShape{LS1}{libertinust1mathbb}{b}{it}{<->ssub * libertinust1mathbb/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd
index 2d9d6ba142b..53b1d746140 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd
@@ -4,18 +4,24 @@ extensions LS2 %
 font definitions]
 \DeclareFontFamily{LS2}{libertinust1mathex}{}
 
-\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
-    \let\LinuxLibertineT@@scale\@empty
+\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
+    \let\LinuxLibertine@@scale\@empty
 \else
-    \edef\LinuxLibertineT@@scale{s*[\csname LinuxLibertineT@scale\endcsname]}%
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
 \fi
 
-\DeclareFontShape{LS2}{libertinust1mathex}{m}{n} {<-> \LinuxLibertineT@@scale libertinust1-mathex}{}
+\expandafter\ifx\csname libus@scale\endcsname\relax
+%    \let\LinuxLibertine@@scale\@empty
+\else
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+\fi
+
+\DeclareFontShape{LS2}{libertinust1mathex}{m}{n} {<-> \LinuxLibertine@@scale libertinust1-mathex}{}
 
-\DeclareFontShape{LS2}{libertinust1mathex}{b}{n}{<->ssub * libertinust1mathsym/m/n}{}
-\DeclareFontShape{LS2}{libertinust1mathex}{b}{it}{<->ssub * libertinust1mathsym/m/n}{}
-\DeclareFontShape{LS2}{libertinust1mathex}{bx}{n}{<->ssub * libertinust1mathsym/m/n}{}
-\DeclareFontShape{LS2}{libertinust1mathex}{bx}{it}{<->ssub * libertinust1mathsym/m/n}{}
-\DeclareFontShape{LS2}{libertinust1mathex}{m}{it}{<->ssub * libertinust1mathsym/m/n}{}
+\DeclareFontShape{LS2}{libertinust1mathex}{b}{n}{<->ssub * libertinust1mathex/m/n}{}
+\DeclareFontShape{LS2}{libertinust1mathex}{b}{it}{<->ssub * libertinust1mathex/m/n}{}
+\DeclareFontShape{LS2}{libertinust1mathex}{bx}{n}{<->ssub * libertinust1mathex/m/n}{}
+\DeclareFontShape{LS2}{libertinust1mathex}{bx}{it}{<->ssub * libertinust1mathex/m/n}{}
+\DeclareFontShape{LS2}{libertinust1mathex}{m}{it}{<->ssub * libertinust1mathex/m/n}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
index c9d71d48b39..1d6a2e41a68 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
@@ -1,15 +1,21 @@
 \ProvidesFile{ls2libertinust1mathsym.fd}
 [2015/04/17 v1.1.2-latex LibertinusT1Mathsym LS2 font definitions]
 
-\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
-    \let\LinuxLibertineT@@scale\@empty
+\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
+    \let\LinuxLibertine@@scale\@empty
 \else
-    \edef\LinuxLibertineT@@scale{s*[\csname LinuxLibertineT@scale\endcsname]}%
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+\fi
+
+\expandafter\ifx\csname libus@scale\endcsname\relax
+%    \let\LinuxLibertine@@scale\@empty
+\else
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
 \fi
 
 \DeclareFontFamily{LS2}{libertinust1mathsym}{\skewchar\font127 }
 
-\DeclareFontShape{LS2}{libertinust1mathsym}{m}{n} {<-> \LinuxLibertineT@@scale libertinust1-mathsym}{}
+\DeclareFontShape{LS2}{libertinust1mathsym}{m}{n} {<-> \LinuxLibertine@@scale libertinust1-mathsym}{}
 
 \DeclareFontShape{LS2}{libertinust1mathsym}{b}{n}{<->ssub * libertinust1mathsym/m/n}{}
 \DeclareFontShape{LS2}{libertinust1mathsym}{b}{it}{<->ssub * libertinust1mathsym/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ot1libertinust1mathsf.fd b/Master/texmf-dist/tex/latex/libertinust1math/ot1libertinust1mathsf.fd
index fd16d595251..38fb78a0949 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ot1libertinust1mathsf.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ot1libertinust1mathsf.fd
@@ -7,24 +7,30 @@
 \ProvidesFile{ot1libertinust1mathsf.fd}
    [2016/03/23 Fontinst v1.933 font definitions for OT1/libertinust1mathsf.]
 
-\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
-    \let\LinuxLibertineT@@scale\@empty
+\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
+    \let\LinuxLibertine@@scale\@empty
 \else
-    \edef\LinuxLibertineT@@scale{s*[\csname LinuxLibertineT@scale\endcsname]}%
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+\fi
+
+\expandafter\ifx\csname libus@scale\endcsname\relax
+%    \let\LinuxLibertine@@scale\@empty
+\else
+    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
 \fi
 
 \DeclareFontFamily{OT1}{libertinust1mathsf}{\skewchar \font =127}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{m}{n}{
-   <-> \LinuxLibertineT@@scale libertinust1-mathsf
+   <-> \LinuxLibertine@@scale libertinust1-mathsf
 }{}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{m}{it}{
-   <-> \LinuxLibertineT@@scale libertinust1-mathsfi
+   <-> \LinuxLibertine@@scale libertinust1-mathsfi
 }{}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{b}{n}{
-   <-> \LinuxLibertineT@@scale libertinust1-mathsfb
+   <-> \LinuxLibertine@@scale libertinust1-mathsfb
 }{}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{m}{sl}{<->ssub * libertinust1mathsf/m/it}{}