comfortaa 2.0 (23aug11)

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

496 files changed, 3610 insertions, 5558 deletions

diff --git a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
index ff4bfec15e3..88993b98f70 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
+++ b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
@@ -11,3 +11,9 @@ Changelog for version 1.4:
 	- remove "light" class option
 	- fix documentation
 	- add samples PDF
+
+Changelog for version 2.0:
+	- complete rewrite of the fontinst driver file
+	- rename .vf and .tfm files based on the pattern <font>-<encoding>
+	- modify paths of the archive: documentation is now in
+          doc/fonts/comfortaa/ and sources in source/fonts/comfortaa/
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README b/Master/texmf-dist/doc/fonts/comfortaa/README
index 795f15ac79d..d7b32665e76 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README
+++ b/Master/texmf-dist/doc/fonts/comfortaa/README
@@ -1,5 +1,5 @@
 ------------------------
- Comfortaa, version 1.4
+ Comfortaa, version 2.0
 ------------------------
 
 Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
index 37bd2281926..ddd94a299d6 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex
index 554a517dd17..91e68f58ed0 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex
@@ -56,6 +56,16 @@
 
 \begin{document}
 
+\section*{Comfortaa Light}
+
+\fontSample{l}{n}
+
+\fontSample{l}{sl}
+
+\fontSample{l}{sc}
+
+\fontSample{l}{scsl}
+
 \section*{Comfortaa Regular}
 
 \fontSample{m}{n}
@@ -76,14 +86,4 @@
 
 \fontSample{b}{scsl}
 
-\section*{Comfortaa Light}
-
-\fontSample{l}{n}
-
-\fontSample{l}{sl}
-
-\fontSample{l}{sc}
-
-\fontSample{l}{scsl}
-
 \end{document}
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
index 2eeae2bc5bf..f274b9b40e1 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
index cf781b72937..a4f2dfdb8a8 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
@@ -1,5 +1,5 @@
 %% comfortaa.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -18,11 +18,10 @@
 \usepackage[american]{babel}
 \usepackage{booktabs}
 \usepackage[default]{comfortaa}
-\usepackage[utf8x]{inputenc}
 \usepackage{microtype}
 \usepackage{multirow}
 \usepackage{path}
-\usepackage{relsize}
+\usepackage{varioref}
 \usepackage[colorlinks]{hyperref}
 
 \hypersetup{%
@@ -39,7 +38,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.4}
+\title{\LaTeX{} support for Comfortaa\\Version~2.0}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -52,11 +51,22 @@
 \section{Introduction}
 
 Comfortaa is a sans-serif font comfortable in every aspect designed by Johan
-\name{Aakerlund}. This font, which includes three weights
-({\fcofamily\fontseries{l}\selectfont thin},
-{\fcofamily\fontseries{m}\selectfont regular} and
-{\fcofamily\fontseries{b}\selectfont bold}), is available on Johan's deviantArt
-web page~\cite{comfortaa} as TrueType files under the \acronym{OFL} version~1.1.
+\name{Aakerlund}. This font, which includes three weights (see
+figure~\vref{styles}), is available on Johan's deviantArt web
+page~\cite{comfortaa} as TrueType files licensed under the \acronym{OFL}
+version~1.1.
+
+\begin{figure}
+  \centering
+  {%
+    \fcofamily%
+    {\fontseries{l}\selectfont Comfortaa Light}\\
+    Comfortaa Regular\\
+    {\bfseries Comfortaa Bold}%
+  }
+  \caption{Available styles for Comfortaa}
+  \label{styles}
+\end{figure}
 
 This package provides support for this font in \LaTeX{}. It includes the
 original TrueType fonts, as well as Type~1 versions, converted for this package
