comfortaa (8may11)

git-svn-id: svn://tug.org/texlive/trunk@22360 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2011-05-08 23:18:56 +0000
committer: Karl Berry <karl@freefriends.org> 2011-05-08 23:18:56 +0000
commit: 5d5a3ce7983e13fe5456b264448248f94d236f6d (patch)
tree: 0137e3631bf1477b10d1a252f6cda405f8f266bc /Master/texmf-dist/doc/fonts/comfortaa
parent: c08901b8b8bb3f997641a53dfa2a6b081e8a0f71 (diff)
23 files changed, 394 insertions, 2282 deletions
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
index 9078da0396a..ff4bfec15e3 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
+++ b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
@@ -6,3 +6,8 @@ Changelog for version 1.2:
 
 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/doc/fonts/comfortaa/Makefile b/Master/texmf-dist/doc/fonts/comfortaa/Makefile
deleted file mode 100644
index 8f587b25213..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/Makefile
+++ /dev/null
@@ -1,229 +0,0 @@
-## Makefile
-## Copyright 2010 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.
-
-######################
-# Fonts informations #
-######################
-
-FONT_NAME = comfortaa
-FOUNDRY = public
-FONT_CODES = fco
-
-# Supported LaTeX encodings
-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
-
-
-#####################
-# Installation root #
-#####################
-
-TEXMFHOME = $(shell kpsexpand '$$TEXMFHOME')
-
-
-###########
-# Archive #
-###########
-
-ARCHIVE_ROOT = $(FONT_NAME)
-ARCHIVE = $(FONT_NAME).zip
-
-
-###########
-# Sources #
-###########
-
-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
-
-STYLE_FILES = $(wildcard *.sty)
-
-DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf CHANGES README
-
-# 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)
-
-
-
-###################
-# Generated files #
-###################
-
-TYPE1_FILES = $(TRUETYPE_FILES:.ttf=.pfb) $(TRUETYPE_FILES:.ttf=-LCDFJ.pfb)
-AFM_FILES = $(TYPE1_FILES:.pfb=.afm)
-
-# Fontinst log file
-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                            \
-             )                                                                      \
-           )
-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      \
-              )                                                              \
-            )
-TFM_FILES = $(PL_FILES:.pl=.tfm) $(VPL_FILES:.vpl=.tfm)
-VF_FILES = $(VPL_FILES:.vpl=.vf)
-
-MAP = $(FONT_NAME).map
-
-# Font definition files
-FD_FILES = $(foreach e,$(SUPPORTED_ENCODINGS), \
-             $(foreach f,$(FONT_CODES),        \
-               $(e)$(f).fd                     \
-             )                                 \
-           )
-
-# Generated encoding files
-ENC_FILES = $(SUPPORTED_ENCODINGS:%=$(FONT_NAME)-%.enc) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=$(FONT_NAME)-%.enc)
-
-# Generated files to be installed
-GENERATED_FILES = $(TYPE1_FILES) $(AFM_FILES) $(TFM_FILES) $(VF_FILES) $(MAP) $(FD_FILES) $(ENC_FILES)
-
-
-
-
-default: all
-
-
-all: dist
-
-
-dist: $(ARCHIVE)
-
-
-%.pfb %.afm: %.ttf
-	fontforge ttf2type1.pe $<
-
-
-%-LCDFJ.pfb: %.pfb
-	t1dotlessj $< $@
-
-
-%-LCDFJ.afm: %-LCDFJ.pfb
-	pf2afm $<
-
-
-%.tfm: %.pl
-	pltotf $< $@
-
-
-%.tfm: %.vpl
-	vptovf $^ $
-
-
-%.vf: %.vpl
-	vptovf $^ $@
-
-
-$(FONTINST_REC_FILE): $(TYPE1_FILES) $(AFM_FILES) $(ETX_FILES) $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE)
-	latex $(FONTINST_FILE)
-
-
-$(PL_FILES) $(VPL_FILES): $(FONTINST_REC_FILE)
-
-
-$(MAP): $(FONTINST_REC_FILE) $(FONTINST_MAP_FILE)
-	latex $(FONTINST_MAP_FILE)
-
-
-$(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)/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)/
-	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)/
-	cp -p $(AFM_FILES) $(ARCHIVE_ROOT)/fonts/afm/$(FOUNDRY)/$(FONT_NAME)/
-	cp -p $(TFM_FILES) $(ARCHIVE_ROOT)/fonts/tfm/$(FOUNDRY)/$(FONT_NAME)/
-	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 README $(ARCHIVE_ROOT)
-	cd $(ARCHIVE_ROOT) && find . -type f > manifest.txt
-
-
-$(ARCHIVE): clean-texmf-tree texmf-tree
-	zip -r $@ $(ARCHIVE_ROOT)
-
-
-install: texmf-tree
-	mkdir -p $(TEXMFHOME)
-	cp -a $(ARCHIVE_ROOT)/* $(TEXMFHOME)
-	texhash
-	updmap --enable Map=$(MAP)
-
-
-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)/source/$(FONT_NAME)/
-	updmap --disable $(MAP)
-	texhash
-
-
-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) $(VPL_FILES)
-	$(RM) $(TFM_FILES)
-	$(RM) $(VF_FILES)
-	$(RM) $(MAP)
-	$(RM) $(FD_FILES)
-	$(RM) $(ENC_FILES)
-	$(RM) $(ARCHIVE)
-	$(RM) *~ *.log
-
-
-clean-texmf-tree:
-	$(RM) -r $(ARCHIVE_ROOT)
-
-
-.PHONY: clean clean-texmf-tree texmf-tree
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README b/Master/texmf-dist/doc/fonts/comfortaa/README
index 50b97906fc6..795f15ac79d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README
+++ b/Master/texmf-dist/doc/fonts/comfortaa/README
@@ -1,5 +1,5 @@
 ------------------------
- Comfortaa, version 1.3
+ Comfortaa, version 1.4
 ------------------------
 
 Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README.comfortaa b/Master/texmf-dist/doc/fonts/comfortaa/README.comfortaa
deleted file mode 100644
index 50b97906fc6..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/README.comfortaa
+++ /dev/null
@@ -1,22 +0,0 @@
-------------------------
- Comfortaa, version 1.3
-------------------------
-
-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/doc/fonts/comfortaa/comfortaa-dotlessj.etx b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-dotlessj.etx
deleted file mode 100644
index ef6bf6debb6..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-dotlessj.etx
+++ /dev/null
@@ -1,23 +0,0 @@
-%% comfortaa-dotlessj.etx
-%% Copyright 2010 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
-
-% dotlessj
-\setslot{uni0237}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-drv.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-drv.tex
deleted file mode 100644
index a8b1613a843..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-drv.tex
+++ /dev/null
@@ -1,263 +0,0 @@
-%% comfortaa-drv.tex
-%% Copyright 2010 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-Thin}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Thin}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Thin-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Thin}}}
-\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-Thin}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Thin}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Thin-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Thin}}}
-\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-Thin}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Thin-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Thin-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Thin-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-Thin}{ot1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Thin-Slanted}{ot1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Thin-SmallCaps}{ot1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Thin-Slanted-SmallCaps}{ot1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-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-Thin}{t1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Thin-Slanted}{t1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Thin-SmallCaps}{t1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Thin-Slanted-SmallCaps}{t1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-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-Thin}{ts1-Comfortaa-Thin,fixtextcomp-Comfortaa-Thin,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{ts1-Comfortaa-Thin-Slanted}{ts1-Comfortaa-Thin-Slanted,fixtextcomp-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Thin}{TS1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Thin-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-Thin}{t2a-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Thin-Slanted}{t2a-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Thin-SmallCaps}{t2a-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Thin-Slanted-SmallCaps}{t2a-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-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-Thin}{t2b-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Thin-Slanted}{t2b-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Thin-SmallCaps}{t2b-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Thin-Slanted-SmallCaps}{t2b-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-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-Thin}{t2c-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Thin-Slanted}{t2c-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Thin-SmallCaps}{t2c-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Thin-Slanted-SmallCaps}{t2c-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-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-Thin}{x2-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Thin-Slanted}{x2-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Thin-SmallCaps}{x2-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Thin-Slanted-SmallCaps}{x2-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-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-Thin}{lgr-Comfortaa-Thin,fixgreek-Comfortaa-Thin,newlatin,greek}{lgr}{LGR}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Thin-Slanted}{lgr-Comfortaa-Thin-Slanted,fixgreek-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,newlatin,greek}{lgr}{LGR}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Thin-SmallCaps}{lgr-Comfortaa-Thin,fixgreek-Comfortaa-Thin,newlatin,greek}{lgrc}{LGR}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Thin-Slanted-SmallCaps}{lgr-Comfortaa-Thin-Slanted,fixgreek-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{l}{scsl}{<->\string\comfortaa@scale}
-\endinstallfonts
-
-
-\endrecordtransforms
-\bye
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixcyrillic.etx b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixcyrillic.etx
deleted file mode 100644
index dba86b6d9ab..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixcyrillic.etx
+++ /dev/null
@@ -1,515 +0,0 @@
-%% comfortaa-fixcyrillic.etx
-%% Copyright 2010 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
-
-% 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
-
-% 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{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{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}
-\endsetslot
-
-% cyrdash
-\setslot{emdash}
-\endsetslot
-
-% numero
-\setslot{afii61352}
-\endsetslot
-
-% fi
-\setslot{uniF001}
-\endsetslot
-
-% fl
-\setslot{uniF002}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixglyphs.mtx b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixglyphs.mtx
deleted file mode 100644
index 63d44cdb762..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixglyphs.mtx
+++ /dev/null
@@ -1,29 +0,0 @@
-%% comfortaa-fixglyphs.mtx
-%% 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
-\metrics
-
-% Fix tilde height
-\setint{tildeheight}{\height{tilde}}
-\setint{breveheight}{\height{breve}}
-\resetglyph{tilde}
-  \moveup{-\int{tildeheight}}
-  \moveup{\int{breveheight}}
-  \glyph{tilde}{1000}
-  \resetdepth{0}
-\endsetglyph
-
-\endmetrics
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixgreek.etx b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixgreek.etx
deleted file mode 100644
index 88e84354926..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixgreek.etx
+++ /dev/null
@@ -1,75 +0,0 @@
-%% comfortaa-fixgreek.etx
-%% Copyright 2010 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/doc/fonts/comfortaa/comfortaa-fixlatin.etx b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixlatin.etx
deleted file mode 100644
index bd59c24e514..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixlatin.etx
+++ /dev/null
@@ -1,63 +0,0 @@
-%% comfortaa-fixlatin.etx
-%% Copyright 2010 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
-
-% dbar
-\setslot{dcroat}
-\endsetslot
-
-% Ng
-\setslot{Eng}
-\endsetslot
-
-% ng
-\setslot{eng}
-\endsetslot
-
-% macron
-\setslot{uni02C9}
-\endsetslot
-
-% ringfitted
-\setslot{ring}
-\endsetslot
-
-% Delta
-\setslot{uni0394}
-\endsetslot
-
-% Omega
-\setslot{uni03A9}
-\endsetslot
-
-% rangedash
-\setslot{endash}
-\endsetslot
-
-% punctdash
-\setslot{emdash}
-\endsetslot
-
-% fi
-\setslot{uniF001}
-\endsetslot
-
-% fl
-\setslot{uniF002}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixtextcomp.etx b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixtextcomp.etx
deleted file mode 100644
index d6537f9d758..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixtextcomp.etx
+++ /dev/null
@@ -1,145 +0,0 @@
-%% comfortaa-fixtextcomp.etx
-%% Copyright 2010 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/doc/fonts/comfortaa/comfortaa-map.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-map.tex
deleted file mode 100644
index 9f00765bf25..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-map.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-%% comfortaa-map.tex
-%% Copyright 2010 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 finstmsc.sty
-
-\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
-
-\bye
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-reglyph.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-reglyph.tex
deleted file mode 100644
index 5d154705987..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-reglyph.tex
+++ /dev/null
@@ -1,301 +0,0 @@
-%% comfortaa-reglyph.tex
-%% Copyright 2010 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-Thin}{raw-ot1-Comfortaa-Thin}
-  \reglyphfont{ot1-Comfortaa-Thin-Slanted}{raw-ot1-Comfortaa-Thin-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-Thin}{raw-t1-Comfortaa-Thin}
-  \reglyphfont{t1-Comfortaa-Thin-Slanted}{raw-t1-Comfortaa-Thin-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-Thin}{raw-fixlatin-Comfortaa-Thin}
-  \reglyphfont{fixlatin-Comfortaa-Thin-Slanted}{raw-fixlatin-Comfortaa-Thin-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-Thin}{raw-ts1-Comfortaa-Thin}
-  \reglyphfont{ts1-Comfortaa-Thin-Slanted}{raw-ts1-Comfortaa-Thin-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-Thin}{raw-fixtextcomp-Comfortaa-Thin}
-  \reglyphfont{fixtextcomp-Comfortaa-Thin-Slanted}{raw-fixtextcomp-Comfortaa-Thin-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-Thin}{raw-t2a-Comfortaa-Thin}
-  \reglyphfont{t2a-Comfortaa-Thin-Slanted}{raw-t2a-Comfortaa-Thin-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-Thin}{raw-t2b-Comfortaa-Thin}
-  \reglyphfont{t2b-Comfortaa-Thin-Slanted}{raw-t2b-Comfortaa-Thin-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-Thin}{raw-t2c-Comfortaa-Thin}
-  \reglyphfont{t2c-Comfortaa-Thin-Slanted}{raw-t2c-Comfortaa-Thin-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-Thin}{raw-x2-Comfortaa-Thin}
-  \reglyphfont{x2-Comfortaa-Thin-Slanted}{raw-x2-Comfortaa-Thin-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-Thin}{raw-fixcyrillic-Comfortaa-Thin}
-  \reglyphfont{fixcyrillic-Comfortaa-Thin-Slanted}{raw-fixcyrillic-Comfortaa-Thin-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-Thin}{raw-lgr-Comfortaa-Thin}
-  \reglyphfont{lgr-Comfortaa-Thin-Slanted}{raw-lgr-Comfortaa-Thin-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-Thin}{raw-fixgreek-Comfortaa-Thin}
-  \reglyphfont{fixgreek-Comfortaa-Thin-Slanted}{raw-fixgreek-Comfortaa-Thin-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-Thin}{raw-dotlessj-Comfortaa-Thin}
-  \reglyphfont{dotlessj-Comfortaa-Thin-Slanted}{raw-dotlessj-Comfortaa-Thin-Slanted}
-\endreglyphfonts
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
new file mode 100644
index 00000000000..37bd2281926
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..554a517dd17
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex
@@ -0,0 +1,89 @@
+%% 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/doc/fonts/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
index d2af93a7a7f..2eeae2bc5bf 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 0325ad745fc..cf781b72937 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 Mohamed El Morabity
+%% 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)
@@ -39,7 +39,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.3}
+\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.4}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -87,10 +87,11 @@ work.
 \subsection{Calling Comfortaa}
 
 You can use the Comfortaa font in a \LaTeX{} document by adding the command
-\begin{verbatim} \usepackage{comfortaa}
+\begin{verbatim}
+\usepackage{comfortaa}
 \end{verbatim}
-to the preamble. The package supplies the
-\code{\char`\\fcofamily} command to switch the current font to Comfortaa.
+to the preamble.  The package supplies the \code{\char`\\fcofamily} command to
+switch the current font to Comfortaa.
 
 \subsubsection{Options}
 
@@ -106,20 +107,6 @@ To set Comfortaa as default sans-serif only:
 \usepackage[defaultsans]{comfortaa}
 \end{verbatim}
 
-\paragraph{Default weight}
-
-The following options specify which weight of the font you prefer to use:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    \code{regular}&{\fcofamily\fontseries{m}\selectfont use regular face}\\
-    \midrule
-    \code{light}&{\fcofamily\fontseries{l}\selectfont use light face}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-The \code{regular} option is enabled by default.
-
 \paragraph{Font scaling}
 
 The font can be up- and downscaled by any factor. This can be used to make
@@ -130,7 +117,6 @@ the font according to \parameter{ratio} (1.0 by default), for example:
 \usepackage[scale=0.95]{comfortaa}
 \end{verbatim}
 
-
 \subsection{Encodings}
 
 The following encodings are supported:
@@ -156,9 +142,9 @@ treated poorly, if at all. Note difference in kerning between e.g.
 \begin{center}
   \begin{tabular}{ll}
     \toprule
-    OT1-encoded&To Ta Té\\
+    OT1-encoded&{\fcofamily To Ta Té}\\
     \midrule
-    T1-encoded&\fontencoding{T1}\selectfont To Ta Té\\
+    T1-encoded&{\fcofamily\fontencoding{T1}\selectfont To Ta Té}\\
     \bottomrule
   \end{tabular}
 \end{center}
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
index d29a12b613f..8d3e8d8d072 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
@@ -1,317 +1,321 @@
-./manifest.txt
-./source/comfortaa/comfortaa-fixlatin.etx
-./source/comfortaa/comfortaa-dotlessj.etx
-./source/comfortaa/ttf2type1.pe
-./source/comfortaa/comfortaa-drv.tex
-./source/comfortaa/comfortaa.tex
-./source/comfortaa/comfortaa-fixglyphs.mtx
-./source/comfortaa/comfortaa.pdf
-./source/comfortaa/comfortaa-fixcyrillic.etx
-./source/comfortaa/comfortaa-fixtextcomp.etx
-./source/comfortaa/comfortaa-fixgreek.etx
-./source/comfortaa/Makefile
-./source/comfortaa/CHANGES
-./source/comfortaa/comfortaa-map.tex
-./source/comfortaa/comfortaa-reglyph.tex
-./source/comfortaa/README
+./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-Thin-LCDFJ.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Thin.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin.tfm
+./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/t1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.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/ot1-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.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/t2c-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin.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/ot1-Comfortaa-Thin-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/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin.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-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.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/t2b-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin.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/t1-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-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/raw-x2-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin.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/raw-t2a-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.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/raw-fixgreek-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted.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-ts1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-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/raw-lgr-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold.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-fixlatin-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.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/raw-fixcyrillic-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm
-./fonts/map/dvips/comfortaa/comfortaa.map
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-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/t2b-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Thin.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+./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-Thin-LCDFJ.afm
 ./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
-./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Thin.ttf
-./fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
-./fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
-./fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
-./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-x2.enc
-./fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
+./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.pdf
+./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/t2cfco.fd
+./tex/latex/comfortaa/t2bfco.fd
 ./tex/latex/comfortaa/t1fco.fd
-./tex/latex/comfortaa/x2fco.fd
-./tex/latex/comfortaa/lgrfco.fd
-./tex/latex/comfortaa/ts1fco.fd
 ./tex/latex/comfortaa/ot1fco.fd
-./tex/latex/comfortaa/t2bfco.fd
-./tex/latex/comfortaa/comfortaa.sty
 ./tex/latex/comfortaa/t2afco.fd
+./tex/latex/comfortaa/lgrfco.fd
+./manifest.txt
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/CHANGES
deleted file mode 100644
index 9078da0396a..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/CHANGES
+++ /dev/null
@@ -1,8 +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
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/README.comfortaa b/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/README.comfortaa
deleted file mode 100644
index 50b97906fc6..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/README.comfortaa
+++ /dev/null
@@ -1,22 +0,0 @@
-------------------------
- Comfortaa, version 1.3
-------------------------
-
-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/doc/fonts/comfortaa/source/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.pdf
deleted file mode 100644
index d2af93a7a7f..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.tex b/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.tex
deleted file mode 100644
index 0325ad745fc..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.tex
+++ /dev/null
@@ -1,227 +0,0 @@
-%% comfortaa.tex
-%% Copyright 2010 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.3}
-
-\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{Default weight}
-
-The following options specify which weight of the font you prefer to use:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    \code{regular}&{\fcofamily\fontseries{m}\selectfont use regular face}\\
-    \midrule
-    \code{light}&{\fcofamily\fontseries{l}\selectfont use light face}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-The \code{regular} option is enabled by default.
-
-\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&To Ta Té\\
-    \midrule
-    T1-encoded&\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/doc/fonts/comfortaa/ttf2type1.pe b/Master/texmf-dist/doc/fonts/comfortaa/ttf2type1.pe
deleted file mode 100644
index 4c71df2b326..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/ttf2type1.pe
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env fontforge
-## ttf2ype1.pe
-## Copyright 2010 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.
-
-i=1
-while (i < $argc)
-  Open($argv[i])
-  Generate($argv[i]:r + ".pfb")
-  i = i+1
-endloop
author	Karl Berry <karl@freefriends.org>	2011-05-08 23:18:56 +0000
committer	Karl Berry <karl@freefriends.org>	2011-05-08 23:18:56 +0000
commit	5d5a3ce7983e13fe5456b264448248f94d236f6d (patch)
tree	0137e3631bf1477b10d1a252f6cda405f8f266bc /Master/texmf-dist/doc/fonts/comfortaa
parent	c08901b8b8bb3f997641a53dfa2a6b081e8a0f71 (diff)