baskervillef (13nov19)

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

4 files changed, 22 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/fonts/baskervillef/README b/Master/texmf-dist/doc/fonts/baskervillef/README
index 0f2c5c60c00..14e68c28e89 100644
--- a/Master/texmf-dist/doc/fonts/baskervillef/README
+++ b/Master/texmf-dist/doc/fonts/baskervillef/README
@@ -19,7 +19,10 @@ Files provided "as is", with no warranties.
 
 The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts.
 
-Current version: 1.047 2019-05-13
+Current version: 1.048 2019-11-12
+
+Changes in version 1.048
+Corrected errors in some of the OT1 fd files. (Thanks Frank Mittelbach.)
 
 Changes in version 1.047
 Corrected some spacing errors involving ligatures, the most egregious involving italic f_f_i.
diff --git a/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-LF.fd b/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-LF.fd
index 1f1fb9f2bcc..72beb1f12e9 100644
--- a/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-LF.fd
+++ b/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-LF.fd
@@ -16,7 +16,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{b}{n}{
-      <-> \BaskervilleF@@scale BaskervilleF-Bold-lf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Bold-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{b}{scit}{
@@ -28,7 +28,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{b}{it}{
-      <-> \BaskervilleF@@scale BaskervilleF-BoldItalic-lf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-BoldItalic-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{b}{nw}{
@@ -39,12 +39,9 @@
       <-> ssub * BaskervilleF-LF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{BaskervilleF-LF}{b}{sl}{
-      <-> ssub * BaskervilleF-LF/m/sl
-}{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{m}{it}{
-      <-> \BaskervilleF@@scale BaskervilleF-Italic-lf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Italic-lf-ot1
 }{}
 \DeclareFontShape{OT1}{BaskervilleF-LF}{m}{sl}{
       <-> \BaskervilleF@@scale BaskervilleF-Italic-tlf-th-ot1
@@ -59,7 +56,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{m}{n}{
-      <-> \BaskervilleF@@scale BaskervilleF-Regular-lf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Regular-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-LF}{m}{scit}{
@@ -105,5 +102,8 @@
 \DeclareFontShape{OT1}{BaskervilleF-LF}{bx}{nw}{
       <-> ssub * BaskervilleF-LF/b/nw
 }{}
+\DeclareFontShape{OT1}{BaskervilleF-LF}{b}{sl}{
+      <-> ssub * BaskervilleF-LF/m/sl
+}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-OsF.fd b/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-OsF.fd
index bc42394879e..298b387be8b 100644
--- a/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-OsF.fd
+++ b/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-OsF.fd
@@ -12,7 +12,7 @@
 \DeclareFontFamily{OT1}{BaskervilleF-OsF}{\providecommand{\BaskervilleF@spc}{}\BaskervilleF@spc}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{m}{n}{
-      <-> \BaskervilleF@@scale BaskervilleF-Regular-osf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Regular-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{m}{sw}{
@@ -28,7 +28,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{m}{it}{
-      <-> \BaskervilleF@@scale BaskervilleF-Italic-osf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Italic-osf-ot1
 }{}
 \DeclareFontShape{OT1}{BaskervilleF-LF}{m}{sl}{
       <-> \BaskervilleF@@scale BaskervilleF-Italic-tlf-th-ot1
@@ -47,7 +47,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{b}{n}{
-      <-> \BaskervilleF@@scale BaskervilleF-Bold-osf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Bold-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{b}{scit}{
@@ -59,7 +59,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{b}{it}{
-      <-> \BaskervilleF@@scale BaskervilleF-BoldItalic-osf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-BoldItalic-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{b}{nw}{
@@ -70,9 +70,6 @@
       <-> ssub * BaskervilleF-OsF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{BaskervilleF-OsF}{b}{sl}{
-      <-> ssub * BaskervilleF-OsF/m/sl
-}{}
 
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{bx}{scit}{
       <-> ssub * BaskervilleF-OsF/b/scit
@@ -105,5 +102,8 @@
 \DeclareFontShape{OT1}{BaskervilleF-OsF}{bx}{it}{
       <-> ssub * BaskervilleF-OsF/b/it
 }{}
+\DeclareFontShape{OT1}{BaskervilleF-OsF}{b}{sl}{
+      <-> ssub * BaskervilleF-OsF/m/sl
+}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-TOsF.fd b/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-TOsF.fd
index db827a236bb..828c6c5dd60 100644
--- a/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/baskervillef/OT1BaskervilleF-TOsF.fd
@@ -16,7 +16,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{m}{n}{
-      <-> \BaskervilleF@@scale BaskervilleF-Regular-tosf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Regular-tosf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{m}{sw}{
@@ -28,7 +28,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{m}{it}{
-      <-> \BaskervilleF@@scale BaskervilleF-Italic-tosf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Italic-tosf-ot1
 }{}
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{m}{sl}{
       <-> \BaskervilleF@@scale BaskervilleF-Italic-tlf-th-ot1
@@ -43,7 +43,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{b}{it}{
-      <-> \BaskervilleF@@scale BaskervilleF-BoldItalic-tosf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-BoldItalic-tosf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{b}{nw}{
@@ -51,7 +51,7 @@
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{b}{n}{
-      <-> \BaskervilleF@@scale BaskervilleF-Bold-tosf-ot1G
+      <-> \BaskervilleF@@scale BaskervilleF-Bold-tosf-ot1
 }{}
 
 \DeclareFontShape{OT1}{BaskervilleF-TOsF}{b}{sw}{