@@ -93,9 +103,9 @@ You can use the Comfortaa font in a \LaTeX{} document by adding the command
 to the preamble.  The package supplies the \code{\char`\\fcofamily} command to
 switch the current font to Comfortaa.
 
-\subsubsection{Options}
+\subsection{Options}
 
-\paragraph{Comfortaa as default (sans-serif) font}
+\subsubsection{Comfortaa as default (sans-serif) font}
 
 You can set \LaTeX{} to use Comfortaa as standard font throughout the whole
 document by passing the \code{default} option to the package:
@@ -107,7 +117,7 @@ To set Comfortaa as default sans-serif only:
 \usepackage[defaultsans]{comfortaa}
 \end{verbatim}
 
-\paragraph{Font scaling}
+\subsubsection{Font scaling}
 
 The font can be up- and downscaled by any factor. This can be used to make
 Comfortaa more friendly when used in company with other type faces, e.g., to
@@ -120,16 +130,11 @@ the font according to \parameter{ratio} (1.0 by default), for example:
 \subsection{Encodings}
 
 The following encodings are supported:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    Latin&OT1, T1, TS1 (partial)\\
-    \midrule
-    Cyrillic&T2A, T2B, T2C, X2\\
-    \midrule Greek&LGR\\
-    \bottomrule
-  \end{tabular}
-\end{center}
+\begin{description}
+\item[Latin] OT1, T1, TS1 (partial)
+\item[Cyrillic] T2A, T2B, T2C, X2
+\item[Greek] LGR (monotonic only)
+\end{description}
 To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
 package as usual, as in
 \begin{verbatim}
@@ -138,37 +143,45 @@ package as usual, as in
 \end{verbatim}
 
 Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between e.g.
-\begin{center}
+treated poorly, if at all. Note difference in kerning between these two encoding
+in table~\vref{kerning}.
+\begin{table}
+\centering
   \begin{tabular}{ll}
     \toprule
-    OT1-encoded&{\fcofamily To Ta Té}\\
+    OT1-encoded&{\fcofamily Te T\'e}\\
     \midrule
-    T1-encoded&{\fcofamily\fontencoding{T1}\selectfont To Ta Té}\\
+    T1-encoded&{\fcofamily\fontencoding{T1}\selectfont Te T\'e}\\
     \bottomrule
   \end{tabular}
-\end{center}
+  \caption{Kerning with OT1 and T1 encodings}
+  \label{kerning}
+\end{table}
 It is therefore advised to always use the Comfortaa fonts in any encoding than
 OT1 when typing diacritics.
 
 \subsection{Available weights and variants}
 
-The following table lists the available font series and shapes with their
+Table~\vref{nfss} lists the available font series and shapes with their
 \acronym{NFSS} classification. Parenthesized combinations are provided via
 substitutions.
-\begin{center}
+\begin{table}
+  \centering
   \begin{tabular}{llll}
     \toprule
     family&encoding&series&shape\\
     \midrule 
-    \multirow{4}{*}{fco}&OT1,T1&\multirow{3}{*}{l, m, b (bx)}&\multirow{2}{*}{n, sl (it),}\\
-    &T2A, T2B, T2C, X2,&&\multirow{2}{*}{sc, scsl (scit)}\\
+    \multirow{4}{*}{fco}&OT1,T1,&\multirow{4}{*}{l, m, b (bx)}&\multirow{3}{*}{n, sl (it), sc, scsl (scit)}\\
+    &T2A, T2B, T2C, X2,&&\\
     &LGR&&\\
-    \cmidrule{2-4}
-    &TS1&l, m, b (bx)&n, sl (it)\\
+    \cmidrule{2-2}
+    \cmidrule{4-4}
+    &TS1&&n, sl (it)\\
     \bottomrule
   \end{tabular}
-\end{center}
+  \caption{Available font series and shapes for Comfortaa}
+  \label{nfss}
+\end{table}
 Notice that the slanted shapes are faked ones, as well as the small capitals
 (reduced to 80\%).
 
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
index 8d3e8d8d072..41859ffb218 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
@@ -1,321 +1,254 @@
-./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
-./fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Light.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf
-./fonts/map/dvips/comfortaa/comfortaa.map
-./fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
-./fonts/enc/dvips/comfortaa/comfortaa-x2.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
-./fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
-./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/afm/public/comfortaa/Comfortaa-Regular-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Light.afm
-./fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
-./source/comfortaa/comfortaa.tex
-./source/comfortaa/comfortaa-fixlatin.etx
-./source/comfortaa/comfortaa-samples.pdf
-./source/comfortaa/Makefile
-./source/comfortaa/comfortaa-reglyph.tex
-./source/comfortaa/ttf2type1.pe
-./source/comfortaa/comfortaa-fixtextcomp.etx
-./source/comfortaa/CHANGES
-./source/comfortaa/comfortaa-map.tex
-./source/comfortaa/comfortaa-dotlessj.etx
-./source/comfortaa/comfortaa.pdf
-./source/comfortaa/comfortaa-fixgreek.etx
-./source/comfortaa/comfortaa-fixcyrillic.etx
-./source/comfortaa/comfortaa-samples.tex
-./source/comfortaa/README
-./source/comfortaa/comfortaa-drv.tex
-./source/comfortaa/comfortaa-fixglyphs.mtx
-./doc/latex/comfortaa/comfortaa.tex
-./doc/latex/comfortaa/comfortaa-samples.pdf
-./doc/latex/comfortaa/CHANGES
-./doc/latex/comfortaa/comfortaa.pdf
-./doc/latex/comfortaa/comfortaa-samples.tex
-./doc/latex/comfortaa/README
 ./README
-./tex/latex/comfortaa/ts1fco.fd
-./tex/latex/comfortaa/x2fco.fd
-./tex/latex/comfortaa/comfortaa.sty
+./tex/latex/comfortaa/ot1fco.fd
 ./tex/latex/comfortaa/t2cfco.fd
-./tex/latex/comfortaa/t2bfco.fd
 ./tex/latex/comfortaa/t1fco.fd
-./tex/latex/comfortaa/ot1fco.fd
-./tex/latex/comfortaa/t2afco.fd
+./tex/latex/comfortaa/comfortaa.sty
+./tex/latex/comfortaa/x2fco.fd
+./tex/latex/comfortaa/ts1fco.fd
+./tex/latex/comfortaa/t2bfco.fd
 ./tex/latex/comfortaa/lgrfco.fd
+./tex/latex/comfortaa/t2afco.fd
+./doc/fonts/comfortaa/README
+./doc/fonts/comfortaa/comfortaa-samples.pdf
+./doc/fonts/comfortaa/comfortaa.tex
+./doc/fonts/comfortaa/CHANGES
+./doc/fonts/comfortaa/comfortaa.pdf
+./doc/fonts/comfortaa/comfortaa-samples.tex
+./source/fonts/comfortaa/ttf2type1.pe
+./source/fonts/comfortaa/comfortaa-drv.tex
+./source/fonts/comfortaa/comfortaa-dotlessj.etx
+./source/fonts/comfortaa/comfortaa-fixlatin.mtx
+./source/fonts/comfortaa/Makefile
+./source/fonts/comfortaa/comfortaa-map.tex
+./source/fonts/comfortaa/comfortaa-01.etx
+./source/fonts/comfortaa/comfortaa-03.etx
+./source/fonts/comfortaa/comfortaa-diacritics.mtx
+./source/fonts/comfortaa/comfortaa-02.etx
+./source/fonts/comfortaa/comfortaa-fixcyrillic.mtx
+./source/fonts/comfortaa/comfortaa-fixgreek.mtx
+./source/fonts/comfortaa/comfortaa-fixtextcomp.mtx
 ./manifest.txt
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ts1.tfm
+./fonts/map/dvips/comfortaa/comfortaa.map
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf
+./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
+./fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
+./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
+./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
+./fonts/afm/public/comfortaa/Comfortaa-Regular-LCDFJ.afm
+./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
+./fonts/afm/public/comfortaa/Comfortaa-Light.afm
+./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+./fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
+./fonts/enc/dvips/comfortaa/comfortaa-02.enc
+./fonts/enc/dvips/comfortaa/comfortaa-01.enc
+./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
+./fonts/enc/dvips/comfortaa/comfortaa-03.enc
+./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Light.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
index cc9d1ac4778..cab17030a5e 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
-Comment Generated by FontForge 20100429
-Comment Creation Date: Thu Mar 24 00:46:52 2011
+Comment Generated by FontForge 20110222
+Comment Creation Date: Sun Aug 21 19:55:55 2011
 FontName Comfortaa-Bold
 FullName Comfortaa-Bold
 FamilyName Comfortaa
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
index b0db0c64a2c..2a9da7e5c7c 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
-Comment Generated by FontForge 20100429
-Comment Creation Date: Thu Mar 24 00:46:52 2011
+Comment Generated by FontForge 20110222
+Comment Creation Date: Sun Aug 21 19:55:55 2011
 FontName Comfortaa-Light
 FullName Comfortaa-Light
 FamilyName Comfortaa
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm
index 4e8858b9aca..0681965fe42 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
-Comment Generated by FontForge 20100429
-Comment Creation Date: Thu Mar 24 00:46:52 2011
+Comment Generated by FontForge 20110222
+Comment Creation Date: Sun Aug 21 19:55:54 2011
 FontName Comfortaa
 FullName Comfortaa
 FamilyName Comfortaa
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t1.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-01.enc
index c052c9e64f8..c2783fa0c9a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-01.enc
@@ -1,17 +1,17 @@
 %!PS-Adobe-3.0 Resource-Encoding
 % @psencodingfile{
-%    author = "See file t1.etx",
-%    version = "See file t1.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-t1.enc",
-%    email = "See file t1.etx",
+%    author = "See file comfortaa-01.etx",
+%    version = "See file comfortaa-01.etx",
+%    date = "generated 2011/08/21",
+%    filename = "comfortaa-01.enc",
+%    email = "See file comfortaa-01.etx",
 %    codetable = "ISO/ASCII",
 %    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from t1.etx."
+%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-01.etx."
 % }
 
 % Created by: tex comfortaa-map
-% Created using: \etxtoenc{t1}{comfortaa-t1}
+% Created using: \etxtoenc{comfortaa-01}{comfortaa-01}
 
 % This file should be installed somewhere that your DVI
 % to postscript driver looks for files. It is needed for
@@ -19,56 +19,20 @@
 
 % After installing this file, you should add the following
 % line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{t1}{fontinst-autoenc-t1}{\download{comfortaa-t1.enc}}
+% \declarepsencoding{comfortaa-01}{fontinst-autoenc-comfortaa-01}{\download{comfortaa-01.enc}}
 
-%%BeginResource: encoding fontinst-autoenc-t1
-/fontinst-autoenc-t1 [
+%%BeginResource: encoding fontinst-autoenc-comfortaa-01
+/fontinst-autoenc-comfortaa-01 [
 % 0
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-% 8
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-% 16
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/rangedash
-/punctdash
-/compwordmark
-% 24
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 32
-/visiblespace
+/space
 /exclam
 /quotedbl
 /numbersign
 /dollar
 /percent
 /ampersand
-/quoteright
-% 40
+/quotesingle
+% 8
 /parenleft
 /parenright
 /asterisk
@@ -77,7 +41,7 @@
 /hyphen
 /period
 /slash
-% 48
+% 16
 /zero
 /one
 /two
@@ -86,7 +50,7 @@
 /five
 /six
 /seven
-% 56
+% 24
 /eight
 /nine
 /colon
@@ -95,7 +59,7 @@
 /equal
 /greater
 /question
-% 64
+% 32
 /at
 /A
 /B
@@ -104,7 +68,7 @@
 /E
 /F
 /G
-% 72
+% 40
 /H
 /I
 /J
@@ -113,7 +77,7 @@
 /M
 /N
 /O
-% 80
+% 48
 /P
 /Q
 /R
@@ -122,7 +86,7 @@
 /U
 /V
 /W
-% 88
+% 56
 /X
 /Y
 /Z
@@ -131,8 +95,8 @@
 /bracketright
 /asciicircum
 /underscore
-% 96
-/quoteleft
+% 64
+/grave
 /a
 /b
 /c
@@ -140,7 +104,7 @@
 /e
 /f
 /g
-% 104
+% 72
 /h
 /i
 /j
@@ -149,7 +113,7 @@
 /m
 /n
 /o
-% 112
+% 80
 /p
 /q
 /r
@@ -158,7 +122,7 @@
 /u
 /v
 /w
-% 120
+% 88
 /x
 /y
 /z
@@ -166,152 +130,188 @@
 /bar
 /braceright
 /asciitilde
-/hyphenchar
-% 128
-/Abreve
-/Aogonek
-/Cacute
-/Ccaron
-/Dcaron
-/Ecaron
-/Eogonek
-/Gbreve
-% 136
-/Lacute
-/Lcaron
-/Lslash
-/Nacute
-/Ncaron
-/Ng
-/Ohungarumlaut
-/Racute
-% 144
-/Rcaron
-/Sacute
-/Scaron
-/Scedilla
-/Tcaron
-/Tcedilla
-/Uhungarumlaut
-/Uring
-% 152
-/Ydieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/IJ
-/Idotaccent
-/dbar
-/section
-% 160
-/abreve
-/aogonek
-/cacute
-/ccaron
-/dcaron
-/ecaron
-/eogonek
-/gbreve
-% 168
-/lacute
-/lcaron
-/lslash
-/nacute
-/ncaron
-/ng
-/ohungarumlaut
-/racute
-% 176
-/rcaron
-/sacute
-/scaron
-/scedilla
-/tcaron
-/tcedilla
-/uhungarumlaut
-/uring
-% 184
-/ydieresis
-/zacute
-/zcaron
-/zdotaccent
-/ij
 /exclamdown
-/questiondown
+% 96
+/cent
 /sterling
-% 192
+/currency
+/yen
+/brokenbar
+/section
+/dieresis
+/copyright
+% 104
+/ordfeminine
+/guillemotleft
+/logicalnot
+/registered
+/macron
+/degree
+/plusminus
+/uni00B2
+% 112
+/uni00B3
+/acute
+/mu
+/paragraph
+/periodcentered
+/cedilla
+/uni00B9
+/ordmasculine
+% 120
+/guillemotright
+/onequarter
+/onehalf
+/threequarters
+/questiondown
 /Agrave
 /Aacute
 /Acircumflex
+% 128
 /Atilde
 /Adieresis
 /Aring
 /AE
 /Ccedilla
-% 200
 /Egrave
 /Eacute
 /Ecircumflex
+% 136
 /Edieresis
 /Igrave
 /Iacute
 /Icircumflex
 /Idieresis
-% 208
 /Eth
 /Ntilde
 /Ograve
+% 144
 /Oacute
 /Ocircumflex
 /Otilde
 /Odieresis
-/OE
-% 216
+/multiply
 /Oslash
 /Ugrave
 /Uacute
+% 152
 /Ucircumflex
 /Udieresis
 /Yacute
 /Thorn
-/SS
-% 224
+/germandbls
 /agrave
 /aacute
 /acircumflex
+% 160
 /atilde
 /adieresis
 /aring
 /ae
 /ccedilla
-% 232
 /egrave
 /eacute
 /ecircumflex
+% 168
 /edieresis
 /igrave
 /iacute
 /icircumflex
 /idieresis
-% 240
 /eth
 /ntilde
 /ograve
+% 176
 /oacute
 /ocircumflex
 /otilde
 /odieresis
-/oe
-% 248
+/divide
 /oslash
 /ugrave
 /uacute
+% 184
 /ucircumflex
 /udieresis
 /yacute
 /thorn
-/germandbls
+/ydieresis
+/dotlessi
+/circumflex
+/caron
+% 192
+/uni02C9
+/breve
+/dotaccent
+/ring
+/ogonek
+/tilde
+/hungarumlaut
+/endash
+% 200
+/emdash
+/quoteleft
+/quoteright
+/quotesinglbase
+/quotedblleft
+/quotedblright
+/quotedblbase
+/dagger
+% 208
+/daggerdbl
+/bullet
+/ellipsis
+/guilsinglleft
+/guilsinglright
+/fraction
+/franc
+/lira
+% 216
+/peseta
+/Euro
+/afii61352
+/trademark
+/partialdiff
+/Delta
+/product
+/summation
+% 224
+/minus
+/radical
+/infinity
+/integral
+/approxequal
+/lessequal
+/greaterequal
+/uniF001
+% 232
+/uniF002
+/Amacron
+/amacron
+/Abreve
+/abreve
+/Aogonek
+/aogonek
+/Cacute
+% 240
+/cacute
+/Ccircumflex
+/ccircumflex
+/Cdotaccent
+/cdotaccent
+/Ccaron
+/ccaron
+/Dcaron
+% 248
+/dcaron
+/Dcroat
+/dcroat
+/Emacron
+/emacron
+/Ebreve
+/ebreve
+/Edotaccent
 ] def
 %%EndResource
 
-% End of file comfortaa-t1.enc.
+% End of file comfortaa-01.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc
new file mode 100644
index 00000000000..f8ef3001849
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc
@@ -0,0 +1,317 @@
+%!PS-Adobe-3.0 Resource-Encoding
+% @psencodingfile{
+%    author = "See file comfortaa-02.etx",
+%    version = "See file comfortaa-02.etx",
+%    date = "generated 2011/08/21",
+%    filename = "comfortaa-02.enc",
+%    email = "See file comfortaa-02.etx",
+%    codetable = "ISO/ASCII",
+%    checksum = "",
+%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-02.etx."
+% }
+
+% Created by: tex comfortaa-map
+% Created using: \etxtoenc{comfortaa-02}{comfortaa-02}
+
+% This file should be installed somewhere that your DVI
+% to postscript driver looks for files. It is needed for
+% reencoding some font you have transformed.
+
+% After installing this file, you should add the following
+% line (minus %) to your finstmsc.rc file:
+% \declarepsencoding{comfortaa-02}{fontinst-autoenc-comfortaa-02}{\download{comfortaa-02.enc}}
+
+%%BeginResource: encoding fontinst-autoenc-comfortaa-02
+/fontinst-autoenc-comfortaa-02 [
+% 0
+/edotaccent
+/Eogonek
+/eogonek
+/Ecaron
+/ecaron
+/Gcircumflex
+/gcircumflex
+/Gbreve
+% 8
+/gbreve
+/Gdotaccent
+/gdotaccent
+/Gcommaaccent
+/gcommaaccent
+/Hcircumflex
+/hcircumflex
+/Hbar
+% 16
+/hbar
+/Itilde
+/itilde
+/Imacron
+/imacron
+/Ibreve
+/ibreve
+/Iogonek
+% 24
+/iogonek
+/Idotaccent
+/IJ
+/ij
+/Jcircumflex
+/jcircumflex
+/Kcommaaccent
+/kcommaaccent
+% 32
+/kgreenlandic
+/Lacute
+/lacute
+/Lcommaaccent
+/lcommaaccent
+/Lcaron
+/lcaron
+/Ldot
+% 40
+/ldot
+/Lslash
+/lslash
+/Nacute
+/nacute
+/Ncommaaccent
+/ncommaaccent
+/Ncaron
+% 48
+/ncaron
+/napostrophe
+/Eng
+/eng
+/Omacron
+/omacron
+/Obreve
+/obreve
+% 56
+/Ohungarumlaut
+/ohungarumlaut
+/OE
+/oe
+/Racute
+/racute
+/Rcommaaccent
+/rcommaaccent
+% 64
+/Rcaron
+/rcaron
+/Sacute
+/sacute
+/Scircumflex
+/scircumflex
+/Scedilla
+/scedilla
+% 72
+/Scaron
+/scaron
+/Tcommaaccent
+/tcommaaccent
+/Tcaron
+/tcaron
+/Tbar
+/tbar
+% 80
+/Utilde
+/utilde
+/Umacron
+/umacron
+/Ubreve
+/ubreve
+/Uring
+/uring
+% 88
+/Uhungarumlaut
+/uhungarumlaut
+/Uogonek
+/uogonek
+/Wcircumflex
+/wcircumflex
+/Ycircumflex
+/ycircumflex
+% 96
+/Ydieresis
+/Zacute
+/zacute
+/Zdotaccent
+/zdotaccent
+/Zcaron
+/zcaron
+/longs
+% 104
+/florin
+/Aringacute
+/aringacute
+/AEacute
+/aeacute
+/Oslashacute
+/oslashacute
+/tonos
+% 112
+/dieresistonos
+/Alphatonos
+/anoteleia
+/Epsilontonos
+/Etatonos
+/Iotatonos
+/Omicrontonos
+/Upsilontonos
+% 120
+/Omegatonos
+/iotadieresistonos
+/Alpha
+/Beta
+/Gamma
+/uni0394
+/Epsilon
+/Zeta
+% 128
+/Eta
+/Theta
+/Iota
+/Kappa
+/Lambda
+/Mu
+/Nu
+/Xi
+% 136
+/Omicron
+/Pi
+/Rho
+/Sigma
+/Tau
+/Upsilon
+/Phi
+/Chi
+% 144
+/Psi
+/uni03A9
+/Iotadieresis
+/Upsilondieresis
+/alphatonos
+/epsilontonos
+/etatonos
+/iotatonos
+% 152
+/upsilondieresistonos
+/alpha
+/beta
+/gamma
+/delta
+/epsilon
+/zeta
+/eta
+% 160
+/theta
+/iota
+/kappa
+/lambda
+/uni03BC
+/nu
+/xi
+/omicron
+% 168
+/pi
+/rho
+/sigma1
+/sigma
+/tau
+/upsilon
+/phi
+/chi
+% 176
+/psi
+/omega
+/iotadieresis
+/upsilondieresis
+/omicrontonos
+/upsilontonos
+/omegatonos
+/afii00208
+% 184
+/underscoredbl
+/quotereversed
+/perthousand
+/minute
+/second
+/exclamdbl
+/uni203E
+/uni207F
+% 192
+/afii61248
+/afii61289
+/Omega
+/estimated
+/oneeighth
+/threeeighths
+/fiveeighths
+/seveneighths
+% 200
+/arrowleft
+/arrowup
+/arrowright
+/arrowdown
+/arrowboth
+/arrowupdn
+/arrowupdnbse
+/orthogonal
+% 208
+/intersection
+/notequal
+/equivalence
+/afii10023
+/afii10051
+/afii10052
+/afii10053
+/afii10054
+% 216
+/afii10055
+/afii10056
+/afii10057
+/afii10058
+/afii10059
+/afii10060
+/afii10061
+/afii10062
+% 224
+/afii10145
+/afii10017
+/afii10018
+/afii10019
+/afii10020
+/afii10021
+/afii10022
+/afii10024
+% 232
+/afii10025
+/afii10026
+/afii10027
+/afii10028
+/afii10029
+/afii10030
+/afii10031
+/afii10032
+% 240
+/afii10033
+/afii10034
+/afii10035
+/afii10036
+/afii10037
+/afii10038
+/afii10039
+/afii10040
+% 248
+/afii10041
+/afii10042
+/afii10043
+/afii10044
+/afii10045
+/afii10046
+/afii10047
+/afii10048
+] def
+%%EndResource
+
+% End of file comfortaa-02.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-03.enc
index f1a8376b1cd..2f18f6d9129 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-03.enc
@@ -1,17 +1,17 @@
 %!PS-Adobe-3.0 Resource-Encoding
 % @psencodingfile{
-%    author = "See file comfortaa-fixcyrillic.etx",
-%    version = "See file comfortaa-fixcyrillic.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-fixcyrillic.enc",
-%    email = "See file comfortaa-fixcyrillic.etx",
+%    author = "See file comfortaa-03.etx",
+%    version = "See file comfortaa-03.etx",
+%    date = "generated 2011/08/21",
+%    filename = "comfortaa-03.enc",
+%    email = "See file comfortaa-03.etx",
 %    codetable = "ISO/ASCII",
 %    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-fixcyrillic.etx."
+%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-03.etx."
 % }
 
 % Created by: tex comfortaa-map
-% Created using: \etxtoenc{comfortaa-fixcyrillic}{comfortaa-fixcyrillic}
+% Created using: \etxtoenc{comfortaa-03}{comfortaa-03}
 
 % This file should be installed somewhere that your DVI
 % to postscript driver looks for files. It is needed for
@@ -19,65 +19,11 @@
 
 % After installing this file, you should add the following
 % line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{comfortaa-fixcyrillic}{fontinst-autoenc-comfortaa-fixcyrillic}{\download{comfortaa-fixcyrillic.enc}}
+% \declarepsencoding{comfortaa-03}{fontinst-autoenc-comfortaa-03}{\download{comfortaa-03.enc}}
 
-%%BeginResource: encoding fontinst-autoenc-comfortaa-fixcyrillic
-/fontinst-autoenc-comfortaa-fixcyrillic [
+%%BeginResource: encoding fontinst-autoenc-comfortaa-03
+/fontinst-autoenc-comfortaa-03 [
 % 0
-/Q
-/W
-/AE
-/ae
-/uni02C9
-/afii10023
-/afii10051
-/afii10053
-% 8
-/afii10054
-/afii10055
-/afii10056
-/afii10057
-/afii10058
-/afii10059
-/afii10060
-/afii10062
-% 16
-/afii10145
-/afii10017
-/afii10018
-/afii10019
-/afii10020
-/afii10021
-/afii10022
-/afii10024
-% 24
-/afii10025
-/afii10026
-/afii10027
-/afii10028
-/afii10029
-/afii10030
-/afii10031
-/afii10032
-% 32
-/afii10033
-/afii10034
-/afii10035
-/afii10036
-/afii10037
-/afii10038
-/afii10039
-/afii10040
-% 40
-/afii10041
-/afii10042
-/afii10043
-/afii10044
-/afii10045
-/afii10046
-/afii10047
-/afii10048
-% 48
 /afii10049
 /afii10065
 /afii10066
@@ -86,7 +32,7 @@
 /afii10069
 /afii10070
 /afii10072
-% 56
+% 8
 /afii10073
 /afii10074
 /afii10075
@@ -95,7 +41,7 @@
 /afii10078
 /afii10079
 /afii10080
-% 64
+% 16
 /afii10081
 /afii10082
 /afii10083
@@ -104,7 +50,7 @@
 /afii10086
 /afii10087
 /afii10088
-% 72
+% 24
 /afii10089
 /afii10090
 /afii10091
@@ -113,56 +59,110 @@
 /afii10094
 /afii10095
 /afii10096
-% 80
+% 32
 /afii10097
 /afii10071
 /afii10099
+/afii10100
 /afii10101
 /afii10102
 /afii10103
 /afii10104
+% 40
 /afii10105
-% 88
 /afii10106
 /afii10107
 /afii10108
+/afii10109
 /afii10110
 /afii10193
 /afii10050
+% 48
 /afii10098
 /uni0492
-% 96
 /uni0493
 /uni0496
 /uni0497
 /uni049A
 /uni049B
 /uni049C
+% 56
 /uni049D
 /uni04A2
-% 104
 /uni04A3
 /uni04AE
 /uni04AF
 /uni04B0
 /uni04B1
 /uni04B2
+% 64
 /uni04B3
 /uni04B8
-% 112
 /uni04B9
 /uni04BA
 /uni04BB
 /uni04D8
 /afii10846
 /uni04E8
+% 72
 /uni04E9
-/endash
+/Wgrave
+/wgrave
+/Wacute
+/wacute
+/Wdieresis
+/wdieresis
+/Ygrave
+% 80
+/ygrave
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 88
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 96
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 104
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 112
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
 % 120
-/emdash
-/afii61352
-/uniF001
-/uniF002
+/.notdef
+/.notdef
+/.notdef
+/.notdef
 /.notdef
 /.notdef
 /.notdef
@@ -314,4 +314,4 @@
 ] def
 %%EndResource
 
-% End of file comfortaa-fixcyrillic.enc.
+% End of file comfortaa-03.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
index 16fa6f7e1dd..39010afb741 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-dotlessj.etx",
 %    version = "See file comfortaa-dotlessj.etx",
-%    date = "generated 2011/03/24",
+%    date = "generated 2011/08/21",
 %    filename = "comfortaa-dotlessj.enc",
 %    email = "See file comfortaa-dotlessj.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
deleted file mode 100644
index 0cc34b7a6aa..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file comfortaa-fixgreek.etx",
-%    version = "See file comfortaa-fixgreek.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-fixgreek.enc",
-%    email = "See file comfortaa-fixgreek.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-fixgreek.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{comfortaa-fixgreek}{comfortaa-fixgreek}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{comfortaa-fixgreek}{fontinst-autoenc-comfortaa-fixgreek}{\download{comfortaa-fixgreek.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-comfortaa-fixgreek
-/fontinst-autoenc-comfortaa-fixgreek [
-% 0
-/f
-/F
-/dieresis
-/guillemotleft
-/guillemotright
-/breve
-/uni02C9
-/semicolon
-% 8
-/uni0394
-/uni03A9
-/uni03BC
-/endash
-/emdash
-/Euro
-/.notdef
-/.notdef
-% 16
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 24
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 32
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 40
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 48
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 56
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 88
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 96
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 136
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 144
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 152
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 160
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 168
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 176
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 184
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file comfortaa-fixgreek.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
deleted file mode 100644
index c0df1e8a63e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file comfortaa-fixlatin.etx",
-%    version = "See file comfortaa-fixlatin.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-fixlatin.enc",
-%    email = "See file comfortaa-fixlatin.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-fixlatin.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{comfortaa-fixlatin}{comfortaa-fixlatin}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{comfortaa-fixlatin}{fontinst-autoenc-comfortaa-fixlatin}{\download{comfortaa-fixlatin.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-comfortaa-fixlatin
-/fontinst-autoenc-comfortaa-fixlatin [
-% 0
-/dcroat
-/Eng
-/eng
-/uni02C9
-/ring
-/uni0394
-/uni03A9
-/endash
-% 8
-/emdash
-/uniF001
-/uniF002
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 16
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 24
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 32
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 40
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 48
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 56
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 88
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 96
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 136
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 144
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 152
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 160
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 168
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 176
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 184
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file comfortaa-fixlatin.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
deleted file mode 100644
index 58371fe7525..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file comfortaa-fixtextcomp.etx",
-%    version = "See file comfortaa-fixtextcomp.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-fixtextcomp.enc",
-%    email = "See file comfortaa-fixtextcomp.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from comfortaa-fixtextcomp.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{comfortaa-fixtextcomp}{comfortaa-fixtextcomp}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{comfortaa-fixtextcomp}{fontinst-autoenc-comfortaa-fixtextcomp}{\download{comfortaa-fixtextcomp.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-comfortaa-fixtextcomp
-/fontinst-autoenc-comfortaa-fixtextcomp [
-% 0
-/exclam
-/parenleft
-/asterisk
-/question
-/C
-/bracketleft
-/bracketright
-/grave
-% 8
-/g
-/bar
-/asciitilde
-/dieresis
-/uni00B2
-/uni00B3
-/acute
-/cedilla
-% 16
-/uni00B9
-/circumflex
-/caron
-/uni02C9
-/breve
-/dotaccent
-/ring
-/ogonek
-% 24
-/tilde
-/hungarumlaut
-/endash
-/quotesinglebase
-/quotedblbase
-/Euro
-/afii61352
-/.notdef
-% 32
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 40
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 48
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 56
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 88
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 96
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 136
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 144
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 152
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 160
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 168
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 176
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 184
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file comfortaa-fixtextcomp.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
deleted file mode 100644
index f5be4b2f450..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file lgr.etx",
-%    version = "See file lgr.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-lgr.enc",
-%    email = "See file lgr.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from lgr.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{lgr}{comfortaa-lgr}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{lgr}{fontinst-autoenc-lgr}{\download{comfortaa-lgr.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-lgr
-/fontinst-autoenc-lgr [
-% 0
-/rangedash
-/.notdef
-/pentedeka
-/pentehekaton
-/penteqilioi
-/pentemurioi
-/stigma
-/vardigamma
-% 8
-/iotaadscript
-/Alphaiota
-/Etaiota
-/Omegaiota
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 16
-/.notdef
-/.notdef
-/qoppa
-/qoppaarchaic
-/.notdef
-/Qoppaarchaic
-/Stigma
-/Sampi
-% 24
-/euro
-/perthousand
-/.notdef
-/sampi
-/quoteleft
-/quoteright
-/brevegreek
-/macrongreek
-% 32
-/dieresiscircum
-/exclam
-/dieresisgreek
-/dieresistonos
-/dieresisgravegreek
-/percent
-/.notdef
-/tonos
-% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-% 56
-/eight
-/nine
-/colon
-/anoteleia
-/asper
-/circumgreek
-/lenis
-/questiongreek
-% 64
-/aspercircum
-/Alpha
-/Beta
-/aspergrave
-/Delta
-/Epsilon
-/Phi
-/Gamma
-% 72
-/Eta
-/Iota
-/Theta
-/Kappa
-/Lambda
-/Mu
-/Nu
-/Omicron
-% 80
-/Pi
-/Chi
-/Rho
-/Sigma
-/Tau
-/Upsilon
-/asperacute
-/Omega
-% 88
-/Xi
-/Psi
-/Zeta
-/bracketleft
-/leniscircum
-/bracketright
-/lenisacute
-/lenisgrave
-% 96
-/gravegreek
-/alpha
-/beta
-/sigma1
-/delta
-/epsilon
-/phi
-/gamma
-% 104
-/eta
-/iota
-/theta
-/kappa
-/lambda
-/mu
-/nu
-/omicron
-% 112
-/pi
-/chi
-/rho
-/sigma
-/tau
-/upsilon
-/compwordmark
-/omega
-% 120
-/xi
-/psi
-/zeta
-/guillemotleftgreek
-/iotasubscript
-/guillemotrightgreek
-/asciitilde
-/punctdash
-% 128
-/alphagrave
-/alphaasper
-/alphalenis
-/alphaaspergrave
-/alphaiotagrave
-/alphaiotaasper
-/alphaiotalenis
-/alphaiotaaspergrave
-% 136
-/alphatonos
-/alphaasperacute
-/alphalenisacute
-/alphalenisgrave
-/alphaiotaacute
-/alphaiotaasperacute
-/alphaiotalenisacute
-/alphaiotalenisgrave
-% 144
-/alphacircum
-/alphaaspercircum
-/alphaleniscircum
-/digamma
-/alphaiotacircum
-/alphaiotaaspercircum
-/alphaiotaleniscircum
-/.notdef
-% 152
-/etagrave
-/etaasper
-/etalenis
-/.notdef
-/etaiotagrave
-/etaiotaasper
-/etaiotalenis
-/.notdef
-% 160
-/etatonos
-/etaasperacute
-/etalenisacute
-/etaaspergrave
-/etaiotaacute
-/etaiotaasperacute
-/etaiotalenisacute
-/etaiotaaspergrave
-% 168
-/etacircum
-/etaaspercircum
-/etaleniscircum
-/etalenisgrave
-/etaiotacircum
-/etaiotaaspercircum
-/etaiotaleniscircum
-/etaiotalenisgrave
-% 176
-/omegagrave
-/omegaasper
-/omegalenis
-/omegaaspergrave
-/omegaiotagrave
-/omegaiotaasper
-/omegaiotalenis
-/omegaiotaaspergrave
-% 184
-/omegatonos
-/omegaasperacute
-/omegalenisacute
-/omegalenisgrave
-/omegaiotaacute
-/omegaiotaasperacute
-/omegaiotalenisacute
-/omegaiotalenisgrave
-% 192
-/omegacircum
-/omegaaspercircum
-/omegaleniscircum
-/Digamma
-/omegaiotacircum
-/omegaiotaaspercircum
-/omegaiotaleniscircum
-/.notdef
-% 200
-/iotagrave
-/iotaasper
-/iotalenis
-/iotaaspergrave
-/upsilongrave
-/upsilonasper
-/upsilonlenis
-/upsilonaspergrave
-% 208
-/iotatonos
-/iotaasperacute
-/iotalenisacute
-/iotalenisgrave
-/upsilontonos
-/upsilonasperacute
-/upsilonlenisacute
-/upsilonlenisgrave
-% 216
-/iotacircum
-/iotaaspercircum
-/iotaleniscircum
-/Iotadieresis
-/upsiloncircum
-/upsilonaspercircum
-/upsilonleniscircum
-/Upsilondieresis
-% 224
-/epsilongrave
-/epsilonasper
-/epsilonlenis
-/epsilonaspergrave
-/omicrongrave
-/omicronasper
-/omicronlenis
-/omicronaspergrave
-% 232
-/epsilontonos
-/epsilonasperacute
-/epsilonlenisacute
-/epsilonlenisgrave
-/omicrontonos
-/omicronasperacute
-/omicronlenisacute
-/omicronlenisgrave
-% 240
-/iotadieresis
-/iotadieresisgrave
-/iotadieresistonos
-/iotadieresiscircum
-/upsilondieresis
-/upsilondieresisgrave
-/upsilondieresistonos
-/upsilondieresiscircum
-% 248
-/alphaiota
-/etaiota
-/omegaiota
-/rhoasper
-/rholenis
-/.notdef
-/anwtonos
-/katwtonos
-] def
-%%EndResource
-
-% End of file comfortaa-lgr.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
deleted file mode 100644
index 65866d4f16d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file ot1.etx",
-%    version = "See file ot1.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-ot1.enc",
-%    email = "See file ot1.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from ot1.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{ot1}{comfortaa-ot1}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{ot1}{fontinst-autoenc-ot1}{\download{comfortaa-ot1.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-ot1
-/fontinst-autoenc-ot1 [
-% 0
-/Gamma
-/Delta
-/Theta
-/Lambda
-/Xi
-/Pi
-/Sigma
-/Upsilon
-% 8
-/Phi
-/Psi
-/Omega
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 16
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ringfitted
-% 24
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
-% 32
-/lslashslash
-/exclam
-/quotedblright
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-% 56
-/eight
-/nine
-/colon
-/semicolon
-/exclamdown
-/equal
-/questiondown
-/question
-% 64
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-% 72
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-% 80
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-% 88
-/X
-/Y
-/Z
-/bracketleft
-/quotedblleft
-/bracketright
-/circumflex
-/dotaccent
-% 96
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-% 104
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-% 112
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-% 120
-/x
-/y
-/z
-/rangedash
-/punctdash
-/hungarumlaut
-/tilde
-/dieresis
-% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 136
-/.notdef
-/.notdef
-/Lslash
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 144
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 152
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 160
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 168
-/.notdef
-/.notdef
-/lslash
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 176
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 184
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file comfortaa-ot1.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
deleted file mode 100644
index 9b9680a5740..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file t2a.etx",
-%    version = "See file t2a.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-t2a.enc",
-%    email = "See file t2a.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from t2a.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{t2a}{comfortaa-t2a}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{t2a}{fontinst-autoenc-t2a}{\download{comfortaa-t2a.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-t2a
-/fontinst-autoenc-t2a [
-% 0
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-% 8
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/CYRpalochka
-/angleleft
-/angleright
-% 16
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/rangedash
-/cyrdash
-/compwordmark
-% 24
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 32
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-% 56
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-% 64
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-% 72
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-% 80
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-% 88
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-% 96
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-% 104
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-% 112
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-% 120
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
-% 128
-/CYRGUP
-/CYRGHCRS
-/CYRDJE
-/CYRTSHE
-/CYRSHHA
-/CYRZHDSC
-/CYRZDSC
-/CYRLJE
-% 136
-/CYRYI
-/CYRKDSC
-/CYRKBEAK
-/CYRKVCRS
-/CYRAE
-/CYRNDSC
-/CYRNG
-/CYRDZE
-% 144
-/CYROTLD
-/CYRSDSC
-/CYRUSHRT
-/CYRY
-/CYRYHCRS
-/CYRHDSC
-/CYRDZHE
-/CYRCHVCRS
-% 152
-/CYRCHRDSC
-/CYRIE
-/CYRSCHWA
-/CYRNJE
-/CYRYO
-/numero
-/currency
-/section
-% 160
-/cyrgup
-/cyrghcrs
-/cyrdje
-/cyrtshe
-/cyrshha
-/cyrzhdsc
-/cyrzdsc
-/cyrlje
-% 168
-/cyryi
-/cyrkdsc
-/cyrkbeak
-/cyrkvcrs
-/cyrae
-/cyrndsc
-/cyrng
-/cyrdze
-% 176
-/cyrotld
-/cyrsdsc
-/cyrushrt
-/cyry
-/cyryhcrs
-/cyrhdsc
-/cyrdzhe
-/cyrchvcrs
-% 184
-/cyrchrdsc
-/cyrie
-/cyrschwa
-/cyrnje
-/cyryo
-/quotedblbase
-/guillemotleft
-/guillemotright
-% 192
-/CYRA
-/CYRB
-/CYRV
-/CYRG
-/CYRD
-/CYRE
-/CYRZH
-/CYRZ
-% 200
-/CYRI
-/CYRISHRT
-/CYRK
-/CYRL
-/CYRM
-/CYRN
-/CYRO
-/CYRP
-% 208
-/CYRR
-/CYRS
-/CYRT
-/CYRU
-/CYRF
-/CYRH
-/CYRC
-/CYRCH
-% 216
-/CYRSH
-/CYRSHCH
-/CYRHRDSN
-/CYRERY
-/CYRSFTSN
-/CYREREV
-/CYRYU
-/CYRYA
-% 224
-/cyra
-/cyrb
-/cyrv
-/cyrg
-/cyrd
-/cyre
-/cyrzh
-/cyrz
-% 232
-/cyri
-/cyrishrt
-/cyrk
-/cyrl
-/cyrm
-/cyrn
-/cyro
-/cyrp
-% 240
-/cyrr
-/cyrs
-/cyrt
-/cyru
-/cyrf
-/cyrh
-/cyrc
-/cyrch
-% 248
-/cyrsh
-/cyrshch
-/cyrhrdsn
-/cyrery
-/cyrsftsn
-/cyrerev
-/cyryu
-/cyrya
-] def
-%%EndResource
-
-% End of file comfortaa-t2a.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
deleted file mode 100644
index 446e8eea66e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file t2b.etx",
-%    version = "See file t2b.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-t2b.enc",
-%    email = "See file t2b.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from t2b.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{t2b}{comfortaa-t2b}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{t2b}{fontinst-autoenc-t2b}{\download{comfortaa-t2b.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-t2b
-/fontinst-autoenc-t2b [
-% 0
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-% 8
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/CYRpalochka
-/angleleft
-/angleright
-% 16
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/rangedash
-/cyrdash
-/compwordmark
-% 24
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 32
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-% 56
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-% 64
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-% 72
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-% 80
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-% 88
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-% 96
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-% 104
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-% 112
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-% 120
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
-% 128
-/CYRGDSCHCRS
-/CYRGHCRS
-/CYRGDSC
-/CYRGHK
-/CYRSHHA
-/CYRZHDSC
-/CYRDELTA
-/CYRABHDZE
-% 136
-/CYRLJE
-/CYRKDSC
-/CYRLDSC
-/CYRKHK
-/CYRLHK
-/CYRNDSC
-/CYRNG
-/CYRNHK
-% 144
-/CYROTLD
-/CYRSACRS
-/CYRUSHRT
-/CYRY
-/CYRHHCRS
-/CYRHDSC
-/CYRHHK
-/CYRCHLDSC
-% 152
-/CYRCHRDSC
-/CYRNJE
-/CYRSCHWA
-/CYREPS
-/CYRYO
-/numero
-/currency
-/section
-% 160
-/cyrgdschcrs
-/cyrghcrs
-/cyrgdsc
-/cyrghk
-/cyrshha
-/cyrzhdsc
-/cyrdelta
-/cyrabhdze
-% 168
-/cyrlje
-/cyrkdsc
-/cyrldsc
-/cyrkhk
-/cyrlhk
-/cyrndsc
-/cyrng
-/cyrnhk
-% 176
-/cyrotld
-/cyrsacrs
-/cyrushrt
-/cyry
-/cyrhhcrs
-/cyrhdsc
-/cyrhhk
-/cyrchldsc
-% 184
-/cyrchrdsc
-/cyrnje
-/cyrschwa
-/cyreps
-/cyryo
-/quotedblbase
-/guillemotleft
-/guillemotright
-% 192
-/CYRA
-/CYRB
-/CYRV
-/CYRG
-/CYRD
-/CYRE
-/CYRZH
-/CYRZ
-% 200
-/CYRI
-/CYRISHRT
-/CYRK
-/CYRL
-/CYRM
-/CYRN
-/CYRO
-/CYRP
-% 208
-/CYRR
-/CYRS
-/CYRT
-/CYRU
-/CYRF
-/CYRH
-/CYRC
-/CYRCH
-% 216
-/CYRSH
-/CYRSHCH
-/CYRHRDSN
-/CYRERY
-/CYRSFTSN
-/CYREREV
-/CYRYU
-/CYRYA
-% 224
-/cyra
-/cyrb
-/cyrv
-/cyrg
-/cyrd
-/cyre
-/cyrzh
-/cyrz
-% 232
-/cyri
-/cyrishrt
-/cyrk
-/cyrl
-/cyrm
-/cyrn
-/cyro
-/cyrp
-% 240
-/cyrr
-/cyrs
-/cyrt
-/cyru
-/cyrf
-/cyrh
-/cyrc
-/cyrch
-% 248
-/cyrsh
-/cyrshch
-/cyrhrdsn
-/cyrery
-/cyrsftsn
-/cyrerev
-/cyryu
-/cyrya
-] def
-%%EndResource
-
-% End of file comfortaa-t2b.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
deleted file mode 100644
index 43fe6b906fb..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file t2c.etx",
-%    version = "See file t2c.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-t2c.enc",
-%    email = "See file t2c.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from t2c.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{t2c}{comfortaa-t2c}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{t2c}{fontinst-autoenc-t2c}{\download{comfortaa-t2c.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-t2c
-/fontinst-autoenc-t2c [
-% 0
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-% 8
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/CYRpalochka
-/angleleft
-/angleright
-% 16
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/rangedash
-/cyrdash
-/compwordmark
-% 24
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 32
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-% 56
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-% 64
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-% 72
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-% 80
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-% 88
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-% 96
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-% 104
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-% 112
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-% 120
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
-% 128
-/CYRPHK
-/CYRTETSE
-/CYRTDSC
-/CYRGHK
-/CYRSHHA
-/CYRRDSC
-/CYRRTICK
-/CYRABHDZE
-% 136
-/CYRMDSC
-/CYRKDSC
-/CYRLDSC
-/CYRKHCRS
-/CYRLHK
-/CYRNDSC
-/CYRMHK
-/CYRNHK
-% 144
-/CYROTLD
-/CYRABHCH
-/CYRABHCHDSC
-/CYRSEMISFTSN
-/CYRISHRTDSC
-/CYRHDSC
-/CYRDZHE
-/CYRABHHA
-% 152
-/CYRCHRDSC
-/CYRNLHK
-/CYRSCHWA
-/CYRRHK
-/CYRYO
-/numero
-/currency
-/section
-% 160
-/cyrphk
-/cyrtetse
-/cyrtdsc
-/cyrghk
-/cyrshha
-/cyrrdsc
-/cyrrtick
-/cyrabhdze
-% 168
-/cyrmdsc
-/cyrkdsc
-/cyrldsc
-/cyrkhcrs
-/cyrlhk
-/cyrndsc
-/cyrmhk
-/cyrnhk
-% 176
-/cyrotld
-/cyrabhch
-/cyrabhchdsc
-/cyrsemisftsn
-/cyrishrtdsc
-/cyrhdsc
-/cyrdzhe
-/cyrabhha
-% 184
-/cyrchrdsc
-/cyrnlhk
-/cyrschwa
-/cyrrhk
-/cyryo
-/quotedblbase
-/guillemotleft
-/guillemotright
-% 192
-/CYRA
-/CYRB
-/CYRV
-/CYRG
-/CYRD
-/CYRE
-/CYRZH
-/CYRZ
-% 200
-/CYRI
-/CYRISHRT
-/CYRK
-/CYRL
-/CYRM
-/CYRN
-/CYRO
-/CYRP
-% 208
-/CYRR
-/CYRS
-/CYRT
-/CYRU
-/CYRF
-/CYRH
-/CYRC
-/CYRCH
-% 216
-/CYRSH
-/CYRSHCH
-/CYRHRDSN
-/CYRERY
-/CYRSFTSN
-/CYREREV
-/CYRYU
-/CYRYA
-% 224
-/cyra
-/cyrb
-/cyrv
-/cyrg
-/cyrd
-/cyre
-/cyrzh
-/cyrz
-% 232
-/cyri
-/cyrishrt
-/cyrk
-/cyrl
-/cyrm
-/cyrn
-/cyro
-/cyrp
-% 240
-/cyrr
-/cyrs
-/cyrt
-/cyru
-/cyrf
-/cyrh
-/cyrc
-/cyrch
-% 248
-/cyrsh
-/cyrshch
-/cyrhrdsn
-/cyrery
-/cyrsftsn
-/cyrerev
-/cyryu
-/cyrya
-] def
-%%EndResource
-
-% End of file comfortaa-t2c.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
deleted file mode 100644
index b06e65bdc6a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file ts1.etx",
-%    version = "See file ts1.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-ts1.enc",
-%    email = "See file ts1.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from ts1.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{ts1}{comfortaa-ts1}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{ts1}{fontinst-autoenc-ts1}{\download{comfortaa-ts1.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-ts1
-/fontinst-autoenc-ts1 [
-% 0
-/capitalgrave
-/capitalacute
-/capitalcircumflex
-/capitaltilde
-/capitaldieresis
-/capitalhungarumlaut
-/capitalring
-/capitalcaron
-% 8
-/capitalbreve
-/capitalmacron
-/capitaldotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/.notdef
-/.notdef
-% 16
-/.notdef
-/.notdef
-/quotedblbase
-/.notdef
-/.notdef
-/twelveudash
-/threequartersemdash
-/capitalcompwordmark
-% 24
-/arrowleft
-/arrowright
-/tieaccentlowercase
-/tieaccentcapital
-/newtieaccentlowercase
-/newtieaccentcapital
-/.notdef
-/ascendercompwordmark
-% 32
-/blank
-/.notdef
-/.notdef
-/.notdef
-/dollar
-/.notdef
-/.notdef
-/quotesingle
-% 40
-/.notdef
-/.notdef
-/asteriskcentered
-/.notdef
-/comma
-/hyphendbl
-/period
-/fraction
-% 48
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-% 56
-/eightoldstyle
-/nineoldstyle
-/.notdef
-/.notdef
-/angbracketleft
-/minus
-/angbracketright
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/Omegainv
-/.notdef
-/bigcircle
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/Omega
-% 88
-/.notdef
-/.notdef
-/.notdef
-/openbracketleft
-/.notdef
-/openbracketright
-/arrowup
-/arrowdown
-% 96
-/asciigrave
-/.notdef
-/born
-/divorced
-/died
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/leaf
-/married
-/musicalnote
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/tildelow
-/hyphendblchar
-% 128
-/asciibreve
-/asciicaron
-/asciiacutedbl
-/asciigravedbl
-/dagger
-/daggerdbl
-/bardbl
-/perthousand
-% 136
-/bullet
-/centigrade
-/dollaroldstyle
-/centoldstyle
-/florin
-/colonmonetary
-/won
-/naira
-% 144
-/guarani
-/peso
-/lira
-/recipe
-/interrobang
-/interrobangdown
-/dong
-/trademark
-% 152
-/pertenthousand
-/pilcrow
-/baht
-/numero
-/discount
-/estimated
-/openbullet
-/servicemark
-% 160
-/quillbracketleft
-/quillbracketright
-/cent
-/sterling
-/currency
-/yen
-/brokenbar
-/section
-% 168
-/asciidieresis
-/copyright
-/ordfeminine
-/copyleft
-/logicalnot
-/circledP
-/registered
-/asciimacron
-% 176
-/degree
-/plusminus
-/twosuperior
-/threesuperior
-/asciiacute
-/mu
-/paragraph
-/periodcentered
-% 184
-/referencemark
-/onesuperior
-/ordmasculine
-/radical
-/onequarter
-/onehalf
-/threequarters
-/euro
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/multiply
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/divide
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file comfortaa-ts1.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc
deleted file mode 100644
index ed9999f1f2d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-%    author = "See file x2.etx",
-%    version = "See file x2.etx",
-%    date = "generated 2011/03/24",
-%    filename = "comfortaa-x2.enc",
-%    email = "See file x2.etx",
-%    codetable = "ISO/ASCII",
-%    checksum = "",
-%    abstract = "This is a postscript encoding file, automatically generated by fontinst from x2.etx."
-% }
-
-% Created by: tex comfortaa-map
-% Created using: \etxtoenc{x2}{comfortaa-x2}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{x2}{fontinst-autoenc-x2}{\download{comfortaa-x2.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-x2
-/fontinst-autoenc-x2 [
-% 0
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-% 8
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/CYRpalochka
-/angleleft
-/angleright
-% 16
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/rangedash
-/cyrdash
-/compwordmark
-% 24
-/perthousandzero
-/gravecross
-/acutecross
-/hcross
-/CYRDELTA
-/cyrdelta
-/CYRNLHK
-/cyrnlhk
-% 32
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-% 56
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-% 64
-/at
-/CYRAE
-/CYRDJE
-/CYRTSHE
-/CYRABHCH
-/CYRABHCHDSC
-/CYRKVCRS
-/CYRKHCRS
-% 72
-/CYRLDSC
-/CYRII
-/CYRJE
-/CYRLJE
-/CYRMDSC
-/CYRNJE
-/CYRABHHA
-/CYRPHK
-% 80
-/CYRRDSC
-/CYRQ
-/CYRTDSC
-/CYRDZE
-/CYRTETSE
-/CYRDZHE
-/CYRCHVCRS
-/CYRW
-% 88
-/CYRYAT
-/CYRBYUS
-/CYRIZH
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-% 96
-/quoteleft
-/cyrae
-/cyrdje
-/cyrtshe
-/cyrabhch
-/cyrabhchdsc
-/cyrkvcrs
-/cyrkhcrs
-% 104
-/cyrldsc
-/cyrii
-/cyrje
-/cyrlje
-/cyrmdsc
-/cyrnje
-/cyrabhha
-/cyrphk
-% 112
-/cyrrdsc
-/cyrq
-/cyrtdsc
-/cyrdze
-/cyrtetse
-/cyrdzhe
-/cyrchvcrs
-/cyrw
-% 120
-/cyryat
-/cyrbyus
-/cyrizh
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
-% 128
-/CYRGUP
-/CYRGHCRS
-/CYRGDSC
-/CYRGHK
-/CYRSHHA
-/CYRZHDSC
-/CYRZDSC
-/CYRABHDZE
-% 136
-/CYRYI
-/CYRKDSC
-/CYRKBEAK
-/CYRKHK
-/CYRLHK
-/CYRNDSC
-/CYRNG
-/CYRNHK
-% 144
-/CYROTLD
-/CYRSDSC
-/CYRUSHRT
-/CYRY
-/CYRYHCRS
-/CYRHDSC
-/CYRHHK
-/CYRCHLDSC
-% 152
-/CYRCHRDSC
-/CYRIE
-/CYRSCHWA
-/CYREPS
-/CYRYO
-/numero
-/currency
-/section
-% 160
-/cyrgup
-/cyrghcrs
-/cyrgdsc
-/cyrghk
-/cyrshha
-/cyrzhdsc
-/cyrzdsc
-/cyrabhdze
-% 168
-/cyryi
-/cyrkdsc
-/cyrkbeak
-/cyrkhk
-/cyrlhk
-/cyrndsc
-/cyrng
-/cyrnhk
-% 176
-/cyrotld
-/cyrsdsc
-/cyrushrt
-/cyry
-/cyryhcrs
-/cyrhdsc
-/cyrhhk
-/cyrchldsc
-% 184
-/cyrchrdsc
-/cyrie
-/cyrschwa
-/cyreps
-/cyryo
-/quotedblbase
-/guillemotleft
-/guillemotright
-% 192
-/CYRA
-/CYRB
-/CYRV
-/CYRG
-/CYRD
-/CYRE
-/CYRZH
-/CYRZ
-% 200
-/CYRI
-/CYRISHRT
-/CYRK
-/CYRL
-/CYRM
-/CYRN
-/CYRO
-/CYRP
-% 208
-/CYRR
-/CYRS
-/CYRT
-/CYRU
-/CYRF
-/CYRH
-/CYRC
-/CYRCH
-% 216
-/CYRSH
-/CYRSHCH
-/CYRHRDSN
-/CYRERY
-/CYRSFTSN
-/CYREREV
-/CYRYU
-/CYRYA
-% 224
-/cyra
-/cyrb
-/cyrv
-/cyrg
-/cyrd
-/cyre
-/cyrzh
-/cyrz
-% 232
-/cyri
-/cyrishrt
-/cyrk
-/cyrl
-/cyrm
-/cyrn
-/cyro
-/cyrp
-% 240
-/cyrr
-/cyrs
-/cyrt
-/cyru
-/cyrf
-/cyrh
-/cyrc
-/cyrch
-% 248
-/cyrsh
-/cyrshch
-/cyrhrdsn
-/cyrery
-/cyrsftsn
-/cyrerev
-/cyryu
-/cyrya
-] def
-%%EndResource
-
-% End of file comfortaa-x2.enc.
diff --git a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
index 7a65e0b547d..305d24eba1f 100644
--- a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
+++ b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
@@ -1,78 +1,24 @@
-raw-ot1-Comfortaa-Regular Comfortaa <comfortaa-ot1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-ot1 ReEncodeFont "
-raw-fixlatin-Comfortaa-Regular Comfortaa <comfortaa-fixlatin.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont "
-raw-dotlessj-Comfortaa-Regular ComfortaaLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Regular-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
-raw-ot1-Comfortaa-Regular-Slanted Comfortaa <comfortaa-ot1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
-raw-fixlatin-Comfortaa-Regular-Slanted Comfortaa <comfortaa-fixlatin.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont 0.167 SlantFont "
-raw-dotlessj-Comfortaa-Regular-Slanted ComfortaaLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Regular-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
-raw-ot1-Comfortaa-Bold Comfortaa-Bold <comfortaa-ot1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont "
-raw-fixlatin-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixlatin.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont "
-raw-dotlessj-Comfortaa-Bold Comfortaa-BoldLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Bold-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
-raw-ot1-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-ot1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
-raw-fixlatin-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixlatin.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont 0.167 SlantFont "
-raw-dotlessj-Comfortaa-Bold-Slanted Comfortaa-BoldLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Bold-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
-raw-ot1-Comfortaa-Light Comfortaa-Light <comfortaa-ot1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ot1 ReEncodeFont "
-raw-fixlatin-Comfortaa-Light Comfortaa-Light <comfortaa-fixlatin.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont "
-raw-dotlessj-Comfortaa-Light Comfortaa-LightLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Light-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
-raw-ot1-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-ot1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
-raw-fixlatin-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixlatin.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont 0.167 SlantFont "
-raw-dotlessj-Comfortaa-Light-Slanted Comfortaa-LightLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Light-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
-raw-t1-Comfortaa-Regular Comfortaa <comfortaa-t1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont "
-raw-t1-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
-raw-t1-Comfortaa-Bold Comfortaa-Bold <comfortaa-t1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont "
-raw-t1-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
-raw-t1-Comfortaa-Light Comfortaa-Light <comfortaa-t1.enc <Comfortaa-Light.pfb " fontinst-autoenc-t1 ReEncodeFont "
-raw-t1-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t1.enc <Comfortaa-Light.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
-raw-fixtextcomp-Comfortaa-Regular Comfortaa <comfortaa-fixtextcomp.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont "
-raw-ts1-Comfortaa-Regular Comfortaa <comfortaa-ts1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont "
-raw-fixtextcomp-Comfortaa-Regular-Slanted Comfortaa <comfortaa-fixtextcomp.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
-raw-ts1-Comfortaa-Regular-Slanted Comfortaa <comfortaa-ts1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
-raw-fixtextcomp-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixtextcomp.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont "
-raw-ts1-Comfortaa-Bold Comfortaa-Bold <comfortaa-ts1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont "
-raw-fixtextcomp-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixtextcomp.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
-raw-ts1-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-ts1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
-raw-fixtextcomp-Comfortaa-Light Comfortaa-Light <comfortaa-fixtextcomp.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont "
-raw-ts1-Comfortaa-Light Comfortaa-Light <comfortaa-ts1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ts1 ReEncodeFont "
-raw-fixtextcomp-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixtextcomp.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
-raw-ts1-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-ts1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
-raw-t2a-Comfortaa-Regular Comfortaa <comfortaa-t2a.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2a ReEncodeFont "
-raw-fixcyrillic-Comfortaa-Regular Comfortaa <comfortaa-fixcyrillic.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
-raw-t2a-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t2a.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
-raw-fixcyrillic-Comfortaa-Regular-Slanted Comfortaa <comfortaa-fixcyrillic.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont 0.167 SlantFont "
-raw-t2a-Comfortaa-Bold Comfortaa-Bold <comfortaa-t2a.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2a ReEncodeFont "
-raw-fixcyrillic-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixcyrillic.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
-raw-t2a-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t2a.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
-raw-fixcyrillic-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixcyrillic.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont 0.167 SlantFont "
-raw-t2a-Comfortaa-Light Comfortaa-Light <comfortaa-t2a.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2a ReEncodeFont "
-raw-fixcyrillic-Comfortaa-Light Comfortaa-Light <comfortaa-fixcyrillic.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
-raw-t2a-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t2a.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
-raw-fixcyrillic-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixcyrillic.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont 0.167 SlantFont "
-raw-t2b-Comfortaa-Regular Comfortaa <comfortaa-t2b.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2b ReEncodeFont "
-raw-t2b-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t2b.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
-raw-t2b-Comfortaa-Bold Comfortaa-Bold <comfortaa-t2b.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2b ReEncodeFont "
-raw-t2b-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t2b.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
-raw-t2b-Comfortaa-Light Comfortaa-Light <comfortaa-t2b.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2b ReEncodeFont "
-raw-t2b-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t2b.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
-raw-t2c-Comfortaa-Regular Comfortaa <comfortaa-t2c.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2c ReEncodeFont "
-raw-t2c-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t2c.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
-raw-t2c-Comfortaa-Bold Comfortaa-Bold <comfortaa-t2c.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2c ReEncodeFont "
-raw-t2c-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t2c.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
-raw-t2c-Comfortaa-Light Comfortaa-Light <comfortaa-t2c.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2c ReEncodeFont "
-raw-t2c-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t2c.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
-raw-x2-Comfortaa-Regular Comfortaa <comfortaa-x2.enc <Comfortaa-Regular.pfb " fontinst-autoenc-x2 ReEncodeFont "
-raw-x2-Comfortaa-Regular-Slanted Comfortaa <comfortaa-x2.enc <Comfortaa-Regular.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
-raw-x2-Comfortaa-Bold Comfortaa-Bold <comfortaa-x2.enc <Comfortaa-Bold.pfb " fontinst-autoenc-x2 ReEncodeFont "
-raw-x2-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-x2.enc <Comfortaa-Bold.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
-raw-x2-Comfortaa-Light Comfortaa-Light <comfortaa-x2.enc <Comfortaa-Light.pfb " fontinst-autoenc-x2 ReEncodeFont "
-raw-x2-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-x2.enc <Comfortaa-Light.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
-raw-fixgreek-Comfortaa-Regular Comfortaa <comfortaa-fixgreek.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont "
-raw-lgr-Comfortaa-Regular Comfortaa <comfortaa-lgr.enc <Comfortaa-Regular.pfb " fontinst-autoenc-lgr ReEncodeFont "
-raw-fixgreek-Comfortaa-Regular-Slanted Comfortaa <comfortaa-fixgreek.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
-raw-lgr-Comfortaa-Regular-Slanted Comfortaa <comfortaa-lgr.enc <Comfortaa-Regular.pfb " fontinst-autoenc-lgr ReEncodeFont 0.167 SlantFont "
-raw-fixgreek-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixgreek.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont "
-raw-lgr-Comfortaa-Bold Comfortaa-Bold <comfortaa-lgr.enc <Comfortaa-Bold.pfb " fontinst-autoenc-lgr ReEncodeFont "
-raw-fixgreek-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixgreek.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
-raw-lgr-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-lgr.enc <Comfortaa-Bold.pfb " fontinst-autoenc-lgr ReEncodeFont 0.167 SlantFont "
-raw-fixgreek-Comfortaa-Light Comfortaa-Light <comfortaa-fixgreek.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont "
-raw-lgr-Comfortaa-Light Comfortaa-Light <comfortaa-lgr.enc <Comfortaa-Light.pfb " fontinst-autoenc-lgr ReEncodeFont "
-raw-fixgreek-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixgreek.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
-raw-lgr-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-lgr.enc <Comfortaa-Light.pfb " fontinst-autoenc-lgr ReEncodeFont 0.167 SlantFont "
+Comfortaa-Light-02 Comfortaa-Light <comfortaa-02.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-02 ReEncodeFont "
+Comfortaa-Light-01 Comfortaa-Light <comfortaa-01.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-01 ReEncodeFont "
+Comfortaa-Light-dotlessj Comfortaa-LightLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Light-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
+Comfortaa-Light-Slanted-02 Comfortaa-Light <comfortaa-02.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-02 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Light-Slanted-01 Comfortaa-Light <comfortaa-01.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-01 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Light-Slanted-dotlessj Comfortaa-LightLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Light-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
+Comfortaa-Regular-02 Comfortaa <comfortaa-02.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-02 ReEncodeFont "
+Comfortaa-Regular-01 Comfortaa <comfortaa-01.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-01 ReEncodeFont "
+Comfortaa-Regular-dotlessj ComfortaaLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Regular-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
+Comfortaa-Regular-Slanted-02 Comfortaa <comfortaa-02.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-02 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Regular-Slanted-01 Comfortaa <comfortaa-01.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-01 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Regular-Slanted-dotlessj ComfortaaLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Regular-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
+Comfortaa-Bold-02 Comfortaa-Bold <comfortaa-02.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-02 ReEncodeFont "
+Comfortaa-Bold-01 Comfortaa-Bold <comfortaa-01.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-01 ReEncodeFont "
+Comfortaa-Bold-dotlessj Comfortaa-BoldLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Bold-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
+Comfortaa-Bold-Slanted-02 Comfortaa-Bold <comfortaa-02.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-02 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Bold-Slanted-01 Comfortaa-Bold <comfortaa-01.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-01 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Bold-Slanted-dotlessj Comfortaa-BoldLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Bold-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
+Comfortaa-Light-03 Comfortaa-Light <comfortaa-03.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-03 ReEncodeFont "
+Comfortaa-Light-Slanted-03 Comfortaa-Light <comfortaa-03.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-03 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Regular-03 Comfortaa <comfortaa-03.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-03 ReEncodeFont "
+Comfortaa-Regular-Slanted-03 Comfortaa <comfortaa-03.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-03 ReEncodeFont 0.167 SlantFont "
+Comfortaa-Bold-03 Comfortaa-Bold <comfortaa-03.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-03 ReEncodeFont "
+Comfortaa-Bold-Slanted-03 Comfortaa-Bold <comfortaa-03.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-03 ReEncodeFont 0.167 SlantFont "
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm
new file mode 100644
index 00000000000..f6b6dba7891
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm
new file mode 100644
index 00000000000..6ffa69d4c22
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm
new file mode 100644
index 00000000000..41d395bc0bb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm
new file mode 100644
index 00000000000..b1a6ff9a532
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm
new file mode 100644
index 00000000000..8b7adb3c1f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm
new file mode 100644
index 00000000000..4d68e756b60
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm
new file mode 100644
index 00000000000..c9a19298edd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.tfm
index 347f5b193b0..347f5b193b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.tfm
index 27d1753be97..27d1753be97 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm
new file mode 100644
index 00000000000..d55c1820dbc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm
new file mode 100644
index 00000000000..1c1d45a36b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm
new file mode 100644
index 00000000000..9c3ba53adf4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm
new file mode 100644
index 00000000000..049451d5e64
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-dotlessj.tfm
index fd42cd30339..fd42cd30339 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-dotlessj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm
new file mode 100644
index 00000000000..69e66d4ec89
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ot1.tfm
index 94f41a75b51..94f41a75b51 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t1.tfm
index 5b14218ac50..5b14218ac50 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm
new file mode 100644
index 00000000000..66d46185d0e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm
new file mode 100644
index 00000000000..b2a21fc7927
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm
new file mode 100644
index 00000000000..30f8d5b1c67
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm
new file mode 100644
index 00000000000..deb56d82d7e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-x2.tfm
new file mode 100644
index 00000000000..73741499999
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm
new file mode 100644
index 00000000000..acab447d354
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.tfm
index f9bef2c2e37..f9bef2c2e37 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.tfm
index 02df46c4fec..02df46c4fec 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm
new file mode 100644
index 00000000000..f474dd8e9e7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm
new file mode 100644
index 00000000000..981a3ff1897
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm
new file mode 100644
index 00000000000..7ae5cef7f2f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm
new file mode 100644
index 00000000000..7893ae99099
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-dotlessj.tfm
index f2a1bc596ec..f2a1bc596ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-dotlessj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm
new file mode 100644
index 00000000000..8feb637605b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-ot1.tfm
index 6036fd08f1f..6036fd08f1f 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t1.tfm
index 61fb741230a..61fb741230a 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Bold.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2a.tfm
new file mode 100644
index 00000000000..953ce9c124c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm
new file mode 100644
index 00000000000..4534c3e8da4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm
new file mode 100644
index 00000000000..c7989aa5c6b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm
new file mode 100644
index 00000000000..96ba69bcb0c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm
new file mode 100644
index 00000000000..e86a37a4578
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm
new file mode 100644
index 00000000000..2b2ae57ac9f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-02.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-02.tfm
new file mode 100644
index 00000000000..a235859683e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-02.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm
new file mode 100644
index 00000000000..4fc18909bb3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-01.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-01.tfm
new file mode 100644
index 00000000000..e6a263c809e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-01.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm
new file mode 100644
index 00000000000..5625d888595
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm
new file mode 100644
index 00000000000..90bf627b84e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.tfm
new file mode 100644
index 00000000000..8a7f970ff54
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.tfm
index 6542dfdb63d..4f97b6981e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.tfm
index f7f55573778..8eb5daab0a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.tfm
new file mode 100644
index 00000000000..5f2be246b3d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm
new file mode 100644
index 00000000000..afa4e155e84
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm
new file mode 100644
index 00000000000..f22af74be61
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm
new file mode 100644
index 00000000000..2caf1f348eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-dotlessj.tfm
index 1ea99a3bf2b..1ea99a3bf2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-dotlessj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-lgr.tfm
new file mode 100644
index 00000000000..a43b380d482
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ot1.tfm
index 8d679021382..4cf33bcea88 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t1.tfm
index 2a35a7d4e66..78bc748e7aa 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm
new file mode 100644
index 00000000000..9a0989ea3f9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm
new file mode 100644
index 00000000000..715a52b211d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm
new file mode 100644
index 00000000000..8ee515af7fc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm
new file mode 100644
index 00000000000..4f3b7df6064
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm
new file mode 100644
index 00000000000..2bb05117cfd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.tfm
new file mode 100644
index 00000000000..e387e2c9d4f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.tfm
index c2a1fc5a8b0..232c8406ba3 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t1.tfm
index 990080c737a..16b2fc98686 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm
new file mode 100644
index 00000000000..6ca0ccad199
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm
new file mode 100644
index 00000000000..1596f7f4c14
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm
new file mode 100644
index 00000000000..cd68ca4cbd2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm
new file mode 100644
index 00000000000..5e192a3ec33
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-dotlessj.tfm
index 49fa818ac29..49fa818ac29 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-dotlessj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm
new file mode 100644
index 00000000000..a104feb4d52
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-ot1.tfm
index c7af11acac8..1071e02b968 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t1.tfm
index ab36d534009..6d1b792d175 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2a.tfm
new file mode 100644
index 00000000000..a64e7ea6ae9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm
new file mode 100644
index 00000000000..5f572d805c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm
new file mode 100644
index 00000000000..7c6022526f3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm
new file mode 100644
index 00000000000..5c97841c402
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm
new file mode 100644
index 00000000000..9296e2b824d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm
new file mode 100644
index 00000000000..29e557cf97b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm
new file mode 100644
index 00000000000..460643672cb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm
new file mode 100644
index 00000000000..7e706f41ed6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-01.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-01.tfm
new file mode 100644
index 00000000000..463b74bd33e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-01.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm
new file mode 100644
index 00000000000..72bf1ae4111
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm
new file mode 100644
index 00000000000..d3b6ca5608f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm
new file mode 100644
index 00000000000..f8e4f21e2c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.tfm
index 18be6093260..18be6093260 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.tfm
index ba728a8adf8..ba728a8adf8 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm
new file mode 100644
index 00000000000..e9cc58b1900
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm
new file mode 100644
index 00000000000..c43fa0beda9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm
new file mode 100644
index 00000000000..092b47a7158
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm
new file mode 100644
index 00000000000..411c011823c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-dotlessj.tfm
index 2eab7651b4f..2eab7651b4f 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-dotlessj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm
new file mode 100644
index 00000000000..0645056ca38
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ot1.tfm
index 685f1209ab0..685f1209ab0 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t1.tfm
index dffecd3d203..dffecd3d203 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm
new file mode 100644
index 00000000000..a4cf43fa177
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm
new file mode 100644
index 00000000000..b3209c798cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm
new file mode 100644
index 00000000000..7f99687c66e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ts1.tfm
new file mode 100644
index 00000000000..de259da45f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm
new file mode 100644
index 00000000000..2833dc92e34
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm
new file mode 100644
index 00000000000..022c81d6a79
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.tfm
index 81f8c7aa919..81f8c7aa919 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.tfm
index 10e43ba7cad..10e43ba7cad 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm
new file mode 100644
index 00000000000..727ee8bb664
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm
new file mode 100644
index 00000000000..21df246bb4b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm
new file mode 100644
index 00000000000..78df3ea9c0f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm
new file mode 100644
index 00000000000..4fc589d076a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-dotlessj.tfm
index 0567c3bf68f..0567c3bf68f 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-dotlessj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm
new file mode 100644
index 00000000000..2b3cacf677a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-ot1.tfm
index 29f7365374b..29f7365374b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t1.tfm
index 3ffec463839..3ffec463839 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Regular.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm
new file mode 100644
index 00000000000..38e23e975b5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm
new file mode 100644
index 00000000000..eb46dc7bc0f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm
new file mode 100644
index 00000000000..e16894eaa4c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-ts1.tfm
new file mode 100644
index 00000000000..6c339160d49
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm
new file mode 100644
index 00000000000..ce1792513a6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.tfm
deleted file mode 100644
index dec9323b49e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index ade72bb0071..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.tfm
deleted file mode 100644
index f7fe037002a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.tfm
deleted file mode 100644
index 2fb153121fc..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm
deleted file mode 100644
index f3419c9155e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 4c0f71ff15a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm
deleted file mode 100644
index 014fe0ace6a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm
deleted file mode 100644
index 5c8d5a6c141..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index 4d3c8eaeb9b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 3846188778b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm
deleted file mode 100644
index 106323a9ea2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.tfm
deleted file mode 100644
index 96580381b3a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 96779c9e01d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm
deleted file mode 100644
index b008372546a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 8a0327c1b4f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm
deleted file mode 100644
index 2e35d3dcd0a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 76c965c0385..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular.tfm
deleted file mode 100644
index acfccd56e61..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 50727895c5b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm
deleted file mode 100644
index 3cf54b06b58..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index f86c683cf28..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm
deleted file mode 100644
index 4e6bb8cb6f9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 2495b64ebca..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular.tfm
deleted file mode 100644
index b33e05392de..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index e52ec51db54..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm
deleted file mode 100644
index a20c48a8da1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 9d0d85ca272..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm
deleted file mode 100644
index b5b6352d8f0..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 8e88f9e8fad..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm
deleted file mode 100644
index 00950da4355..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 8d1bb0e2b79..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.tfm
deleted file mode 100644
index 160959792d9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index c8886cae54b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm
deleted file mode 100644
index 65a51317518..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 7515a447c78..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm
deleted file mode 100644
index fd18e9d8d55..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index d6903d58308..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold.tfm
deleted file mode 100644
index 400c966fe04..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index cf6487a8421..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm
deleted file mode 100644
index 6130d706dc6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index cf898f80de9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.tfm
deleted file mode 100644
index 2e8d30d069c..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 378e7e52814..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm
deleted file mode 100644
index 1d15fc46e30..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index c53a9551611..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm
deleted file mode 100644
index c514c7dd5b8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 23e77d77fb0..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular.tfm
deleted file mode 100644
index 172f8aa05fa..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 65a05893980..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm
deleted file mode 100644
index d88f71e1d06..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 39fc7485846..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm
deleted file mode 100644
index 2a6687cd54e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index bbc47413b4f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm
deleted file mode 100644
index c383b542e3e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 451e550d623..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm
deleted file mode 100644
index fe0a03d5088..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 94006c0176b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm
deleted file mode 100644
index 38763e53f88..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index e279248f109..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm
deleted file mode 100644
index bce44aba072..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 451e550d623..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm
deleted file mode 100644
index fe0a03d5088..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 94006c0176b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm
deleted file mode 100644
index 38763e53f88..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index e279248f109..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm
deleted file mode 100644
index bce44aba072..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 451e550d623..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm
deleted file mode 100644
index fe0a03d5088..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 94006c0176b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm
deleted file mode 100644
index 38763e53f88..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index e279248f109..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm
deleted file mode 100644
index bce44aba072..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 90d0a3d0560..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm
deleted file mode 100644
index 4a2b15e40d3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 0f85ad85e3b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm
deleted file mode 100644
index e9ff8d173fb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 2d8f35fe272..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm
deleted file mode 100644
index 8f2ac94d7a9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index f38a2b9be9b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold.tfm
deleted file mode 100644
index f5b5b45b34a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 597275e510a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm
deleted file mode 100644
index 1b5a411d7d0..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index b5a1556a21d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm
deleted file mode 100644
index 11ef90e39e9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.tfm
deleted file mode 100644
index 193f1461074..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index e57d3b54b04..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm
deleted file mode 100644
index c55522acea9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm
deleted file mode 100644
index 17ce8e7a720..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm
deleted file mode 100644
index 8b763e90051..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 5520bca2784..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm
deleted file mode 100644
index da4562719b9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm
deleted file mode 100644
index c041ee5a05e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index c242221c5b4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index b9522ecf870..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm
deleted file mode 100644
index 55455449fb9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.tfm
deleted file mode 100644
index ba28647b36d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm
deleted file mode 100644
index 42196b5b20e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index 76f99c564cf..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm
deleted file mode 100644
index 295e728edda..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm
deleted file mode 100644
index b474871caed..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm
deleted file mode 100644
index e9bcee8b159..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index fdfeaa166e7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm
deleted file mode 100644
index 3dd627b0350..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm
deleted file mode 100644
index 7d5472dd322..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index fa3836b533d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 8170f0782f9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.tfm
deleted file mode 100644
index 34e5613ae52..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm
deleted file mode 100644
index 48e2fe9b95b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm
deleted file mode 100644
index 9737b8bf32d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index f7eb4cc3613..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm
deleted file mode 100644
index 21488ebb41e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold.tfm
deleted file mode 100644
index 9726741418c..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm
deleted file mode 100644
index 50f90d7c600..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 3e3fd988729..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm
deleted file mode 100644
index 3e18c8430cb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm
deleted file mode 100644
index 93f13b331a7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index 7022e8a2ae3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index cd1ffb67a39..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.tfm
deleted file mode 100644
index 4c6162a8e99..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm
deleted file mode 100644
index 22f74baefdb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index e68c1accc20..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm
deleted file mode 100644
index 794e7e4f184..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 10b7eec6091..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm
deleted file mode 100644
index 1a1db3458af..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index f469d6ec8fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm
deleted file mode 100644
index a412e5178b5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.tfm
deleted file mode 100644
index d3a928d9aac..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm
deleted file mode 100644
index f10a7a68737..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.tfm
deleted file mode 100644
index 4b47f0fbaac..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm
deleted file mode 100644
index f2fc87f0340..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm
deleted file mode 100644
index 95a115af796..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm
deleted file mode 100644
index 22e45b56d11..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm
deleted file mode 100644
index a4d2e3c9d0b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm
deleted file mode 100644
index 8359bde2004..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index b11d740809b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted.tfm
deleted file mode 100644
index 5ff6cde812b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm
deleted file mode 100644
index eadb6db9749..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm
deleted file mode 100644
index 8eb3fa6ad8a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
index 620ea735c7c..db385bc4e8e 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
index 1e71c5d0c04..377edae335b 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
index 423545f54b0..a94acc4d3a3 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
index 11033b8ea58..65d82b4ffaa 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
index 1dfdc70b5a3..9dbd79c9a73 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
index 4c633870dbe..aeb01a885b9 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf
new file mode 100644
index 00000000000..f0a7b58ae64
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..4acfd283d80
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf
new file mode 100644
index 00000000000..372bf349276
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf
new file mode 100644
index 00000000000..a5aed5c08de
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.vf
new file mode 100644
index 00000000000..b065f935133
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf
new file mode 100644
index 00000000000..923ffc67ce2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf
new file mode 100644
index 00000000000..4836af1dd44
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf
new file mode 100644
index 00000000000..70328d9f401
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf
new file mode 100644
index 00000000000..dc7bf59ae42
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf
new file mode 100644
index 00000000000..d0b72783b55
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2a.vf
new file mode 100644
index 00000000000..d8b2ee176b8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf
new file mode 100644
index 00000000000..0e3e54edb8c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf
new file mode 100644
index 00000000000..58912409508
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf
new file mode 100644
index 00000000000..0cebcecd628
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf
new file mode 100644
index 00000000000..6c7b2ae8fe8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf
new file mode 100644
index 00000000000..d8876adf29c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..e80a828fef3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.vf
new file mode 100644
index 00000000000..b44d0f92067
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf
new file mode 100644
index 00000000000..7fd9adfa48d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf
new file mode 100644
index 00000000000..9a83d30bce3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf
new file mode 100644
index 00000000000..c650d088ea3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf
new file mode 100644
index 00000000000..ba31e593b91
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf
new file mode 100644
index 00000000000..196f6e4b31e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf
new file mode 100644
index 00000000000..2e8b26829e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf
new file mode 100644
index 00000000000..70af0806731
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf
new file mode 100644
index 00000000000..6ec84fc3c65
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf
new file mode 100644
index 00000000000..ce798aa5650
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf
new file mode 100644
index 00000000000..f2ab4e78e96
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf
new file mode 100644
index 00000000000..d5515a24ca6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf
new file mode 100644
index 00000000000..e393fa2a1a8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf
new file mode 100644
index 00000000000..078222230f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..f967b7ddc44
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf
new file mode 100644
index 00000000000..13855540e1a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf
new file mode 100644
index 00000000000..6d76157eaa8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf
new file mode 100644
index 00000000000..47e91308aca
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf
new file mode 100644
index 00000000000..a4f97be0641
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf
new file mode 100644
index 00000000000..3d8d1a9c1c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf
new file mode 100644
index 00000000000..c5fc795e98d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf
new file mode 100644
index 00000000000..fd582bad029
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf
new file mode 100644
index 00000000000..29a10158ff0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2a.vf
new file mode 100644
index 00000000000..a1dcd8d996c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf
new file mode 100644
index 00000000000..0ff9eacde65
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf
new file mode 100644
index 00000000000..b5f40019ef3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf
new file mode 100644
index 00000000000..5db9bdfade7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf
new file mode 100644
index 00000000000..1184d11b2f9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf
new file mode 100644
index 00000000000..4a38c467801
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..13c8bb94802
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf
new file mode 100644
index 00000000000..bfae89b31be
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf
new file mode 100644
index 00000000000..c6469cba417
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf
new file mode 100644
index 00000000000..57c306a343b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf
new file mode 100644
index 00000000000..5bf252849d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf
new file mode 100644
index 00000000000..f27999a7b6c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf
new file mode 100644
index 00000000000..d4c8496bec8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf
new file mode 100644
index 00000000000..2d372f3b0c8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf
new file mode 100644
index 00000000000..b2dcc9bf0bb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf
new file mode 100644
index 00000000000..1e9bf951aa2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2b.vf
new file mode 100644
index 00000000000..8e9bb857dbb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf
new file mode 100644
index 00000000000..615aa4ecd3f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf
new file mode 100644
index 00000000000..1b74335dea0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf
new file mode 100644
index 00000000000..b44f3d9fa73
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf
new file mode 100644
index 00000000000..51defa5a2e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..54542e3e99e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf
new file mode 100644
index 00000000000..5a6cac1fb88
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf
new file mode 100644
index 00000000000..33459633dad
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.vf
new file mode 100644
index 00000000000..752a795c392
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf
new file mode 100644
index 00000000000..558d2beefce
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf
new file mode 100644
index 00000000000..55ba97473ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf
new file mode 100644
index 00000000000..37cae4b0029
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf
new file mode 100644
index 00000000000..5505e3bb310
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t1.vf
new file mode 100644
index 00000000000..2cb09546bc6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2a.vf
new file mode 100644
index 00000000000..f8c334ab672
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf
new file mode 100644
index 00000000000..205fc6b22c1
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf
new file mode 100644
index 00000000000..d01fb3a2553
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf
new file mode 100644
index 00000000000..22004b60254
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf
new file mode 100644
index 00000000000..eedcb3da76f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.vf
new file mode 100644
index 00000000000..56845b68ba7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..a07d985fffd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf
new file mode 100644
index 00000000000..35c831fd3cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf
new file mode 100644
index 00000000000..e521cd7146a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.vf
new file mode 100644
index 00000000000..d4fdce302ea
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf
new file mode 100644
index 00000000000..59d196d7873
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf
new file mode 100644
index 00000000000..1a796f7c86f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf
new file mode 100644
index 00000000000..0d8c8fa2436
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf
new file mode 100644
index 00000000000..4441499d62c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf
new file mode 100644
index 00000000000..70c90c9d08f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2a.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2a.vf
new file mode 100644
index 00000000000..bcf4e3e695a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2a.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf
new file mode 100644
index 00000000000..e22ab3418f2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf
new file mode 100644
index 00000000000..08e5b939d49
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf
new file mode 100644
index 00000000000..283019dfffb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf
new file mode 100644
index 00000000000..00256b283cf
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index c726aa5597f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index 9cadb530e84..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index 058f63e20cf..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf
deleted file mode 100644
index b1df9f45b41..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index 9d845fec27f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 1e1ceb995f6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index 2b4916c742b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf
deleted file mode 100644
index 2567465f7e5..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index 250227b509a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index f7d5f0e2b34..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index 15177275b80..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf
deleted file mode 100644
index 33cc2b44c11..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index c452e5a7a00..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index e7c2f221517..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index 977f6bc9fc5..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf
deleted file mode 100644
index 4a5c6747d97..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index fc5948b0b32..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 20d32bfcbf2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index 05cff2fe0af..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf
deleted file mode 100644
index 9aaa2568c6b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index c96eaf58f66..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index 80ac357d7de..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index 49549d20f5c..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf
deleted file mode 100644
index b595e8a75e9..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 76e08efbc81..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index ea2d9ae5d9f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index 62adbbbe711..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf
deleted file mode 100644
index 1f14cd8c4dd..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index af809734d30..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 9e42a8af9af..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index a10931d77ee..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf
deleted file mode 100644
index e928fedf3c8..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index 49e9d0fe459..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index 93bfae6c253..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index 386be243ef5..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf
deleted file mode 100644
index 6d58c4188b1..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 329c67e743f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index 45bfa9cd58e..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index c776fe09a28..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf
deleted file mode 100644
index 14fb7b43c78..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index 91c35d635af..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 9c39f63f867..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index eeb564dc434..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf
deleted file mode 100644
index 722760cd3e9..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index f9d07d52907..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index 37409d1b453..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index c1cbaded8a3..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf
deleted file mode 100644
index 2cafac3801a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 042c829a6d7..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index fb8cb1321f0..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index 19223c493ad..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf
deleted file mode 100644
index f8b59830b61..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index ea26dc974b9..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 702d4b09ebd..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index f89d42cc685..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf
deleted file mode 100644
index 14593e10769..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index de7af4b1bf8..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index 854a723a714..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index 73363fb4228..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf
deleted file mode 100644
index 9b2ea58c97d..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 7fbfedff6c7..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index fe424104e71..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index 029a1735cd0..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf
deleted file mode 100644
index 8344570103b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index e2a3b5147c6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 2a23c014f64..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index 0592831367f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf
deleted file mode 100644
index 48ec5f0b30c..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index 759cf9954bf..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index 5e7becb1fae..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index 515f94ddeb0..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf
deleted file mode 100644
index 7537c990039..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index a04c0e69668..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf
deleted file mode 100644
index 7fec477cb28..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index 2c86098c0c5..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf
deleted file mode 100644
index ddf59ace114..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index d57067b4b3f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf
deleted file mode 100644
index ada31d61820..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 0b6a52b8425..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf
deleted file mode 100644
index 33d3cc37ef6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf
deleted file mode 100644
index 84ff05732f2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf
deleted file mode 100644
index 4acd1254634..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf
deleted file mode 100644
index 2047e87cb6f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf
deleted file mode 100644
index bc6a152a914..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf
deleted file mode 100644
index 37a4ff426d1..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf
deleted file mode 100644
index f9a47ad4e39..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index 43af2940b8b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf
deleted file mode 100644
index 192b00d20ad..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf
deleted file mode 100644
index 3d7571e63cf..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf
deleted file mode 100644
index 849b87b0e5b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf
+++ /dev/null
diff --git a/Master/texmf-dist/source/comfortaa/CHANGES b/Master/texmf-dist/source/comfortaa/CHANGES
deleted file mode 100644
index ff4bfec15e3..00000000000
--- a/Master/texmf-dist/source/comfortaa/CHANGES
+++ /dev/null
@@ -1,13 +0,0 @@
-Changelog for version 1.1:
-	- fix small caps series in TS1 encoding
-
-Changelog for version 1.2:
-	- clean comfortaa-fixlatin.etx
-
-Changelog for version 1.3:
-	- fix comfortaa-fixglyphs.mtx
-
-Changelog for version 1.4:
-	- remove "light" class option
-	- fix documentation
-	- add samples PDF
diff --git a/Master/texmf-dist/source/comfortaa/README b/Master/texmf-dist/source/comfortaa/README
deleted file mode 100644
index 795f15ac79d..00000000000
--- a/Master/texmf-dist/source/comfortaa/README
+++ /dev/null
@@ -1,22 +0,0 @@
-------------------------
- Comfortaa, version 1.4
-------------------------
-
-Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
-Aakerlund. This font, delivered under the OFL version 1.1, is available on
-Jonas's deviantArt web page at
-http://aajohan.deviantart.com/art/Comfortaa-font-105395949 as TrueType files.
-
-This package provides support for this font in LaTeX. It includes the original
-TrueType fonts, as well as Type 1 versions, converted for this package using
-FontForge for full support with Dvips.
-
-Installation and usage instructions are described in
-doc/latex/comfortaa/comfortaa.pdf.
-
-This package is released under the LaTeX Project Public License, either version
-1.3c or above, with the exception of the .ttf and .pfb files, released under the
-Open Font License version 1.1.
-
-If you have comments about the package, please contact Mohamed El Morabity
-(melmorabity AT fedoraproject DOT org).
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-drv.tex b/Master/texmf-dist/source/comfortaa/comfortaa-drv.tex
deleted file mode 100644
index 31b6b0d1fbf..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa-drv.tex
+++ /dev/null
@@ -1,262 +0,0 @@
-%% comfortaa-drv.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\input fontinst.sty
-
-
-\setint{slant}{167}
-\setint{smallcapsscale}{800}
-
-\substitutesilent{scit}{scsl}
-
-
-\recordtransforms{comfortaa-rec.tex}
-
-
-\foreach(encoding){ot1,t1,ts1,t2a,t2b,t2c,x2,lgr}
-  \transformfont{raw-\str{encoding}-Comfortaa-Regular}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Regular}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Regular}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Bold}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Bold}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Bold}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Light}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Light}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Light-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Light}}}
-\endfor(encoding)
-
-\foreach(encoding){fixlatin,fixtextcomp,fixcyrillic,fixgreek}
-  \transformfont{raw-\str{encoding}-Comfortaa-Regular}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Regular}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Regular}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Bold}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Bold}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Bold}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Light}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Light}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Light-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Light}}}
-\endfor(encoding)
-
-\transformfont{raw-dotlessj-Comfortaa-Regular}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Regular-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Regular-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Bold}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Bold-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Bold-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Light}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Light-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Light-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Light-LCDFJ}}}
-
-\input comfortaa-reglyph
-
-
-\fontinstcc
-\def\fd_family#1#2#3{
-   \a_toks{#3}
-   \edef\lowercase_file{\lowercase{
-     \edef\noexpand\lowercase_file{#1#2.fd}}}
-   \lowercase_file
-   \open_out{\lowercase_file}
-   \out_line{\percent_char~Filename:~\lowercase_file}
-   \out_line{\percent_char~Created~by:~tex~\jobname}
-   \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
-   \out_line{}
-   \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
-      DIRECTORY}
-   \out_line{}
-   \out_line{\string\ProvidesFile{\lowercase_file}}
-   \out_lline{[
-      \the\year/
-      \ifnum10>\month0\fi\the\month/
-      \ifnum10>\day0\fi\the\day\space
-      Fontinst~v\fontinstversion\space
-      font~definitions~for~#1/#2.
-   ]}
-   \out_line{}
-   %%%
-   \out_line{\string\expandafter\string\ifx\string\csname\space comfortaa@scale\string\endcsname\string\relax}
-   \out_line{\space\space\string\let\string\comfortaa@scale\string\@empty}
-   \out_line{\string\fi}
-   \out_line{}
-   %%%
-   \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
-   {
-      \csname #1-#2\endcsname
-      \out_line{}
-      \let\do_shape=\substitute_shape
-      \csname #1-#2\endcsname
-      \let\do_shape=\remove_shape
-      \csname #1-#2\endcsname
-   }
-   \x_cs\g_let{#1-#2}\x_relax
-   \out_line{}
-   \out_line{\string\endinput}
-   \close_out{Font~definitions}
-}
-\normalcc
-
-\installfonts
-\installfamily{OT1}{fco}{}
-
-\installfont{ot1-Comfortaa-Regular}{ot1-Comfortaa-Regular,fixlatin-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Regular-Slanted}{ot1-Comfortaa-Regular-Slanted,fixlatin-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Regular-SmallCaps}{ot1-Comfortaa-Regular,fixlatin-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Regular-Slanted-SmallCaps}{ot1-Comfortaa-Regular-Slanted,fixlatin-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{ot1-Comfortaa-Bold}{ot1-Comfortaa-Bold,fixlatin-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Bold-Slanted}{ot1-Comfortaa-Bold-Slanted,fixlatin-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Bold-SmallCaps}{ot1-Comfortaa-Bold,fixlatin-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Bold-Slanted-SmallCaps}{ot1-Comfortaa-Bold-Slanted,fixlatin-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{ot1-Comfortaa-Light}{ot1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Light-Slanted}{ot1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Light-SmallCaps}{ot1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Light-Slanted-SmallCaps}{ot1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T1}{fco}{}
-
-\installfont{t1-Comfortaa-Regular}{t1-Comfortaa-Regular,fixlatin-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Regular-Slanted}{t1-Comfortaa-Regular-Slanted,fixlatin-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Regular-SmallCaps}{t1-Comfortaa-Regular,fixlatin-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Regular-Slanted-SmallCaps}{t1-Comfortaa-Regular-Slanted,fixlatin-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t1-Comfortaa-Bold}{t1-Comfortaa-Bold,fixlatin-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Bold-Slanted}{t1-Comfortaa-Bold-Slanted,fixlatin-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Bold-SmallCaps}{t1-Comfortaa-Bold,fixlatin-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Bold-Slanted-SmallCaps}{t1-Comfortaa-Bold-Slanted,fixlatin-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t1-Comfortaa-Light}{t1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Light-Slanted}{t1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Light-SmallCaps}{t1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Light-Slanted-SmallCaps}{t1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{TS1}{fco}{}
-
-\installfont{ts1-Comfortaa-Regular}{ts1-Comfortaa-Regular,fixtextcomp-Comfortaa-Regular,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{ts1-Comfortaa-Regular-Slanted}{ts1-Comfortaa-Regular-Slanted,fixtextcomp-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Regular}{TS1}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Regular-Slanted}{TS1}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{ts1-Comfortaa-Bold}{ts1-Comfortaa-Bold,fixtextcomp-Comfortaa-Bold,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{ts1-Comfortaa-Bold-Slanted}{ts1-Comfortaa-Bold-Slanted,fixtextcomp-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Bold}{TS1}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Bold-Slanted}{TS1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{ts1-Comfortaa-Light}{ts1-Comfortaa-Light,fixtextcomp-Comfortaa-Light,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{ts1-Comfortaa-Light-Slanted}{ts1-Comfortaa-Light-Slanted,fixtextcomp-Comfortaa-Light-Slanted,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Light}{TS1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Light-Slanted}{TS1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2A}{fco}{}
-
-\installfont{t2a-Comfortaa-Regular}{t2a-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Regular-Slanted}{t2a-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Regular-SmallCaps}{t2a-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Regular-Slanted-SmallCaps}{t2a-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t2a-Comfortaa-Bold}{t2a-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Bold-Slanted}{t2a-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Bold-SmallCaps}{t2a-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Bold-Slanted-SmallCaps}{t2a-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t2a-Comfortaa-Light}{t2a-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Light-Slanted}{t2a-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Light-SmallCaps}{t2a-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Light-Slanted-SmallCaps}{t2a-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2B}{fco}{}
-
-\installfont{t2b-Comfortaa-Regular}{t2b-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Regular-Slanted}{t2b-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Regular-SmallCaps}{t2b-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Regular-Slanted-SmallCaps}{t2b-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t2b-Comfortaa-Bold}{t2b-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Bold-Slanted}{t2b-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Bold-SmallCaps}{t2b-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Bold-Slanted-SmallCaps}{t2b-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t2b-Comfortaa-Light}{t2b-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Light-Slanted}{t2b-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Light-SmallCaps}{t2b-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Light-Slanted-SmallCaps}{t2b-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2C}{fco}{}
-
-\installfont{t2c-Comfortaa-Regular}{t2c-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Regular-Slanted}{t2c-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Regular-SmallCaps}{t2c-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Regular-Slanted-SmallCaps}{t2c-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t2c-Comfortaa-Bold}{t2c-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Bold-Slanted}{t2c-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Bold-SmallCaps}{t2c-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Bold-Slanted-SmallCaps}{t2c-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{t2c-Comfortaa-Light}{t2c-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Light-Slanted}{t2c-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Light-SmallCaps}{t2c-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Light-Slanted-SmallCaps}{t2c-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{X2}{fco}{}
-
-\installfont{x2-Comfortaa-Regular}{x2-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Regular-Slanted}{x2-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Regular-SmallCaps}{x2-Comfortaa-Regular,fixcyrillic-Comfortaa-Regular,dotlessj-Comfortaa-Regular,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Regular-Slanted-SmallCaps}{x2-Comfortaa-Regular-Slanted,fixcyrillic-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{x2-Comfortaa-Bold}{x2-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Bold-Slanted}{x2-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Bold-SmallCaps}{x2-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Bold-Slanted-SmallCaps}{x2-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{x2-Comfortaa-Light}{x2-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Light-Slanted}{x2-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Light-SmallCaps}{x2-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Light-Slanted-SmallCaps}{x2-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{LGR}{fco}{}
-
-\installfont{lgr-Comfortaa-Regular}{lgr-Comfortaa-Regular,fixgreek-Comfortaa-Regular,newlatin,greek}{lgr}{LGR}{fco}{m}{n}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Regular-Slanted}{lgr-Comfortaa-Regular-Slanted,fixgreek-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,newlatin,greek}{lgr}{LGR}{fco}{m}{sl}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Regular-SmallCaps}{lgr-Comfortaa-Regular,fixgreek-Comfortaa-Regular,newlatin,greek}{lgrc}{LGR}{fco}{m}{sc}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Regular-Slanted-SmallCaps}{lgr-Comfortaa-Regular-Slanted,fixgreek-Comfortaa-Regular-Slanted,dotlessj-Comfortaa-Regular-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{m}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{lgr-Comfortaa-Bold}{lgr-Comfortaa-Bold,fixgreek-Comfortaa-Bold,newlatin,greek}{lgr}{LGR}{fco}{b}{n}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Bold-Slanted}{lgr-Comfortaa-Bold-Slanted,fixgreek-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,newlatin,greek}{lgr}{LGR}{fco}{b}{sl}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Bold-SmallCaps}{lgr-Comfortaa-Bold,fixgreek-Comfortaa-Bold,newlatin,greek}{lgrc}{LGR}{fco}{b}{sc}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Bold-Slanted-SmallCaps}{lgr-Comfortaa-Bold-Slanted,fixgreek-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{b}{scsl}{<->\string\comfortaa@scale}
-
-\installfont{lgr-Comfortaa-Light}{lgr-Comfortaa-Light,fixgreek-Comfortaa-Light,newlatin,greek}{lgr}{LGR}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Light-Slanted}{lgr-Comfortaa-Light-Slanted,fixgreek-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,newlatin,greek}{lgr}{LGR}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Light-SmallCaps}{lgr-Comfortaa-Light,fixgreek-Comfortaa-Light,newlatin,greek}{lgrc}{LGR}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Light-Slanted-SmallCaps}{lgr-Comfortaa-Light-Slanted,fixgreek-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\endrecordtransforms
-\bye
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-fixgreek.etx b/Master/texmf-dist/source/comfortaa/comfortaa-fixgreek.etx
deleted file mode 100644
index f6d6b30bf26..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa-fixgreek.etx
+++ /dev/null
@@ -1,75 +0,0 @@
-%% comfortaa-fixgreek.etx
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-\encoding
-
-% digamma
-\setslot{f}
-\endsetslot
-
-% Digamma
-\setslot{F}
-\endsetslot
-
-% dieresisgreek
-\setslot{dieresis}
-\endsetslot
-
-% guillemotleft
-\setslot{guillemotleft}
-\endsetslot
-
-% guillemotright
-\setslot{guillemotright}
-\endsetslot
-
-% brevegreek
-\setslot{breve}
-\endsetslot
-
-% macrongreek
-\setslot{uni02C9}
-\endsetslot
-
-% questiongreek
-\setslot{semicolon}
-\endsetslot
-
-% Delta
-\setslot{uni0394}
-\endsetslot
-
-% Omega
-\setslot{uni03A9}
-\endsetslot
-
-% mu
-\setslot{uni03BC}
-\endsetslot
-
-% rangedash
-\setslot{endash}
-\endsetslot
-
-% punctdash
-\setslot{emdash}
-\endsetslot
-
-% euro
-\setslot{Euro}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-fixtextcomp.etx b/Master/texmf-dist/source/comfortaa/comfortaa-fixtextcomp.etx
deleted file mode 100644
index 02365466b4d..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa-fixtextcomp.etx
+++ /dev/null
@@ -1,145 +0,0 @@
-%% comfortaa-fixtextcomp.etx
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-\encoding
-
-% Needed to fake interrobang
-\setslot{exclam}
-\endsetslot
-
-% Needed to set vaxis variable
-\setslot{parenleft}
-\endsetslot
-
-% Needed to fake asteriskcentered
-\setslot{asterisk}
-\endsetslot
-
-% Needed to fake interrobang
-\setslot{question}
-\endsetslot
-
-% Needed to fake centigrade
-\setslot{C}
-\endsetslot
-
-% Needed to fake openbracketleft
-\setslot{bracketleft}
-\endsetslot
-
-% Needed to fake openbracketright
-\setslot{bracketright}
-\endsetslot
-
-% capitalgreve, asciigrave
-% Needed to fake asciigravedbl
-\setslot{grave}
-\endsetslot
-
-% Needed to set descender variable
-\setslot{g}
-\endsetslot
-
-% Needed to fake bardbl
-\setslot{bar}
-\endsetslot
-
-% tildelow
-\setslot{asciitilde}
-\endsetslot
-
-% capitaldieresis, asciidieresis
-\setslot{dieresis}
-\endsetslot
-
-% twosuperior
-\setslot{uni00B2}
-\endsetslot
-
-% threesuperior
-\setslot{uni00B3}
-\endsetslot
-
-% capitalacute, asciiacute
-% Needed to fake asciiacutedbl
-\setslot{acute}
-\endsetslot
-
-% cedilla
-\setslot{cedilla}
-\endsetslot
-
-% onesuperior
-\setslot{uni00B9}
-\endsetslot
-
-% capitalcircumflex
-\setslot{circumflex}
-\endsetslot
-
-% capitalcaron, asciicaron
-\setslot{caron}
-\endsetslot
-
-% capitalmacron, asciimacron
-\setslot{uni02C9}
-\endsetslot
-
-% capitalbreve, asciibreve
-\setslot{breve}
-\endsetslot
-
-% capitaldotaccent
-\setslot{dotaccent}
-\endsetslot
-
-% capitalring
-\setslot{ring}
-\endsetslot
-
-% ogonek
-\setslot{ogonek}
-\endsetslot
-
-% capitaltilde
-\setslot{tilde}
-\endsetslot
-
-% capitalhungarumlaut
-\setslot{hungarumlaut}
-\endsetslot
-
-% Needed to fake twelveudash and threequartersemdash
-\setslot{endash}
-\endsetslot
-
-% quotesinglebase
-\setslot{quotesinglebase}
-\endsetslot
-
-% quotedblbase
-\setslot{quotedblbase}
-\endsetslot
-
-% euro
-\setslot{Euro}
-\endsetslot
-
-% numero
-\setslot{afii61352}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-reglyph.tex b/Master/texmf-dist/source/comfortaa/comfortaa-reglyph.tex
deleted file mode 100644
index 1ac910713db..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa-reglyph.tex
+++ /dev/null
@@ -1,301 +0,0 @@
-%% comfortaa-reglyph.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-
-
-\reglyphfonts
-  \killglyph{Delta}
-  \killglyph{Omega}
-  \killglyph{macron}
-
-  \reglyphfont{ot1-Comfortaa-Regular}{raw-ot1-Comfortaa-Regular}
-  \reglyphfont{ot1-Comfortaa-Regular-Slanted}{raw-ot1-Comfortaa-Regular-Slanted}
-  \reglyphfont{ot1-Comfortaa-Bold}{raw-ot1-Comfortaa-Bold}
-  \reglyphfont{ot1-Comfortaa-Bold-Slanted}{raw-ot1-Comfortaa-Bold-Slanted}
-  \reglyphfont{ot1-Comfortaa-Light}{raw-ot1-Comfortaa-Light}
-  \reglyphfont{ot1-Comfortaa-Light-Slanted}{raw-ot1-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \killglyph{macron}
-
-  \reglyphfont{t1-Comfortaa-Regular}{raw-t1-Comfortaa-Regular}
-  \reglyphfont{t1-Comfortaa-Regular-Slanted}{raw-t1-Comfortaa-Regular-Slanted}
-  \reglyphfont{t1-Comfortaa-Bold}{raw-t1-Comfortaa-Bold}
-  \reglyphfont{t1-Comfortaa-Bold-Slanted}{raw-t1-Comfortaa-Bold-Slanted}
-  \reglyphfont{t1-Comfortaa-Light}{raw-t1-Comfortaa-Light}
-  \reglyphfont{t1-Comfortaa-Light-Slanted}{raw-t1-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \renameglyph{Ng}{Eng}
-  \renameglyph{dbar}{dcroat}
-  \renameglyph{ng}{eng}
-  \renameglyph{macron}{uni02C9}
-  \renameglyph{Delta}{uni0394}
-  \renameglyph{Omega}{uni03A9}
-  \renameglyph{fi}{uniF001}
-  \renameglyph{fl}{uniF002}
-
-  \reglyphfont{fixlatin-Comfortaa-Regular}{raw-fixlatin-Comfortaa-Regular}
-  \reglyphfont{fixlatin-Comfortaa-Regular-Slanted}{raw-fixlatin-Comfortaa-Regular-Slanted}
-  \reglyphfont{fixlatin-Comfortaa-Bold}{raw-fixlatin-Comfortaa-Bold}
-  \reglyphfont{fixlatin-Comfortaa-Bold-Slanted}{raw-fixlatin-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixlatin-Comfortaa-Light}{raw-fixlatin-Comfortaa-Light}
-  \reglyphfont{fixlatin-Comfortaa-Light-Slanted}{raw-fixlatin-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{ts1-Comfortaa-Regular}{raw-ts1-Comfortaa-Regular}
-  \reglyphfont{ts1-Comfortaa-Regular-Slanted}{raw-ts1-Comfortaa-Regular-Slanted}
-  \reglyphfont{ts1-Comfortaa-Bold}{raw-ts1-Comfortaa-Bold}
-  \reglyphfont{ts1-Comfortaa-Bold-Slanted}{raw-ts1-Comfortaa-Bold-Slanted}
-  \reglyphfont{ts1-Comfortaa-Light}{raw-ts1-Comfortaa-Light}
-  \reglyphfont{ts1-Comfortaa-Light-Slanted}{raw-ts1-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \renameglyph{twosuperior}{uni00B2}
-  \renameglyph{threesuperior}{uni00B3}
-  \renameglyph{onesuperior}{uni00B9}
-  \renameglyph{macron}{uni02C9}
-  \renameglyph{numero}{afii61352}
-
-  \reglyphfont{fixtextcomp-Comfortaa-Regular}{raw-fixtextcomp-Comfortaa-Regular}
-  \reglyphfont{fixtextcomp-Comfortaa-Regular-Slanted}{raw-fixtextcomp-Comfortaa-Regular-Slanted}
-  \reglyphfont{fixtextcomp-Comfortaa-Bold}{raw-fixtextcomp-Comfortaa-Bold}
-  \reglyphfont{fixtextcomp-Comfortaa-Bold-Slanted}{raw-fixtextcomp-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixtextcomp-Comfortaa-Light}{raw-fixtextcomp-Comfortaa-Light}
-  \reglyphfont{fixtextcomp-Comfortaa-Light-Slanted}{raw-fixtextcomp-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \killglyph{macron}
-
-  \reglyphfont{t2a-Comfortaa-Regular}{raw-t2a-Comfortaa-Regular}
-  \reglyphfont{t2a-Comfortaa-Regular-Slanted}{raw-t2a-Comfortaa-Regular-Slanted}
-  \reglyphfont{t2a-Comfortaa-Bold}{raw-t2a-Comfortaa-Bold}
-  \reglyphfont{t2a-Comfortaa-Bold-Slanted}{raw-t2a-Comfortaa-Bold-Slanted}
-  \reglyphfont{t2a-Comfortaa-Light}{raw-t2a-Comfortaa-Light}
-  \reglyphfont{t2a-Comfortaa-Light-Slanted}{raw-t2a-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \killglyph{macron}
-
-  \reglyphfont{t2b-Comfortaa-Regular}{raw-t2b-Comfortaa-Regular}
-  \reglyphfont{t2b-Comfortaa-Regular-Slanted}{raw-t2b-Comfortaa-Regular-Slanted}
-  \reglyphfont{t2b-Comfortaa-Bold}{raw-t2b-Comfortaa-Bold}
-  \reglyphfont{t2b-Comfortaa-Bold-Slanted}{raw-t2b-Comfortaa-Bold-Slanted}
-  \reglyphfont{t2b-Comfortaa-Light}{raw-t2b-Comfortaa-Light}
-  \reglyphfont{t2b-Comfortaa-Light-Slanted}{raw-t2b-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \killglyph{macron}
-
-  \reglyphfont{t2c-Comfortaa-Regular}{raw-t2c-Comfortaa-Regular}
-  \reglyphfont{t2c-Comfortaa-Regular-Slanted}{raw-t2c-Comfortaa-Regular-Slanted}
-  \reglyphfont{t2c-Comfortaa-Bold}{raw-t2c-Comfortaa-Bold}
-  \reglyphfont{t2c-Comfortaa-Bold-Slanted}{raw-t2c-Comfortaa-Bold-Slanted}
-  \reglyphfont{t2c-Comfortaa-Light}{raw-t2c-Comfortaa-Light}
-  \reglyphfont{t2c-Comfortaa-Light-Slanted}{raw-t2c-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \killglyph{macron}
-
-  \reglyphfont{x2-Comfortaa-Regular}{raw-x2-Comfortaa-Regular}
-  \reglyphfont{x2-Comfortaa-Regular-Slanted}{raw-x2-Comfortaa-Regular-Slanted}
-  \reglyphfont{x2-Comfortaa-Bold}{raw-x2-Comfortaa-Bold}
-  \reglyphfont{x2-Comfortaa-Bold-Slanted}{raw-x2-Comfortaa-Bold-Slanted}
-  \reglyphfont{x2-Comfortaa-Light}{raw-x2-Comfortaa-Light}
-  \reglyphfont{x2-Comfortaa-Light-Slanted}{raw-x2-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \renameglyph{macron}{uni02C9}
-  \renameglyph{CYRYO}{afii10023}
-  \renameglyph{CYRDJE}{afii10051}
-  \renameglyph{CYRIE}{afii10053}
-  \renameglyph{CYRDZE}{afii10054}
-  \renameglyph{CYRII}{afii10055}
-  \renameglyph{CYRYI}{afii10056}
-  \renameglyph{CYRJE}{afii10057}
-  \renameglyph{CYRLJE}{afii10058}
-  \renameglyph{CYRNJE}{afii10059}
-  \renameglyph{CYRTSHE}{afii10060}
-  \renameglyph{CYRUSHRT}{afii10062}
-  \renameglyph{CYRDZHE}{afii10145}
-  \renameglyph{CYRA}{afii10017}
-  \renameglyph{CYRB}{afii10018}
-  \renameglyph{CYRV}{afii10019}
-  \renameglyph{CYRG}{afii10020}
-  \renameglyph{CYRD}{afii10021}
-  \renameglyph{CYRE}{afii10022}
-  \renameglyph{CYRZH}{afii10024}
-  \renameglyph{CYRZ}{afii10025}
-  \renameglyph{CYRI}{afii10026}
-  \renameglyph{CYRISHRT}{afii10027}
-  \renameglyph{CYRK}{afii10028}
-  \renameglyph{CYRL}{afii10029}
-  \renameglyph{CYRM}{afii10030}
-  \renameglyph{CYRN}{afii10031}
-  \renameglyph{CYRO}{afii10032}
-  \renameglyph{CYRP}{afii10033}
-  \renameglyph{CYRR}{afii10034}
-  \renameglyph{CYRS}{afii10035}
-  \renameglyph{CYRT}{afii10036}
-  \renameglyph{CYRU}{afii10037}
-  \renameglyph{CYRF}{afii10038}
-  \renameglyph{CYRH}{afii10039}
-  \renameglyph{CYRC}{afii10040}
-  \renameglyph{CYRCH}{afii10041}
-  \renameglyph{CYRSH}{afii10042}
-  \renameglyph{CYRSHCH}{afii10043}
-  \renameglyph{CYRHRDSN}{afii10044}
-  \renameglyph{CYRERY}{afii10045}
-  \renameglyph{CYRSFTSN}{afii10046}
-  \renameglyph{CYREREV}{afii10047}
-  \renameglyph{CYRYU}{afii10048}
-  \renameglyph{CYRYA}{afii10049}
-  \renameglyph{cyra}{afii10065}
-  \renameglyph{cyrb}{afii10066}
-  \renameglyph{cyrv}{afii10067}
-  \renameglyph{cyrg}{afii10068}
-  \renameglyph{cyrd}{afii10069}
-  \renameglyph{cyre}{afii10070}
-  \renameglyph{cyrzh}{afii10072}
-  \renameglyph{cyrz}{afii10073}
-  \renameglyph{cyri}{afii10074}
-  \renameglyph{cyrishrt}{afii10075}
-  \renameglyph{cyrk}{afii10076}
-  \renameglyph{cyrl}{afii10077}
-  \renameglyph{cyrm}{afii10078}
-  \renameglyph{cyrn}{afii10079}
-  \renameglyph{cyro}{afii10080}
-  \renameglyph{cyrp}{afii10081}
-  \renameglyph{cyrr}{afii10082}
-  \renameglyph{cyrs}{afii10083}
-  \renameglyph{cyrt}{afii10084}
-  \renameglyph{cyru}{afii10085}
-  \renameglyph{cyrf}{afii10086}
-  \renameglyph{cyrh}{afii10087}
-  \renameglyph{cyrc}{afii10088}
-  \renameglyph{cyrch}{afii10089}
-  \renameglyph{cyrsh}{afii10090}
-  \renameglyph{cyrshch}{afii10091}
-  \renameglyph{cyrhrdsn}{afii10092}
-  \renameglyph{cyrery}{afii10093}
-  \renameglyph{cyrsftsn}{afii10094}
-  \renameglyph{cyrerev}{afii10095}
-  \renameglyph{cyryu}{afii10096}
-  \renameglyph{cyrya}{afii10097}
-  \renameglyph{cyryo}{afii10071}
-  \renameglyph{cyrdje}{afii10099}
-  \renameglyph{cyrie}{afii10101}
-  \renameglyph{cyrdze}{afii10102}
-  \renameglyph{cyrii}{afii10103}
-  \renameglyph{cyryi}{afii10104}
-  \renameglyph{cyrje}{afii10105}
-  \renameglyph{cyrlje}{afii10106}
-  \renameglyph{cyrnje}{afii10107}
-  \renameglyph{cyrtshe}{afii10108}
-  \renameglyph{cyrushrt}{afii10110}
-  \renameglyph{cyrdzhe}{afii10193}
-  \renameglyph{CYRGUP}{afii10050}
-  \renameglyph{cyrgup}{afii10098}
-  \renameglyph{CYRGHCRS}{uni0492}
-  \renameglyph{cyrghcrs}{uni0493}
-  \renameglyph{CYRZHDSC}{uni0496}
-  \renameglyph{cyrzhdsc}{uni0497}
-  \renameglyph{CYRKDSC}{uni049A}
-  \renameglyph{cyrkdsc}{uni049B}
-  \renameglyph{CYRKVCRS}{uni049C}
-  \renameglyph{cyrkvcrs}{uni049D}
-  \renameglyph{CYRNDSC}{uni04A2}
-  \renameglyph{cyrndsc}{uni04A3}
-  \renameglyph{CYRY}{uni04AE}
-  \renameglyph{cyry}{uni04AF}
-  \renameglyph{CYRYHCRS}{uni04B0}
-  \renameglyph{cyryhcrs}{uni04B1}
-  \renameglyph{CYRHDSC}{uni04B2}
-  \renameglyph{cyrhdsc}{uni04B3}
-  \renameglyph{CYRCHVCRS}{uni04B8}
-  \renameglyph{cyrchvcrs}{uni04B9}
-  \renameglyph{CYRSHHA}{uni04BA}
-  \renameglyph{cyrshha}{uni04BB}
-  \renameglyph{CYRSCHWA}{uni04D8}
-  \renameglyph{cyrschwa}{afii10846}
-  \renameglyph{CYROTLD}{uni04E8}
-  \renameglyph{cyrotld}{uni04E9}
-  \renameglyph{numero}{afii61352}
-  \renameglyph{fi}{uniF001}
-  \renameglyph{fl}{uniF002}
-
-  \reglyphfont{fixcyrillic-Comfortaa-Regular}{raw-fixcyrillic-Comfortaa-Regular}
-  \reglyphfont{fixcyrillic-Comfortaa-Regular-Slanted}{raw-fixcyrillic-Comfortaa-Regular-Slanted}
-  \reglyphfont{fixcyrillic-Comfortaa-Bold}{raw-fixcyrillic-Comfortaa-Bold}
-  \reglyphfont{fixcyrillic-Comfortaa-Bold-Slanted}{raw-fixcyrillic-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixcyrillic-Comfortaa-Light}{raw-fixcyrillic-Comfortaa-Light}
-  \reglyphfont{fixcyrillic-Comfortaa-Light-Slanted}{raw-fixcyrillic-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \killglyph{Delta}
-  \killglyph{Omega}
-  \killglyph{mu}
-
-  \reglyphfont{lgr-Comfortaa-Regular}{raw-lgr-Comfortaa-Regular}
-  \reglyphfont{lgr-Comfortaa-Regular-Slanted}{raw-lgr-Comfortaa-Regular-Slanted}
-  \reglyphfont{lgr-Comfortaa-Bold}{raw-lgr-Comfortaa-Bold}
-  \reglyphfont{lgr-Comfortaa-Bold-Slanted}{raw-lgr-Comfortaa-Bold-Slanted}
-  \reglyphfont{lgr-Comfortaa-Light}{raw-lgr-Comfortaa-Light}
-  \reglyphfont{lgr-Comfortaa-Light-Slanted}{raw-lgr-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \renameglyph{macron}{uni02C9}
-  \renameglyph{Delta}{uni0394}
-  \renameglyph{Omega}{uni03A9}
-  \renameglyph{mu}{uni03BC}
-  \renameglyph{euro}{Euro}
-
-  \reglyphfont{fixgreek-Comfortaa-Regular}{raw-fixgreek-Comfortaa-Regular}
-  \reglyphfont{fixgreek-Comfortaa-Regular-Slanted}{raw-fixgreek-Comfortaa-Regular-Slanted}
-  \reglyphfont{fixgreek-Comfortaa-Bold}{raw-fixgreek-Comfortaa-Bold}
-  \reglyphfont{fixgreek-Comfortaa-Bold-Slanted}{raw-fixgreek-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixgreek-Comfortaa-Light}{raw-fixgreek-Comfortaa-Light}
-  \reglyphfont{fixgreek-Comfortaa-Light-Slanted}{raw-fixgreek-Comfortaa-Light-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \renameglyph{dotlessj}{uni0237}
-
-  \reglyphfont{dotlessj-Comfortaa-Regular}{raw-dotlessj-Comfortaa-Regular}
-  \reglyphfont{dotlessj-Comfortaa-Regular-Slanted}{raw-dotlessj-Comfortaa-Regular-Slanted}
-  \reglyphfont{dotlessj-Comfortaa-Bold}{raw-dotlessj-Comfortaa-Bold}
-  \reglyphfont{dotlessj-Comfortaa-Bold-Slanted}{raw-dotlessj-Comfortaa-Bold-Slanted}
-  \reglyphfont{dotlessj-Comfortaa-Light}{raw-dotlessj-Comfortaa-Light}
-  \reglyphfont{dotlessj-Comfortaa-Light-Slanted}{raw-dotlessj-Comfortaa-Light-Slanted}
-\endreglyphfonts
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/source/comfortaa/comfortaa-samples.pdf
deleted file mode 100644
index 37bd2281926..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa-samples.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-samples.tex b/Master/texmf-dist/source/comfortaa/comfortaa-samples.tex
deleted file mode 100644
index 554a517dd17..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa-samples.tex
+++ /dev/null
@@ -1,89 +0,0 @@
-%% comfortaa-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{comfortaa}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
-  \foreignlanguage{francais}{%
-    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
-  }%
-}
-
-\newcommand{\cyrillicSample}{%
-  \foreignlanguage{russian}{%
-    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
-  }%
-}
-
-\newcommand{\greekSample}{%
-  \foreignlanguage{greek}{%
-    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
-  }%
-}
-
-\newcommand{\miscSample}{%
-  0123456789 fi fl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
-  {\usefont{T1}{fco}{#1}{#2} \latinSample}
-
-  {\usefont{T2A}{fco}{#1}{#2} \cyrillicSample}
-
-  {\usefont{LGR}{fco}{#1}{#2} \greekSample}%
-
-  {\fontfamily{fco}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Comfortaa Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\section*{Comfortaa Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scsl}
-
-\section*{Comfortaa Light}
-
-\fontSample{l}{n}
-
-\fontSample{l}{sl}
-
-\fontSample{l}{sc}
-
-\fontSample{l}{scsl}
-
-\end{document}
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa.pdf b/Master/texmf-dist/source/comfortaa/comfortaa.pdf
deleted file mode 100644
index 2eeae2bc5bf..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa.tex b/Master/texmf-dist/source/comfortaa/comfortaa.tex
deleted file mode 100644
index cf781b72937..00000000000
--- a/Master/texmf-dist/source/comfortaa/comfortaa.tex
+++ /dev/null
@@ -1,213 +0,0 @@
-%% comfortaa.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage[default]{comfortaa}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{relsize}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
-  pdftitle={LaTeX support for Comfortaa},%
-  pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.4}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-Comfortaa is a sans-serif font comfortable in every aspect designed by Johan
-\name{Aakerlund}. This font, which includes three weights
-({\fcofamily\fontseries{l}\selectfont thin},
-{\fcofamily\fontseries{m}\selectfont regular} and
-{\fcofamily\fontseries{b}\selectfont bold}), is available on Johan's deviantArt
-web page~\cite{comfortaa} as TrueType files under the \acronym{OFL} version~1.1.
-
-This package provides support for this font in \LaTeX{}. It includes the
-original TrueType fonts, as well as Type~1 versions, converted for this package
-using \program{FontForge} for full support with \program{Dvips}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|comfortaa.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
-  directories to your \path|texmf/| directory (either your local or global
-  \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
-  aware of the new files.
-\item Run \command{updmap --enable Map comfortaa.map} to make \program{Dvips},
-  \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Comfortaa}
-
-You can use the Comfortaa font in a \LaTeX{} document by adding the command
-\begin{verbatim}
-\usepackage{comfortaa}
-\end{verbatim}
-to the preamble.  The package supplies the \code{\char`\\fcofamily} command to
-switch the current font to Comfortaa.
-
-\subsubsection{Options}
-
-\paragraph{Comfortaa as default (sans-serif) font}
-
-You can set \LaTeX{} to use Comfortaa as standard font throughout the whole
-document by passing the \code{default} option to the package:
-\begin{verbatim}
-\usepackage[default]{comfortaa}
-\end{verbatim}
-To set Comfortaa as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{comfortaa}
-\end{verbatim}
-
-\paragraph{Font scaling}
-
-The font can be up- and downscaled by any factor. This can be used to make
-Comfortaa more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
-the font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{comfortaa}
-\end{verbatim}
-
-\subsection{Encodings}
-
-The following encodings are supported:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    Latin&OT1, T1, TS1 (partial)\\
-    \midrule
-    Cyrillic&T2A, T2B, T2C, X2\\
-    \midrule Greek&LGR\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{comfortaa}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between e.g.
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    OT1-encoded&{\fcofamily To Ta Té}\\
-    \midrule
-    T1-encoded&{\fcofamily\fontencoding{T1}\selectfont To Ta Té}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-It is therefore advised to always use the Comfortaa fonts in any encoding than
-OT1 when typing diacritics.
-
-\subsection{Available weights and variants}
-
-The following table lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{center}
-  \begin{tabular}{llll}
-    \toprule
-    family&encoding&series&shape\\
-    \midrule 
-    \multirow{4}{*}{fco}&OT1,T1&\multirow{3}{*}{l, m, b (bx)}&\multirow{2}{*}{n, sl (it),}\\
-    &T2A, T2B, T2C, X2,&&\multirow{2}{*}{sc, scsl (scit)}\\
-    &LGR&&\\
-    \cmidrule{2-4}
-    &TS1&l, m, b (bx)&n, sl (it)\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Comfortaa \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}, not to
-Johan \name{Aakerlund}. Johan only distributes the TrueType font files
-themselves.
-
-\subsection{Small dotless ``j''}
-
-The Comfortaa font files do not provide any dotless ``j'' glyph. This \LaTeX{}
-support provides a faked one ({\fcofamily\j}), available by typing
-\code{\char`\\j}, and built using the \command{t1dotlessj} command (from
-LCDF~Typetools~\cite{lcdf}).
-
-\subsection{Searching for words containing ligatures in \acronym{PDF} documents}
-
-Searching for words typeset in Comfortaa and containing ligatures (such as
-``fi'' or ``fl'') in \acronym{PDF} documents is currently only possible if the
-\acronym{PDF} was generated using \program{pdf\TeX}~1.40 or above.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Open Font License version~1.1~\cite{ofl}.
-
-\begin{thebibliography}{9}
-\bibitem{comfortaa}
-  \url{http://aajohan.deviantart.com/art/Comfortaa-font-105395949}
-\bibitem{keyval}
-  \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
-  \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lcdf} \url{http://www.lcdf.org/type/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{ofl} \url{http://scripts.sil.org/OFL_web}
-\end{thebibliography}
-
-\end{document}
diff --git a/Master/texmf-dist/source/comfortaa/Makefile b/Master/texmf-dist/source/fonts/comfortaa/Makefile
index fa853b8f7dd..b8d08772c39 100644
--- a/Master/texmf-dist/source/comfortaa/Makefile
+++ b/Master/texmf-dist/source/fonts/comfortaa/Makefile
@@ -1,5 +1,5 @@
 ## Makefile
-## Copyright 2010, 2011 Mohamed El Morabity
+## Copyright 2011 Mohamed El Morabity
 #
 # This work may be distributed and/or modified under the conditions of the LaTeX
 # Project Public License, either version 1.3 of this license or (at your option)
@@ -26,7 +26,7 @@ SUPPORTED_ENCODINGS = ot1 t1 ts1 t2a t2b t2c x2 lgr
 # Supported LaTeX encodings containing small caps
 SUPPORTED_SC_ENCODINGS = $(filter-out ts1,$(SUPPORTED_ENCODINGS))
 # Custom encodings provided
-CUSTOM_ENCODINGS = $(FONT_NAME)-fixlatin $(FONT_NAME)-fixtextcomp $(FONT_NAME)-fixcyrillic $(FONT_NAME)-fixgreek $(FONT_NAME)-dotlessj
+INPUT_ENCODINGS = $(INPUT_ETX_FILES:$(FONT_NAME)-%.etx=%)
 
 
 #####################
@@ -52,25 +52,18 @@ TRUETYPE_FILES = $(wildcard *.ttf)
 
 # Fontinst files
 FONTINST_FILE = $(FONT_NAME)-drv.tex
-FONTINST_REGLYPH_FILE = $(FONT_NAME)-reglyph.tex
 FONTINST_MAP_FILE = $(FONT_NAME)-map.tex
 
 # Custom Fontinst encoding files
-ETX_FILES = $(CUSTOM_ENCODINGS:=.etx)
-
-# Custom Fontinst encoding files
-MTX_FILES = $(FONT_NAME)-fixglyphs.mtx
+INPUT_ETX_FILES = $(FONT_NAME)-01.etx $(FONT_NAME)-02.etx $(FONT_NAME)-03.etx $(FONT_NAME)-dotlessj.etx
+MTX_FILES = $(FONT_NAME)-fixlatin.mtx $(FONT_NAME)-fixtextcomp.mtx $(FONT_NAME)-fixcyrillic.mtx $(FONT_NAME)-fixgreek.mtx $(FONT_NAME)-diacritics.mtx
 
 STYLE_FILES = $(wildcard *.sty)
 
-DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf $(FONT_NAME)-samples.tex $(FONT_NAME)-samples.pdf CHANGES README
+DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf $(FONT_NAME)-samples.tex $(FONT_NAME)-samples.pdf README CHANGES
 
 # Files to be installed in texmf/source
-BUILD_FILES = $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE) $(FONTINST_MAP_FILE) $(ETX_FILES) $(MTX_FILES) Makefile ttf2type1.pe $(DOCUMENTATION)
-
-# Source files to be installed
-SOURCES_FILES = $(TRUETYPE_FILES) $(STYLE_FILES) $(BUILD_FILES) $(DOCUMENTATION)
-
+SOURCE_FILES = $(FONTINST_FILE) $(FONTINST_MAP_FILE) $(INPUT_ETX_FILES) $(MTX_FILES) Makefile ttf2type1.pe
 
 
 ###################
@@ -84,19 +77,18 @@ AFM_FILES = $(TYPE1_FILES:.pfb=.afm)
 FONTINST_REC_FILE = $(FONT_NAME)-rec.tex
 
 # Metrics files
-PL_FILES = $(foreach e,$(SUPPORTED_ENCODINGS) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=%), \
-             $(foreach f,$(TRUETYPE_FILES:.ttf=),                                   \
-               raw-$(e)-$(f).pl raw-$(e)-$(f)-Slanted.pl                            \
-             )                                                                      \
+PL_FILES = $(foreach e,$(INPUT_ENCODINGS),           \
+             $(TRUETYPE_FILES:.ttf=-$(e).pl)         \
+             $(TRUETYPE_FILES:.ttf=-Slanted-$(e).pl) \
            )
-TMP_MTX_FILES = $(PL_FILES:%.pl=%.mtx) $(PL_FILES:raw-%.pl=%.mtx)
-VPL_FILES = $(foreach f,$(TRUETYPE_FILES:.ttf=),                             \
-              $(foreach e,$(SUPPORTED_ENCODINGS),                            \
-                $(e)-$(f).vpl $(e)-$(f)-Slanted.vpl                          \
-              )                                                              \
-              $(foreach e,$(SUPPORTED_SC_ENCODINGS),                         \
-                $(e)-$(f)-SmallCaps.vpl $(e)-$(f)-Slanted-SmallCaps.vpl      \
-              )                                                              \
+OUTPUT_MTX_FILES = $(PL_FILES:.pl=.mtx)
+VPL_FILES = $(foreach e,$(SUPPORTED_ENCODINGS),                  \
+              $(TRUETYPE_FILES:.ttf=-$(e).vpl)                   \
+              $(TRUETYPE_FILES:.ttf=-Slanted-$(e).vpl)           \
+            )                                                    \
+            $(foreach e,$(SUPPORTED_SC_ENCODINGS),               \
+              $(TRUETYPE_FILES:.ttf=-SmallCaps-$(e).vpl)         \
+              $(TRUETYPE_FILES:.ttf=-Slanted-SmallCaps-$(e).vpl) \
             )
 TFM_FILES = $(PL_FILES:.pl=.tfm) $(VPL_FILES:.vpl=.tfm)
 VF_FILES = $(VPL_FILES:.vpl=.vf)
@@ -111,14 +103,12 @@ FD_FILES = $(foreach e,$(SUPPORTED_ENCODINGS), \
            )
 
 # Generated encoding files
-ENC_FILES = $(SUPPORTED_ENCODINGS:%=$(FONT_NAME)-%.enc) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=$(FONT_NAME)-%.enc)
+ENC_FILES = $(INPUT_ETX_FILES:.etx=.enc)
 
 # Generated files to be installed
 GENERATED_FILES = $(TYPE1_FILES) $(AFM_FILES) $(TFM_FILES) $(VF_FILES) $(MAP) $(FD_FILES) $(ENC_FILES)
 
 
-
-
 default: all
 
 
@@ -152,7 +142,7 @@ dist: $(ARCHIVE)
 	vptovf $^ $@
 
 
-$(FONTINST_REC_FILE): $(TYPE1_FILES) $(AFM_FILES) $(ETX_FILES) $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE)
+$(FONTINST_REC_FILE): $(AFM_FILES) $(MTX_FILES) $(FONTINST_FILE)
 	latex $(FONTINST_FILE)
 
 
@@ -167,12 +157,12 @@ $(FD_FILES) $(ENC_FILES): $(MAP)
 
 
 texmf-tree: clean-texmf-tree $(GENERATED_FILES) $(SOURCES_FILES)
-	mkdir -p $(ARCHIVE_ROOT)/doc/latex/$(FONT_NAME)/
+	mkdir -p $(ARCHIVE_ROOT)/doc/fonts/$(FONT_NAME)/
 	mkdir -p $(ARCHIVE_ROOT)/tex/latex/$(FONT_NAME)/
 	mkdir -p $(ARCHIVE_ROOT)/fonts/{enc,map}/dvips/$(FONT_NAME)/
 	mkdir -p $(ARCHIVE_ROOT)/fonts/{afm,tfm,truetype,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
-	mkdir -p $(ARCHIVE_ROOT)/source/$(FONT_NAME)/
-	cp -p $(DOCUMENTATION) $(ARCHIVE_ROOT)/doc/latex/$(FONT_NAME)/
+	mkdir -p $(ARCHIVE_ROOT)/source/fonts/$(FONT_NAME)/
+	cp -p $(DOCUMENTATION) $(ARCHIVE_ROOT)/doc/fonts/$(FONT_NAME)/
 	cp -p $(FD_FILES) $(STYLE_FILES) $(ARCHIVE_ROOT)/tex/latex/$(FONT_NAME)/
 	cp -p $(ENC_FILES) $(ARCHIVE_ROOT)/fonts/enc/dvips/$(FONT_NAME)/
 	cp -p $(MAP) $(ARCHIVE_ROOT)/fonts/map/dvips/$(FONT_NAME)/
@@ -181,7 +171,7 @@ texmf-tree: clean-texmf-tree $(GENERATED_FILES) $(SOURCES_FILES)
 	cp -p $(TRUETYPE_FILES) $(ARCHIVE_ROOT)/fonts/truetype/$(FOUNDRY)/$(FONT_NAME)/
 	cp -p $(TYPE1_FILES) $(ARCHIVE_ROOT)/fonts/type1/$(FOUNDRY)/$(FONT_NAME)/
 	cp -p $(VF_FILES) $(ARCHIVE_ROOT)/fonts/vf/$(FOUNDRY)/$(FONT_NAME)/
-	cp -p $(BUILD_FILES) $(ARCHIVE_ROOT)/source/$(FONT_NAME)/
+	cp -p $(SOURCE_FILES) $(ARCHIVE_ROOT)/source/fonts/$(FONT_NAME)/
 	cp -p README $(ARCHIVE_ROOT)
 	cd $(ARCHIVE_ROOT) && find . -type f > manifest.txt
 
@@ -201,7 +191,7 @@ uninstall:
 	$(RM) -r $(TEXMFHOME)/doc/latex/$(FONT_NAME)/
 	$(RM) -r $(TEXMFHOME)/tex/latex/$(FONT_NAME)/
 	$(RM) -r $(TEXMFHOME)/fonts/{enc,map}/dvips/$(FONT_NAME)/
-	$(RM) -r $(TEXMFHOME)/fonts/{afm,tfm,truetype,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
+	$(RM) -r $(TEXMFHOME)/fonts/{afm,tfm,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
 	$(RM) -r $(TEXMFHOME)/source/$(FONT_NAME)/
 	updmap --disable $(MAP)
 	texhash
@@ -211,7 +201,7 @@ clean: clean-texmf-tree
 	$(RM) $(TYPE1_FILES) $(AFM_FILES)
 	$(RM) $(FONTINST_REC_FILE)
 	$(RM) $(PL_FILES) $(TYPE1_FILES:.pfb=.pl)
-	$(RM) $(TMP_MTX_FILES) $(TYPE1_FILES:.pfb=.mtx)
+	$(RM) $(OUTPUT_MTX_FILES) $(TYPE1_FILES:.pfb=.mtx)
 	$(RM) $(VPL_FILES)
 	$(RM) $(TFM_FILES)
 	$(RM) $(VF_FILES)
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-01.etx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-01.etx
new file mode 100644
index 00000000000..5ae58b0eda6
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-01.etx
@@ -0,0 +1,788 @@
+%% comfortaa-01.etx
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\encoding
+
+\setslot{space}
+\endsetslot
+
+\setslot{exclam}
+\endsetslot
+
+\setslot{quotedbl}
+\endsetslot
+
+\setslot{numbersign}
+\endsetslot
+
+\setslot{dollar}
+\endsetslot
+
+\setslot{percent}
+\endsetslot
+
+\setslot{ampersand}
+\endsetslot
+
+\setslot{quotesingle}
+\endsetslot
+
+\setslot{parenleft}
+\endsetslot
+
+\setslot{parenright}
+\endsetslot
+
+\setslot{asterisk}
+\endsetslot
+
+\setslot{plus}
+\endsetslot
+
+\setslot{comma}
+\endsetslot
+
+\setslot{hyphen}
+\endsetslot
+
+\setslot{period}
+\endsetslot
+
+\setslot{slash}
+\endsetslot
+
+\setslot{zero}
+\endsetslot
+
+\setslot{one}
+\endsetslot
+
+\setslot{two}
+\endsetslot
+
+\setslot{three}
+\endsetslot
+
+\setslot{four}
+\endsetslot
+
+\setslot{five}
+\endsetslot
+
+\setslot{six}
+\endsetslot
+
+\setslot{seven}
+\endsetslot
+
+\setslot{eight}
+\endsetslot
+
+\setslot{nine}
+\endsetslot
+
+\setslot{colon}
+\endsetslot
+
+\setslot{semicolon}
+\endsetslot
+
+\setslot{less}
+\endsetslot
+
+\setslot{equal}
+\endsetslot
+
+\setslot{greater}
+\endsetslot
+
+\setslot{question}
+\endsetslot
+
+\setslot{at}
+\endsetslot
+
+\setslot{A}
+\endsetslot
+
+\setslot{B}
+\endsetslot
+
+\setslot{C}
+\endsetslot
+
+\setslot{D}
+\endsetslot
+
+\setslot{E}
+\endsetslot
+
+\setslot{F}
+\endsetslot
+
+\setslot{G}
+\endsetslot
+
+\setslot{H}
+\endsetslot
+
+\setslot{I}
+\endsetslot
+
+\setslot{J}
+\endsetslot
+
+\setslot{K}
+\endsetslot
+
+\setslot{L}
+\endsetslot
+
+\setslot{M}
+\endsetslot
+
+\setslot{N}
+\endsetslot
+
+\setslot{O}
+\endsetslot
+
+\setslot{P}
+\endsetslot
+
+\setslot{Q}
+\endsetslot
+
+\setslot{R}
+\endsetslot
+
+\setslot{S}
+\endsetslot
+
+\setslot{T}
+\endsetslot
+
+\setslot{U}
+\endsetslot
+
+\setslot{V}
+\endsetslot
+
+\setslot{W}
+\endsetslot
+
+\setslot{X}
+\endsetslot
+
+\setslot{Y}
+\endsetslot
+
+\setslot{Z}
+\endsetslot
+
+\setslot{bracketleft}
+\endsetslot
+
+\setslot{backslash}
+\endsetslot
+
+\setslot{bracketright}
+\endsetslot
+
+\setslot{asciicircum}
+\endsetslot
+
+\setslot{underscore}
+\endsetslot
+
+\setslot{grave}
+\endsetslot
+
+\setslot{a}
+\endsetslot
+
+\setslot{b}
+\endsetslot
+
+\setslot{c}
+\endsetslot
+
+\setslot{d}
+\endsetslot
+
+\setslot{e}
+\endsetslot
+
+\setslot{f}
+\endsetslot
+
+\setslot{g}
+\endsetslot
+
+\setslot{h}
+\endsetslot
+
+\setslot{i}
+\endsetslot
+
+\setslot{j}
+\endsetslot
+
+\setslot{k}
+\endsetslot
+
+\setslot{l}
+\endsetslot
+
+\setslot{m}
+\endsetslot
+
+\setslot{n}
+\endsetslot
+
+\setslot{o}
+\endsetslot
+
+\setslot{p}
+\endsetslot
+
+\setslot{q}
+\endsetslot
+
+\setslot{r}
+\endsetslot
+
+\setslot{s}
+\endsetslot
+
+\setslot{t}
+\endsetslot
+
+\setslot{u}
+\endsetslot
+
+\setslot{v}
+\endsetslot
+
+\setslot{w}
+\endsetslot
+
+\setslot{x}
+\endsetslot
+
+\setslot{y}
+\endsetslot
+
+\setslot{z}
+\endsetslot
+
+\setslot{braceleft}
+\endsetslot
+
+\setslot{bar}
+\endsetslot
+
+\setslot{braceright}
+\endsetslot
+
+\setslot{asciitilde}
+\endsetslot
+
+\setslot{exclamdown}
+\endsetslot
+
+\setslot{cent}
+\endsetslot
+
+\setslot{sterling}
+\endsetslot
+
+\setslot{currency}
+\endsetslot
+
+\setslot{yen}
+\endsetslot
+
+\setslot{brokenbar}
+\endsetslot
+
+\setslot{section}
+\endsetslot
+
+\setslot{dieresis}
+\endsetslot
+
+\setslot{copyright}
+\endsetslot
+
+\setslot{ordfeminine}
+\endsetslot
+
+\setslot{guillemotleft}
+\endsetslot
+
+\setslot{logicalnot}
+\endsetslot
+
+\setslot{registered}
+\endsetslot
+
+\setslot{macron}
+\endsetslot
+
+\setslot{degree}
+\endsetslot
+
+\setslot{plusminus}
+\endsetslot
+
+\setslot{uni00B2}
+\endsetslot
+
+\setslot{uni00B3}
+\endsetslot
+
+\setslot{acute}
+\endsetslot
+
+\setslot{mu}
+\endsetslot
+
+\setslot{paragraph}
+\endsetslot
+
+\setslot{periodcentered}
+\endsetslot
+
+\setslot{cedilla}
+\endsetslot
+
+\setslot{uni00B9}
+\endsetslot
+
+\setslot{ordmasculine}
+\endsetslot
+
+\setslot{guillemotright}
+\endsetslot
+
+\setslot{onequarter}
+\endsetslot
+
+\setslot{onehalf}
+\endsetslot
+
+\setslot{threequarters}
+\endsetslot
+
+\setslot{questiondown}
+\endsetslot
+
+\setslot{Agrave}
+\endsetslot
+
+\setslot{Aacute}
+\endsetslot
+
+\setslot{Acircumflex}
+\endsetslot
+
+\setslot{Atilde}
+\endsetslot
+
+\setslot{Adieresis}
+\endsetslot
+
+\setslot{Aring}
+\endsetslot
+
+\setslot{AE}
+\endsetslot
+
+\setslot{Ccedilla}
+\endsetslot
+
+\setslot{Egrave}
+\endsetslot
+
+\setslot{Eacute}
+\endsetslot
+
+\setslot{Ecircumflex}
+\endsetslot
+
+\setslot{Edieresis}
+\endsetslot
+
+\setslot{Igrave}
+\endsetslot
+
+\setslot{Iacute}
+\endsetslot
+
+\setslot{Icircumflex}
+\endsetslot
+
+\setslot{Idieresis}
+\endsetslot
+
+\setslot{Eth}
+\endsetslot
+
+\setslot{Ntilde}
+\endsetslot
+
+\setslot{Ograve}
+\endsetslot
+
+\setslot{Oacute}
+\endsetslot
+
+\setslot{Ocircumflex}
+\endsetslot
+
+\setslot{Otilde}
+\endsetslot
+
+\setslot{Odieresis}
+\endsetslot
+
+\setslot{multiply}
+\endsetslot
+
+\setslot{Oslash}
+\endsetslot
+
+\setslot{Ugrave}
+\endsetslot
+
+\setslot{Uacute}
+\endsetslot
+
+\setslot{Ucircumflex}
+\endsetslot
+
+\setslot{Udieresis}
+\endsetslot
+
+\setslot{Yacute}
+\endsetslot
+
+\setslot{Thorn}
+\endsetslot
+
+\setslot{germandbls}
+\endsetslot
+
+\setslot{agrave}
+\endsetslot
+
+\setslot{aacute}
+\endsetslot
+
+\setslot{acircumflex}
+\endsetslot
+
+\setslot{atilde}
+\endsetslot
+
+\setslot{adieresis}
+\endsetslot
+
+\setslot{aring}
+\endsetslot
+
+\setslot{ae}
+\endsetslot
+
+\setslot{ccedilla}
+\endsetslot
+
+\setslot{egrave}
+\endsetslot
+
+\setslot{eacute}
+\endsetslot
+
+\setslot{ecircumflex}
+\endsetslot
+
+\setslot{edieresis}
+\endsetslot
+
+\setslot{igrave}
+\endsetslot
+
+\setslot{iacute}
+\endsetslot
+
+\setslot{icircumflex}
+\endsetslot
+
+\setslot{idieresis}
+\endsetslot
+
+\setslot{eth}
+\endsetslot
+
+\setslot{ntilde}
+\endsetslot
+
+\setslot{ograve}
+\endsetslot
+
+\setslot{oacute}
+\endsetslot
+
+\setslot{ocircumflex}
+\endsetslot
+
+\setslot{otilde}
+\endsetslot
+
+\setslot{odieresis}
+\endsetslot
+
+\setslot{divide}
+\endsetslot
+
+\setslot{oslash}
+\endsetslot
+
+\setslot{ugrave}
+\endsetslot
+
+\setslot{uacute}
+\endsetslot
+
+\setslot{ucircumflex}
+\endsetslot
+
+\setslot{udieresis}
+\endsetslot
+
+\setslot{yacute}
+\endsetslot
+
+\setslot{thorn}
+\endsetslot
+
+\setslot{ydieresis}
+\endsetslot
+
+\setslot{dotlessi}
+\endsetslot
+
+\setslot{circumflex}
+\endsetslot
+
+\setslot{caron}
+\endsetslot
+
+\setslot{uni02C9}
+\endsetslot
+
+\setslot{breve}
+\endsetslot
+
+\setslot{dotaccent}
+\endsetslot
+
+\setslot{ring}
+\endsetslot
+
+\setslot{ogonek}
+\endsetslot
+
+\setslot{tilde}
+\endsetslot
+
+\setslot{hungarumlaut}
+\endsetslot
+
+\setslot{endash}
+\endsetslot
+
+\setslot{emdash}
+\endsetslot
+
+\setslot{quoteleft}
+\endsetslot
+
+\setslot{quoteright}
+\endsetslot
+
+\setslot{quotesinglbase}
+\endsetslot
+
+\setslot{quotedblleft}
+\endsetslot
+
+\setslot{quotedblright}
+\endsetslot
+
+\setslot{quotedblbase}
+\endsetslot
+
+\setslot{dagger}
+\endsetslot
+
+\setslot{daggerdbl}
+\endsetslot
+
+\setslot{bullet}
+\endsetslot
+
+\setslot{ellipsis}
+\endsetslot
+
+\setslot{guilsinglleft}
+\endsetslot
+
+\setslot{guilsinglright}
+\endsetslot
+
+\setslot{fraction}
+\endsetslot
+
+\setslot{franc}
+\endsetslot
+
+\setslot{lira}
+\endsetslot
+
+\setslot{peseta}
+\endsetslot
+
+\setslot{Euro}
+\endsetslot
+
+\setslot{afii61352}
+\endsetslot
+
+\setslot{trademark}
+\endsetslot
+
+\setslot{partialdiff}
+\endsetslot
+
+\setslot{Delta}
+\endsetslot
+
+\setslot{product}
+\endsetslot
+
+\setslot{summation}
+\endsetslot
+
+\setslot{minus}
+\endsetslot
+
+\setslot{radical}
+\endsetslot
+
+\setslot{infinity}
+\endsetslot
+
+\setslot{integral}
+\endsetslot
+
+\setslot{approxequal}
+\endsetslot
+
+\setslot{lessequal}
+\endsetslot
+
+\setslot{greaterequal}
+\endsetslot
+
+\setslot{uniF001}
+\endsetslot
+
+\setslot{uniF002}
+\endsetslot
+
+\setslot{Amacron}
+\endsetslot
+
+\setslot{amacron}
+\endsetslot
+
+\setslot{Abreve}
+\endsetslot
+
+\setslot{abreve}
+\endsetslot
+
+\setslot{Aogonek}
+\endsetslot
+
+\setslot{aogonek}
+\endsetslot
+
+\setslot{Cacute}
+\endsetslot
+
+\setslot{cacute}
+\endsetslot
+
+\setslot{Ccircumflex}
+\endsetslot
+
+\setslot{ccircumflex}
+\endsetslot
+
+\setslot{Cdotaccent}
+\endsetslot
+
+\setslot{cdotaccent}
+\endsetslot
+
+\setslot{Ccaron}
+\endsetslot
+
+\setslot{ccaron}
+\endsetslot
+
+\setslot{Dcaron}
+\endsetslot
+
+\setslot{dcaron}
+\endsetslot
+
+\setslot{Dcroat}
+\endsetslot
+
+\setslot{dcroat}
+\endsetslot
+
+\setslot{Emacron}
+\endsetslot
+
+\setslot{emacron}
+\endsetslot
+
+\setslot{Ebreve}
+\endsetslot
+
+\setslot{ebreve}
+\endsetslot
+
+\setslot{Edotaccent}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-02.etx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-02.etx
new file mode 100644
index 00000000000..399ae1b1d68
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-02.etx
@@ -0,0 +1,788 @@
+%% comfortaa-02.etx
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\encoding
+
+\setslot{edotaccent}
+\endsetslot
+
+\setslot{Eogonek}
+\endsetslot
+
+\setslot{eogonek}
+\endsetslot
+
+\setslot{Ecaron}
+\endsetslot
+
+\setslot{ecaron}
+\endsetslot
+
+\setslot{Gcircumflex}
+\endsetslot
+
+\setslot{gcircumflex}
+\endsetslot
+
+\setslot{Gbreve}
+\endsetslot
+
+\setslot{gbreve}
+\endsetslot
+
+\setslot{Gdotaccent}
+\endsetslot
+
+\setslot{gdotaccent}
+\endsetslot
+
+\setslot{Gcommaaccent}
+\endsetslot
+
+\setslot{gcommaaccent}
+\endsetslot
+
+\setslot{Hcircumflex}
+\endsetslot
+
+\setslot{hcircumflex}
+\endsetslot
+
+\setslot{Hbar}
+\endsetslot
+
+\setslot{hbar}
+\endsetslot
+
+\setslot{Itilde}
+\endsetslot
+
+\setslot{itilde}
+\endsetslot
+
+\setslot{Imacron}
+\endsetslot
+
+\setslot{imacron}
+\endsetslot
+
+\setslot{Ibreve}
+\endsetslot
+
+\setslot{ibreve}
+\endsetslot
+
+\setslot{Iogonek}
+\endsetslot
+
+\setslot{iogonek}
+\endsetslot
+
+\setslot{Idotaccent}
+\endsetslot
+
+\setslot{IJ}
+\endsetslot
+
+\setslot{ij}
+\endsetslot
+
+\setslot{Jcircumflex}
+\endsetslot
+
+\setslot{jcircumflex}
+\endsetslot
+
+\setslot{Kcommaaccent}
+\endsetslot
+
+\setslot{kcommaaccent}
+\endsetslot
+
+\setslot{kgreenlandic}
+\endsetslot
+
+\setslot{Lacute}
+\endsetslot
+
+\setslot{lacute}
+\endsetslot
+
+\setslot{Lcommaaccent}
+\endsetslot
+
+\setslot{lcommaaccent}
+\endsetslot
+
+\setslot{Lcaron}
+\endsetslot
+
+\setslot{lcaron}
+\endsetslot
+
+\setslot{Ldot}
+\endsetslot
+
+\setslot{ldot}
+\endsetslot
+
+\setslot{Lslash}
+\endsetslot
+
+\setslot{lslash}
+\endsetslot
+
+\setslot{Nacute}
+\endsetslot
+
+\setslot{nacute}
+\endsetslot
+
+\setslot{Ncommaaccent}
+\endsetslot
+
+\setslot{ncommaaccent}
+\endsetslot
+
+\setslot{Ncaron}
+\endsetslot
+
+\setslot{ncaron}
+\endsetslot
+
+\setslot{napostrophe}
+\endsetslot
+
+\setslot{Eng}
+\endsetslot
+
+\setslot{eng}
+\endsetslot
+
+\setslot{Omacron}
+\endsetslot
+
+\setslot{omacron}
+\endsetslot
+
+\setslot{Obreve}
+\endsetslot
+
+\setslot{obreve}
+\endsetslot
+
+\setslot{Ohungarumlaut}
+\endsetslot
+
+\setslot{ohungarumlaut}
+\endsetslot
+
+\setslot{OE}
+\endsetslot
+
+\setslot{oe}
+\endsetslot
+
+\setslot{Racute}
+\endsetslot
+
+\setslot{racute}
+\endsetslot
+
+\setslot{Rcommaaccent}
+\endsetslot
+
+\setslot{rcommaaccent}
+\endsetslot
+
+\setslot{Rcaron}
+\endsetslot
+
+\setslot{rcaron}
+\endsetslot
+
+\setslot{Sacute}
+\endsetslot
+
+\setslot{sacute}
+\endsetslot
+
+\setslot{Scircumflex}
+\endsetslot
+
+\setslot{scircumflex}
+\endsetslot
+
+\setslot{Scedilla}
+\endsetslot
+
+\setslot{scedilla}
+\endsetslot
+
+\setslot{Scaron}
+\endsetslot
+
+\setslot{scaron}
+\endsetslot
+
+\setslot{Tcommaaccent}
+\endsetslot
+
+\setslot{tcommaaccent}
+\endsetslot
+
+\setslot{Tcaron}
+\endsetslot
+
+\setslot{tcaron}
+\endsetslot
+
+\setslot{Tbar}
+\endsetslot
+
+\setslot{tbar}
+\endsetslot
+
+\setslot{Utilde}
+\endsetslot
+
+\setslot{utilde}
+\endsetslot
+
+\setslot{Umacron}
+\endsetslot
+
+\setslot{umacron}
+\endsetslot
+
+\setslot{Ubreve}
+\endsetslot
+
+\setslot{ubreve}
+\endsetslot
+
+\setslot{Uring}
+\endsetslot
+
+\setslot{uring}
+\endsetslot
+
+\setslot{Uhungarumlaut}
+\endsetslot
+
+\setslot{uhungarumlaut}
+\endsetslot
+
+\setslot{Uogonek}
+\endsetslot
+
+\setslot{uogonek}
+\endsetslot
+
+\setslot{Wcircumflex}
+\endsetslot
+
+\setslot{wcircumflex}
+\endsetslot
+
+\setslot{Ycircumflex}
+\endsetslot
+
+\setslot{ycircumflex}
+\endsetslot
+
+\setslot{Ydieresis}
+\endsetslot
+
+\setslot{Zacute}
+\endsetslot
+
+\setslot{zacute}
+\endsetslot
+
+\setslot{Zdotaccent}
+\endsetslot
+
+\setslot{zdotaccent}
+\endsetslot
+
+\setslot{Zcaron}
+\endsetslot
+
+\setslot{zcaron}
+\endsetslot
+
+\setslot{longs}
+\endsetslot
+
+\setslot{florin}
+\endsetslot
+
+\setslot{Aringacute}
+\endsetslot
+
+\setslot{aringacute}
+\endsetslot
+
+\setslot{AEacute}
+\endsetslot
+
+\setslot{aeacute}
+\endsetslot
+
+\setslot{Oslashacute}
+\endsetslot
+
+\setslot{oslashacute}
+\endsetslot
+
+\setslot{tonos}
+\endsetslot
+
+\setslot{dieresistonos}
+\endsetslot
+
+\setslot{Alphatonos}
+\endsetslot
+
+\setslot{anoteleia}
+\endsetslot
+
+\setslot{Epsilontonos}
+\endsetslot
+
+\setslot{Etatonos}
+\endsetslot
+
+\setslot{Iotatonos}
+\endsetslot
+
+\setslot{Omicrontonos}
+\endsetslot
+
+\setslot{Upsilontonos}
+\endsetslot
+
+\setslot{Omegatonos}
+\endsetslot
+
+\setslot{iotadieresistonos}
+\endsetslot
+
+\setslot{Alpha}
+\endsetslot
+
+\setslot{Beta}
+\endsetslot
+
+\setslot{Gamma}
+\endsetslot
+
+\setslot{uni0394}
+\endsetslot
+
+\setslot{Epsilon}
+\endsetslot
+
+\setslot{Zeta}
+\endsetslot
+
+\setslot{Eta}
+\endsetslot
+
+\setslot{Theta}
+\endsetslot
+
+\setslot{Iota}
+\endsetslot
+
+\setslot{Kappa}
+\endsetslot
+
+\setslot{Lambda}
+\endsetslot
+
+\setslot{Mu}
+\endsetslot
+
+\setslot{Nu}
+\endsetslot
+
+\setslot{Xi}
+\endsetslot
+
+\setslot{Omicron}
+\endsetslot
+
+\setslot{Pi}
+\endsetslot
+
+\setslot{Rho}
+\endsetslot
+
+\setslot{Sigma}
+\endsetslot
+
+\setslot{Tau}
+\endsetslot
+
+\setslot{Upsilon}
+\endsetslot
+
+\setslot{Phi}
+\endsetslot
+
+\setslot{Chi}
+\endsetslot
+
+\setslot{Psi}
+\endsetslot
+
+\setslot{uni03A9}
+\endsetslot
+
+\setslot{Iotadieresis}
+\endsetslot
+
+\setslot{Upsilondieresis}
+\endsetslot
+
+\setslot{alphatonos}
+\endsetslot
+
+\setslot{epsilontonos}
+\endsetslot
+
+\setslot{etatonos}
+\endsetslot
+
+\setslot{iotatonos}
+\endsetslot
+
+\setslot{upsilondieresistonos}
+\endsetslot
+
+\setslot{alpha}
+\endsetslot
+
+\setslot{beta}
+\endsetslot
+
+\setslot{gamma}
+\endsetslot
+
+\setslot{delta}
+\endsetslot
+
+\setslot{epsilon}
+\endsetslot
+
+\setslot{zeta}
+\endsetslot
+
+\setslot{eta}
+\endsetslot
+
+\setslot{theta}
+\endsetslot
+
+\setslot{iota}
+\endsetslot
+
+\setslot{kappa}
+\endsetslot
+
+\setslot{lambda}
+\endsetslot
+
+\setslot{uni03BC}
+\endsetslot
+
+\setslot{nu}
+\endsetslot
+
+\setslot{xi}
+\endsetslot
+
+\setslot{omicron}
+\endsetslot
+
+\setslot{pi}
+\endsetslot
+
+\setslot{rho}
+\endsetslot
+
+\setslot{sigma1}
+\endsetslot
+
+\setslot{sigma}
+\endsetslot
+
+\setslot{tau}
+\endsetslot
+
+\setslot{upsilon}
+\endsetslot
+
+\setslot{phi}
+\endsetslot
+
+\setslot{chi}
+\endsetslot
+
+\setslot{psi}
+\endsetslot
+
+\setslot{omega}
+\endsetslot
+
+\setslot{iotadieresis}
+\endsetslot
+
+\setslot{upsilondieresis}
+\endsetslot
+
+\setslot{omicrontonos}
+\endsetslot
+
+\setslot{upsilontonos}
+\endsetslot
+
+\setslot{omegatonos}
+\endsetslot
+
+\setslot{afii00208}
+\endsetslot
+
+\setslot{underscoredbl}
+\endsetslot
+
+\setslot{quotereversed}
+\endsetslot
+
+\setslot{perthousand}
+\endsetslot
+
+\setslot{minute}
+\endsetslot
+
+\setslot{second}
+\endsetslot
+
+\setslot{exclamdbl}
+\endsetslot
+
+\setslot{uni203E}
+\endsetslot
+
+\setslot{uni207F}
+\endsetslot
+
+\setslot{afii61248}
+\endsetslot
+
+\setslot{afii61289}
+\endsetslot
+
+\setslot{Omega}
+\endsetslot
+
+\setslot{estimated}
+\endsetslot
+
+\setslot{oneeighth}
+\endsetslot
+
+\setslot{threeeighths}
+\endsetslot
+
+\setslot{fiveeighths}
+\endsetslot
+
+\setslot{seveneighths}
+\endsetslot
+
+\setslot{arrowleft}
+\endsetslot
+
+\setslot{arrowup}
+\endsetslot
+
+\setslot{arrowright}
+\endsetslot
+
+\setslot{arrowdown}
+\endsetslot
+
+\setslot{arrowboth}
+\endsetslot
+
+\setslot{arrowupdn}
+\endsetslot
+
+\setslot{arrowupdnbse}
+\endsetslot
+
+\setslot{orthogonal}
+\endsetslot
+
+\setslot{intersection}
+\endsetslot
+
+\setslot{notequal}
+\endsetslot
+
+\setslot{equivalence}
+\endsetslot
+
+\setslot{afii10023}
+\endsetslot
+
+\setslot{afii10051}
+\endsetslot
+
+\setslot{afii10052}
+\endsetslot
+
+\setslot{afii10053}
+\endsetslot
+
+\setslot{afii10054}
+\endsetslot
+
+\setslot{afii10055}
+\endsetslot
+
+\setslot{afii10056}
+\endsetslot
+
+\setslot{afii10057}
+\endsetslot
+
+\setslot{afii10058}
+\endsetslot
+
+\setslot{afii10059}
+\endsetslot
+
+\setslot{afii10060}
+\endsetslot
+
+\setslot{afii10061}
+\endsetslot
+
+\setslot{afii10062}
+\endsetslot
+
+\setslot{afii10145}
+\endsetslot
+
+\setslot{afii10017}
+\endsetslot
+
+\setslot{afii10018}
+\endsetslot
+
+\setslot{afii10019}
+\endsetslot
+
+\setslot{afii10020}
+\endsetslot
+
+\setslot{afii10021}
+\endsetslot
+
+\setslot{afii10022}
+\endsetslot
+
+\setslot{afii10024}
+\endsetslot
+
+\setslot{afii10025}
+\endsetslot
+
+\setslot{afii10026}
+\endsetslot
+
+\setslot{afii10027}
+\endsetslot
+
+\setslot{afii10028}
+\endsetslot
+
+\setslot{afii10029}
+\endsetslot
+
+\setslot{afii10030}
+\endsetslot
+
+\setslot{afii10031}
+\endsetslot
+
+\setslot{afii10032}
+\endsetslot
+
+\setslot{afii10033}
+\endsetslot
+
+\setslot{afii10034}
+\endsetslot
+
+\setslot{afii10035}
+\endsetslot
+
+\setslot{afii10036}
+\endsetslot
+
+\setslot{afii10037}
+\endsetslot
+
+\setslot{afii10038}
+\endsetslot
+
+\setslot{afii10039}
+\endsetslot
+
+\setslot{afii10040}
+\endsetslot
+
+\setslot{afii10041}
+\endsetslot
+
+\setslot{afii10042}
+\endsetslot
+
+\setslot{afii10043}
+\endsetslot
+
+\setslot{afii10044}
+\endsetslot
+
+\setslot{afii10045}
+\endsetslot
+
+\setslot{afii10046}
+\endsetslot
+
+\setslot{afii10047}
+\endsetslot
+
+\setslot{afii10048}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-fixcyrillic.etx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-03.etx
index 78267648a6d..08a34c31674 100644
--- a/Master/texmf-dist/source/comfortaa/comfortaa-fixcyrillic.etx
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-03.etx
@@ -1,5 +1,5 @@
-%% comfortaa-fixcyrillic.etx
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% comfortaa-03.etx
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -8,508 +8,256 @@
 % distributions of LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status `maintained'.
-%
+% 
 % The Current Maintainer of this work is Mohamed El Morabity
 %
 % This work consists of all files listed in manifest.txt.
 
 \relax
-\encoding
-
-% CYRQ
-\setslot{Q}
-\endsetslot
-
-% CYRW
-\setslot{W}
-\endsetslot
-
-% CYRAE
-\setslot{AE}
-\endsetslot
-
-% cyrae
-\setslot{ae}
-\endsetslot
-
-% macron
-\setslot{uni02C9}
-\endsetslot
-
-% CYRYO
-\setslot{afii10023}
-\endsetslot
-
-% CYRDJE
-\setslot{afii10051}
-\endsetslot
-
-% CYRIE
-\setslot{afii10053}
-\endsetslot
-
-% CYRDZE
-\setslot{afii10054}
-\endsetslot
-
-% CYRII
-\setslot{afii10055}
-\endsetslot
-
-% CYRYI
-\setslot{afii10056}
-\endsetslot
-
-% CYRJE
-\setslot{afii10057}
-\endsetslot
-
-% CYRLJE
-\setslot{afii10058}
-\endsetslot
-
-% CYRNJE
-\setslot{afii10059}
-\endsetslot
-
-% CYRTSHE
-\setslot{afii10060}
-\endsetslot
-
-% CYRUSHRT
-\setslot{afii10062}
-\endsetslot
-
-% CYRDZHE
-\setslot{afii10145}
-\endsetslot
-
-% CYRA
-\setslot{afii10017}
-\endsetslot
-
-% CYRB
-\setslot{afii10018}
-\endsetslot
-
-% CYRV
-\setslot{afii10019}
-\endsetslot
-
-% CYRG
-\setslot{afii10020}
-\endsetslot
-
-% CYRD
-\setslot{afii10021}
-\endsetslot
-
-% CYRE
-\setslot{afii10022}
-\endsetslot
-
-% CYRZH
-\setslot{afii10024}
-\endsetslot
-
-% CYRZ
-\setslot{afii10025}
-\endsetslot
-
-% CYRI
-\setslot{afii10026}
-\endsetslot
 
-% CYRISHRT
-\setslot{afii10027}
-\endsetslot
-
-% CYRK
-\setslot{afii10028}
-\endsetslot
-
-% CYRL
-\setslot{afii10029}
-\endsetslot
-
-% CYRM
-\setslot{afii10030}
-\endsetslot
-
-% CYRN
-\setslot{afii10031}
-\endsetslot
-
-% CYRO
-\setslot{afii10032}
-\endsetslot
-
-% CYRP
-\setslot{afii10033}
-\endsetslot
-
-% CYRR
-\setslot{afii10034}
-\endsetslot
-
-% CYRS
-\setslot{afii10035}
-\endsetslot
-
-% CYRT
-\setslot{afii10036}
-\endsetslot
-
-% CYRU
-\setslot{afii10037}
-\endsetslot
-
-% CYRF
-\setslot{afii10038}
-\endsetslot
-
-% CYRH
-\setslot{afii10039}
-\endsetslot
-
-% CYRC
-\setslot{afii10040}
-\endsetslot
-
-% CYRCH
-\setslot{afii10041}
-\endsetslot
-
-% CYRSH
-\setslot{afii10042}
-\endsetslot
-
-% CYRSHCH
-\setslot{afii10043}
-\endsetslot
-
-% CYRHRDSN
-\setslot{afii10044}
-\endsetslot
-
-% CYRERY
-\setslot{afii10045}
-\endsetslot
-
-% CYRSFTSN
-\setslot{afii10046}
-\endsetslot
-
-% CYREREV
-\setslot{afii10047}
-\endsetslot
-
-% CYRYU
-\setslot{afii10048}
-\endsetslot
+\encoding
 
-% CYRYA
 \setslot{afii10049}
 \endsetslot
 
-% cyra
 \setslot{afii10065}
 \endsetslot
 
-% cyrb
 \setslot{afii10066}
 \endsetslot
 
-% cyrv
 \setslot{afii10067}
 \endsetslot
 
-% cyrg
 \setslot{afii10068}
 \endsetslot
 
-% cyrd
 \setslot{afii10069}
 \endsetslot
 
-% cyre
 \setslot{afii10070}
 \endsetslot
 
-% cyrzh
 \setslot{afii10072}
 \endsetslot
 
-% cyrz
 \setslot{afii10073}
 \endsetslot
 
-% cyri
 \setslot{afii10074}
 \endsetslot
 
-% cyrishrt
 \setslot{afii10075}
 \endsetslot
 
-% cyrk
 \setslot{afii10076}
 \endsetslot
 
-% cyrl
 \setslot{afii10077}
 \endsetslot
 
-% cyrm
 \setslot{afii10078}
 \endsetslot
 
-% cyrn
 \setslot{afii10079}
 \endsetslot
 
-% cyro
 \setslot{afii10080}
 \endsetslot
 
-% cyrp
 \setslot{afii10081}
 \endsetslot
 
-% cyrr
 \setslot{afii10082}
 \endsetslot
 
-% cyrs
 \setslot{afii10083}
 \endsetslot
 
-% cyrt
 \setslot{afii10084}
 \endsetslot
 
-% cyru
 \setslot{afii10085}
 \endsetslot
 
-% cyrf
 \setslot{afii10086}
 \endsetslot
 
-% cyrh
 \setslot{afii10087}
 \endsetslot
 
-% cyrc
 \setslot{afii10088}
 \endsetslot
 
-% cyrch
 \setslot{afii10089}
 \endsetslot
 
-% cyrsh
 \setslot{afii10090}
 \endsetslot
 
-% cyrshch
 \setslot{afii10091}
 \endsetslot
 
-% cyrhrdsn
 \setslot{afii10092}
 \endsetslot
 
-% cyrery
 \setslot{afii10093}
 \endsetslot
 
-% cyrsftsn
 \setslot{afii10094}
 \endsetslot
 
-% cyrerev
 \setslot{afii10095}
 \endsetslot
 
-% cyryu
 \setslot{afii10096}
 \endsetslot
 
-% cyrya
 \setslot{afii10097}
 \endsetslot
 
-% cyryo
 \setslot{afii10071}
 \endsetslot
 
-% cyrdje
 \setslot{afii10099}
 \endsetslot
 
-% cyrie
+\setslot{afii10100}
+\endsetslot
+
 \setslot{afii10101}
 \endsetslot
 
-% cyrdze
 \setslot{afii10102}
 \endsetslot
 
-% cyrii
 \setslot{afii10103}
 \endsetslot
 
-% cyryi
 \setslot{afii10104}
 \endsetslot
 
-% cyrje
 \setslot{afii10105}
 \endsetslot
 
-% cyrlje
 \setslot{afii10106}
 \endsetslot
 
-% cyrnje
 \setslot{afii10107}
 \endsetslot
 
-% cyrtshe
 \setslot{afii10108}
 \endsetslot
 
-% cyrushrt
+\setslot{afii10109}
+\endsetslot
+
 \setslot{afii10110}
 \endsetslot
 
-% cyrdzhe
 \setslot{afii10193}
 \endsetslot
 
-% CYRGUP
 \setslot{afii10050}
 \endsetslot
 
-% cyrgup
 \setslot{afii10098}
 \endsetslot
 
-% CYRGHCRS
 \setslot{uni0492}
 \endsetslot
 
-% cyrghcrs
 \setslot{uni0493}
 \endsetslot
 
-% CYRZHDSC
 \setslot{uni0496}
 \endsetslot
 
-% cyrzhdsc
 \setslot{uni0497}
 \endsetslot
 
-% CYRKDSC
 \setslot{uni049A}
 \endsetslot
 
-% cyrkdsc
 \setslot{uni049B}
 \endsetslot
 
-% CYRKVCRS
 \setslot{uni049C}
 \endsetslot
 
-% cyrkvcrs
 \setslot{uni049D}
 \endsetslot
 
-% CYRNDSC
 \setslot{uni04A2}
 \endsetslot
 
-% cyrndsc
 \setslot{uni04A3}
 \endsetslot
 
-% CYRY
 \setslot{uni04AE}
 \endsetslot
 
-% cyry
 \setslot{uni04AF}
 \endsetslot
 
-% CYRYHCRS
 \setslot{uni04B0}
 \endsetslot
 
-% cyryhcrs
 \setslot{uni04B1}
 \endsetslot
 
-% CYRHDSC
 \setslot{uni04B2}
 \endsetslot
 
-% cyrhdsc
 \setslot{uni04B3}
 \endsetslot
 
-% CYRCHVCRS
 \setslot{uni04B8}
 \endsetslot
 
-% cyrchvcrs
 \setslot{uni04B9}
 \endsetslot
 
-% CYRSHHA
 \setslot{uni04BA}
 \endsetslot
 
-% cyrshha
 \setslot{uni04BB}
 \endsetslot
 
-% CYRSCHWA
 \setslot{uni04D8}
 \endsetslot
 
-% cyrschwa
 \setslot{afii10846}
 \endsetslot
 
-% CYROTLD
 \setslot{uni04E8}
 \endsetslot
 
-% cyrotld
 \setslot{uni04E9}
 \endsetslot
 
-% rangedash
-\setslot{endash}
+\setslot{Wgrave}
+\endsetslot
+
+\setslot{wgrave}
+\endsetslot
+
+\setslot{Wacute}
+\endsetslot
+
+\setslot{wacute}
 \endsetslot
 
-% cyrdash
-\setslot{emdash}
+\setslot{Wdieresis}
 \endsetslot
 
-% numero
-\setslot{afii61352}
+\setslot{wdieresis}
 \endsetslot
 
-% fi
-\setslot{uniF001}
+\setslot{Ygrave}
 \endsetslot
 
-% fl
-\setslot{uniF002}
+\setslot{ygrave}
 \endsetslot
 
 \endencoding
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-fixglyphs.mtx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-diacritics.mtx
index 63d44cdb762..5b0fbc30172 100644
--- a/Master/texmf-dist/source/comfortaa/comfortaa-fixglyphs.mtx
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-diacritics.mtx
@@ -1,5 +1,5 @@
-%% comfortaa-fixglyphs.mtx
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% comfortaa-diacritics.mtx
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-dotlessj.etx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-dotlessj.etx
index fd0c0750ed2..bc296da349f 100644
--- a/Master/texmf-dist/source/comfortaa/comfortaa-dotlessj.etx
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-dotlessj.etx
@@ -1,5 +1,5 @@
 %% comfortaa-dotlessj.etx
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -8,15 +8,15 @@
 % distributions of LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity.
+% 
+% The Current Maintainer of this work is Mohamed El Morabity
 %
 % This work consists of all files listed in manifest.txt.
 
 \relax
+
 \encoding
 
-% dotlessj
 \setslot{uni0237}
 \endsetslot
 
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex
new file mode 100644
index 00000000000..1c594250c96
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex
@@ -0,0 +1,259 @@
+%% comfortaa-drv.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\input fontinst.sty
+
+
+\setint{slant}{167}
+\setint{smallcapsscale}{800}
+
+\substitutesilent{scit}{scsl}
+
+
+\recordtransforms{comfortaa-rec.tex}
+
+
+\foreach(e){01,02,03}
+  \transformfont{Comfortaa-Light-\str{e}}{\reencodefont{comfortaa-\str{e}}{\fromafm{Comfortaa-Light}}}
+  \transformfont{Comfortaa-Light-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{e}}{\fromafm{Comfortaa-Light}}}
+  \transformfont{Comfortaa-Regular-\str{e}}{\reencodefont{comfortaa-\str{e}}{\fromafm{Comfortaa-Regular}}}
+  \transformfont{Comfortaa-Regular-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{e}}{\fromafm{Comfortaa-Regular}}}
+  \transformfont{Comfortaa-Bold-\str{e}}{\reencodefont{comfortaa-\str{e}}{\fromafm{Comfortaa-Bold}}}
+  \transformfont{Comfortaa-Bold-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{e}}{\fromafm{Comfortaa-Bold}}}
+\endfor(e)
+\transformfont{Comfortaa-Light-dotlessj}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Light-LCDFJ}}}
+\transformfont{Comfortaa-Light-Slanted-dotlessj}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Light-LCDFJ}}}
+\transformfont{Comfortaa-Regular-dotlessj}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Regular-LCDFJ}}}
+\transformfont{Comfortaa-Regular-Slanted-dotlessj}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Regular-LCDFJ}}}
+\transformfont{Comfortaa-Bold-dotlessj}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Bold-LCDFJ}}}
+\transformfont{Comfortaa-Bold-Slanted-dotlessj}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Bold-LCDFJ}}}
+
+
+\fontinstcc
+\def\fd_family#1#2#3{
+   \a_toks{#3}
+   \edef\lowercase_file{\lowercase{
+     \edef\noexpand\lowercase_file{#1#2.fd}}}
+   \lowercase_file
+   \open_out{\lowercase_file}
+   \out_line{\percent_char~Filename:~\lowercase_file}
+   \out_line{\percent_char~Created~by:~tex~\jobname}
+   \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
+   \out_line{}
+   \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
+      DIRECTORY}
+   \out_line{}
+   \out_line{\string\ProvidesFile{\lowercase_file}}
+   \out_lline{[
+      \the\year/
+      \ifnum10>\month0\fi\the\month/
+      \ifnum10>\day0\fi\the\day\space
+      Fontinst~v\fontinstversion\space
+      font~definitions~for~#1/#2.
+   ]}
+   \out_line{}
+   %%%
+   \out_line{\string\expandafter\string\ifx\string\csname\space comfortaa@scale\string\endcsname\string\relax}
+   \out_line{\space\space\string\let\string\comfortaa@scale\string\@empty}
+   \out_line{\string\fi}
+   \out_line{}
+   %%%
+   \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
+   {
+      \csname #1-#2\endcsname
+      \out_line{}
+      \let\do_shape=\substitute_shape
+      \csname #1-#2\endcsname
+      \let\do_shape=\remove_shape
+      \csname #1-#2\endcsname
+   }
+   \x_cs\g_let{#1-#2}\x_relax
+   \out_line{}
+   \out_line{\string\endinput}
+   \close_out{Font~definitions}
+}
+\normalcc
+
+
+\installfonts
+\installfamily{OT1}{fco}{}
+
+\installfont{Comfortaa-Light-ot1}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1}{OT1}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-ot1}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1}{OT1}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-ot1}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1c}{OT1}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-ot1}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1c}{OT1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-ot1}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1}{OT1}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-ot1}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1}{OT1}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-ot1}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1c}{OT1}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-ot1}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1c}{OT1}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-ot1}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1}{OT1}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-ot1}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1}{OT1}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-ot1}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1c}{OT1}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-ot1}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{ot1c}{OT1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T1}{fco}{}
+
+\installfont{Comfortaa-Light-t1}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1}{T1}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-t1}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1}{T1}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-t1}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1c}{T1}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-t1}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1c}{T1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-t1}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1}{T1}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-t1}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1}{T1}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-t1}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1c}{T1}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-t1}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1c}{T1}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-t1}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1}{T1}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-t1}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1}{T1}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-t1}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1c}{T1}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-t1}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixlatin,comfortaa-diacritics,newlatin}{t1c}{T1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{TS1}{fco}{}
+
+\installfont{Comfortaa-Light-ts1}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,comfortaa-fixtextcomp,comfortaa-diacritics,textcomp}{ts1}{TS1}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-ts1}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,comfortaa-fixtextcomp,comfortaa-diacritics,textcomp}{ts1}{TS1}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfontas{Comfortaa-Light-ts1}{TS1}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfontas{Comfortaa-Light-Slanted-ts1}{TS1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-ts1}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,comfortaa-fixtextcomp,comfortaa-diacritics,textcomp}{ts1}{TS1}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-ts1}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,comfortaa-fixtextcomp,comfortaa-diacritics,textcomp}{ts1}{TS1}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfontas{Comfortaa-Regular-ts1}{TS1}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfontas{Comfortaa-Regular-Slanted-ts1}{TS1}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-ts1}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,comfortaa-fixtextcomp,comfortaa-diacritics,textcomp}{ts1}{TS1}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-ts1}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,comfortaa-fixtextcomp,comfortaa-diacritics,textcomp}{ts1}{TS1}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfontas{Comfortaa-Bold-ts1}{TS1}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfontas{Comfortaa-Bold-Slanted-ts1}{TS1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2A}{fco}{}
+
+\installfont{Comfortaa-Light-t2a}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-t2a}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-t2a}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-t2a}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-t2a}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2a}{T2A}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-t2a}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2a}{T2A}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-t2a}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2ac}{T2A}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-t2a}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2ac}{T2A}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-t2a}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2a}{T2A}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-t2a}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2a}{T2A}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-t2a}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2ac}{T2A}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-t2a}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2ac}{T2A}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2B}{fco}{}
+
+\installfont{Comfortaa-Light-t2b}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-t2b}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-t2b}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-t2b}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-t2b}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2b}{T2B}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-t2b}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2b}{T2B}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-t2b}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2bc}{T2B}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-t2b}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2bc}{T2B}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-t2b}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2b}{T2B}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-t2b}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2b}{T2B}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-t2b}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2bc}{T2B}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-t2b}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2bc}{T2B}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2C}{fco}{}
+
+\installfont{Comfortaa-Light-t2c}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-t2c}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-t2c}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,Comfortaa-Light-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-t2c}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,Comfortaa-Light-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-t2c}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2c}{T2C}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-t2c}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2c}{T2C}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-t2c}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,Comfortaa-Regular-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2cc}{T2C}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-t2c}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,Comfortaa-Regular-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2cc}{T2C}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-t2c}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2c}{T2C}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-t2c}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2c}{T2C}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-t2c}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,Comfortaa-Bold-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2cc}{T2C}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-t2c}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,Comfortaa-Bold-Slanted-dotlessj,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{t2cc}{T2C}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{X2}{fco}{}
+
+\installfont{Comfortaa-Light-x2}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2}{X2}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-x2}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2}{X2}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-x2}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2c}{X2}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-x2}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2c}{X2}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-x2}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2}{X2}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-x2}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2}{X2}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-x2}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2c}{X2}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-x2}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2c}{X2}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-x2}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2}{X2}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-x2}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2}{X2}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-x2}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2c}{X2}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-x2}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,comfortaa-fixcyrillic,comfortaa-diacritics,newlatin,cyrillic}{x2c}{X2}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{LGR}{fco}{}
+
+\installfont{Comfortaa-Light-lgr}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,comfortaa-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-lgr}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,comfortaa-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-SmallCaps-lgr}{Comfortaa-Light-01,Comfortaa-Light-02,Comfortaa-Light-03,comfortaa-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Light-Slanted-SmallCaps-lgr}{Comfortaa-Light-Slanted-01,Comfortaa-Light-Slanted-02,Comfortaa-Light-Slanted-03,comfortaa-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Regular-lgr}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,comfortaa-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fco}{m}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-lgr}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,comfortaa-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fco}{m}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-SmallCaps-lgr}{Comfortaa-Regular-01,Comfortaa-Regular-02,Comfortaa-Regular-03,comfortaa-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fco}{m}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Regular-Slanted-SmallCaps-lgr}{Comfortaa-Regular-Slanted-01,Comfortaa-Regular-Slanted-02,Comfortaa-Regular-Slanted-03,comfortaa-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fco}{m}{scsl}{<->\string\comfortaa@scale}
+
+\installfont{Comfortaa-Bold-lgr}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,comfortaa-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fco}{b}{n}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-lgr}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,comfortaa-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fco}{b}{sl}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-SmallCaps-lgr}{Comfortaa-Bold-01,Comfortaa-Bold-02,Comfortaa-Bold-03,comfortaa-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fco}{b}{sc}{<->\string\comfortaa@scale}
+\installfont{Comfortaa-Bold-Slanted-SmallCaps-lgr}{Comfortaa-Bold-Slanted-01,Comfortaa-Bold-Slanted-02,Comfortaa-Bold-Slanted-03,comfortaa-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fco}{b}{scsl}{<->\string\comfortaa@scale}
+
+\endinstallfonts
+
+
+\endrecordtransforms
+\bye
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixcyrillic.mtx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixcyrillic.mtx
new file mode 100644
index 00000000000..6431f944c81
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixcyrillic.mtx
@@ -0,0 +1,498 @@
+%% comfortaa-fixcyrillic.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{macron}
+  \glyph{uni02C9}{1000}
+\endresetglyph
+
+\ifisglyph{uni0237}\then
+  \resetglyph{dotlessj}
+    \glyph{uni0237}{1000}
+  \endresetglyph
+\fi
+
+\resetglyph{fi}
+  \glyph{uniF001}{1000}
+\endresetglyph
+
+\resetglyph{fl}
+  \glyph{uniF002}{1000}
+\endresetglyph
+
+\resetglyph{CYRGUP}
+  \glyph{afii10050}{1000}
+\endresetglyph
+
+\resetglyph{CYRGHCRS}
+  \glyph{uni0492}{1000}
+\endresetglyph
+
+\resetglyph{CYRDJE}
+  \glyph{afii10051}{1000}
+\endresetglyph
+
+\resetglyph{CYRTSHE}
+  \glyph{afii10060}{1000}
+\endresetglyph
+
+\resetglyph{CYRSHHA}
+  \glyph{uni04BA}{1000}
+\endresetglyph
+
+\resetglyph{CYRZHDSC}
+  \glyph{uni0496}{1000}
+\endresetglyph
+
+\resetglyph{CYRLJE}
+  \glyph{afii10058}{1000}
+\endresetglyph
+
+\resetglyph{CYRYI}
+  \glyph{afii10056}{1000}
+\endresetglyph
+
+\resetglyph{CYRKDSC}
+  \glyph{uni049A}{1000}
+\endresetglyph
+
+\resetglyph{CYRKVCRS}
+  \glyph{uni049C}{1000}
+\endresetglyph
+
+\resetglyph{CYRNDSC}
+  \glyph{uni04A2}{1000}
+\endresetglyph
+
+\resetglyph{CYRDZE}
+  \glyph{afii10054}{1000}
+\endresetglyph
+
+\resetglyph{CYROTLD}
+  \glyph{uni04E8}{1000}
+\endresetglyph
+
+\resetglyph{CYRUSHRT}
+  \glyph{afii10062}{1000}
+\endresetglyph
+
+\resetglyph{CYRY}
+  \glyph{uni04AE}{1000}
+\endresetglyph
+
+\resetglyph{CYRYHCRS}
+  \glyph{uni04B0}{1000}
+\endresetglyph
+
+\resetglyph{CYRHDSC}
+  \glyph{uni04B2}{1000}
+\endresetglyph
+
+\resetglyph{CYRDZHE}
+  \glyph{afii10145}{1000}
+\endresetglyph
+
+\resetglyph{CYRCHVCRS}
+  \glyph{uni04B8}{1000}
+\endresetglyph
+
+\resetglyph{CYRIE}
+  \glyph{afii10053}{1000}
+\endresetglyph
+
+\resetglyph{CYRSCHWA}
+  \glyph{uni04D8}{1000}
+\endresetglyph
+
+\resetglyph{CYRNJE}
+  \glyph{afii10059}{1000}
+\endresetglyph
+
+\resetglyph{CYRYO}
+  \glyph{afii10023}{1000}
+\endresetglyph
+
+\resetglyph{numero}
+  \glyph{afii61352}{1000}
+\endresetglyph
+
+\resetglyph{cyrgup}
+  \glyph{afii10098}{1000}
+\endresetglyph
+
+\resetglyph{cyrghcrs}
+  \glyph{uni0493}{1000}
+\endresetglyph
+
+\resetglyph{cyrdje}
+  \glyph{afii10099}{1000}
+\endresetglyph
+
+\resetglyph{cyrtshe}
+  \glyph{afii10108}{1000}
+\endresetglyph
+
+\resetglyph{cyrshha}
+  \glyph{uni04BB}{1000}
+\endresetglyph
+
+\resetglyph{cyrzhdsc}
+  \glyph{uni0497}{1000}
+\endresetglyph
+
+\resetglyph{cyrlje}
+  \glyph{afii10106}{1000}
+\endresetglyph
+
+\resetglyph{cyryi}
+  \glyph{afii10104}{1000}
+\endresetglyph
+
+\resetglyph{cyrkdsc}
+  \glyph{uni049B}{1000}
+\endresetglyph
+
+\resetglyph{cyrkvcrs}
+  \glyph{uni049D}{1000}
+\endresetglyph
+
+\resetglyph{cyrndsc}
+  \glyph{uni04A3}{1000}
+\endresetglyph
+
+\resetglyph{cyrdze}
+  \glyph{afii10102}{1000}
+\endresetglyph
+
+\resetglyph{cyrotld}
+  \glyph{uni04E9}{1000}
+\endresetglyph
+
+\resetglyph{cyrushrt}
+  \glyph{afii10110}{1000}
+\endresetglyph
+
+\resetglyph{cyry}
+  \glyph{uni04AF}{1000}
+\endresetglyph
+
+\resetglyph{cyryhcrs}
+  \glyph{uni04B1}{1000}
+\endresetglyph
+
+\resetglyph{cyrhdsc}
+  \glyph{uni04B3}{1000}
+\endresetglyph
+
+\resetglyph{cyrdzhe}
+  \glyph{afii10193}{1000}
+\endresetglyph
+
+\resetglyph{cyrchvcrs}
+  \glyph{uni04B9}{1000}
+\endresetglyph
+
+\resetglyph{cyrie}
+  \glyph{afii10101}{1000}
+\endresetglyph
+
+\resetglyph{cyrschwa}
+  \glyph{afii10846}{1000}
+\endresetglyph
+
+\resetglyph{cyrnje}
+  \glyph{afii10107}{1000}
+\endresetglyph
+
+\resetglyph{cyryo}
+  \glyph{afii10071}{1000}
+\endresetglyph
+
+\resetglyph{CYRA}
+  \glyph{afii10017}{1000}
+\endresetglyph
+
+\resetglyph{CYRB}
+  \glyph{afii10018}{1000}
+\endresetglyph
+
+\resetglyph{CYRV}
+  \glyph{afii10019}{1000}
+\endresetglyph
+
+\resetglyph{CYRG}
+  \glyph{afii10020}{1000}
+\endresetglyph
+
+\resetglyph{CYRD}
+  \glyph{afii10021}{1000}
+\endresetglyph
+
+\resetglyph{CYRE}
+  \glyph{afii10022}{1000}
+\endresetglyph
+
+\resetglyph{CYRZH}
+  \glyph{afii10024}{1000}
+\endresetglyph
+
+\resetglyph{CYRZ}
+  \glyph{afii10025}{1000}
+\endresetglyph
+
+\resetglyph{CYRI}
+  \glyph{afii10026}{1000}
+\endresetglyph
+
+\resetglyph{CYRISHRT}
+  \glyph{afii10027}{1000}
+\endresetglyph
+
+\resetglyph{CYRK}
+  \glyph{afii10028}{1000}
+\endresetglyph
+
+\resetglyph{CYRL}
+  \glyph{afii10029}{1000}
+\endresetglyph
+
+\resetglyph{CYRM}
+  \glyph{afii10030}{1000}
+\endresetglyph
+
+\resetglyph{CYRN}
+  \glyph{afii10031}{1000}
+\endresetglyph
+
+\resetglyph{CYRO}
+  \glyph{afii10032}{1000}
+\endresetglyph
+
+\resetglyph{CYRP}
+  \glyph{afii10033}{1000}
+\endresetglyph
+
+\resetglyph{CYRR}
+  \glyph{afii10034}{1000}
+\endresetglyph
+
+\resetglyph{CYRS}
+  \glyph{afii10035}{1000}
+\endresetglyph
+
+\resetglyph{CYRT}
+  \glyph{afii10036}{1000}
+\endresetglyph
+
+\resetglyph{CYRU}
+  \glyph{afii10037}{1000}
+\endresetglyph
+
+\resetglyph{CYRF}
+  \glyph{afii10038}{1000}
+\endresetglyph
+
+\resetglyph{CYRH}
+  \glyph{afii10039}{1000}
+\endresetglyph
+
+\resetglyph{CYRC}
+  \glyph{afii10040}{1000}
+\endresetglyph
+
+\resetglyph{CYRCH}
+  \glyph{afii10041}{1000}
+\endresetglyph
+
+\resetglyph{CYRSH}
+  \glyph{afii10042}{1000}
+\endresetglyph
+
+\resetglyph{CYRSHCH}
+  \glyph{afii10043}{1000}
+\endresetglyph
+
+\resetglyph{CYRHRDSN}
+  \glyph{afii10044}{1000}
+\endresetglyph
+
+\resetglyph{CYRERY}
+  \glyph{afii10045}{1000}
+\endresetglyph
+
+\resetglyph{CYRSFTSN}
+  \glyph{afii10046}{1000}
+\endresetglyph
+
+\resetglyph{CYREREV}
+  \glyph{afii10047}{1000}
+\endresetglyph
+
+\resetglyph{CYRYU}
+  \glyph{afii10048}{1000}
+\endresetglyph
+
+\resetglyph{CYRYA}
+  \glyph{afii10049}{1000}
+\endresetglyph
+
+\resetglyph{cyra}
+  \glyph{afii10065}{1000}
+\endresetglyph
+
+\resetglyph{cyrb}
+  \glyph{afii10066}{1000}
+\endresetglyph
+
+\resetglyph{cyrv}
+  \glyph{afii10067}{1000}
+\endresetglyph
+
+\resetglyph{cyrg}
+  \glyph{afii10068}{1000}
+\endresetglyph
+
+\resetglyph{cyrd}
+  \glyph{afii10069}{1000}
+\endresetglyph
+
+\resetglyph{cyre}
+  \glyph{afii10070}{1000}
+\endresetglyph
+
+\resetglyph{cyrzh}
+  \glyph{afii10072}{1000}
+\endresetglyph
+
+\resetglyph{cyrz}
+  \glyph{afii10073}{1000}
+\endresetglyph
+
+\resetglyph{cyri}
+  \glyph{afii10074}{1000}
+\endresetglyph
+
+\resetglyph{cyrishrt}
+  \glyph{afii10075}{1000}
+\endresetglyph
+
+\resetglyph{cyrk}
+  \glyph{afii10076}{1000}
+\endresetglyph
+
+\resetglyph{cyrl}
+  \glyph{afii10077}{1000}
+\endresetglyph
+
+\resetglyph{cyrm}
+  \glyph{afii10078}{1000}
+\endresetglyph
+
+\resetglyph{cyrn}
+  \glyph{afii10079}{1000}
+\endresetglyph
+
+\resetglyph{cyro}
+  \glyph{afii10080}{1000}
+\endresetglyph
+
+\resetglyph{cyrp}
+  \glyph{afii10081}{1000}
+\endresetglyph
+
+\resetglyph{cyrr}
+  \glyph{afii10082}{1000}
+\endresetglyph
+
+\resetglyph{cyrs}
+  \glyph{afii10083}{1000}
+\endresetglyph
+
+\resetglyph{cyrt}
+  \glyph{afii10084}{1000}
+\endresetglyph
+
+\resetglyph{cyru}
+  \glyph{afii10085}{1000}
+\endresetglyph
+
+\resetglyph{cyrf}
+  \glyph{afii10086}{1000}
+\endresetglyph
+
+\resetglyph{cyrh}
+  \glyph{afii10087}{1000}
+\endresetglyph
+
+\resetglyph{cyrc}
+  \glyph{afii10088}{1000}
+\endresetglyph
+
+\resetglyph{cyrch}
+  \glyph{afii10089}{1000}
+\endresetglyph
+
+\resetglyph{cyrsh}
+  \glyph{afii10090}{1000}
+\endresetglyph
+
+\resetglyph{cyrshch}
+  \glyph{afii10091}{1000}
+\endresetglyph
+
+\resetglyph{cyrhrdsn}
+  \glyph{afii10092}{1000}
+\endresetglyph
+
+\resetglyph{cyrery}
+  \glyph{afii10093}{1000}
+\endresetglyph
+
+\resetglyph{cyrsftsn}
+  \glyph{afii10094}{1000}
+\endresetglyph
+
+\resetglyph{cyrerev}
+  \glyph{afii10095}{1000}
+\endresetglyph
+
+\resetglyph{cyryu}
+  \glyph{afii10096}{1000}
+\endresetglyph
+
+\resetglyph{cyrya}
+  \glyph{afii10097}{1000}
+\endresetglyph
+
+\resetglyph{CYRII}
+  \glyph{afii10055}{1000}
+\endresetglyph
+
+\resetglyph{CYRJE}
+  \glyph{afii10057}{1000}
+\endresetglyph
+
+\resetglyph{cyrii}
+  \glyph{afii10103}{1000}
+\endresetglyph
+
+\resetglyph{cyrje}
+  \glyph{afii10105}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixgreek.mtx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixgreek.mtx
new file mode 100644
index 00000000000..03e36596a6e
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixgreek.mtx
@@ -0,0 +1,40 @@
+%% comfortaa-fixgreek.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{euro}
+  \glyph{Euro}{1000}
+\endresetglyph
+
+\resetglyph{macron}
+  \glyph{uni02C9}{1000}
+\endresetglyph
+
+\resetglyph{Delta}
+  \glyph{uni0394}{1000}
+\endresetglyph
+
+\resetglyph{Omega}
+  \glyph{uni03A9}{1000}
+\endresetglyph
+
+\resetglyph{mu}
+  \glyph{uni03BC}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-fixlatin.etx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixlatin.mtx
index b936132ba1a..db064fa4582 100644
--- a/Master/texmf-dist/source/comfortaa/comfortaa-fixlatin.etx
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixlatin.mtx
@@ -1,5 +1,5 @@
-%% comfortaa-fixlatin.etx
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% comfortaa-fixlatin.tex
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,50 +14,31 @@
 % This work consists of all files listed in manifest.txt.
 
 \relax
