clearsans (16oct19)

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

17 files changed, 593 insertions, 397 deletions

diff --git a/Master/texmf-dist/tex/latex/clearsans/ClearSans.sty b/Master/texmf-dist/tex/latex/clearsans/ClearSans.sty
index 5e8641b30b3..86ea6e1a546 100644
--- a/Master/texmf-dist/tex/latex/clearsans/ClearSans.sty
+++ b/Master/texmf-dist/tex/latex/clearsans/ClearSans.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ClearSans}
-    [2014/03/16 (Bob Tennent)  Supports Clear-Sans fonts for all LaTeX engines.]
+    [2019/10/16 (Bob Tennent)  Supports Clear-Sans fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -35,7 +35,7 @@
 
   \def\bfseries@sf{b}
   \def\mdseries@sf{m}
-  \ifclear@medium\def\bfseries@sf{mb}\fi
+  \ifclear@medium\def\bfseries@sf{sb}\fi
 \fi
 
 \ifclear@ttf
@@ -79,12 +79,12 @@
       ]
       {ClearSans}
 \else % type1
-  \def\clearfamily{ClearSans-LF}
+  \def\clearfamily{ClearSans-TLF}
   \newcommand*\clear{\fontfamily{\clearfamily}\selectfont}
   \def\sfdefault{\clearfamily}
   \ifclear@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
-  \newcommand*\clearlight{\fontfamily{ClearSansLight-LF}\selectfont}
-  \newcommand*\clearthin{\fontfamily{ClearSansThin-LF}\selectfont}
+  \newcommand*\clearlight{\fontseries{l}\selectfont}
+  \newcommand*\clearthin{\fontseries{el}\selectfont}
 \fi
 
 \DeclareTextFontCommand{\textsfl}{\clearlight}
