CTAN sync 201910170301

132 files changed, 678 insertions, 478 deletions

diff --git a/fonts/clearsans/README b/fonts/clearsans/README
index 3975f222e1..82fa20768b 100644
--- a/fonts/clearsans/README
+++ b/fonts/clearsans/README
@@ -1,4 +1,4 @@
-This is the README for the clearsans package, version 2014-05-28.
+This is the README for the clearsans package, version 2019-10-16.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
 for the Clear Sans family of fonts (version 1.0), designed by Daniel
diff --git a/fonts/clearsans/enc/clr_zjpm5y.enc b/fonts/clearsans/enc/clr_c5eikb.enc
index 80e9886c77..885b7cd9df 100644
--- a/fonts/clearsans/enc/clr_zjpm5y.enc
+++ b/fonts/clearsans/enc/clr_c5eikb.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd
-% Encoding created by otftotfm on Fri Mar 14 21:20:37 2014
+%%AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc
+% Encoding created by otftotfm on Wed Oct 16 11:21:05 2019
 % Command line follows encoding
-/AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd [
+/AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc [
 %00
-  /f_f /Euro /fi /fl /fraction /dotaccent /hungarumlaut /ogonek
-  /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /fl /fi
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,11 +54,13 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/intel/clear
-% --vf-directory=texmf/fonts/vf/intel/clear
-% --type1-directory=texmf/fonts/type1/intel/clear
-% --truetype-directory=texmf/fonts/truetype/intel/clear
-% --encoding-directory=texmf/fonts/enc/dvips/clear
-% --map-file=texmf/fonts/map/dvips/clear/ClearSans.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/intel/clearsans
+% --vf-directory=texmf/fonts/vf/intel/clearsans
+% --type1-directory=texmf/fonts/type1/intel/clearsans
+% --truetype-directory=texmf/fonts/truetype/intel/clearsans
+% --encoding-directory=texmf/fonts/enc/dvips/clearsans
+% --map-file=texmf/fonts/map/dvips/clearsans/ClearSans.map --no-updmap
 % --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga ClearSans-BoldItalic.ttf ClearSans-BoldItalic-lf-ly1'
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl ClearSans-BoldItalic.ttf
+% ClearSans-BoldItalic-tlf-ly1'
diff --git a/fonts/clearsans/enc/clr_y7ge35.enc b/fonts/clearsans/enc/clr_lz5qp4.enc
index a57e582f4c..4625fd7aaa 100644
--- a/fonts/clearsans/enc/clr_y7ge35.enc
+++ b/fonts/clearsans/enc/clr_lz5qp4.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh
-% Encoding created by otftotfm on Fri Mar 14 21:20:37 2014
+%%AutoEnc_lz5qp4ntrpi44knldmmupps7be
+% Encoding created by otftotfm on Wed Oct 16 11:21:05 2019
 % Command line follows encoding
-/AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh [
+/AutoEnc_lz5qp4ntrpi44knldmmupps7be [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /fi /fl /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,11 +54,13 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/intel/clear
-% --vf-directory=texmf/fonts/vf/intel/clear
-% --type1-directory=texmf/fonts/type1/intel/clear
-% --truetype-directory=texmf/fonts/truetype/intel/clear
-% --encoding-directory=texmf/fonts/enc/dvips/clear
-% --map-file=texmf/fonts/map/dvips/clear/ClearSans.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/intel/clearsans
+% --vf-directory=texmf/fonts/vf/intel/clearsans
+% --type1-directory=texmf/fonts/type1/intel/clearsans
+% --truetype-directory=texmf/fonts/truetype/intel/clearsans
+% --encoding-directory=texmf/fonts/enc/dvips/clearsans
+% --map-file=texmf/fonts/map/dvips/clearsans/ClearSans.map --no-updmap
 % --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% ClearSans-BoldItalic.ttf ClearSans-BoldItalic-lf-ot1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl ClearSans-BoldItalic.ttf
+% ClearSans-BoldItalic-tlf-ot1'
diff --git a/fonts/clearsans/enc/clr_nrghxx.enc b/fonts/clearsans/enc/clr_nrghxx.enc
index 1769754747..1632b8b50f 100644
--- a/fonts/clearsans/enc/clr_nrghxx.enc
+++ b/fonts/clearsans/enc/clr_nrghxx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nrghxxvfwfaja52lajohe5fbba
-% Encoding created by otftotfm on Fri Mar 14 21:20:37 2014
+% Encoding created by otftotfm on Wed Oct 16 11:21:05 2019
 % Command line follows encoding
 /AutoEnc_nrghxxvfwfaja52lajohe5fbba [
 %00
@@ -54,13 +54,13 @@
   /f_f_l /f_f_i /f_f /fl /l /fi /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/intel/clear
-% --vf-directory=texmf/fonts/vf/intel/clear
-% --type1-directory=texmf/fonts/type1/intel/clear
-% --truetype-directory=texmf/fonts/truetype/intel/clear
-% --encoding-directory=texmf/fonts/enc/dvips/clear
-% --map-file=texmf/fonts/map/dvips/clear/ClearSans.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/intel/clearsans
+% --vf-directory=texmf/fonts/vf/intel/clearsans
+% --type1-directory=texmf/fonts/type1/intel/clearsans
+% --truetype-directory=texmf/fonts/truetype/intel/clearsans
+% --encoding-directory=texmf/fonts/enc/dvips/clearsans
+% --map-file=texmf/fonts/map/dvips/clearsans/ClearSans.map --no-updmap
 % --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f
 % i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
 % --ligkern=ff l =: ffl ClearSans-BoldItalic.ttf
-% ClearSans-BoldItalic-lf-ts1'
+% ClearSans-BoldItalic-tlf-ts1'
diff --git a/fonts/clearsans/enc/clr_er7w2x.enc b/fonts/clearsans/enc/clr_zxbkm4.enc
index f2ca418fc5..41c52a9829 100644
--- a/fonts/clearsans/enc/clr_er7w2x.enc
+++ b/fonts/clearsans/enc/clr_zxbkm4.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf
-% Encoding created by otftotfm on Fri Mar 14 21:20:37 2014
+%%AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg
+% Encoding created by otftotfm on Wed Oct 16 11:21:05 2019
 % Command line follows encoding
-/AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf [
+/AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /dotlessj /f_f /fi /fl /f_f_i /f_f_l
+  /f_f /dotlessi /dotlessj /f_f_i /fi /fl /f_f_l /.notdef
 %20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -54,12 +54,13 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/intel/clear
-% --vf-directory=texmf/fonts/vf/intel/clear
-% --type1-directory=texmf/fonts/type1/intel/clear
-% --truetype-directory=texmf/fonts/truetype/intel/clear
-% --encoding-directory=texmf/fonts/enc/dvips/clear
-% --map-file=texmf/fonts/map/dvips/clear/ClearSans.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/intel/clearsans
+% --vf-directory=texmf/fonts/vf/intel/clearsans
+% --type1-directory=texmf/fonts/type1/intel/clearsans
+% --truetype-directory=texmf/fonts/truetype/intel/clearsans
+% --encoding-directory=texmf/fonts/enc/dvips/clearsans
+% --map-file=texmf/fonts/map/dvips/clearsans/ClearSans.map --no-updmap
 % --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga ClearSans-BoldItalic.ttf
-% ClearSans-BoldItalic-lf-t1'
+% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% ClearSans-BoldItalic.ttf ClearSans-BoldItalic-tlf-t1'
diff --git a/fonts/clearsans/latex/ClearSans.sty b/fonts/clearsans/latex/ClearSans.sty
index 5e8641b30b..86ea6e1a54 100644
--- a/fonts/clearsans/latex/ClearSans.sty
+++ b/fonts/clearsans/latex/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/fonts/clearsans/latex/LY1ClearSans-LF.fd b/fonts/clearsans/latex/LY1ClearSans-LF.fd
deleted file mode 100644
index c0908ee674..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/LY1ClearSans-TLF.fd b/fonts/clearsans/latex/LY1ClearSans-TLF.fd
new file mode 100644
index 0000000000..431d81a2cb
--- /dev/null
+++ b/fonts/clearsans/latex/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/fonts/clearsans/latex/LY1ClearSansLight-LF.fd b/fonts/clearsans/latex/LY1ClearSansLight-LF.fd
deleted file mode 100644
index b6b28db5de..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/LY1ClearSansThin-LF.fd b/fonts/clearsans/latex/LY1ClearSansThin-LF.fd
deleted file mode 100644
index 7442ceb2cb..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/OT1ClearSans-LF.fd b/fonts/clearsans/latex/OT1ClearSans-LF.fd
deleted file mode 100644
index fca3a44cd1..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/OT1ClearSans-TLF.fd b/fonts/clearsans/latex/OT1ClearSans-TLF.fd
new file mode 100644
index 0000000000..1b181570c4
--- /dev/null
+++ b/fonts/clearsans/latex/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/fonts/clearsans/latex/OT1ClearSansLight-LF.fd b/fonts/clearsans/latex/OT1ClearSansLight-LF.fd
deleted file mode 100644
index f1a34a5b02..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/OT1ClearSansThin-LF.fd b/fonts/clearsans/latex/OT1ClearSansThin-LF.fd
deleted file mode 100644
index 88a452bf7b..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/T1ClearSans-LF.fd b/fonts/clearsans/latex/T1ClearSans-LF.fd
deleted file mode 100644
index cce83ef180..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/T1ClearSans-TLF.fd b/fonts/clearsans/latex/T1ClearSans-TLF.fd
new file mode 100644
index 0000000000..cdf15bc244
--- /dev/null
+++ b/fonts/clearsans/latex/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/fonts/clearsans/latex/T1ClearSansLight-LF.fd b/fonts/clearsans/latex/T1ClearSansLight-LF.fd
deleted file mode 100644
index 174fd7a093..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/T1ClearSansThin-LF.fd b/fonts/clearsans/latex/T1ClearSansThin-LF.fd
deleted file mode 100644
index 00815f44ce..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/TS1ClearSans-LF.fd b/fonts/clearsans/latex/TS1ClearSans-LF.fd
deleted file mode 100644
index b9637d489a..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/TS1ClearSans-TLF.fd b/fonts/clearsans/latex/TS1ClearSans-TLF.fd
new file mode 100644
index 0000000000..15c1846c77
--- /dev/null
+++ b/fonts/clearsans/latex/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/fonts/clearsans/latex/TS1ClearSansLight-LF.fd b/fonts/clearsans/latex/TS1ClearSansLight-LF.fd
deleted file mode 100644
index 0511c6213d..0000000000
--- a/fonts/clearsans/latex/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/fonts/clearsans/latex/TS1ClearSansThin-LF.fd b/fonts/clearsans/latex/TS1ClearSansThin-LF.fd
deleted file mode 100644
index 535220a034..0000000000
--- a/fonts/clearsans/latex/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
diff --git a/fonts/clearsans/map/ClearSans.map b/fonts/clearsans/map/ClearSans.map
index ad1578de39..d780ab7a76 100644
--- a/fonts/clearsans/map/ClearSans.map
+++ b/fonts/clearsans/map/ClearSans.map
@@ -1,34 +1,33 @@
-% Automatically maintained by otftotfm or other programs. Do not edit.
 
-ClearSans-BoldItalic-lf-ot1 ClearSans-BoldItalic "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-BoldItalic.pfb
-ClearSans-BoldItalic-lf-t1--base ClearSans-BoldItalic "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-BoldItalic.pfb
-ClearSans-BoldItalic-lf-ly1--base ClearSans-BoldItalic "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-BoldItalic.pfb
-ClearSans-BoldItalic-lf-ts1--base ClearSans-BoldItalic "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-BoldItalic.pfb
-ClearSans-Bold-lf-ot1 ClearSans-Bold "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-Bold.pfb
-ClearSans-Bold-lf-t1--base ClearSans-Bold "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-Bold.pfb
-ClearSans-Bold-lf-ly1--base ClearSans-Bold "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-Bold.pfb
-ClearSans-Bold-lf-ts1--base ClearSans-Bold "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Bold.pfb
-ClearSans-Italic-lf-ot1 ClearSans-Italic "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-Italic.pfb
-ClearSans-Italic-lf-t1--base ClearSans-Italic "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-Italic.pfb
-ClearSans-Italic-lf-ly1--base ClearSans-Italic "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-Italic.pfb
-ClearSans-Italic-lf-ts1--base ClearSans-Italic "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Italic.pfb
-ClearSans-lf-ot1 ClearSans "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-Regular.pfb
-ClearSans-lf-t1--base ClearSans "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-Regular.pfb
-ClearSans-lf-ly1--base ClearSans "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-Regular.pfb
-ClearSans-lf-ts1--base ClearSans "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Regular.pfb
-ClearSans-MediumItalic-lf-ot1 ClearSans-MediumItalic "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-MediumItalic.pfb
-ClearSans-MediumItalic-lf-t1--base ClearSans-MediumItalic "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-MediumItalic.pfb
-ClearSans-MediumItalic-lf-ly1--base ClearSans-MediumItalic "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-MediumItalic.pfb
-ClearSans-MediumItalic-lf-ts1--base ClearSans-MediumItalic "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-MediumItalic.pfb
-ClearSans-Medium-lf-ot1 ClearSans-Medium "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-Medium.pfb
-ClearSans-Medium-lf-t1--base ClearSans-Medium "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-Medium.pfb
-ClearSans-Medium-lf-ly1--base ClearSans-Medium "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-Medium.pfb
-ClearSans-Medium-lf-ts1--base ClearSans-Medium "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Medium.pfb
-ClearSans-Light-lf-ot1 ClearSans-Light "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-Light.pfb
-ClearSans-Light-lf-t1--base ClearSans-Light "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-Light.pfb
-ClearSans-Light-lf-ly1--base ClearSans-Light "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-Light.pfb
-ClearSans-Light-lf-ts1--base ClearSans-Light "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Light.pfb
-ClearSans-Thin-lf-ot1 ClearSans-Thin "AutoEnc_y7ge35cngdgstsr6c7oy4wfdeh ReEncodeFont" <[clr_y7ge35.enc <ClearSans-Thin.pfb
-ClearSans-Thin-lf-t1--base ClearSans-Thin "AutoEnc_er7w2x72mxuwsg3yl7k5ssfptf ReEncodeFont" <[clr_er7w2x.enc <ClearSans-Thin.pfb
-ClearSans-Thin-lf-ly1--base ClearSans-Thin "AutoEnc_zjpm5yt3mb4gzqsdymhky76jzd ReEncodeFont" <[clr_zjpm5y.enc <ClearSans-Thin.pfb
-ClearSans-Thin-lf-ts1--base ClearSans-Thin "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Thin.pfb
+ClearSans-BoldItalic-tlf-ot1 ClearSans-BoldItalic "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-BoldItalic.pfb
+ClearSans-BoldItalic-tlf-t1--base ClearSans-BoldItalic "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-BoldItalic.pfb
+ClearSans-BoldItalic-tlf-ly1--base ClearSans-BoldItalic "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-BoldItalic.pfb
+ClearSans-BoldItalic-tlf-ts1--base ClearSans-BoldItalic "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-BoldItalic.pfb
+ClearSans-Bold-tlf-ot1 ClearSans-Bold "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-Bold.pfb
+ClearSans-Bold-tlf-t1--base ClearSans-Bold "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-Bold.pfb
+ClearSans-Bold-tlf-ly1--base ClearSans-Bold "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-Bold.pfb
+ClearSans-Bold-tlf-ts1--base ClearSans-Bold "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Bold.pfb
+ClearSans-Italic-tlf-ot1 ClearSans-Italic "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-Italic.pfb
+ClearSans-Italic-tlf-t1--base ClearSans-Italic "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-Italic.pfb
+ClearSans-Italic-tlf-ly1--base ClearSans-Italic "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-Italic.pfb
+ClearSans-Italic-tlf-ts1--base ClearSans-Italic "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Italic.pfb
+ClearSans-Light-tlf-ot1 ClearSans-Light "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-Light.pfb
+ClearSans-Light-tlf-t1--base ClearSans-Light "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-Light.pfb
+ClearSans-Light-tlf-ly1--base ClearSans-Light "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-Light.pfb
+ClearSans-Light-tlf-ts1--base ClearSans-Light "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Light.pfb
+ClearSans-MediumItalic-tlf-ot1 ClearSans-MediumItalic "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-MediumItalic.pfb
+ClearSans-MediumItalic-tlf-t1--base ClearSans-MediumItalic "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-MediumItalic.pfb
+ClearSans-MediumItalic-tlf-ly1--base ClearSans-MediumItalic "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-MediumItalic.pfb
+ClearSans-MediumItalic-tlf-ts1--base ClearSans-MediumItalic "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-MediumItalic.pfb
+ClearSans-Medium-tlf-ot1 ClearSans-Medium "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-Medium.pfb
+ClearSans-Medium-tlf-t1--base ClearSans-Medium "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-Medium.pfb
+ClearSans-Medium-tlf-ly1--base ClearSans-Medium "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-Medium.pfb
+ClearSans-Medium-tlf-ts1--base ClearSans-Medium "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Medium.pfb
+ClearSans-tlf-ot1 ClearSans "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-Regular.ttf
+ClearSans-tlf-t1--base ClearSans "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-Regular.ttf
+ClearSans-tlf-ly1--base ClearSans "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-Regular.ttf
+ClearSans-tlf-ts1--base ClearSans "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Regular.ttf
+ClearSans-Thin-tlf-ot1 ClearSans-Thin "AutoEnc_lz5qp4ntrpi44knldmmupps7be ReEncodeFont" <[clr_lz5qp4.enc <ClearSans-Thin.pfb
+ClearSans-Thin-tlf-t1--base ClearSans-Thin "AutoEnc_zxbkm4wuxvt6uis5gmkze5ljkg ReEncodeFont" <[clr_zxbkm4.enc <ClearSans-Thin.pfb
+ClearSans-Thin-tlf-ly1--base ClearSans-Thin "AutoEnc_c5eikbpdrmwjxif6gnyslpdlmc ReEncodeFont" <[clr_c5eikb.enc <ClearSans-Thin.pfb
+ClearSans-Thin-tlf-ts1--base ClearSans-Thin "AutoEnc_nrghxxvfwfaja52lajohe5fbba ReEncodeFont" <[clr_nrghxx.enc <ClearSans-Thin.pfb
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Bold-lf-t1--base.tfm
deleted file mode 100644
index 6479f81104..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Bold-lf-ts1.tfm
deleted file mode 100644
index 9a9e06756d..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ly1--base.tfm
index 203fe52712..0bd6b2afe0 100644
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ly1.tfm
index 6c667aef5d..78aaffbef7 100644
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-ly1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ot1.tfm
index b2e77923d0..561cc14739 100644
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-ot1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-t1--base.tfm
new file mode 100644
index 0000000000..329f11bae2
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-t1.tfm
index 2362e1ea6c..42c01cd2b4 100644
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ts1--base.tfm
index 7a1577db29..7a1577db29 100644
--- a/fonts/clearsans/tfm/ClearSans-Bold-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Bold-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ts1.tfm
new file mode 100644
index 0000000000..3cec025454
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Bold-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-t1--base.tfm
deleted file mode 100644
index 88e11f3499..0000000000
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ts1.tfm
deleted file mode 100644
index b79238146e..0000000000
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ly1--base.tfm
index f3d34973a8..fd1984558a 100644
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ly1.tfm
index df072e1313..798618082c 100644
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ly1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ot1.tfm
index a780803cad..133408a51d 100644
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ot1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..943661a406
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-t1.tfm
index 8c46fe0b60..1d7c5dee02 100644
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ts1--base.tfm
index 893454531c..893454531c 100644
--- a/fonts/clearsans/tfm/ClearSans-BoldItalic-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..93c73b21a3
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-BoldItalic-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-lf-ly1.tfm
deleted file mode 100644
index 5e741124cf..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-ly1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-lf-ot1.tfm
deleted file mode 100644
index 7a1f9e635d..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-ot1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Italic-lf-t1--base.tfm
deleted file mode 100644
index 1fda992be3..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-lf-ts1.tfm
deleted file mode 100644
index f5e3508bd5..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ly1--base.tfm
index f796ecd34b..ace749f9c7 100644
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-tlf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ly1.tfm
new file mode 100644
index 0000000000..edef57131a
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-tlf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ot1.tfm
new file mode 100644
index 0000000000..7970b723c3
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..8a2640bf4e
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-t1.tfm
index ea67d6b51c..7c258abcda 100644
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ts1--base.tfm
index 4a3e733f80..4a3e733f80 100644
--- a/fonts/clearsans/tfm/ClearSans-Italic-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Italic-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ts1.tfm
new file mode 100644
index 0000000000..39f4486b7d
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Italic-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Light-lf-ot1.tfm
deleted file mode 100644
index b8129fc6a9..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-ot1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Light-lf-t1--base.tfm
deleted file mode 100644
index 9f7ca6317f..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Light-lf-ts1.tfm
deleted file mode 100644
index 76b5d817b2..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-ly1--base.tfm
index 202221aefc..5f9c9a330b 100644
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-ly1.tfm
index 3ba5f8e96c..660548eb2b 100644
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-ly1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-tlf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-ot1.tfm
new file mode 100644
index 0000000000..9d8893c786
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-t1--base.tfm
new file mode 100644
index 0000000000..a62921b8fa
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-t1.tfm
index f595f2ceb3..5b18b82814 100644
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-ts1--base.tfm
index 2cfa9c373f..2cfa9c373f 100644
--- a/fonts/clearsans/tfm/ClearSans-Light-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Light-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Light-tlf-ts1.tfm
new file mode 100644
index 0000000000..ca35bfb317
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Light-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Medium-lf-t1--base.tfm
deleted file mode 100644
index 40f1e7d188..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Medium-lf-ts1.tfm
deleted file mode 100644
index dfb6bb3624..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ly1--base.tfm
index 3aa4e6a2c3..53569ccf29 100644
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ly1.tfm
index c6339b6814..c075c8830e 100644
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-ly1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ot1.tfm
index aae16576f5..3742f40976 100644
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-ot1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-t1--base.tfm
new file mode 100644
index 0000000000..ee610425a6
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-t1.tfm
index 8a52b6d13b..b3fd5c314e 100644
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ts1--base.tfm
index e8707f4653..e8707f4653 100644
--- a/fonts/clearsans/tfm/ClearSans-Medium-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Medium-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ts1.tfm
new file mode 100644
index 0000000000..74184d607b
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Medium-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-t1--base.tfm
deleted file mode 100644
index 2ea8010ab7..0000000000
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ts1.tfm
deleted file mode 100644
index 47fa9af9eb..0000000000
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ly1--base.tfm
index 6c28b40022..1a2010e500 100644
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ly1.tfm
index 715d96d8b7..7c3ff418f7 100644
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ly1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ot1.tfm
index 45e7d159a5..9a92521555 100644
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ot1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..5134fd473a
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-t1.tfm
index 853d3edbf9..e36005e366 100644
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ts1--base.tfm
index 4f0594b467..4f0594b467 100644
--- a/fonts/clearsans/tfm/ClearSans-MediumItalic-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..92ab4fdd96
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-MediumItalic-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-lf-ly1.tfm
deleted file mode 100644
index 68140a9a0f..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-ly1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-lf-ot1.tfm
deleted file mode 100644
index 5abb19b238..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-ot1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-lf-ts1.tfm
deleted file mode 100644
index a66c71a48d..0000000000
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ly1--base.tfm
index c3b0e073b7..af1135dbca 100644
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-tlf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ly1.tfm
new file mode 100644
index 0000000000..5f2a8ad7d9
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-tlf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ot1.tfm
new file mode 100644
index 0000000000..060ece5234
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-t1--base.tfm
index a17f767213..e29fbd615d 100644
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-t1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-t1.tfm
index b5d3c97c4e..c7e373c5fa 100644
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ts1--base.tfm
index 1224aa352e..1224aa352e 100644
--- a/fonts/clearsans/tfm/ClearSans-Thin-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-Thin-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ts1.tfm
new file mode 100644
index 0000000000..b9b2bf3dfe
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-Thin-tlf-ts1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-lf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-lf-ly1.tfm
deleted file mode 100644
index 8c65ced3e5..0000000000
--- a/fonts/clearsans/tfm/ClearSans-lf-ly1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-lf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-lf-ot1.tfm
deleted file mode 100644
index 39444abe3f..0000000000
--- a/fonts/clearsans/tfm/ClearSans-lf-ot1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-lf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-lf-t1--base.tfm
deleted file mode 100644
index 184496c2f7..0000000000
--- a/fonts/clearsans/tfm/ClearSans-lf-t1--base.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-lf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-lf-ts1.tfm
deleted file mode 100644
index a383332b1e..0000000000
--- a/fonts/clearsans/tfm/ClearSans-lf-ts1.tfm
+++ /dev/null
diff --git a/fonts/clearsans/tfm/ClearSans-lf-ly1--base.tfm b/fonts/clearsans/tfm/ClearSans-tlf-ly1--base.tfm
index 5eadb19e9e..c0adc59c4f 100644
--- a/fonts/clearsans/tfm/ClearSans-lf-ly1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-tlf-ly1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-tlf-ly1.tfm b/fonts/clearsans/tfm/ClearSans-tlf-ly1.tfm
new file mode 100644
index 0000000000..d30ad47172
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-tlf-ly1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-tlf-ot1.tfm b/fonts/clearsans/tfm/ClearSans-tlf-ot1.tfm
new file mode 100644
index 0000000000..836d277c63
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-tlf-ot1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-tlf-t1--base.tfm b/fonts/clearsans/tfm/ClearSans-tlf-t1--base.tfm
new file mode 100644
index 0000000000..80a230432c
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-tlf-t1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-lf-t1.tfm b/fonts/clearsans/tfm/ClearSans-tlf-t1.tfm
index 51c84fbb4c..a8e21d4469 100644
--- a/fonts/clearsans/tfm/ClearSans-lf-t1.tfm
+++ b/fonts/clearsans/tfm/ClearSans-tlf-t1.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-lf-ts1--base.tfm b/fonts/clearsans/tfm/ClearSans-tlf-ts1--base.tfm
index 4479b3a14e..4479b3a14e 100644
--- a/fonts/clearsans/tfm/ClearSans-lf-ts1--base.tfm
+++ b/fonts/clearsans/tfm/ClearSans-tlf-ts1--base.tfm
diff --git a/fonts/clearsans/tfm/ClearSans-tlf-ts1.tfm b/fonts/clearsans/tfm/ClearSans-tlf-ts1.tfm
new file mode 100644
index 0000000000..3ce818ee87
--- /dev/null
+++ b/fonts/clearsans/tfm/ClearSans-tlf-ts1.tfm
diff --git a/fonts/clearsans/vf/ClearSans-Bold-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-Bold-tlf-ly1.vf
index ec29b92757..c3a70c8af8 100644
--- a/fonts/clearsans/vf/ClearSans-Bold-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-Bold-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Bold-lf-t1.vf b/fonts/clearsans/vf/ClearSans-Bold-tlf-t1.vf
index b7b0866280..2572f49675 100644
--- a/fonts/clearsans/vf/ClearSans-Bold-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-Bold-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Bold-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-Bold-tlf-ts1.vf
index 35067b2c03..2e922bab6e 100644
--- a/fonts/clearsans/vf/ClearSans-Bold-lf-ts1.vf
+++ b/fonts/clearsans/vf/ClearSans-Bold-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-BoldItalic-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-BoldItalic-lf-ts1.vf
deleted file mode 100644
index a4d4a10c8f..0000000000
--- a/fonts/clearsans/vf/ClearSans-BoldItalic-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-BoldItalic-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-ly1.vf
index a8e68c9898..003caef896 100644
--- a/fonts/clearsans/vf/ClearSans-BoldItalic-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-BoldItalic-lf-t1.vf b/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-t1.vf
index 5b69379c01..caf72e981c 100644
--- a/fonts/clearsans/vf/ClearSans-BoldItalic-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..505ca4bf51
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-BoldItalic-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Italic-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-Italic-lf-ts1.vf
deleted file mode 100644
index 7618f8ad13..0000000000
--- a/fonts/clearsans/vf/ClearSans-Italic-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-Italic-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-Italic-tlf-ly1.vf
index 7283a8fee7..bb8864541b 100644
--- a/fonts/clearsans/vf/ClearSans-Italic-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-Italic-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Italic-lf-t1.vf b/fonts/clearsans/vf/ClearSans-Italic-tlf-t1.vf
index 4bc5915ecc..5f756ff16a 100644
--- a/fonts/clearsans/vf/ClearSans-Italic-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-Italic-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Italic-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-Italic-tlf-ts1.vf
new file mode 100644
index 0000000000..2274807d8f
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-Italic-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Light-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-Light-lf-ts1.vf
deleted file mode 100644
index ac865fd745..0000000000
--- a/fonts/clearsans/vf/ClearSans-Light-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-Light-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-Light-tlf-ly1.vf
index 770540bc61..107b911fbd 100644
--- a/fonts/clearsans/vf/ClearSans-Light-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-Light-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Light-lf-t1.vf b/fonts/clearsans/vf/ClearSans-Light-tlf-t1.vf
index 694e50f740..4d8d90206f 100644
--- a/fonts/clearsans/vf/ClearSans-Light-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-Light-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Light-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-Light-tlf-ts1.vf
new file mode 100644
index 0000000000..aeb0307064
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-Light-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Medium-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-Medium-lf-ts1.vf
deleted file mode 100644
index 573b2b3e2f..0000000000
--- a/fonts/clearsans/vf/ClearSans-Medium-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-Medium-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-Medium-tlf-ly1.vf
index 615550a6fe..1afd57388a 100644
--- a/fonts/clearsans/vf/ClearSans-Medium-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-Medium-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Medium-lf-t1.vf b/fonts/clearsans/vf/ClearSans-Medium-tlf-t1.vf
index 3b9750329b..3ce557919e 100644
--- a/fonts/clearsans/vf/ClearSans-Medium-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-Medium-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Medium-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-Medium-tlf-ts1.vf
new file mode 100644
index 0000000000..5b248ba857
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-Medium-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-MediumItalic-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-MediumItalic-lf-ts1.vf
deleted file mode 100644
index fed91f9e66..0000000000
--- a/fonts/clearsans/vf/ClearSans-MediumItalic-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-MediumItalic-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-ly1.vf
index e40116725a..e284b98513 100644
--- a/fonts/clearsans/vf/ClearSans-MediumItalic-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-MediumItalic-lf-t1.vf b/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-t1.vf
index 27966f2de0..c66207fea5 100644
--- a/fonts/clearsans/vf/ClearSans-MediumItalic-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..0e64df4982
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-MediumItalic-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Thin-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-Thin-lf-ts1.vf
deleted file mode 100644
index 3e365c1566..0000000000
--- a/fonts/clearsans/vf/ClearSans-Thin-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-Thin-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-Thin-tlf-ly1.vf
index a75daa2cef..5c12d86df8 100644
--- a/fonts/clearsans/vf/ClearSans-Thin-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-Thin-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Thin-lf-t1.vf b/fonts/clearsans/vf/ClearSans-Thin-tlf-t1.vf
index f35d577768..06940ae41f 100644
--- a/fonts/clearsans/vf/ClearSans-Thin-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-Thin-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-Thin-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-Thin-tlf-ts1.vf
new file mode 100644
index 0000000000..ba2b2ec0e0
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-Thin-tlf-ts1.vf
diff --git a/fonts/clearsans/vf/ClearSans-lf-ts1.vf b/fonts/clearsans/vf/ClearSans-lf-ts1.vf
deleted file mode 100644
index b4d1728778..0000000000
--- a/fonts/clearsans/vf/ClearSans-lf-ts1.vf
+++ /dev/null
diff --git a/fonts/clearsans/vf/ClearSans-lf-ly1.vf b/fonts/clearsans/vf/ClearSans-tlf-ly1.vf
index 27eb5b5ad2..f6dbf92db2 100644
--- a/fonts/clearsans/vf/ClearSans-lf-ly1.vf
+++ b/fonts/clearsans/vf/ClearSans-tlf-ly1.vf
diff --git a/fonts/clearsans/vf/ClearSans-lf-t1.vf b/fonts/clearsans/vf/ClearSans-tlf-t1.vf
index be9845658a..51c5a29867 100644
--- a/fonts/clearsans/vf/ClearSans-lf-t1.vf
+++ b/fonts/clearsans/vf/ClearSans-tlf-t1.vf
diff --git a/fonts/clearsans/vf/ClearSans-tlf-ts1.vf b/fonts/clearsans/vf/ClearSans-tlf-ts1.vf
new file mode 100644
index 0000000000..0005839272
--- /dev/null
+++ b/fonts/clearsans/vf/ClearSans-tlf-ts1.vf