comfortaa (20jun19)

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

27 files changed, 78 insertions, 253 deletions

diff --git a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
index 64cc49d91cd..f19a28af675 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
+++ b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
@@ -1,37 +1,41 @@
+VERSION 3.1:
+        - Fix OT1 encoding with slanted shape
+        - Fix packaging according to CTAN guidelines
+
 VERSION 3.0:
-	- Update .ttf files to version 3.001
-	- Complete rewrite of the TeX metric file generation (otftotfm is now
+        - Update .ttf files to version 3.001
+        - Complete rewrite of the TeX metric file generation (otftotfm is now
           used instead of fontinst)
-	- Support for XeLaTeX and LuaLaTeX
-	- Drop faked smallcaps support
-	- Fix kerning with uppercase Greek diacritics
-	- Add "scaled" alias option
+        - Support for XeLaTeX and LuaLaTeX
+        - Drop faked smallcaps support
+        - Fix kerning with uppercase Greek diacritics
+        - Add "scaled" alias option
 
 VERSION 2.3:
-	- Update fonts to version 2.003
+        - Update fonts to version 2.003
 
 VERSION 2.2:
-	- Update fonts to version 2.002
+        - Update fonts to version 2.002
 
 VERSION 2.1:
-	- Fix bad weight substitution when using light weight and slanted shape
+        - Fix bad weight substitution when using light weight and slanted shape
 
 VERSION 2.0:
-	- Complete rewrite of the fontinst driver file
-	- Rename .vf and .tfm files based on the pattern <font>-<encoding>
-	- Modify paths of the archive: documentation is now in
+        - Complete rewrite of the fontinst driver file
+        - Rename .vf and .tfm files based on the pattern <font>-<encoding>
+        - Modify paths of the archive: documentation is now in
           doc/fonts/comfortaa/ and sources in source/fonts/comfortaa/
 
 VERSION 1.4:
-	- Remove "light" class option
-	- Fix documentation
-	- Add samples PDF
+        - Remove "light" class option
+        - Fix documentation
+        - Add samples PDF
 
 VERSION 1.3:
-	- Fix comfortaa-fixglyphs.mtx
+        - Fix comfortaa-fixglyphs.mtx
 
 VERSION 1.2:
-	- Clean comfortaa-fixlatin.etx
+        - Clean comfortaa-fixlatin.etx
 
 VERSION 1.1:
-	- Fix small caps series in TS1 encoding
+        - Fix small caps series in TS1 encoding
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README b/Master/texmf-dist/doc/fonts/comfortaa/README
index 4616cda87ba..8e6e0bf414a 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README
+++ b/Master/texmf-dist/doc/fonts/comfortaa/README
@@ -1,5 +1,5 @@
 ------------------------
- Comfortaa, version 3.0
+ Comfortaa, version 3.1
 ------------------------
 
 Comfortaa is a rounded geometric sans-serif type designed by Johan
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
index 0fbde98a089..68cacb424ac 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
index c71744db9f1..aaa5c4bed15 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/manifest.txt b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
deleted file mode 100644
index 018452a8658..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-comfortaa/doc/fonts/comfortaa/CHANGES
-comfortaa/doc/fonts/comfortaa/comfortaa.pdf
-comfortaa/doc/fonts/comfortaa/comfortaa-samples.pdf
-comfortaa/doc/fonts/comfortaa/README
-comfortaa/fonts/enc/dvips/comfortaa/
-comfortaa/fonts/enc/dvips/comfortaa/a_64c3ob.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_bh4242.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_e4iqkg.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_m2qr2b.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_n5moke.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_ovobyi.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_q4mh67.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_qfuw5x.enc
-comfortaa/fonts/enc/dvips/comfortaa/a_xu66hj.enc
-comfortaa/fonts/map/dvips/comfortaa/comfortaa.map
-comfortaa/fonts/tfm/aajohan/comfortaa/
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-LGR--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-LGR-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-LGR-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-LGR.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-OT1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-OT1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-OT1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-OT1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-TS1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-TS1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-TS1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-TS1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-LGR--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-LGR-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-LGR-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-LGR.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-OT1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-OT1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-OT1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-OT1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-TS1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-TS1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-TS1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-TS1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-LGR--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-LGR-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-LGR-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-LGR.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-OT1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-OT1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-OT1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-OT1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-TS1--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-TS1-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-TS1-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-TS1.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted--base.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted.tfm
-comfortaa/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2.tfm
-comfortaa/fonts/truetype/aajohan/comfortaa/
-comfortaa/fonts/truetype/aajohan/comfortaa/Comfortaa-Bold.ttf
-comfortaa/fonts/truetype/aajohan/comfortaa/Comfortaa-Light.ttf
-comfortaa/fonts/truetype/aajohan/comfortaa/Comfortaa-Regular.ttf
-comfortaa/fonts/type1/aajohan/comfortaa/
-comfortaa/fonts/type1/aajohan/comfortaa/Comfortaa-Bold.pfb
-comfortaa/fonts/type1/aajohan/comfortaa/Comfortaa-Light.pfb
-comfortaa/fonts/type1/aajohan/comfortaa/Comfortaa-Regular.pfb
-comfortaa/fonts/vf/aajohan/comfortaa/
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-LGR-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-LGR.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-OT1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-OT1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T2A.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T2B.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-T2C.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-TS1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-TS1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Bold-X2.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-LGR-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-LGR.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-OT1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-OT1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T2A.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T2B.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-T2C.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-TS1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-TS1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-X2-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Light-X2.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-LGR-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-LGR.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-OT1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-OT1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T2A.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T2B.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-T2C.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-TS1-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-TS1.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted.vf
-comfortaa/fonts/vf/aajohan/comfortaa/Comfortaa-Regular-X2.vf
-comfortaa/manifest.txt
-comfortaa/README
-comfortaa/tex/latex/comfortaa/
-comfortaa/tex/latex/comfortaa/comfortaa.sty
-comfortaa/tex/latex/comfortaa/LGRcomfortaa.fd
-comfortaa/tex/latex/comfortaa/OT1comfortaa.fd
-comfortaa/tex/latex/comfortaa/T1comfortaa.fd
-comfortaa/tex/latex/comfortaa/T2Acomfortaa.fd
-comfortaa/tex/latex/comfortaa/T2Bcomfortaa.fd
-comfortaa/tex/latex/comfortaa/T2Ccomfortaa.fd
-comfortaa/tex/latex/comfortaa/TS1comfortaa.fd
-comfortaa/tex/latex/comfortaa/X2comfortaa.fd
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_64c3ob.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_64c3ob.enc
index c4273dc1b93..7113d922e98 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_64c3ob.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_64c3ob.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_64c3obu772h6ddjelkvqclq6we
-% Encoding created by otftotfm on Sat Jun 15 16:47:54 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:40 2019
 % Command line follows encoding
 /AutoEnc_64c3obu772h6ddjelkvqclq6we [
 %00
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.fYVBKYxd0O.enc
+% --encoding=/tmp/tmp.SJSWlZKSwQ.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern --script=latn /tmp/tmp.il25rVwn8o.otf
+% --feature=kern --script=latn /tmp/tmp.Co7LHXM4bI.otf
 % Comfortaa-Regular-OT1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_bh4242.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_bh4242.enc
index c538aa102c7..5f419db1ae0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_bh4242.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_bh4242.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bh42423yy3mk46xsyvmypgaf6a
-% Encoding created by otftotfm on Sat Jun 15 16:48:09 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:54 2019
 % Command line follows encoding
 /AutoEnc_bh42423yy3mk46xsyvmypgaf6a [
 %00
@@ -54,11 +54,11 @@
   /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.95gv3oRltv.enc
+% --encoding=/tmp/tmp.otkhXOEBqp.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern /tmp/tmp.yFRp06JeU5.otf Comfortaa-Regular-T2C'
+% --feature=kern /tmp/tmp.sYtq0jgTN8.otf Comfortaa-Regular-T2C'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_e4iqkg.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_e4iqkg.enc
index 6e68fff3086..6a2fe7f306d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_e4iqkg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_e4iqkg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_e4iqkg2kwdqtdom7664vy57ecg
-% Encoding created by otftotfm on Sat Jun 15 16:48:03 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:49 2019
 % Command line follows encoding
 /AutoEnc_e4iqkg2kwdqtdom7664vy57ecg [
 %00
@@ -54,11 +54,12 @@
   /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.rtXQJXfwQq.enc
+% --encoding=/tmp/tmp.CBMuYcnE12.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern /tmp/tmp.XBd2g0idHb.otf Comfortaa-Bold-T2A'
+% --feature=kern --slant=0.167 /tmp/tmp.BAZX1WOPwV.otf
+% Comfortaa-Regular-T2A-Slanted'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_m2qr2b.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_m2qr2b.enc
index 895af105ac8..067003855c4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_m2qr2b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_m2qr2b.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e
-% Encoding created by otftotfm on Sat Jun 15 16:48:04 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:50 2019
 % Command line follows encoding
 /AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e [
 %00
@@ -54,11 +54,11 @@
   /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.kXcKx5LNMA.enc
+% --encoding=/tmp/tmp.Fm5ReeCHES.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern /tmp/tmp.YLGInKvqbE.otf Comfortaa-Regular-T2B'
+% --feature=kern /tmp/tmp.wWj4BLhdmJ.otf Comfortaa-Light-T2B'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_n5moke.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_n5moke.enc
index 0d9cac9c0e4..5fa3cfae343 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_n5moke.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_n5moke.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e
-% Encoding created by otftotfm on Sat Jun 15 16:47:55 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:40 2019
 % Command line follows encoding
 /AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e [
 %00
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.w4Ejud07eG.enc
+% --encoding=/tmp/tmp.7jsKkAogyI.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern --slant=0.167 --script=latn /tmp/tmp.cA2Htxz3l5.otf
+% --feature=kern --slant=0.167 --script=latn /tmp/tmp.793fpoWD9X.otf
 % Comfortaa-Bold-OT1-Slanted'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_ovobyi.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_ovobyi.enc
index 35498a8bdcb..2b35ac17ddc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_ovobyi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_ovobyi.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ovobyi3j4qqh2asaabug7cg6jc
-% Encoding created by otftotfm on Sat Jun 15 16:48:00 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:44 2019
 % Command line follows encoding
 /AutoEnc_ovobyi3j4qqh2asaabug7cg6jc [
 %00
@@ -54,12 +54,11 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.Zacw6Ij12P.enc
+% --encoding=/tmp/tmp.Y6Jtfcoocg.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern --slant=0.167 /tmp/tmp.NqoCiFCqH9.otf
-% Comfortaa-Regular-TS1-Slanted'
+% --feature=kern /tmp/tmp.PSefsqrpNS.otf Comfortaa-Light-TS1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_q4mh67.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_q4mh67.enc
index eeceb035fe7..f596390ac7b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_q4mh67.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_q4mh67.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_q4mh67dqytw2gqshmdc3usi4nh
-% Encoding created by otftotfm on Sat Jun 15 16:48:19 2019
+% Encoding created by otftotfm on Wed Jun 19 01:05:04 2019
 % Command line follows encoding
 /AutoEnc_q4mh67dqytw2gqshmdc3usi4nh [
 %00
@@ -54,11 +54,11 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.cg8wy3Fhti.enc
+% --encoding=/tmp/tmp.Vm5LLWfI4N.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern /tmp/tmp.UkfDOdqpzp.otf Comfortaa-Regular-LGR'
+% --feature=kern /tmp/tmp.hAboxPXgFx.otf Comfortaa-Regular-LGR'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_qfuw5x.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_qfuw5x.enc
index f94d3d5b14b..5d6031e5f07 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_qfuw5x.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_qfuw5x.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qfuw5xizuw7a5kglbffnvug3ud
-% Encoding created by otftotfm on Sat Jun 15 16:48:15 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:58 2019
 % Command line follows encoding
 /AutoEnc_qfuw5xizuw7a5kglbffnvug3ud [
 %00
@@ -54,11 +54,12 @@
   /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.KBiEfoo0tr.enc
+% --encoding=/tmp/tmp.GUNfx2KzFS.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern /tmp/tmp.fj1BgZ4sGF.otf Comfortaa-Regular-X2'
+% --feature=kern --slant=0.167 /tmp/tmp.oGKRHmh6xp.otf
+% Comfortaa-Regular-X2-Slanted'
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_xu66hj.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_xu66hj.enc
index d8523bece3c..62e155fd725 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_xu66hj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_xu66hj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xu66hjm6dcmhdgktfmwne7h6va
-% Encoding created by otftotfm on Sat Jun 15 16:47:55 2019
+% Encoding created by otftotfm on Wed Jun 19 01:04:41 2019
 % Command line follows encoding
 /AutoEnc_xu66hjm6dcmhdgktfmwne7h6va [
 %00
@@ -54,11 +54,11 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.jKF9KLppmb.enc
+% --encoding=/tmp/tmp.cdQtvUxNyH.enc
 % --glyphlist=scripts/lib/data/otftotfm.glyphlist --warn-missing
 % --type1-directory=comfortaa/fonts/type1/aajohan/comfortaa
 % --tfm-directory=comfortaa/fonts/tfm/aajohan/comfortaa
 % --vf-directory=comfortaa/fonts/vf/aajohan/comfortaa
 % --encoding-directory=comfortaa/fonts/enc/dvips/comfortaa
 % --map-file=comfortaa/fonts/map/dvips/comfortaa/comfortaa.map --no-updmap
-% --feature=kern --script=latn /tmp/tmp.D1opKtuEf6.otf Comfortaa-Regular-T1'
+% --feature=kern --script=latn /tmp/tmp.pCGiVQantU.otf Comfortaa-Bold-T1'
diff --git a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
index ec3e56ff4d5..60eb448f065 100644
--- a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
+++ b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
@@ -1,50 +1,50 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
 Comfortaa-Bold-OT1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e ReEncodeFont" <[a_n5moke.enc <Comfortaa-Bold.pfb
-Comfortaa-Regular-OT1--base Comfortaa-Regular "AutoEnc_64c3obu772h6ddjelkvqclq6we ReEncodeFont" <[a_64c3ob.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-OT1-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e ReEncodeFont" <[a_n5moke.enc <Comfortaa-Light.pfb
+Comfortaa-Regular-OT1--base Comfortaa-Regular "AutoEnc_64c3obu772h6ddjelkvqclq6we ReEncodeFont" <[a_64c3ob.enc <Comfortaa-Regular.pfb
 Comfortaa-Regular-OT1-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e ReEncodeFont" <[a_n5moke.enc <Comfortaa-Regular.pfb
-Comfortaa-Regular-T1--base Comfortaa-Regular "AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Regular.pfb
 Comfortaa-Bold-T1--base Comfortaa-Bold "AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Bold.pfb
+Comfortaa-Regular-T1--base Comfortaa-Regular "AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-T1--base Comfortaa-Light "AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Light.pfb
 Comfortaa-Regular-T1-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Regular.pfb
-Comfortaa-Regular-TS1-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Regular.pfb
+Comfortaa-Bold-T1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Bold.pfb
 Comfortaa-Light-TS1--base Comfortaa-Light "AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Light.pfb
 Comfortaa-Regular-TS1--base Comfortaa-Regular "AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Regular.pfb
-Comfortaa-Bold-T1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Bold.pfb
 Comfortaa-Light-T1-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Light.pfb
+Comfortaa-Regular-TS1-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Regular.pfb
 Comfortaa-Bold-TS1--base Comfortaa-Bold "AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Bold.pfb
-Comfortaa-Light-TS1-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Light.pfb
 Comfortaa-Bold-TS1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Bold.pfb
-Comfortaa-Bold-T2A--base Comfortaa-Bold "AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Bold.pfb
+Comfortaa-Light-TS1-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Light.pfb
+Comfortaa-Regular-T2A-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Regular.pfb
+Comfortaa-Regular-T2A--base Comfortaa-Regular "AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-T2A--base Comfortaa-Light "AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Light.pfb
+Comfortaa-Bold-T2A--base Comfortaa-Bold "AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Bold.pfb
 Comfortaa-Light-T2A-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Light.pfb
-Comfortaa-Regular-T2B--base Comfortaa-Regular "AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Regular.pfb
-Comfortaa-Regular-T2A--base Comfortaa-Regular "AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Regular.pfb
 Comfortaa-Bold-T2A-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Bold.pfb
-Comfortaa-Regular-T2A-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-T2B--base Comfortaa-Light "AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Light.pfb
+Comfortaa-Regular-T2B--base Comfortaa-Regular "AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Regular.pfb
+Comfortaa-Light-T2B-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Light.pfb
 Comfortaa-Bold-T2B--base Comfortaa-Bold "AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Bold.pfb
 Comfortaa-Regular-T2B-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Regular.pfb
+Comfortaa-Bold-T2B-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Bold.pfb
 Comfortaa-Regular-T2C--base Comfortaa-Regular "AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Regular.pfb
+Comfortaa-Bold-T2C--base Comfortaa-Bold "AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Bold.pfb
 Comfortaa-Regular-T2C-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-T2C--base Comfortaa-Light "AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Light.pfb
-Comfortaa-Bold-T2B-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Bold.pfb
-Comfortaa-Bold-T2C--base Comfortaa-Bold "AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Bold.pfb
-Comfortaa-Light-T2B-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Light.pfb
 Comfortaa-Light-T2C-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Light.pfb
 Comfortaa-Bold-T2C-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Bold.pfb
+Comfortaa-Regular-X2-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Regular.pfb
 Comfortaa-Regular-X2--base Comfortaa-Regular "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Regular.pfb
-Comfortaa-Bold-X2--base Comfortaa-Bold "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Bold.pfb
-Comfortaa-Light-X2--base Comfortaa-Light "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Light.pfb
 Comfortaa-Light-X2-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Light.pfb
-Comfortaa-Regular-X2-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Regular.pfb
 Comfortaa-Bold-X2-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Bold.pfb
+Comfortaa-Bold-X2--base Comfortaa-Bold "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Bold.pfb
+Comfortaa-Light-X2--base Comfortaa-Light "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Light.pfb
 Comfortaa-Regular-LGR--base Comfortaa-Regular "AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-LGR--base Comfortaa-Light "AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Light.pfb
-Comfortaa-Bold-LGR--base Comfortaa-Bold "AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Bold.pfb
-Comfortaa-Light-LGR-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Light.pfb
 Comfortaa-Regular-LGR-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Regular.pfb
+Comfortaa-Bold-LGR--base Comfortaa-Bold "AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Bold.pfb
 Comfortaa-Bold-LGR-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Bold.pfb
+Comfortaa-Light-LGR-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Light.pfb
 Comfortaa-Light-OT1--base Comfortaa-Light "AutoEnc_64c3obu772h6ddjelkvqclq6we ReEncodeFont" <[a_64c3ob.enc <Comfortaa-Light.pfb
 Comfortaa-Bold-OT1--base Comfortaa-Bold "AutoEnc_64c3obu772h6ddjelkvqclq6we ReEncodeFont" <[a_64c3ob.enc <Comfortaa-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Bold.pfb b/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Bold.pfb
index 7235efe7316..8feea008e58 100644
--- a/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Light.pfb b/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Light.pfb
index 7ac27ca1382..83ea6a55e36 100644
--- a/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Light.pfb
+++ b/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Light.pfb
diff --git a/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Regular.pfb b/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Regular.pfb
index 392d856533e..4c3569ab1a2 100644
--- a/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/aajohan/comfortaa/Comfortaa-Regular.pfb
diff --git a/Master/texmf-dist/tex/latex/comfortaa/LGRcomfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/LGRcomfortaa.fd
index a894015133d..f4a8cd916f8 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/LGRcomfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/LGRcomfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{LGRcomfortaa.fd}[2019/06/15 Font definitions for LGR/comfortaa.]
+\ProvidesFile{LGRcomfortaa.fd}[2019/06/19 Font definitions for LGR/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/OT1comfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/OT1comfortaa.fd
index c343ad6a75a..7b024d8dffa 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/OT1comfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/OT1comfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{OT1comfortaa.fd}[2019/06/15 Font definitions for OT1/comfortaa.]
+\ProvidesFile{OT1comfortaa.fd}[2019/06/19 Font definitions for OT1/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/T1comfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/T1comfortaa.fd
index 64b49203faf..ad0e1a27cf3 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/T1comfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/T1comfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{T1comfortaa.fd}[2019/06/15 Font definitions for T1/comfortaa.]
+\ProvidesFile{T1comfortaa.fd}[2019/06/19 Font definitions for T1/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/T2Acomfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/T2Acomfortaa.fd
index 9e3b6b2841c..48d5f1b2ebb 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/T2Acomfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/T2Acomfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{T2Acomfortaa.fd}[2019/06/15 Font definitions for T2A/comfortaa.]
+\ProvidesFile{T2Acomfortaa.fd}[2019/06/19 Font definitions for T2A/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/T2Bcomfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/T2Bcomfortaa.fd
index 3c720fc3f72..c22285a2c59 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/T2Bcomfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/T2Bcomfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{T2Bcomfortaa.fd}[2019/06/15 Font definitions for T2B/comfortaa.]
+\ProvidesFile{T2Bcomfortaa.fd}[2019/06/19 Font definitions for T2B/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/T2Ccomfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/T2Ccomfortaa.fd
index 619ce34c1b9..1bb01b4ddbe 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/T2Ccomfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/T2Ccomfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{T2Ccomfortaa.fd}[2019/06/15 Font definitions for T2C/comfortaa.]
+\ProvidesFile{T2Ccomfortaa.fd}[2019/06/19 Font definitions for T2C/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/TS1comfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/TS1comfortaa.fd
index a3c633d6c15..1f2cda3f7c1 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/TS1comfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/TS1comfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{TS1comfortaa.fd}[2019/06/15 Font definitions for TS1/comfortaa.]
+\ProvidesFile{TS1comfortaa.fd}[2019/06/19 Font definitions for TS1/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/X2comfortaa.fd b/Master/texmf-dist/tex/latex/comfortaa/X2comfortaa.fd
index 6f84b5ecebf..96b36a5e74f 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/X2comfortaa.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/X2comfortaa.fd
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 
-\ProvidesFile{X2comfortaa.fd}[2019/06/15 Font definitions for X2/comfortaa.]
+\ProvidesFile{X2comfortaa.fd}[2019/06/19 Font definitions for X2/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index 64486c53866..da0190378f2 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -132,6 +132,7 @@ depend fontawesome
 depend fontawesome5
 depend fontmfizz
 depend fonts-churchslavonic
+depend forum
 depend fourier
 depend fouriernc
 depend frcursive