-\encoding
 
-% dbar
-\setslot{dcroat}
-\endsetslot
+\metrics
 
-% Ng
-\setslot{Eng}
-\endsetslot
+\resetglyph{Delta}
+  \glyph{uni0394}{1000}
+\endresetglyph
 
-% ng
-\setslot{eng}
-\endsetslot
+\resetglyph{Omega}
+  \glyph{uni03A9}{1000}
+\endresetglyph
 
-% macron
-\setslot{uni02C9}
-\endsetslot
+\resetglyph{fi}
+  \glyph{uniF001}{1000}
+\endresetglyph
 
-% ringfitted
-\setslot{ring}
-\endsetslot
+\resetglyph{fl}
+  \glyph{uniF002}{1000}
+\endresetglyph
 
-% Delta
-\setslot{uni0394}
-\endsetslot
+\resetglyph{macron}
+  \glyph{uni02C9}{1000}
+\endresetglyph
 
-% Omega
-\setslot{uni03A9}
-\endsetslot
+\resetglyph{dotlessj}
+  \glyph{uni0237}{1000}
+\endresetglyph
 
-% rangedash
-\setslot{endash}
-\endsetslot
-
-% punctdash
-\setslot{emdash}
-\endsetslot
-
-% fi
-\setslot{uniF001}
-\endsetslot
-
-% fl
-\setslot{uniF002}
-\endsetslot
-
-\endencoding
+\endmetrics
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixtextcomp.mtx b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixtextcomp.mtx
new file mode 100644
index 00000000000..7e502708f5a
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-fixtextcomp.mtx
@@ -0,0 +1,40 @@
+%% comfortaa-fixtextcomp.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{macron}
+  \glyph{uni02C9}{1000}
+\endresetglyph
+
+\resetglyph{numero}
+  \glyph{afii61352}{1000}
+\endresetglyph
+
+\resetglyph{twosuperior}
+  \glyph{uni00B2}{1000}
+\endresetglyph
+
+\resetglyph{threesuperior}
+  \glyph{uni00B3}{1000}
+\endresetglyph
+
+\resetglyph{onesuperior}
+  \glyph{uni00B9}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-map.tex b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-map.tex
index eec96437360..45e1cc098d9 100644
--- a/Master/texmf-dist/source/comfortaa/comfortaa-map.tex
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-map.tex
@@ -1,5 +1,5 @@
-%% comfortaa-map.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% comfortaa-map.etx
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -17,10 +17,6 @@
 
 \resetstr{PSfontsuffix}{.pfb}
 
