erewhon (15mar17)

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

46 files changed, 465 insertions, 404 deletions

diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Dnom.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Dnom.fd
index 7f779ca328e..333ae977bc9 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Dnom.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-Dnom}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-Dnom}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-dnom-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-dnom-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-dnom-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-dnom-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-dnom-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-dnom-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Dnom}{bx}{sl}{
       <-> ssub * erewhon-Dnom/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Inf.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Inf.fd
index 3112ad32ab3..e527ca70d0b 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Inf.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Inf.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-Inf}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-Inf}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-inf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-inf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-inf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-inf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-inf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-inf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Inf}{bx}{sl}{
       <-> ssub * erewhon-Inf/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-LF.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-LF.fd
index 9b6ba22496e..db8e9b6ff92 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-LF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-LF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-LF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-LF}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-LF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-lf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-lf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-lf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{b}{scit}{
       <-> ssub * erewhon-LF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{LY1}{erewhon-LF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-lf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-lf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-lf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-LF}{m}{scit}{
       <-> ssub * erewhon-LF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Numr.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Numr.fd
index 0b5b1522e80..fd2280defb3 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Numr.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Numr.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-Numr}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-Numr}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-numr-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-numr-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-numr-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-numr-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-numr-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-numr-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Numr}{bx}{sl}{
       <-> ssub * erewhon-Numr/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-OsF.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-OsF.fd
index 36c1958d7b5..66522f7562a 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-OsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-OsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-OsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-OsF}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-osf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-osf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-osf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{b}{scit}{
       <-> ssub * erewhon-OsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{LY1}{erewhon-OsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-osf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-osf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-osf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-OsF}{m}{scit}{
       <-> ssub * erewhon-OsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Sup.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Sup.fd
index 277b4a24741..b30be29f496 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Sup.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-Sup.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-Sup}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-Sup}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-sup-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-sup-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-sup-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-sup-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-sup-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-sup-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-Sup}{bx}{sl}{
       <-> ssub * erewhon-Sup/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TLF.fd
index 659a03491e9..5f4c2c70b4b 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TLF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-TLF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tlf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{b}{scit}{
       <-> ssub * erewhon-TLF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{LY1}{erewhon-TLF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tlf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TLF}{m}{scit}{
       <-> ssub * erewhon-TLF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TOsF.fd b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TOsF.fd
index 12ef182059a..486b95072b1 100644
--- a/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/LY1erewhon-TOsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{LY1}{erewhon-TOsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{LY1}{erewhon-TOsF}{\erewhon@sf}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tosf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{b}{scit}{
       <-> ssub * erewhon-TOsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-sc-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tosf-ly1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{LY1}{erewhon-TOsF}{m}{scit}{
       <-> ssub * erewhon-TOsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/OT2erewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/OT2erewhon-TLF.fd
index 3da0739156c..627d4ed2ac1 100644
--- a/Master/texmf-dist/tex/latex/erewhon/OT2erewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/OT2erewhon-TLF.fd
@@ -13,7 +13,8 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{OT2}{erewhon-TLF}{}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{OT2}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{OT2}{erewhon-TLF}{m}{n}{
    <-> \erewhon@@scale Erewhon-Regular-tlf-ot2
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Dnom.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Dnom.fd
index 548c53511c9..e9352f51418 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Dnom.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-Dnom}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T1}{erewhon-Dnom}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-dnom-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-dnom-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-dnom-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-dnom-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-dnom-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-dnom-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Dnom}{bx}{sl}{
       <-> ssub * erewhon-Dnom/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Inf.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Inf.fd
index 7f3cf0f117f..5412a8527eb 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Inf.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Inf.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-Inf}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T1}{erewhon-Inf}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-Inf}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-inf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Inf}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-inf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Inf}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-inf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Inf}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-inf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Inf}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-inf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Inf}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-inf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Inf}{bx}{sl}{
       <-> ssub * erewhon-Inf/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-LF.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-LF.fd
index a97690c318d..a046e6c6ea1 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-LF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-LF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-LF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T1}{erewhon-LF}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-LF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-lf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-lf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-lf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{b}{scit}{
       <-> ssub * erewhon-LF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T1}{erewhon-LF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-lf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-lf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-lf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-LF}{m}{scit}{
       <-> ssub * erewhon-LF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Numr.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Numr.fd
index 4683dd1ffd1..aa4563572af 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Numr.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Numr.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-Numr}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T1}{erewhon-Numr}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-Numr}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-numr-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Numr}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-numr-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Numr}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-numr-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Numr}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-numr-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Numr}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-numr-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Numr}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-numr-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Numr}{bx}{sl}{
       <-> ssub * erewhon-Numr/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-OsF.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-OsF.fd
index b7d9b94bcad..030641c46d4 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-OsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-OsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-OsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T1}{erewhon-OsF}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-OsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-osf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-osf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-osf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{b}{scit}{
       <-> ssub * erewhon-OsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T1}{erewhon-OsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-osf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-osf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-osf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-OsF}{m}{scit}{
       <-> ssub * erewhon-OsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Sup.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Sup.fd
index 65d1ce45cdb..ca6df049009 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Sup.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-Sup.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-Sup}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T1}{erewhon-Sup}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-Sup}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-sup-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Sup}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-sup-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Sup}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-sup-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Sup}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-sup-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Sup}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-sup-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Sup}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-sup-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-Sup}{bx}{sl}{
       <-> ssub * erewhon-Sup/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TLF.fd
index 10c6b80e097..b1d49ea7e4b 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TLF.fd
@@ -9,27 +9,29 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-TLF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+
+\DeclareFontFamily{T1}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-TLF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tlf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{b}{scit}{
       <-> ssub * erewhon-TLF/b/scsl
@@ -37,23 +39,23 @@
 
 \DeclareFontShape{T1}{erewhon-TLF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tlf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TLF}{m}{scit}{
       <-> ssub * erewhon-TLF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TOsF.fd b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TOsF.fd
index ca2fd5ed9f9..c871fcca815 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T1erewhon-TOsF.fd
@@ -9,27 +9,29 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T1}{erewhon-TOsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+
+\DeclareFontFamily{T1}{erewhon-TOsF}{\erewhon@sf}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tosf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{b}{scit}{
       <-> ssub * erewhon-TOsF/b/scsl
@@ -37,23 +39,23 @@
 
 \DeclareFontShape{T1}{erewhon-TOsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-sc-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tosf-t1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T1}{erewhon-TOsF}{m}{scit}{
       <-> ssub * erewhon-TOsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Dnom.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Dnom.fd
index de2ad509f45..f300a7b8776 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Dnom.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-Dnom}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-Dnom}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-dnom-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-dnom-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-dnom-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-dnom-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-dnom-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-dnom-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Dnom}{bx}{sl}{
       <-> ssub * erewhon-Dnom/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Inf.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Inf.fd
index b08c2b587d2..82aeec379c4 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Inf.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Inf.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-Inf}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-Inf}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-inf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-inf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-inf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-inf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-inf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-inf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Inf}{bx}{sl}{
       <-> ssub * erewhon-Inf/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-LF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-LF.fd
index 5680592606d..0fc49b199fd 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-LF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-LF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-LF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-LF}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-LF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-lf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-lf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-lf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{b}{scit}{
       <-> ssub * erewhon-LF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2A}{erewhon-LF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-lf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-lf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-lf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-LF}{m}{scit}{
       <-> ssub * erewhon-LF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Numr.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Numr.fd
index f2108d04dba..3017d487499 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Numr.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Numr.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-Numr}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-Numr}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-numr-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-numr-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-numr-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-numr-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-numr-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-numr-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Numr}{bx}{sl}{
       <-> ssub * erewhon-Numr/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-OsF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-OsF.fd
index 05fe4a84962..b0ec3dfbb33 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-OsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-OsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-OsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-OsF}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-osf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-osf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-osf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{b}{scit}{
       <-> ssub * erewhon-OsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2A}{erewhon-OsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-osf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-osf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-osf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-OsF}{m}{scit}{
       <-> ssub * erewhon-OsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Sup.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Sup.fd
index e1dcf82bcf2..cc22eca5bf0 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Sup.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-Sup.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-Sup}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-Sup}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-sup-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-sup-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-sup-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-sup-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-sup-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-sup-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-Sup}{bx}{sl}{
       <-> ssub * erewhon-Sup/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TLF.fd
index 5ecff21aefe..93c69a72f68 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TLF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-TLF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tlf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{b}{scit}{
       <-> ssub * erewhon-TLF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2A}{erewhon-TLF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tlf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TLF}{m}{scit}{
       <-> ssub * erewhon-TLF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TOsF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TOsF.fd
index 8ff3fddd3ef..a0534412d75 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Aerewhon-TOsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2A}{erewhon-TOsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2A}{erewhon-TOsF}{\erewhon@sf}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tosf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{b}{scit}{
       <-> ssub * erewhon-TOsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-sc-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tosf-t2a
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2A}{erewhon-TOsF}{m}{scit}{
       <-> ssub * erewhon-TOsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Dnom.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Dnom.fd
index 560c59b82ec..af81b177600 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Dnom.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-Dnom}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-Dnom}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-dnom-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-dnom-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-dnom-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-dnom-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-dnom-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-dnom-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Dnom}{bx}{sl}{
       <-> ssub * erewhon-Dnom/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Inf.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Inf.fd
index 2096d9b77a2..de6c5ae42b9 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Inf.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Inf.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-Inf}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-Inf}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-inf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-inf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-inf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-inf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-inf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-inf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Inf}{bx}{sl}{
       <-> ssub * erewhon-Inf/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-LF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-LF.fd
index 8ab0d30516a..cc406b76e4d 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-LF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-LF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-LF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-LF}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-LF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-lf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-lf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-lf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{b}{scit}{
       <-> ssub * erewhon-LF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2B}{erewhon-LF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-lf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-lf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-lf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-LF}{m}{scit}{
       <-> ssub * erewhon-LF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Numr.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Numr.fd
index d344c25190b..6ce626dc9cd 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Numr.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Numr.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-Numr}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-Numr}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-numr-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-numr-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-numr-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-numr-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-numr-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-numr-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Numr}{bx}{sl}{
       <-> ssub * erewhon-Numr/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-OsF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-OsF.fd
index 455e13cba01..978cb3eda69 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-OsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-OsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-OsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-OsF}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-osf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-osf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-osf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{b}{scit}{
       <-> ssub * erewhon-OsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2B}{erewhon-OsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-osf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-osf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-osf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-OsF}{m}{scit}{
       <-> ssub * erewhon-OsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Sup.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Sup.fd
index fd3d5f0488a..4644a9553db 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Sup.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-Sup.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-Sup}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-Sup}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-sup-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-sup-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-sup-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-sup-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-sup-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-sup-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-Sup}{bx}{sl}{
       <-> ssub * erewhon-Sup/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TLF.fd
index 3153e3acfdd..6c53810d423 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TLF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-TLF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tlf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{b}{scit}{
       <-> ssub * erewhon-TLF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2B}{erewhon-TLF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tlf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TLF}{m}{scit}{
       <-> ssub * erewhon-TLF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TOsF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TOsF.fd
index ddb2d99c150..8b5209c28d7 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Berewhon-TOsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2B}{erewhon-TOsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2B}{erewhon-TOsF}{\erewhon@sf}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tosf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{b}{scit}{
       <-> ssub * erewhon-TOsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-sc-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tosf-t2b
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2B}{erewhon-TOsF}{m}{scit}{
       <-> ssub * erewhon-TOsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Dnom.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Dnom.fd
index 4f6cc3ac48f..4b0c50b4ee8 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Dnom.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-Dnom}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-Dnom}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-dnom-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-dnom-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-dnom-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-dnom-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-dnom-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-dnom-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Dnom}{bx}{sl}{
       <-> ssub * erewhon-Dnom/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Inf.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Inf.fd
index 59cb3dccd25..7fedeefefd0 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Inf.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Inf.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-Inf}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-Inf}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-inf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-inf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-inf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-inf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-inf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-inf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Inf}{bx}{sl}{
       <-> ssub * erewhon-Inf/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-LF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-LF.fd
index 28553889b6c..80b268026a8 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-LF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-LF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-LF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-LF}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-LF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-lf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-lf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-lf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{b}{scit}{
       <-> ssub * erewhon-LF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2C}{erewhon-LF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-lf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-lf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-lf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-LF}{m}{scit}{
       <-> ssub * erewhon-LF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Numr.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Numr.fd
index f73b9ff9155..a1ad7543d60 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Numr.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Numr.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-Numr}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-Numr}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-numr-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-numr-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-numr-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-numr-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-numr-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-numr-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Numr}{bx}{sl}{
       <-> ssub * erewhon-Numr/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-OsF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-OsF.fd
index a2dd651563a..7cf6b7bb046 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-OsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-OsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-OsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-OsF}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-osf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-osf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-osf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{b}{scit}{
       <-> ssub * erewhon-OsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2C}{erewhon-OsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-osf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-osf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-osf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-OsF}{m}{scit}{
       <-> ssub * erewhon-OsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Sup.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Sup.fd
index 06513d202c1..0b05873cc4f 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Sup.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-Sup.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-Sup}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-Sup}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-sup-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-sup-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-sup-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-sup-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-sup-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-sup-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-Sup}{bx}{sl}{
       <-> ssub * erewhon-Sup/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TLF.fd
index ad2ee77e97b..606046011e6 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TLF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-TLF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tlf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{b}{scit}{
       <-> ssub * erewhon-TLF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2C}{erewhon-TLF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tlf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TLF}{m}{scit}{
       <-> ssub * erewhon-TLF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TOsF.fd b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TOsF.fd
index c7866c3337b..433d5ce3659 100644
--- a/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/T2Cerewhon-TOsF.fd
@@ -9,27 +9,28 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{T2C}{erewhon-TOsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{T2C}{erewhon-TOsF}{\erewhon@sf}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{b}{scsl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{b}{sc}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tosf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{b}{scit}{
       <-> ssub * erewhon-TOsF/b/scsl
@@ -37,23 +38,23 @@
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{m}{scsl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{m}{sc}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-sc-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tosf-t2c
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{T2C}{erewhon-TOsF}{m}{scit}{
       <-> ssub * erewhon-TOsF/m/scsl
diff --git a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-LF.fd b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-LF.fd
index 43da2c12cd5..ac82aa6c159 100644
--- a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-LF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-LF.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{TS1}{erewhon-LF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{TS1}{erewhon-LF}{\erewhon@sf}
 
 \DeclareFontShape{TS1}{erewhon-LF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-lf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-LF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-lf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-LF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-lf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-LF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-lf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-LF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-lf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-LF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-lf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-LF}{bx}{sl}{
       <-> ssub * erewhon-LF/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-OsF.fd b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-OsF.fd
index 0e9bdf3d77a..9e2016ecf41 100644
--- a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-OsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-OsF.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{TS1}{erewhon-OsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{TS1}{erewhon-OsF}{\erewhon@sf}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-osf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-osf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-osf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-osf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-osf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-osf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-OsF}{bx}{sl}{
       <-> ssub * erewhon-OsF/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TLF.fd b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TLF.fd
index 6b7b61d0494..07c9c1a1910 100644
--- a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TLF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TLF.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{TS1}{erewhon-TLF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{TS1}{erewhon-TLF}{\erewhon@sf}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tlf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tlf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tlf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tlf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tlf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tlf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TLF}{bx}{sl}{
       <-> ssub * erewhon-TLF/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TOsF.fd b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TOsF.fd
index 49ff64c6508..708c6f7ce35 100644
--- a/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/erewhon/TS1erewhon-TOsF.fd
@@ -9,31 +9,32 @@
     \edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
 \fi
 
-\DeclareFontFamily{TS1}{erewhon-TOsF}{\providecommand{\erewhon@sf}{}}
+\providecommand{\erewhon@sf}{}
+\DeclareFontFamily{TS1}{erewhon-TOsF}{\erewhon@sf}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{b}{sl}{
       <-> \erewhon@@scale Erewhon-BoldSlanted-tosf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{b}{n}{
       <-> \erewhon@@scale Erewhon-Bold-tosf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{b}{it}{
       <-> \erewhon@@scale Erewhon-BoldItalic-tosf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{m}{sl}{
       <-> \erewhon@@scale Erewhon-RegularSlanted-tosf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{m}{n}{
       <-> \erewhon@@scale Erewhon-Regular-tosf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{m}{it}{
       <-> \erewhon@@scale Erewhon-Italic-tosf-ts1
-}{\erewhon@sf}
+}{}
 
 \DeclareFontShape{TS1}{erewhon-TOsF}{bx}{sl}{
       <-> ssub * erewhon-TOsF/b/sl
diff --git a/Master/texmf-dist/tex/latex/erewhon/erewhon.sty b/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
index dd50919aadc..53182a6c24b 100644
--- a/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
+++ b/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
@@ -1,8 +1,8 @@
 %% erewhon.sty
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.075}
-\def\filedate{2017/03/11}
+\def\fileversion{1.08}
+\def\filedate{2017/03/14}
 \ProvidesPackage{erewhon}
     [\filedate\space v\fileversion]
     
@@ -11,6 +11,7 @@
 %\RequirePackage[T2A,T2B,T2C,LY1,T1]{fontenc}
 \RequirePackage[LY1,T1]{fontenc}
 \RequirePackage{textcomp}
+\RequirePackage{ifthen}
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \RequirePackage{etoolbox}
 \IfFileExists{fontaxes.sty}{
@@ -45,18 +46,20 @@
 \providecommand*{\textfrac}[2]{%
     \textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
 
-\IfFileExists{xkeyval.sty}{
-    \newcommand*{\erewhon@scale}{1}
-    \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\erewhon@scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\erewhon@scale}{##1}}
-    \DeclareOptionX{space}[1.2]{\DeclareRobustCommand{\erewhon@sf}{%
-    \fontdimen2\font=##1\fontdimen2\font}}
-}{
-    \let\DeclareOptionX\DeclareOption
-    \let\ExecuteOptionsX\ExecuteOptions
-    \let\ProcessOptionsX\ProcessOptions
-}
+\def\erewhon@spc{.211em}
+\def\erewhon@stretch{.1055em}
+\def\erewhon@shrink{.0703em}
+\def\erewhon@spcf{} % a factor to multiply \fontdimen2
+
+\newcommand*{\erewhon@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\erewhon@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\erewhon@scale}{#1}}
+\DeclareOptionX{spacing}[.25em]{\gdef\erewhon@spc{#1}}
+\DeclareOptionX{stretch}[.125em]{\gdef\erewhon@stretch{#1}}
+\DeclareOptionX{shrink}[.1em]{\gdef\erewhon@shrink{#1}}
+\DeclareOptionX{space}[1.23]{\gdef\erewhon@spcf{#1}}
+
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
 \def\bfseries@rm{b}
@@ -80,10 +83,21 @@
 \DeclareOptionX{proportional}{\useproportional}
 \DeclareOptionX{sups}{\@Erewhon@supstrue}
 \DeclareOptionX{scosf}{\@Erewhon@scosftrue}
+\DeclareOptionX{looser}{%
+\gdef\erewhon@spc{.25em}\gdef\erewhon@stretch{.125em}\erewhon@shrink{.1em}}
+\DeclareOptionX{loosest}{%
+\gdef\erewhon@spc{.28em}\gdef\erewhon@stretch{.125em}\gdef\erewhon@shrink{.13em}}
 \ExecuteOptionsX{lining,tabular}
 \ProcessOptionsX\relax
 
-
+\ifthenelse{\equal{\erewhon@spcf}{}}{%
+\DeclareRobustCommand{\erewhon@sf}{%
+	\fontdimen2\font=\erewhon@spc
+	\fontdimen3\font=\erewhon@stretch
+	\fontdimen4\font=\erewhon@shrink}}{%
+\DeclareRobustCommand{\erewhon@sf}{%
+    \fontdimen2\font=\erewhon@spcf\fontdimen2\font}}
+    
 \DeclareRobustCommand{\lfstyle}{%
   \not@math@alphabet\lfstyle\relax
   \fontfamily{erewhon-LF}\selectfont %