comfortaa (25jun19)

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

56 files changed, 64 insertions, 65 deletions

diff --git a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
index f19a28af675..2f2616b5ef0 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
+++ b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
@@ -1,3 +1,6 @@
+VERSION 3.2:
+        - Fix ligatures for hyphens
+
 VERSION 3.1:
         - Fix OT1 encoding with slanted shape
         - Fix packaging according to CTAN guidelines
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README b/Master/texmf-dist/doc/fonts/comfortaa/README
index 8e6e0bf414a..c4b9d34911d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README
+++ b/Master/texmf-dist/doc/fonts/comfortaa/README
@@ -12,9 +12,6 @@ and LuaLaTeX. It includes the original OpenType fonts, as well as Type 1
 versions, converted for this package using FontForge for full support with LaTeX
 and 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.
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
index 68cacb424ac..143d11ec96e 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 aaa5c4bed15..3802dd21621 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/fonts/enc/dvips/comfortaa/a_64c3ob.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/a_64c3ob.enc
index 7113d922e98..2b6d2b41565 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 Wed Jun 19 01:04:40 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:12 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.SJSWlZKSwQ.enc
+% --encoding=/tmp/tmp.w3cSzQsJWh.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.Co7LHXM4bI.otf
+% --feature=kern --script=latn /tmp/tmp.6WNA9NRTB6.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 5f419db1ae0..eb1449f8548 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 Wed Jun 19 01:04:54 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:25 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.otkhXOEBqp.enc
+% --encoding=/tmp/tmp.JSiME3hw9J.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.sYtq0jgTN8.otf Comfortaa-Regular-T2C'
+% --feature=kern /tmp/tmp.gw1tihpqAx.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 6a2fe7f306d..e055b6fed53 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 Wed Jun 19 01:04:49 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:20 2019
 % Command line follows encoding
 /AutoEnc_e4iqkg2kwdqtdom7664vy57ecg [
 %00
@@ -54,12 +54,11 @@
   /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.CBMuYcnE12.enc
+% --encoding=/tmp/tmp.oVedWDHJPJ.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.BAZX1WOPwV.otf
-% Comfortaa-Regular-T2A-Slanted'
+% --feature=kern /tmp/tmp.iwdWZAV1zW.otf Comfortaa-Regular-T2A'
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 067003855c4..12e3f047415 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 Wed Jun 19 01:04:50 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:21 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.Fm5ReeCHES.enc
+% --encoding=/tmp/tmp.bD8IBJyKhv.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.wWj4BLhdmJ.otf Comfortaa-Light-T2B'
+% --feature=kern /tmp/tmp.R8Om2BSWlq.otf Comfortaa-Regular-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 5fa3cfae343..a7186a73486 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 Wed Jun 19 01:04:40 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:12 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.7jsKkAogyI.enc
+% --encoding=/tmp/tmp.pzaecCbp1B.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.793fpoWD9X.otf
-% Comfortaa-Bold-OT1-Slanted'
+% --feature=kern --slant=0.167 --script=latn /tmp/tmp.5ANP6dGjvb.otf
+% Comfortaa-Regular-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 2b35ac17ddc..e3210800863 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 Wed Jun 19 01:04:44 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:16 2019
 % Command line follows encoding
 /AutoEnc_ovobyi3j4qqh2asaabug7cg6jc [
 %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.Y6Jtfcoocg.enc
+% --encoding=/tmp/tmp.B3wcQK65OE.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.PSefsqrpNS.otf Comfortaa-Light-TS1'
+% --feature=kern /tmp/tmp.iRj4xjj8RR.otf Comfortaa-Regular-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 f596390ac7b..b4c0dcf3abb 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 Wed Jun 19 01:05:04 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:31 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.Vm5LLWfI4N.enc
+% --encoding=/tmp/tmp.tMMZjWzTK1.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.hAboxPXgFx.otf Comfortaa-Regular-LGR'
+% --feature=kern /tmp/tmp.kP0iv66vLY.otf Comfortaa-Light-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 5d6031e5f07..4e1ccce1990 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 Wed Jun 19 01:04:58 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:28 2019
 % Command line follows encoding
 /AutoEnc_qfuw5xizuw7a5kglbffnvug3ud [
 %00
@@ -54,12 +54,11 @@
   /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.GUNfx2KzFS.enc
+% --encoding=/tmp/tmp.qeqWtC5si6.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.oGKRHmh6xp.otf
-% Comfortaa-Regular-X2-Slanted'
+% --feature=kern /tmp/tmp.tGcGpjvX3w.otf Comfortaa-Regular-X2'
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 62e155fd725..3262464c0cd 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 Wed Jun 19 01:04:41 2019
+% Encoding created by otftotfm on Mon Jun 24 21:41:13 2019
 % Command line follows encoding
 /AutoEnc_xu66hjm6dcmhdgktfmwne7h6va [
 %00
@@ -54,11 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --verbose --vendor=aajohan --typeface=comfortaa
-% --encoding=/tmp/tmp.cdQtvUxNyH.enc
+% --encoding=/tmp/tmp.XJFiW8nJE6.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.pCGiVQantU.otf Comfortaa-Bold-T1'
+% --feature=kern --slant=0.167 --script=latn /tmp/tmp.3qWaE0NtPI.otf
+% Comfortaa-Regular-T1-Slanted'
diff --git a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
index 60eb448f065..c611d8c720c 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-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-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-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-Light-OT1-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e ReEncodeFont" <[a_n5moke.enc <Comfortaa-Light.pfb
+Comfortaa-Light-T1--base Comfortaa-Light "AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Light.pfb
+Comfortaa-Bold-OT1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_n5mokechyhrgrwcwwmjcvl2l6e ReEncodeFont" <[a_n5moke.enc <Comfortaa-Bold.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-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-Regular-TS1--base Comfortaa-Regular "AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Regular.pfb
+Comfortaa-Light-TS1--base Comfortaa-Light "AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Light.pfb
+Comfortaa-Bold-T1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_xu66hjm6dcmhdgktfmwne7h6va ReEncodeFont" <[a_xu66hj.enc <Comfortaa-Bold.pfb
 Comfortaa-Bold-TS1--base Comfortaa-Bold "AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Bold.pfb
-Comfortaa-Bold-TS1-Slanted--base Comfortaa-Bold "0.167 SlantFont 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-Regular-T2A-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.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-TS1-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_ovobyi3j4qqh2asaabug7cg6jc ReEncodeFont" <[a_ovobyi.enc <Comfortaa-Bold.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-Light-T2A--base Comfortaa-Light "AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.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-T2B--base Comfortaa-Regular "AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Regular.pfb
 Comfortaa-Bold-T2A-Slanted--base Comfortaa-Bold "0.167 SlantFont AutoEnc_e4iqkg2kwdqtdom7664vy57ecg ReEncodeFont" <[a_e4iqkg.enc <Comfortaa-Bold.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-Light-T2B-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_m2qr2bqcbiueokdoq5vj5e3d4e ReEncodeFont" <[a_m2qr2b.enc <Comfortaa-Light.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-Light-T2C-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Light.pfb
+Comfortaa-Bold-T2C--base Comfortaa-Bold "AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Bold.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-Light-T2C-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_bh42423yy3mk46xsyvmypgaf6a ReEncodeFont" <[a_bh4242.enc <Comfortaa-Light.pfb
 Comfortaa-Regular-X2--base Comfortaa-Regular "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Regular.pfb
+Comfortaa-Light-X2--base Comfortaa-Light "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Light.pfb
+Comfortaa-Bold-X2--base Comfortaa-Bold "AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Bold.pfb
+Comfortaa-Regular-X2-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Regular.pfb
 Comfortaa-Light-X2-Slanted--base Comfortaa-Light "0.167 SlantFont AutoEnc_qfuw5xizuw7a5kglbffnvug3ud ReEncodeFont" <[a_qfuw5x.enc <Comfortaa-Light.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-Regular-LGR-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Regular.pfb
+Comfortaa-Regular-LGR--base Comfortaa-Regular "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-Regular-LGR-Slanted--base Comfortaa-Regular "0.167 SlantFont AutoEnc_q4mh67dqytw2gqshmdc3usi4nh ReEncodeFont" <[a_q4mh67.enc <Comfortaa-Regular.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
+Comfortaa-Light-OT1--base Comfortaa-Light "AutoEnc_64c3obu772h6ddjelkvqclq6we ReEncodeFont" <[a_64c3ob.enc <Comfortaa-Light.pfb
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted.tfm
index 0f0a473374b..c292db6ebc8 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1.tfm
index 22f88a8c690..615be57a6c8 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted.tfm
index c4e1288dc0a..38c207fd6e6 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A.tfm
index 210aa88b69e..f2665424493 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2A.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted.tfm
index fd2208d7e42..d5c0458f2c4 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B.tfm
index 41a2c9c55a7..3d3fa640991 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2B.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted.tfm
index 88e4e950777..5fce8c906d3 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C.tfm
index 4be10d46ace..71c4c05a348 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-T2C.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted.tfm
index b56e7820ec1..c7b48c22cc8 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2.tfm
index ba4c5525ad5..899e876f873 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Bold-X2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1-Slanted.tfm
index 60cf278ba86..141d375bc41 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1.tfm
index aeb17c09621..b89c329700f 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted.tfm
index 63c5742b952..bda5cfc553a 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A.tfm
index 3ce5f231a54..db9919c33ed 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2A.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted.tfm
index 1b1e41664e3..9a54bf3ca2c 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B.tfm
index c9211cc203c..01bf6cfe084 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2B.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted.tfm
index 847ece63bf9..a27e0860328 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C.tfm
index 7b7be7333c1..e195a521818 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-T2C.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2-Slanted.tfm
index 573f61f8ecf..9470bafe3a8 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2.tfm
index 8b9b161e90c..9cc480e1894 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Light-X2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted.tfm
index ea49e6d413d..4068c54151c 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1.tfm
index 2a9d524586d..06e2c5a6529 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted.tfm
index a34aaac6a87..d1e1e279574 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A.tfm
index 233fbd15dbc..e89c81e69e4 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2A.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted.tfm
index f44fd51d8ca..1b059f9b855 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B.tfm
index ad1518df7da..c39e3e4c879 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2B.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted.tfm
index e077e2c71a7..04498bd1a99 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C.tfm
index ccddda20d35..729504171ba 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-T2C.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted.tfm
index cdd246a57e1..97392fef72d 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2.tfm b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2.tfm
index f597de9476a..c7178fb65a1 100644
--- a/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2.tfm
+++ b/Master/texmf-dist/fonts/tfm/aajohan/comfortaa/Comfortaa-Regular-X2.tfm
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 8feea008e58..1ccd11a758f 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 83ea6a55e36..a724c28b2ab 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 4c3569ab1a2..f9ee8e89de8 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 f4a8cd916f8..32598eeec0a 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/19 Font definitions for LGR/comfortaa.]
+\ProvidesFile{LGRcomfortaa.fd}[2019/06/24 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 7b024d8dffa..7b6affc8d8b 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/19 Font definitions for OT1/comfortaa.]
+\ProvidesFile{OT1comfortaa.fd}[2019/06/24 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 ad0e1a27cf3..69438b51f05 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/19 Font definitions for T1/comfortaa.]
+\ProvidesFile{T1comfortaa.fd}[2019/06/24 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 48d5f1b2ebb..b14ba1d21e1 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/19 Font definitions for T2A/comfortaa.]
+\ProvidesFile{T2Acomfortaa.fd}[2019/06/24 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 c22285a2c59..7c1cbb658c9 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/19 Font definitions for T2B/comfortaa.]
+\ProvidesFile{T2Bcomfortaa.fd}[2019/06/24 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 1bb01b4ddbe..eddc1aed024 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/19 Font definitions for T2C/comfortaa.]
+\ProvidesFile{T2Ccomfortaa.fd}[2019/06/24 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 1f2cda3f7c1..95661390625 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/19 Font definitions for TS1/comfortaa.]
+\ProvidesFile{TS1comfortaa.fd}[2019/06/24 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 96b36a5e74f..60e5b694888 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/19 Font definitions for X2/comfortaa.]
+\ProvidesFile{X2comfortaa.fd}[2019/06/24 Font definitions for X2/comfortaa.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
     \let\comfortaa@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
index da916de3e97..f66bba08811 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
+++ b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
@@ -15,7 +15,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{comfortaa}[2019/06/15 Style file for Comfortaa.]
+\ProvidesPackage{comfortaa}[2019/06/20 Style file for Comfortaa.]
 
 \RequirePackage{ifluatex}
 \RequirePackage{ifxetex}
@@ -62,7 +62,7 @@
   \newcommand*{\comfortaa@otf@slant}{0.167}
   \newcommand*{\comfortaa@otf@features}{%
     Extension=.ttf,%
-    Ligatures=Common,%
+    Ligatures={TeX,Common},%
     Scale=\comfortaa@scale,%
     FontFace={l}{n}{*-Light},%
     FontFace={l}{it}{Font=*-Light,FakeSlant=\comfortaa@otf@slant},%