-\foreach(encoding){ot1,t1,ts1,t2a,t2b,t2c,x2,lgr}
-  \etxtoenc{\str{encoding}}{comfortaa-\str{encoding}}
-\endfor(encoding)
-
 \adddriver{dvips}{comfortaa.map}
 \input comfortaa-rec.tex
 \donedrivers
diff --git a/Master/texmf-dist/source/comfortaa/ttf2type1.pe b/Master/texmf-dist/source/fonts/comfortaa/ttf2type1.pe
index 0719858b891..47286fe2180 100644
--- a/Master/texmf-dist/source/comfortaa/ttf2type1.pe
+++ b/Master/texmf-dist/source/fonts/comfortaa/ttf2type1.pe
@@ -1,6 +1,6 @@
 #!/usr/bin/env fontforge
 ## ttf2ype1.pe
-## Copyright 2010, 2011 Mohamed El Morabity
+## Copyright 2011 Mohamed El Morabity
 #
 # This work may be distributed and/or modified under the conditions of the LaTeX
 # Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
index fa5659a22c9..612e5ad219d 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
+++ b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
@@ -1,5 +1,5 @@
 %% comfortaa.sty
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{comfortaa}[2011/03/24 Comfortaa]
+\ProvidesPackage{comfortaa}[2011/08/14 Comfortaa]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
index cb7ae9167f4..b9739eac6e6 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{lgrfco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for LGR/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for LGR/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{LGR}{fco}{}
 
-\DeclareFontShape{LGR}{fco}{m}{n}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular
+\DeclareFontShape{LGR}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{sl}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular-Slanted
+\DeclareFontShape{LGR}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{sc}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{LGR}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{scsl}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{n}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold
+\DeclareFontShape{LGR}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{sl}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold-Slanted
+\DeclareFontShape{LGR}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{sc}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{LGR}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{scsl}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{n}{
-   <->\comfortaa@scale lgr-Comfortaa-Light
+\DeclareFontShape{LGR}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{sl}{
-   <->\comfortaa@scale lgr-Comfortaa-Light-Slanted
+\DeclareFontShape{LGR}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{sc}{
-   <->\comfortaa@scale lgr-Comfortaa-Light-SmallCaps
+\DeclareFontShape{LGR}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{scsl}{
-   <->\comfortaa@scale lgr-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{LGR}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{LGR}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{LGR}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{LGR}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{LGR}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{LGR}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{LGR}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{LGR}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{LGR}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{LGR}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{LGR}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{LGR}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{LGR}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
index b9af7d9bc24..cf1deb77561 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ot1fco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for OT1/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for OT1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{OT1}{fco}{}
 
-\DeclareFontShape{OT1}{fco}{m}{n}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular
+\DeclareFontShape{OT1}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{sl}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular-Slanted
+\DeclareFontShape{OT1}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{sc}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{OT1}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{scsl}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{n}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold
+\DeclareFontShape{OT1}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{sl}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold-Slanted
+\DeclareFontShape{OT1}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{sc}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{OT1}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{scsl}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{n}{
-   <->\comfortaa@scale ot1-Comfortaa-Light
+\DeclareFontShape{OT1}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{sl}{
-   <->\comfortaa@scale ot1-Comfortaa-Light-Slanted
+\DeclareFontShape{OT1}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{sc}{
-   <->\comfortaa@scale ot1-Comfortaa-Light-SmallCaps
+\DeclareFontShape{OT1}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{scsl}{
-   <->\comfortaa@scale ot1-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{OT1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{OT1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{OT1}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{OT1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{OT1}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{OT1}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{OT1}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{OT1}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{OT1}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{OT1}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{OT1}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{OT1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{OT1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
index 043400edd06..74895d17c33 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1fco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T1/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T1}{fco}{}
 
-\DeclareFontShape{T1}{fco}{m}{n}{
-   <->\comfortaa@scale t1-Comfortaa-Regular
+\DeclareFontShape{T1}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{sl}{
-   <->\comfortaa@scale t1-Comfortaa-Regular-Slanted
+\DeclareFontShape{T1}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{sc}{
-   <->\comfortaa@scale t1-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T1}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{scsl}{
-   <->\comfortaa@scale t1-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T1}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{n}{
-   <->\comfortaa@scale t1-Comfortaa-Bold
+\DeclareFontShape{T1}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{sl}{
-   <->\comfortaa@scale t1-Comfortaa-Bold-Slanted
+\DeclareFontShape{T1}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{sc}{
-   <->\comfortaa@scale t1-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T1}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{scsl}{
-   <->\comfortaa@scale t1-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T1}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{n}{
-   <->\comfortaa@scale t1-Comfortaa-Light
+\DeclareFontShape{T1}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{sl}{
-   <->\comfortaa@scale t1-Comfortaa-Light-Slanted
+\DeclareFontShape{T1}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{sc}{
-   <->\comfortaa@scale t1-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T1}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{scsl}{
-   <->\comfortaa@scale t1-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T1}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T1}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T1}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T1}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T1}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T1}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T1}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T1}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T1}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
index b74b0a0c30b..559f58f4348 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2afco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2A/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T2A/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T2A}{fco}{}
 
-\DeclareFontShape{T2A}{fco}{m}{n}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular
+\DeclareFontShape{T2A}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{sl}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular-Slanted
+\DeclareFontShape{T2A}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{sc}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T2A}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{scsl}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{n}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold
+\DeclareFontShape{T2A}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{sl}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold-Slanted
+\DeclareFontShape{T2A}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{sc}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T2A}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{scsl}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{n}{
-   <->\comfortaa@scale t2a-Comfortaa-Light
+\DeclareFontShape{T2A}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{sl}{
-   <->\comfortaa@scale t2a-Comfortaa-Light-Slanted
+\DeclareFontShape{T2A}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{sc}{
-   <->\comfortaa@scale t2a-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T2A}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{scsl}{
-   <->\comfortaa@scale t2a-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T2A}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T2A}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T2A}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T2A}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T2A}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T2A}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T2A}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T2A}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T2A}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2A}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2A}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T2A}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T2A}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
index e1dbffa6056..55afd682259 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2bfco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2B/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T2B/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T2B}{fco}{}
 
