imfellenglish (1oct22)

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

5 files changed, 141 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd
index 84d6d874309..419e18aa105 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/09/29
+%% Generated by autoinst on 2019/10/11
 %%
 \ProvidesFile{LY1IMFELLEnglish-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for LY1/IMFELLEnglish-TLF.]
+    [2019/10/11 (autoinst)  Font definitions for LY1/IMFELLEnglish-TLF.]
 
 \expandafter\ifx\csname IMFELLEnglish@scale\endcsname\relax
     \let\IMFELLEnglish@@scale\@empty
@@ -11,21 +11,53 @@
 
 \DeclareFontFamily{LY1}{IMFELLEnglish-TLF}{}
 
-\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{regular}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{regular}{n}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Roman-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{it}{
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{regular}{it}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-ly1
 }{}
 
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{regular}{sw}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{regular}{sl}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
 \DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{sl}{
-      <-> ssub * IMFELLEnglish-TLF/m/it
+      <-> ssub * IMFELLEnglish-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{sc}{
-      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-ly1
+      <-> ssub * IMFELLEnglish-TLF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{n}{
+      <-> ssub * IMFELLEnglish-TLF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{it}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
 
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{sw}{
+      <-> ssub * IMFELLEnglish-TLF/regular/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd
index 5d72e436bc8..9c747bfcac8 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/09/29
+%% Generated by autoinst on 2019/10/11
 %%
 \ProvidesFile{OT1IMFELLEnglish-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for OT1/IMFELLEnglish-TLF.]
+    [2019/10/11 (autoinst)  Font definitions for OT1/IMFELLEnglish-TLF.]
 
 \expandafter\ifx\csname IMFELLEnglish@scale\endcsname\relax
     \let\IMFELLEnglish@@scale\@empty
@@ -11,20 +11,53 @@
 
 \DeclareFontFamily{OT1}{IMFELLEnglish-TLF}{}
 
-\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{regular}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{regular}{n}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Roman-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{it}{
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{regular}{it}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-ot1
 }{}
 
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{regular}{sw}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{regular}{sl}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
 \DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{sl}{
-      <-> ssub * IMFELLEnglish-TLF/m/it
+      <-> ssub * IMFELLEnglish-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{sc}{
-      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-ot1
+      <-> ssub * IMFELLEnglish-TLF/regular/sc
+}{}
+
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{n}{
+      <-> ssub * IMFELLEnglish-TLF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{it}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{sw}{
+      <-> ssub * IMFELLEnglish-TLF/regular/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd
index 032589cea16..00dc3e40e12 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/09/29
+%% Generated by autoinst on 2019/10/11
 %%
 \ProvidesFile{T1IMFELLEnglish-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for T1/IMFELLEnglish-TLF.]
+    [2019/10/11 (autoinst)  Font definitions for T1/IMFELLEnglish-TLF.]
 
 \expandafter\ifx\csname IMFELLEnglish@scale\endcsname\relax
     \let\IMFELLEnglish@@scale\@empty
@@ -11,20 +11,53 @@
 
 \DeclareFontFamily{T1}{IMFELLEnglish-TLF}{}
 
-\DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{regular}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{regular}{n}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Roman-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{it}{
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{regular}{it}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-t1
 }{}
 
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{regular}{sw}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{regular}{sl}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
 \DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{sl}{
-      <-> ssub * IMFELLEnglish-TLF/m/it
+      <-> ssub * IMFELLEnglish-TLF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{sc}{
-      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-t1
+      <-> ssub * IMFELLEnglish-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{n}{
+      <-> ssub * IMFELLEnglish-TLF/regular/n
+}{}
+
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{it}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
+
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{sw}{
+      <-> ssub * IMFELLEnglish-TLF/regular/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd
index deda5a02864..eaf4f0dbd2e 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/09/29
+%% Generated by autoinst on 2019/10/11
 %%
 \ProvidesFile{TS1IMFELLEnglish-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for TS1/IMFELLEnglish-TLF.]
+    [2019/10/11 (autoinst)  Font definitions for TS1/IMFELLEnglish-TLF.]
 
 \expandafter\ifx\csname IMFELLEnglish@scale\endcsname\relax
     \let\IMFELLEnglish@@scale\@empty
@@ -11,20 +11,37 @@
 
 \DeclareFontFamily{TS1}{IMFELLEnglish-TLF}{}
 
-\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{regular}{n}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Roman-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{it}{
+\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{regular}{it}{
       <-> \IMFELLEnglish@@scale IM_FELL_English_Italic-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{regular}{sl}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
 \DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{sl}{
-      <-> ssub * IMFELLEnglish-TLF/m/it
+      <-> ssub * IMFELLEnglish-TLF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{n}{
+      <-> ssub * IMFELLEnglish-TLF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{sc}{
-      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-ts1
+\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{it}{
+      <-> ssub * IMFELLEnglish-TLF/regular/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/imfellEnglish.sty b/Master/texmf-dist/tex/latex/imfellenglish/imfellEnglish.sty
index a582fe239fa..e4a4bb9ccac 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/imfellEnglish.sty
+++ b/Master/texmf-dist/tex/latex/imfellenglish/imfellEnglish.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{imfellEnglish}
-    [2015/10/04 (Bob Tennent and autoinst)  Style file for IM Fell English fonts.]
+    [2022/10/01 (Bob Tennent and autoinst)  Style file for IM Fell English fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -28,7 +28,6 @@
 \fi
 
 \ifimfellEnglish@otf
-  \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \IMFELLEnglish@scale ,