libertinust1math (21sep18)

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

6 files changed, 68 insertions, 44 deletions

diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd
index 7e8a900bfac..6d5635ccd55 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1math.fd
@@ -7,16 +7,20 @@
 \ProvidesFile{ls1libertinust1math.fd}
    [2016/03/23 Fontinst v1.933 font definitions for LS1/libertinust1math.]
 
-\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
-    \let\LinuxLibertine@@scale\@empty
+\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
+  \expandafter\ifx\csname LibertinusSerif@scale\endcsname\relax
+    \let\LibertinusMath@@scale\@empty
+  \else
+    \edef\LibertinusMath@@scale{s*[\LibertinusSerif@scale]}
+  \fi
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\LinuxLibertineT@scale]}%
 \fi
 
 \expandafter\ifx\csname libus@scale\endcsname\relax
-%    \let\LinuxLibertine@@scale\@empty
+%    \let\LibertinusMath@@scale\@empty
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname libus@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\libus@scale]}%
 \fi
 
 \edef\libus@sf{}
@@ -25,22 +29,22 @@
 \DeclareFontFamily{LS1}{libertinust1math}{\skewchar \font =127}
 
 \DeclareFontShape{LS1}{libertinust1math}{m}{it}{
-   <-> \LinuxLibertine@@scale
+   <-> \LibertinusMath@@scale
  libertinust1-math\libus@sf it
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{b}{it}{
-   <-> \LinuxLibertine@@scale
+   <-> \LibertinusMath@@scale
  libertinust1-math\libus@sf it-bold
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{m}{n}{
-   <-> \LinuxLibertine@@scale
+   <-> \LibertinusMath@@scale
  libertinust1-math\libus@sf rm
 }{}
 
 \DeclareFontShape{LS1}{libertinust1math}{b}{n}{
-   <-> \LinuxLibertine@@scale
+   <-> \LibertinusMath@@scale
  libertinust1-math\libus@sf rm-bold
 }{}
 
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd
index 94212b41db5..693ba5e3970 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathbb.fd
@@ -1,22 +1,26 @@
 \ProvidesFile{ls1libertinust1mathbb.fd}
 [2016/08/22 latex LibertinusT1Mathbb LS1 font definitions]
 
-\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
-    \let\LinuxLibertine@@scale\@empty
+\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
+  \expandafter\ifx\csname LibertinusSerif@scale\endcsname\relax
+    \let\LibertinusMath@@scale\@empty
+  \else
+    \edef\LibertinusMath@@scale{s*[\LibertinusSerif@scale]}
+  \fi
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\LinuxLibertineT@scale]}%
 \fi
 
 \expandafter\ifx\csname libus@scale\endcsname\relax
-%    \let\LinuxLibertine@@scale\@empty
+%    \let\LibertinusMath@@scale\@empty
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\libus@scale]}%
 \fi
 
 
 \DeclareFontFamily{LS1}{libertinust1mathbb}{\skewchar\font127 }
 
-\DeclareFontShape{LS1}{libertinust1mathbb}{m}{n} {<-> \LinuxLibertine@@scale libertinust1-mathbb}{}
+\DeclareFontShape{LS1}{libertinust1mathbb}{m}{n} {<-> \LibertinusMath@@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/ls1libertinust1mathsf.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathsf.fd
index 6beda390477..e99e3dddd63 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathsf.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls1libertinust1mathsf.fd
@@ -1,28 +1,32 @@
 \ProvidesFile{ls1libertinust1mathsf.fd}
 [2017/08/11 Font definitions for LS1/ libertinust1mathsf]
 
-\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
-    \let\LinuxLibertine@@scale\@empty
+\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
+  \expandafter\ifx\csname LibertinusSerif@scale\endcsname\relax
+    \let\LibertinusMath@@scale\@empty
+  \else
+    \edef\LibertinusMath@@scale{s*[\LibertinusSerif@scale]}
+  \fi
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\LinuxLibertineT@scale]}%
 \fi
 
 \expandafter\ifx\csname libus@scale\endcsname\relax
-%    \let\LinuxLibertine@@scale\@empty
+%    \let\LibertinusMath@@scale\@empty
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\libus@scale]}%
 \fi
 
 \DeclareFontFamily{LS1}{libertinust1mathsf}{\skewchar\font =127 }
 
 \DeclareFontShape{LS1}{libertinust1mathsf}{m}{n}{
-   <-> \LinuxLibertine@@scale libertinust1-mathsfrm}{}
+   <-> \LibertinusMath@@scale libertinust1-mathsfrm}{}
 \DeclareFontShape{LS1}{libertinust1mathsf}{m}{it}{
-  <-> \LinuxLibertine@@scale  libertinust1-mathsfit}{}
+  <-> \LibertinusMath@@scale  libertinust1-mathsfit}{}
 \DeclareFontShape{LS1}{libertinust1mathsf}{b}{n} {
-  <-> \LinuxLibertine@@scale libertinust1-mathsfrm-bold}{}
+  <-> \LibertinusMath@@scale libertinust1-mathsfrm-bold}{}
 \DeclareFontShape{LS1}{libertinust1mathsf}{b}{it}{
-  <-> \LinuxLibertine@@scale libertinust1-mathsfit-bold}{}
+  <-> \LibertinusMath@@scale libertinust1-mathsfit-bold}{}
 
 \DeclareFontShape{LS1}{libertinust1mathsf}{m}{sl}{<->ssub * libertinust1mathsf/m/it}{}
 %\DeclareFontShape{LS1}{libertinust1mathsf}{b}{it}{<->ssub * libertinust1mathsf/m/it}{}
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd
index 53b1d746140..5afe9e33184 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathex.fd
@@ -4,19 +4,23 @@ extensions LS2 %
 font definitions]
 \DeclareFontFamily{LS2}{libertinust1mathex}{}
 