-\DeclareFontShape{T2B}{fco}{m}{n}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular
+\DeclareFontShape{T2B}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{sl}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular-Slanted
+\DeclareFontShape{T2B}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{sc}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T2B}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{scsl}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{n}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold
+\DeclareFontShape{T2B}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{sl}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold-Slanted
+\DeclareFontShape{T2B}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{sc}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T2B}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{scsl}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{n}{
-   <->\comfortaa@scale t2b-Comfortaa-Light
+\DeclareFontShape{T2B}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{sl}{
-   <->\comfortaa@scale t2b-Comfortaa-Light-Slanted
+\DeclareFontShape{T2B}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{sc}{
-   <->\comfortaa@scale t2b-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T2B}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{scsl}{
-   <->\comfortaa@scale t2b-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T2B}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T2B}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T2B}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T2B}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T2B}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T2B}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T2B}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T2B}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T2B}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2B}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2B}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T2B}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T2B}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
index 909efa9bfeb..0ef601b66d7 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2cfco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2C/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T2C/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T2C}{fco}{}
 
-\DeclareFontShape{T2C}{fco}{m}{n}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular
+\DeclareFontShape{T2C}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{sl}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular-Slanted
+\DeclareFontShape{T2C}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{sc}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T2C}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{scsl}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{n}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold
+\DeclareFontShape{T2C}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{sl}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold-Slanted
+\DeclareFontShape{T2C}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{sc}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T2C}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{scsl}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{n}{
-   <->\comfortaa@scale t2c-Comfortaa-Light
+\DeclareFontShape{T2C}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{sl}{
-   <->\comfortaa@scale t2c-Comfortaa-Light-Slanted
+\DeclareFontShape{T2C}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{sc}{
-   <->\comfortaa@scale t2c-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T2C}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{scsl}{
-   <->\comfortaa@scale t2c-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T2C}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T2C}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T2C}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T2C}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T2C}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T2C}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T2C}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T2C}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T2C}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2C}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2C}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T2C}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T2C}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
index 74a903a6eb1..880af5fcf70 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1fco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for TS1/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for TS1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{TS1}{fco}{}
 