diff --git a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSans-LF.fd b/Master/texmf-dist/tex/latex/clearsans/LY1ClearSans-LF.fd
deleted file mode 100644
index c0908ee674c..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSans-LF.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1ClearSans-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/ClearSans-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{ClearSans-LF}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{b}{n}{
-      <-> \ClearSans@@scale ClearSans-Bold-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{b}{it}{
-      <-> \ClearSans@@scale ClearSans-BoldItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{b}{sl}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{m}{it}{
-      <-> \ClearSans@@scale ClearSans-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{m}{sl}{
-      <-> ssub * ClearSans-LF/m/it
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{mb}{n}{
-      <-> \ClearSans@@scale ClearSans-Medium-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{mb}{it}{
-      <-> \ClearSans@@scale ClearSans-MediumItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{mb}{sl}{
-      <-> ssub * ClearSans-LF/mb/it
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{bx}{sl}{
-      <-> ssub * ClearSans-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{bx}{n}{
-      <-> ssub * ClearSans-LF/b/n
-}{}
-
-\DeclareFontShape{LY1}{ClearSans-LF}{bx}{it}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSans-TLF.fd b/Master/texmf-dist/tex/latex/clearsans/LY1ClearSans-TLF.fd
new file mode 100644
index 00000000000..431d81a2cbd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clearsans/LY1ClearSans-TLF.fd
@@ -0,0 +1,147 @@
+%% Generated by autoinst on 2019/10/16
+%%
+\ProvidesFile{LY1ClearSans-TLF.fd}
+    [2019/10/16 (autoinst)  Font definitions for LY1/ClearSans-TLF.]
+
+\expandafter\ifx\csname ClearSans@scale\endcsname\relax
+    \let\ClearSans@@scale\@empty
+\else
+    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{ClearSans-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{regular}{n}{
+      <-> \ClearSans@@scale ClearSans-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{regular}{it}{
+      <-> \ClearSans@@scale ClearSans-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{regular}{sl}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{thin}{n}{
+      <-> \ClearSans@@scale ClearSans-Thin-tlf-ly1
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{bold}{n}{
+      <-> \ClearSans@@scale ClearSans-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{bold}{it}{
+      <-> \ClearSans@@scale ClearSans-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{bold}{sl}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{medium}{n}{
+      <-> \ClearSans@@scale ClearSans-Medium-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{medium}{it}{
+      <-> \ClearSans@@scale ClearSans-MediumItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{medium}{sl}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{light}{n}{
+      <-> \ClearSans@@scale ClearSans-Light-tlf-ly1
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{el}{n}{
+      <-> ssub * ClearSans-TLF/thin/n
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{l}{n}{
+      <-> ssub * ClearSans-TLF/light/n
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{m}{sl}{
+      <-> ssub * ClearSans-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{m}{n}{
+      <-> ssub * ClearSans-TLF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{m}{it}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{sb}{sl}{
+      <-> ssub * ClearSans-TLF/medium/sl
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{sb}{n}{
+      <-> ssub * ClearSans-TLF/medium/n
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{sb}{it}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{b}{sl}{
+      <-> ssub * ClearSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{b}{n}{
+      <-> ssub * ClearSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{b}{it}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{bx}{n}{
+      <-> ssub * ClearSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{bx}{sl}{
+      <-> ssub * ClearSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{ClearSans-TLF}{bx}{it}{
+      <-> ssub * ClearSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSansLight-LF.fd b/Master/texmf-dist/tex/latex/clearsans/LY1ClearSansLight-LF.fd
deleted file mode 100644
index b6b28db5de7..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSansLight-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1ClearSansLight-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/ClearSansLight-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{ClearSansLight-LF}{}
-
-\DeclareFontShape{LY1}{ClearSansLight-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Light-lf-ly1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSansThin-LF.fd b/Master/texmf-dist/tex/latex/clearsans/LY1ClearSansThin-LF.fd
deleted file mode 100644
index 7442ceb2cb3..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/LY1ClearSansThin-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1ClearSansThin-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/ClearSansThin-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{ClearSansThin-LF}{}
-
-\DeclareFontShape{LY1}{ClearSansThin-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Thin-lf-ly1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSans-LF.fd b/Master/texmf-dist/tex/latex/clearsans/OT1ClearSans-LF.fd
deleted file mode 100644
index fca3a44cd12..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSans-LF.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1ClearSans-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/ClearSans-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{ClearSans-LF}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{b}{n}{
-      <-> \ClearSans@@scale ClearSans-Bold-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{b}{it}{
-      <-> \ClearSans@@scale ClearSans-BoldItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{b}{sl}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{m}{it}{
-      <-> \ClearSans@@scale ClearSans-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{m}{sl}{
-      <-> ssub * ClearSans-LF/m/it
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{mb}{n}{
-      <-> \ClearSans@@scale ClearSans-Medium-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{mb}{it}{
-      <-> \ClearSans@@scale ClearSans-MediumItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{mb}{sl}{
-      <-> ssub * ClearSans-LF/mb/it
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{bx}{sl}{
-      <-> ssub * ClearSans-LF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{bx}{n}{
-      <-> ssub * ClearSans-LF/b/n
-}{}
-
-\DeclareFontShape{OT1}{ClearSans-LF}{bx}{it}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSans-TLF.fd b/Master/texmf-dist/tex/latex/clearsans/OT1ClearSans-TLF.fd
new file mode 100644
index 00000000000..1b181570c4a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clearsans/OT1ClearSans-TLF.fd
@@ -0,0 +1,147 @@
+%% Generated by autoinst on 2019/10/16
+%%
+\ProvidesFile{OT1ClearSans-TLF.fd}
+    [2019/10/16 (autoinst)  Font definitions for OT1/ClearSans-TLF.]
+
+\expandafter\ifx\csname ClearSans@scale\endcsname\relax
+    \let\ClearSans@@scale\@empty
+\else
+    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{ClearSans-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{regular}{n}{
+      <-> \ClearSans@@scale ClearSans-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{regular}{it}{
+      <-> \ClearSans@@scale ClearSans-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{regular}{sl}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{thin}{n}{
+      <-> \ClearSans@@scale ClearSans-Thin-tlf-ot1
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{bold}{n}{
+      <-> \ClearSans@@scale ClearSans-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{bold}{it}{
+      <-> \ClearSans@@scale ClearSans-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{bold}{sl}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{medium}{n}{
+      <-> \ClearSans@@scale ClearSans-Medium-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{medium}{it}{
+      <-> \ClearSans@@scale ClearSans-MediumItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{medium}{sl}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{light}{n}{
+      <-> \ClearSans@@scale ClearSans-Light-tlf-ot1
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{el}{n}{
+      <-> ssub * ClearSans-TLF/thin/n
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{l}{n}{
+      <-> ssub * ClearSans-TLF/light/n
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{m}{sl}{
+      <-> ssub * ClearSans-TLF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{m}{n}{
+      <-> ssub * ClearSans-TLF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{m}{it}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{sb}{sl}{
+      <-> ssub * ClearSans-TLF/medium/sl
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{sb}{n}{
+      <-> ssub * ClearSans-TLF/medium/n
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{sb}{it}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{b}{sl}{
+      <-> ssub * ClearSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{b}{n}{
+      <-> ssub * ClearSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{b}{it}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{bx}{n}{
+      <-> ssub * ClearSans-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{bx}{sl}{
+      <-> ssub * ClearSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{ClearSans-TLF}{bx}{it}{
+      <-> ssub * ClearSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSansLight-LF.fd b/Master/texmf-dist/tex/latex/clearsans/OT1ClearSansLight-LF.fd
deleted file mode 100644
index f1a34a5b024..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSansLight-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1ClearSansLight-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/ClearSansLight-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{ClearSansLight-LF}{}
-
-\DeclareFontShape{OT1}{ClearSansLight-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Light-lf-ot1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSansThin-LF.fd b/Master/texmf-dist/tex/latex/clearsans/OT1ClearSansThin-LF.fd
deleted file mode 100644
index 88a452bf7ba..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/OT1ClearSansThin-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1ClearSansThin-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/ClearSansThin-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{ClearSansThin-LF}{}
-
-\DeclareFontShape{OT1}{ClearSansThin-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Thin-lf-ot1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/T1ClearSans-LF.fd b/Master/texmf-dist/tex/latex/clearsans/T1ClearSans-LF.fd
deleted file mode 100644
index cce83ef1807..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/T1ClearSans-LF.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1ClearSans-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/ClearSans-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{ClearSans-LF}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{b}{n}{
-      <-> \ClearSans@@scale ClearSans-Bold-lf-t1
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{b}{it}{
-      <-> \ClearSans@@scale ClearSans-BoldItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{b}{sl}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-lf-t1
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{m}{it}{
-      <-> \ClearSans@@scale ClearSans-Italic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{m}{sl}{
-      <-> ssub * ClearSans-LF/m/it
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{mb}{n}{
-      <-> \ClearSans@@scale ClearSans-Medium-lf-t1
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{mb}{it}{
-      <-> \ClearSans@@scale ClearSans-MediumItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{mb}{sl}{
-      <-> ssub * ClearSans-LF/mb/it
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{bx}{sl}{
-      <-> ssub * ClearSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{bx}{n}{
-      <-> ssub * ClearSans-LF/b/n
-}{}
-
-\DeclareFontShape{T1}{ClearSans-LF}{bx}{it}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/T1ClearSans-TLF.fd b/Master/texmf-dist/tex/latex/clearsans/T1ClearSans-TLF.fd
new file mode 100644
index 00000000000..cdf15bc2440
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clearsans/T1ClearSans-TLF.fd
@@ -0,0 +1,147 @@
+%% Generated by autoinst on 2019/10/16
+%%
+\ProvidesFile{T1ClearSans-TLF.fd}
+    [2019/10/16 (autoinst)  Font definitions for T1/ClearSans-TLF.]
+
+\expandafter\ifx\csname ClearSans@scale\endcsname\relax
+    \let\ClearSans@@scale\@empty
+\else
+    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{ClearSans-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{ClearSans-TLF}{regular}{n}{
+      <-> \ClearSans@@scale ClearSans-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{regular}{it}{
+      <-> \ClearSans@@scale ClearSans-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{regular}{sl}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{ClearSans-TLF}{thin}{n}{
+      <-> \ClearSans@@scale ClearSans-Thin-tlf-t1
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{ClearSans-TLF}{bold}{n}{
+      <-> \ClearSans@@scale ClearSans-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{bold}{it}{
+      <-> \ClearSans@@scale ClearSans-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{bold}{sl}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{ClearSans-TLF}{medium}{n}{
+      <-> \ClearSans@@scale ClearSans-Medium-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{medium}{it}{
+      <-> \ClearSans@@scale ClearSans-MediumItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{medium}{sl}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{ClearSans-TLF}{light}{n}{
+      <-> \ClearSans@@scale ClearSans-Light-tlf-t1
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{ClearSans-TLF}{el}{n}{
+      <-> ssub * ClearSans-TLF/thin/n
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{ClearSans-TLF}{l}{n}{
+      <-> ssub * ClearSans-TLF/light/n
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{ClearSans-TLF}{m}{sl}{
+      <-> ssub * ClearSans-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{m}{n}{
+      <-> ssub * ClearSans-TLF/regular/n
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{m}{it}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{ClearSans-TLF}{sb}{sl}{
+      <-> ssub * ClearSans-TLF/medium/sl
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{sb}{n}{
+      <-> ssub * ClearSans-TLF/medium/n
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{sb}{it}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{ClearSans-TLF}{b}{sl}{
+      <-> ssub * ClearSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{b}{n}{
+      <-> ssub * ClearSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{b}{it}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{bx}{n}{
+      <-> ssub * ClearSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{bx}{sl}{
+      <-> ssub * ClearSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{ClearSans-TLF}{bx}{it}{
+      <-> ssub * ClearSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/T1ClearSansLight-LF.fd b/Master/texmf-dist/tex/latex/clearsans/T1ClearSansLight-LF.fd
deleted file mode 100644
index 174fd7a0930..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/T1ClearSansLight-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1ClearSansLight-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/ClearSansLight-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{ClearSansLight-LF}{}
-
-\DeclareFontShape{T1}{ClearSansLight-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Light-lf-t1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/T1ClearSansThin-LF.fd b/Master/texmf-dist/tex/latex/clearsans/T1ClearSansThin-LF.fd
deleted file mode 100644
index 00815f44cef..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/T1ClearSansThin-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1ClearSansThin-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/ClearSansThin-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{ClearSansThin-LF}{}
-
-\DeclareFontShape{T1}{ClearSansThin-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Thin-lf-t1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSans-LF.fd b/Master/texmf-dist/tex/latex/clearsans/TS1ClearSans-LF.fd
deleted file mode 100644
index b9637d489a8..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSans-LF.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1ClearSans-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/ClearSans-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{ClearSans-LF}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{b}{n}{
-      <-> \ClearSans@@scale ClearSans-Bold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{b}{it}{
-      <-> \ClearSans@@scale ClearSans-BoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{b}{sl}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{m}{it}{
-      <-> \ClearSans@@scale ClearSans-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{m}{sl}{
-      <-> ssub * ClearSans-LF/m/it
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{mb}{n}{
-      <-> \ClearSans@@scale ClearSans-Medium-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{mb}{it}{
-      <-> \ClearSans@@scale ClearSans-MediumItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{mb}{sl}{
-      <-> ssub * ClearSans-LF/mb/it
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{bx}{sl}{
-      <-> ssub * ClearSans-LF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{bx}{n}{
-      <-> ssub * ClearSans-LF/b/n
-}{}
-
-\DeclareFontShape{TS1}{ClearSans-LF}{bx}{it}{
-      <-> ssub * ClearSans-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSans-TLF.fd b/Master/texmf-dist/tex/latex/clearsans/TS1ClearSans-TLF.fd
new file mode 100644
index 00000000000..15c1846c779
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clearsans/TS1ClearSans-TLF.fd
@@ -0,0 +1,147 @@
+%% Generated by autoinst on 2019/10/16
+%%
+\ProvidesFile{TS1ClearSans-TLF.fd}
+    [2019/10/16 (autoinst)  Font definitions for TS1/ClearSans-TLF.]
+
+\expandafter\ifx\csname ClearSans@scale\endcsname\relax
+    \let\ClearSans@@scale\@empty
+\else
+    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{ClearSans-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{regular}{n}{
+      <-> \ClearSans@@scale ClearSans-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{regular}{it}{
+      <-> \ClearSans@@scale ClearSans-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{regular}{sl}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{thin}{n}{
+      <-> \ClearSans@@scale ClearSans-Thin-tlf-ts1
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{bold}{n}{
+      <-> \ClearSans@@scale ClearSans-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{bold}{it}{
+      <-> \ClearSans@@scale ClearSans-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{bold}{sl}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{medium}{n}{
+      <-> \ClearSans@@scale ClearSans-Medium-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{medium}{it}{
+      <-> \ClearSans@@scale ClearSans-MediumItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{medium}{sl}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{light}{n}{
+      <-> \ClearSans@@scale ClearSans-Light-tlf-ts1
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{el}{n}{
+      <-> ssub * ClearSans-TLF/thin/n
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{l}{n}{
+      <-> ssub * ClearSans-TLF/light/n
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{m}{sl}{
+      <-> ssub * ClearSans-TLF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{m}{n}{
+      <-> ssub * ClearSans-TLF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{m}{it}{
+      <-> ssub * ClearSans-TLF/regular/it
+}{}
+
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{sb}{sl}{
+      <-> ssub * ClearSans-TLF/medium/sl
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{sb}{n}{
+      <-> ssub * ClearSans-TLF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{sb}{it}{
+      <-> ssub * ClearSans-TLF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{b}{sl}{
+      <-> ssub * ClearSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{b}{n}{
+      <-> ssub * ClearSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{b}{it}{
+      <-> ssub * ClearSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{bx}{n}{
+      <-> ssub * ClearSans-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{bx}{sl}{
+      <-> ssub * ClearSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{ClearSans-TLF}{bx}{it}{
+      <-> ssub * ClearSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSansLight-LF.fd b/Master/texmf-dist/tex/latex/clearsans/TS1ClearSansLight-LF.fd
deleted file mode 100644
index 0511c6213d1..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSansLight-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1ClearSansLight-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/ClearSansLight-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{ClearSansLight-LF}{}
-
-\DeclareFontShape{TS1}{ClearSansLight-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Light-lf-ts1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSansThin-LF.fd b/Master/texmf-dist/tex/latex/clearsans/TS1ClearSansThin-LF.fd
deleted file mode 100644
index 535220a034f..00000000000
--- a/Master/texmf-dist/tex/latex/clearsans/TS1ClearSansThin-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1ClearSansThin-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/ClearSansThin-LF.]
-
-\expandafter\ifx\csname ClearSans@scale\endcsname\relax
-    \let\ClearSans@@scale\@empty
-\else
-    \edef\ClearSans@@scale{s*[\csname ClearSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{ClearSansThin-LF}{}
-
-\DeclareFontShape{TS1}{ClearSansThin-LF}{m}{n}{
-      <-> \ClearSans@@scale ClearSans-Thin-lf-ts1
-}{}
-
-\endinput