imfellEnglish (4oct15)

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

9 files changed, 19 insertions, 81 deletions

diff --git a/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd
index ad7ace01cae..84d6d874309 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglish-TLF.fd
@@ -23,4 +23,9 @@
       <-> ssub * IMFELLEnglish-TLF/m/it
 }{}
 
+\DeclareFontShape{LY1}{IMFELLEnglish-TLF}{m}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-ly1
+
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglishSC-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglishSC-TLF.fd
deleted file mode 100644
index c7a3a87c4be..00000000000
--- a/Master/texmf-dist/tex/latex/imfellenglish/LY1IMFELLEnglishSC-TLF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2015/09/29
-%%
-\ProvidesFile{LY1IMFELLEnglishSC-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for LY1/IMFELLEnglishSC-TLF.]
-
-\expandafter\ifx\csname IMFELLEnglishSC@scale\endcsname\relax
-    \let\IMFELLEnglishSC@@scale\@empty
-\else
-    \edef\IMFELLEnglishSC@@scale{s*[\csname IMFELLEnglishSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{IMFELLEnglishSC-TLF}{}
-
-\DeclareFontShape{LY1}{IMFELLEnglishSC-TLF}{m}{n}{
-      <-> \IMFELLEnglishSC@@scale IM_FELL_English_SC-tlf-ly1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd
index 75ac8d5d3ed..5d72e436bc8 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglish-TLF.fd
@@ -23,4 +23,8 @@
       <-> ssub * IMFELLEnglish-TLF/m/it
 }{}
 
+\DeclareFontShape{OT1}{IMFELLEnglish-TLF}{m}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-ot1
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglishSC-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglishSC-TLF.fd
deleted file mode 100644
index 143feb5b5ff..00000000000
--- a/Master/texmf-dist/tex/latex/imfellenglish/OT1IMFELLEnglishSC-TLF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2015/09/29
-%%
-\ProvidesFile{OT1IMFELLEnglishSC-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for OT1/IMFELLEnglishSC-TLF.]
-
-\expandafter\ifx\csname IMFELLEnglishSC@scale\endcsname\relax
-    \let\IMFELLEnglishSC@@scale\@empty
-\else
-    \edef\IMFELLEnglishSC@@scale{s*[\csname IMFELLEnglishSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{IMFELLEnglishSC-TLF}{}
-
-\DeclareFontShape{OT1}{IMFELLEnglishSC-TLF}{m}{n}{
-      <-> \IMFELLEnglishSC@@scale IM_FELL_English_SC-tlf-ot1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd
index f9f03dd5bb0..032589cea16 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglish-TLF.fd
@@ -23,4 +23,8 @@
       <-> ssub * IMFELLEnglish-TLF/m/it
 }{}
 
+\DeclareFontShape{T1}{IMFELLEnglish-TLF}{m}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-t1
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglishSC-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglishSC-TLF.fd
deleted file mode 100644
index 01334c5cd08..00000000000
--- a/Master/texmf-dist/tex/latex/imfellenglish/T1IMFELLEnglishSC-TLF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2015/09/29
-%%
-\ProvidesFile{T1IMFELLEnglishSC-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for T1/IMFELLEnglishSC-TLF.]
-
-\expandafter\ifx\csname IMFELLEnglishSC@scale\endcsname\relax
-    \let\IMFELLEnglishSC@@scale\@empty
-\else
-    \edef\IMFELLEnglishSC@@scale{s*[\csname IMFELLEnglishSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{IMFELLEnglishSC-TLF}{}
-
-\DeclareFontShape{T1}{IMFELLEnglishSC-TLF}{m}{n}{
-      <-> \IMFELLEnglishSC@@scale IM_FELL_English_SC-tlf-t1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd
index 570f8bdd195..deda5a02864 100644
--- a/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd
+++ b/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd
@@ -23,4 +23,8 @@
       <-> ssub * IMFELLEnglish-TLF/m/it
 }{}
 
+\DeclareFontShape{TS1}{IMFELLEnglish-TLF}{m}{sc}{
+      <-> \IMFELLEnglish@@scale IM_FELL_English_SC-tlf-ts1
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglishSC-TLF.fd b/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglishSC-TLF.fd
deleted file mode 100644
index c8d2f71c006..00000000000
--- a/Master/texmf-dist/tex/latex/imfellenglish/TS1IMFELLEnglishSC-TLF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2015/09/29
-%%
-\ProvidesFile{TS1IMFELLEnglishSC-TLF.fd}
-    [2015/09/29 (autoinst)  Font definitions for TS1/IMFELLEnglishSC-TLF.]
-
-\expandafter\ifx\csname IMFELLEnglishSC@scale\endcsname\relax
-    \let\IMFELLEnglishSC@@scale\@empty
-\else
-    \edef\IMFELLEnglishSC@@scale{s*[\csname IMFELLEnglishSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{IMFELLEnglishSC-TLF}{}
-
-\DeclareFontShape{TS1}{IMFELLEnglishSC-TLF}{m}{n}{
-      <-> \IMFELLEnglishSC@@scale IM_FELL_English_SC-tlf-ts1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/imfellenglish/imfellEnglish.sty b/Master/texmf-dist/tex/latex/imfellenglish/imfellEnglish.sty
index 9aebdfa913e..a582fe239fa 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/09/30 (Bob Tennent and autoinst)  Style file for IM Fell English fonts.]
+    [2015/10/04 (Bob Tennent and autoinst)  Style file for IM Fell English fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -38,22 +38,15 @@
         ItalicFont = *it28P ,
         BoldFont =   *rm28P ,
         BoldItalicFont =   *it28P ,
+        SmallCapsFont  = *sc28P,
       ]
       
-  \newfontfamily\scshape[
-        UprightFont    = *sc28P,
-      ]
-      {IMFeEN}
-
 \else % type1
 
   \def\imfellEnglish@family{IMFELLEnglish-TLF}
-  \def\imfellEnglishSC@family{IMFELLEnglishSC-TLF}
   \renewcommand*\rmdefault{\imfellEnglish@family}
   \newcommand*\imfellEnglish{\fontfamily{\imfellEnglish@family}\selectfont}
 
-  \DeclareRobustCommand\scshape{\fontfamily{\imfellEnglishSC@family}\selectfont}
-
 \fi
 
 \ifimfellEnglish@otf