-\DeclareFontShape{TS1}{fco}{m}{n}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular
+\DeclareFontShape{TS1}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{sl}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular-Slanted
+\DeclareFontShape{TS1}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{sc}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular
+\DeclareFontShape{TS1}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{scsl}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular-Slanted
+\DeclareFontShape{TS1}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{n}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold
+\DeclareFontShape{TS1}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{sl}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
+\DeclareFontShape{TS1}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{sc}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold
+\DeclareFontShape{TS1}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{scsl}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
+\DeclareFontShape{TS1}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{n}{
-   <->\comfortaa@scale ts1-Comfortaa-Light
+\DeclareFontShape{TS1}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{sl}{
-   <->\comfortaa@scale ts1-Comfortaa-Light-Slanted
+\DeclareFontShape{TS1}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{sc}{
-   <->\comfortaa@scale ts1-Comfortaa-Light
+\DeclareFontShape{TS1}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{scsl}{
-   <->\comfortaa@scale ts1-Comfortaa-Light-Slanted
+\DeclareFontShape{TS1}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{TS1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{TS1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{TS1}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{TS1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{TS1}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{TS1}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{TS1}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{TS1}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{TS1}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{TS1}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{TS1}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{TS1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{TS1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
index 47d8133b613..c76da021732 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{x2fco.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for X2/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for X2/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{X2}{fco}{}
 
-\DeclareFontShape{X2}{fco}{m}{n}{
-   <->\comfortaa@scale x2-Comfortaa-Regular
+\DeclareFontShape{X2}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{sl}{
-   <->\comfortaa@scale x2-Comfortaa-Regular-Slanted
+\DeclareFontShape{X2}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{sc}{
-   <->\comfortaa@scale x2-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{X2}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{scsl}{
-   <->\comfortaa@scale x2-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{X2}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{n}{
-   <->\comfortaa@scale x2-Comfortaa-Bold
+\DeclareFontShape{X2}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{sl}{
-   <->\comfortaa@scale x2-Comfortaa-Bold-Slanted
+\DeclareFontShape{X2}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{sc}{
-   <->\comfortaa@scale x2-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{X2}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{scsl}{
-   <->\comfortaa@scale x2-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{X2}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{n}{
-   <->\comfortaa@scale x2-Comfortaa-Light
+\DeclareFontShape{X2}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{sl}{
-   <->\comfortaa@scale x2-Comfortaa-Light-Slanted
+\DeclareFontShape{X2}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{sc}{
-   <->\comfortaa@scale x2-Comfortaa-Light-SmallCaps
+\DeclareFontShape{X2}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{scsl}{
-   <->\comfortaa@scale x2-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{X2}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{X2}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{X2}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{X2}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{X2}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{X2}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{X2}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{X2}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{X2}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{X2}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{X2}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{X2}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{X2}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{X2}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f18f3e7dd16..8f8c9b1a889 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -929,7 +929,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'biber'                => '&POSTbiber',
  'bibtex'               => '&POSTbibtex',
  'cantarell'		=> '&POSTdroid',
- 'comfortaa'		=> '&POSTdroid',
  'context-games'        => '&POSTcontext_games',
  'coordsys'		=> '&POSTcoordsys',
  'ctex'			=> '&POSTctex',