-\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
-    \let\LinuxLibertine@@scale\@empty
+\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
+  \expandafter\ifx\csname LibertinusSerif@scale\endcsname\relax
+    \let\LibertinusMath@@scale\@empty
+  \else
+    \edef\LibertinusMath@@scale{s*[\LibertinusSerif@scale]}
+  \fi
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\LinuxLibertineT@scale]}%
 \fi
 
 \expandafter\ifx\csname libus@scale\endcsname\relax
-%    \let\LinuxLibertine@@scale\@empty
+%    \let\LibertinusMath@@scale\@empty
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\libus@scale]}%
 \fi
 
-\DeclareFontShape{LS2}{libertinust1mathex}{m}{n} {<-> \LinuxLibertine@@scale libertinust1-mathex}{}
+\DeclareFontShape{LS2}{libertinust1mathex}{m}{n} {<-> \LibertinusMath@@scale libertinust1-mathex}{}
 
 \DeclareFontShape{LS2}{libertinust1mathex}{b}{n}{<->ssub * libertinust1mathex/m/n}{}
 \DeclareFontShape{LS2}{libertinust1mathex}{b}{it}{<->ssub * libertinust1mathex/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
index 1d6a2e41a68..f7a9a3a0784 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
@@ -1,21 +1,25 @@
 \ProvidesFile{ls2libertinust1mathsym.fd}
 [2015/04/17 v1.1.2-latex LibertinusT1Mathsym LS2 font definitions]
 
-\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
-    \let\LinuxLibertine@@scale\@empty
+\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
+  \expandafter\ifx\csname LibertinusSerif@scale\endcsname\relax
+    \let\LibertinusMath@@scale\@empty
+  \else
+    \edef\LibertinusMath@@scale{s*[\LibertinusSerif@scale]}
+  \fi
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\LinuxLibertineT@scale]}%
 \fi
 
 \expandafter\ifx\csname libus@scale\endcsname\relax
-%    \let\LinuxLibertine@@scale\@empty
+%    \let\LibertinusMath@@scale\@empty
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\libus@scale]}%
 \fi
 
 \DeclareFontFamily{LS2}{libertinust1mathsym}{\skewchar\font127 }
 
-\DeclareFontShape{LS2}{libertinust1mathsym}{m}{n} {<-> \LinuxLibertine@@scale libertinust1-mathsym}{}
+\DeclareFontShape{LS2}{libertinust1mathsym}{m}{n} {<-> \LibertinusMath@@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 38fb78a0949..d1b607b7703 100644
--- a/Master/texmf-dist/tex/latex/libertinust1math/ot1libertinust1mathsf.fd
+++ b/Master/texmf-dist/tex/latex/libertinust1math/ot1libertinust1mathsf.fd
@@ -7,30 +7,34 @@
 \ProvidesFile{ot1libertinust1mathsf.fd}
    [2016/03/23 Fontinst v1.933 font definitions for OT1/libertinust1mathsf.]
 
-\expandafter\ifx\csname LinuxLibertine@scale\endcsname\relax
-    \let\LinuxLibertine@@scale\@empty
+\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax
+  \expandafter\ifx\csname LibertinusSerif@scale\endcsname\relax
+    \let\LibertinusMath@@scale\@empty
+  \else
+    \edef\LibertinusMath@@scale{s*[\LibertinusSerif@scale]}
+  \fi
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\LinuxLibertineT@scale]}%
 \fi
 
 \expandafter\ifx\csname libus@scale\endcsname\relax
-%    \let\LinuxLibertine@@scale\@empty
+%    \let\LibertinusMath@@scale\@empty
 \else
-    \edef\LinuxLibertine@@scale{s*[\csname LinuxLibertine@scale\endcsname]}%
+    \edef\LibertinusMath@@scale{s*[\libus@scale]}%
 \fi
 
 \DeclareFontFamily{OT1}{libertinust1mathsf}{\skewchar \font =127}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{m}{n}{
-   <-> \LinuxLibertine@@scale libertinust1-mathsf
+   <-> \LibertinusMath@@scale libertinust1-mathsf
 }{}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{m}{it}{
-   <-> \LinuxLibertine@@scale libertinust1-mathsfi
+   <-> \LibertinusMath@@scale libertinust1-mathsfi
 }{}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{b}{n}{
-   <-> \LinuxLibertine@@scale libertinust1-mathsfb
+   <-> \LibertinusMath@@scale libertinust1-mathsfb
 }{}
 
 \DeclareFontShape{OT1}{libertinust1mathsf}{m}{sl}{<->ssub * libertinust1mathsf/m/it}{}