librebaskerville (24jul20)

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

8 files changed, 28 insertions, 340 deletions

diff --git a/Master/texmf-dist/tex/latex/librebaskerville/LY1LibreBaskerville-Sup.fd b/Master/texmf-dist/tex/latex/librebaskerville/LY1LibreBaskerville-Sup.fd
deleted file mode 100644
index 7bae49f68e0..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/LY1LibreBaskerville-Sup.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{LY1LibreBaskerville-Sup.fd}
-    [2012/12/01 (autoinst)  Font definitions for LY1/LibreBaskerville-Sup.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibreBaskerville-Sup}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{b}{sl}{
-    <-> ssub * LibreBaskerville-Sup/b/it
-}{}
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{m}{sl}{
-    <-> ssub * LibreBaskerville-Sup/m/it
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{bx}{n}{ <-> ssub * LibreBaskerville-Sup/b/n }{}
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{bx}{it}{ <-> ssub * LibreBaskerville-Sup/b/it }{}
-\DeclareFontShape{LY1}{LibreBaskerville-Sup}{bx}{sl}{ <-> ssub * LibreBaskerville-Sup/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/LY1LibreBaskerville-TLF.fd b/Master/texmf-dist/tex/latex/librebaskerville/LY1LibreBaskerville-TLF.fd
deleted file mode 100644
index fb472e83388..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/LY1LibreBaskerville-TLF.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{LY1LibreBaskerville-TLF.fd}
-    [2012/12/01 (autoinst)  Font definitions for LY1/LibreBaskerville-TLF.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibreBaskerville-TLF}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{b}{sl}{
-    <-> ssub * LibreBaskerville-TLF/b/it
-}{}
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{m}{sl}{
-    <-> ssub * LibreBaskerville-TLF/m/it
-}{}
-
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{bx}{n}{ <-> ssub * LibreBaskerville-TLF/b/n }{}
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{bx}{it}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-\DeclareFontShape{LY1}{LibreBaskerville-TLF}{bx}{sl}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/OT1LibreBaskerville-Sup.fd b/Master/texmf-dist/tex/latex/librebaskerville/OT1LibreBaskerville-Sup.fd
deleted file mode 100644
index bc939fdc7c7..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/OT1LibreBaskerville-Sup.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{OT1LibreBaskerville-Sup.fd}
-    [2012/12/01 (autoinst)  Font definitions for OT1/LibreBaskerville-Sup.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibreBaskerville-Sup}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{b}{sl}{
-    <-> ssub * LibreBaskerville-Sup/b/it
-}{}
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{m}{sl}{
-    <-> ssub * LibreBaskerville-Sup/m/it
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{bx}{n}{ <-> ssub * LibreBaskerville-Sup/b/n }{}
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{bx}{it}{ <-> ssub * LibreBaskerville-Sup/b/it }{}
-\DeclareFontShape{OT1}{LibreBaskerville-Sup}{bx}{sl}{ <-> ssub * LibreBaskerville-Sup/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/OT1LibreBaskerville-TLF.fd b/Master/texmf-dist/tex/latex/librebaskerville/OT1LibreBaskerville-TLF.fd
deleted file mode 100644
index 1f17b42ea58..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/OT1LibreBaskerville-TLF.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{OT1LibreBaskerville-TLF.fd}
-    [2012/12/01 (autoinst)  Font definitions for OT1/LibreBaskerville-TLF.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibreBaskerville-TLF}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{b}{sl}{
-    <-> ssub * LibreBaskerville-TLF/b/it
-}{}
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{m}{sl}{
-    <-> ssub * LibreBaskerville-TLF/m/it
-}{}
-
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{bx}{n}{ <-> ssub * LibreBaskerville-TLF/b/n }{}
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{bx}{it}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-\DeclareFontShape{OT1}{LibreBaskerville-TLF}{bx}{sl}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/T1LibreBaskerville-Sup.fd b/Master/texmf-dist/tex/latex/librebaskerville/T1LibreBaskerville-Sup.fd
deleted file mode 100644
index d57b53bdf88..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/T1LibreBaskerville-Sup.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{T1LibreBaskerville-Sup.fd}
-    [2012/12/01 (autoinst)  Font definitions for T1/LibreBaskerville-Sup.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibreBaskerville-Sup}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{b}{sl}{
-    <-> ssub * LibreBaskerville-Sup/b/it
-}{}
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{m}{sl}{
-    <-> ssub * LibreBaskerville-Sup/m/it
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{bx}{n}{ <-> ssub * LibreBaskerville-Sup/b/n }{}
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{bx}{it}{ <-> ssub * LibreBaskerville-Sup/b/it }{}
-\DeclareFontShape{T1}{LibreBaskerville-Sup}{bx}{sl}{ <-> ssub * LibreBaskerville-Sup/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/T1LibreBaskerville-TLF.fd b/Master/texmf-dist/tex/latex/librebaskerville/T1LibreBaskerville-TLF.fd
deleted file mode 100644
index 0b0ccae2bdd..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/T1LibreBaskerville-TLF.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{T1LibreBaskerville-TLF.fd}
-    [2012/12/01 (autoinst)  Font definitions for T1/LibreBaskerville-TLF.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibreBaskerville-TLF}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{b}{sl}{
-    <-> ssub * LibreBaskerville-TLF/b/it
-}{}
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{m}{sl}{
-    <-> ssub * LibreBaskerville-TLF/m/it
-}{}
-
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{bx}{n}{ <-> ssub * LibreBaskerville-TLF/b/n }{}
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{bx}{it}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-\DeclareFontShape{T1}{LibreBaskerville-TLF}{bx}{sl}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/TS1LibreBaskerville-TLF.fd b/Master/texmf-dist/tex/latex/librebaskerville/TS1LibreBaskerville-TLF.fd
deleted file mode 100644
index 68db5eb2c17..00000000000
--- a/Master/texmf-dist/tex/latex/librebaskerville/TS1LibreBaskerville-TLF.fd
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/12/01
-%%
-\ProvidesFile{TS1LibreBaskerville-TLF.fd}
-    [2012/12/01 (autoinst)  Font definitions for TS1/LibreBaskerville-TLF.]
-
-\expandafter\ifx\csname LibreBaskerville@scale\endcsname\relax
-    \let\LibreBaskerville@@scale\@empty
-\else
-    \edef\LibreBaskerville@@scale{s*[\csname LibreBaskerville@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{LibreBaskerville-TLF}{}
-
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{b}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Bold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{b}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-BoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{b}{sl}{
-    <-> ssub * LibreBaskerville-TLF/b/it
-}{}
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{m}{n}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Regular-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{m}{it}{
-      <-> \LibreBaskerville@@scale LibreBaskerville-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{m}{sl}{
-    <-> ssub * LibreBaskerville-TLF/m/it
-}{}
-
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{bx}{n}{ <-> ssub * LibreBaskerville-TLF/b/n }{}
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{bx}{it}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-\DeclareFontShape{TS1}{LibreBaskerville-TLF}{bx}{sl}{ <-> ssub * LibreBaskerville-TLF/b/it }{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/librebaskerville/librebaskerville.sty b/Master/texmf-dist/tex/latex/librebaskerville/librebaskerville.sty
index 220ff31d2b6..4bd08fb21a2 100644
--- a/Master/texmf-dist/tex/latex/librebaskerville/librebaskerville.sty
+++ b/Master/texmf-dist/tex/latex/librebaskerville/librebaskerville.sty
@@ -1,69 +1,44 @@
 \ProvidesPackage{librebaskerville}[%
-   2012/12/01 (Bob Tennent)  Supports LibreBaskerville fonts for all LaTeX engines. ] 
+   2020/07/24 (Bob Tennent)  Supports LibreBaskerville fonts for XeLaTeX and LuaLaTeX. ] 
 
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
 
-\newif\iflibrebaskerville@otf
-\ifxetex
-  \librebaskerville@otftrue
-\else\ifluatex
-  \librebaskerville@otftrue
-\else  % [pdf]LaTeX
-  \librebaskerville@otffalse
-\fi\fi
+\ifpdftex
+\PackageError{librebaskerville}{%
+ *****************************************\MessageBreak
+  Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi  
 
 \newcommand*{\LibreBaskerville@scale}{1}  
 \RequirePackage{xkeyval}
 \DeclareOptionX{scaled}{\renewcommand*{\LibreBaskerville@scale}{#1}}
 \DeclareOptionX{scale}{\renewcommand*{\LibreBaskerville@scale}{#1}}
 
-\DeclareOptionX{type1}{\librebaskerville@otffalse}
-
 \ProcessOptionsX\relax
 
-\iflibrebaskerville@otf
-  \RequirePackage{fontspec}
-\else
-  \RequirePackage{fontenc,fontaxes}
-\fi
-
-\iflibrebaskerville@otf
-  \ifxetex\XeTeXtracingfonts=1\fi
-  \defaultfontfeatures{
-     Ligatures = TeX ,
-     Extension = .otf ,
-  }
-  \setmainfont
-      [ UprightFont    = *-Regular ,
-        ItalicFont     = *-Italic ,
-        BoldFont       = *-Bold , 
-        BoldItalicFont = *-BoldItalic ]
-      {LibreBaskerville}
-  \newfontfamily\librebaskerville
-      [ UprightFont    = *-Regular ,
-        ItalicFont     = *-Italic ,
-        BoldFont       = *-Bold , 
-        BoldItalicFont = *-BoldItalic ]
-      {LibreBaskerville}
-  \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
-
-
-\else % type1
-
-  \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
-  \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
-  \providecommand\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
-  \def\librebaskervillefamily{LibreBaskerville-TLF}
-  \renewcommand*\rmdefault{\librebaskervillefamily}
-  \newcommand*\librebaskerville{\fontfamily{\librebaskervillefamily}\selectfont}
-
-\fi
-\DeclareTextFontCommand{\textsu}{\sufigures}
+\RequirePackage{fontspec}
+
+\ifxetex\XeTeXtracingfonts=1\fi
+\defaultfontfeatures{
+   Ligatures = TeX ,
+   Extension = .ttf ,
+}
+\setmainfont
+    [ UprightFont    = *-Regular ,
+      ItalicFont     = *-Italic ,
+      BoldFont       = *-Bold , 
+      ]
+    {LibreBaskerville}
+\newfontfamily\librebaskerville
+    [ UprightFont    = *-Regular ,
+      ItalicFont     = *-Italic ,
+      BoldFont       = *-Bold , 
+      ]
+    {LibreBaskerville}
 
 % turn off defaults in case other fonts are selected:
-\iflibrebaskerville@otf
-  \defaultfontfeatures{}
-\fi
+\defaultfontfeatures{}
 
 \endinput