summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-26 22:23:22 +0000
committerKarl Berry <karl@freefriends.org>2011-08-26 22:23:22 +0000
commit718cd7a964f6502a23e12933340cbb85ce82bbac (patch)
treea8e57b49266f2623dc436a91d956a8ee3e421979 /Master/texmf-dist/fonts
parent27d845eb760ac861a99420a219473a50a5d4c98d (diff)
cantarell 2.0 (23aug11)
git-svn-id: svn://tug.org/texlive/trunk@23708 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts')
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc)288
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc)288
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc317
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc317
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc317
-rw-r--r--Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map28
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-01.tfmbin0 -> 1828 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-02.tfmbin0 -> 1020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfmbin0 -> 2068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfmbin0 -> 1200 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm)bin1488 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfmbin0 -> 2212 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfmbin0 -> 1508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfmbin0 -> 2188 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfmbin0 -> 1616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm)bin1396 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm)bin1972 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm)bin1392 -> 1392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm)bin1964 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-01.tfmbin0 -> 1676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfmbin0 -> 1028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfmbin0 -> 1892 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfmbin0 -> 1184 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfmbin0 -> 1416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfmbin0 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfmbin0 -> 1444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfmbin0 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfmbin0 -> 1564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm)bin1316 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm)bin1804 -> 1804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm)bin1332 -> 1332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm (renamed from Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm)bin1816 -> 1816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfmbin0 -> 1444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfmbin1488 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfmbin1396 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfmbin1416 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfmbin328 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfmbin292 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfmbin332 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfmbin296 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfmbin524 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfmbin440 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfmbin500 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfmbin432 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfmbin1308 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfmbin1216 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfmbin1240 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfmbin1156 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfmbin1960 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfmbin1788 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfmbin1792 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfmbin1632 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfmbin1392 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfmbin1300 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfmbin1376 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfmbin1292 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfmbin2176 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfmbin2136 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfmbin1972 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfmbin1976 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfmbin1584 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfmbin1464 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfmbin1552 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfmbin1440 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfbbin68121 -> 68121 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfbbin46707 -> 46707 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vfbin0 -> 1708 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vfbin0 -> 2616 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vfbin0 -> 1468 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vfbin0 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vfbin0 -> 3560 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vfbin0 -> 1676 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vfbin0 -> 2584 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ot1.vfbin0 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vfbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ts1.vfbin0 -> 3512 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vfbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vfbin0 -> 2628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vfbin0 -> 1472 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vfbin0 -> 1892 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vfbin0 -> 3560 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vfbin0 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vfbin0 -> 2596 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ot1.vfbin0 -> 1456 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-t1.vfbin0 -> 1876 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ts1.vfbin0 -> 3512 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vfbin1680 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vfbin1488 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vfbin1656 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vfbin1472 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vfbin1692 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vfbin1496 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vfbin1668 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vfbin1480 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vfbin2660 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vfbin1884 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vfbin2628 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vfbin1868 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vfbin2672 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vfbin1888 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vfbin2640 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vfbin1872 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vfbin3700 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vfbin3652 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vfbin3664 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vfbin3616 -> 0 bytes
109 files changed, 298 insertions, 1261 deletions
diff --git a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
index 2accc38b5d1..bc4e225cea7 100644
--- a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20110222
-Comment Creation Date: Wed Apr 6 02:42:30 2011
+Comment Creation Date: Sun Aug 21 19:51:40 2011
FontName Cantarell-Bold
FullName Cantarell Bold
FamilyName Cantarell
diff --git a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
index 6847498d0a6..d9081ba8528 100644
--- a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
+++ b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20110222
-Comment Creation Date: Wed Apr 6 02:42:31 2011
+Comment Creation Date: Sun Aug 21 19:51:41 2011
FontName Cantarell-Regular
FullName Cantarell Regular
FamilyName Cantarell
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
index 4239cc3c943..1b3b66f66f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
@@ -1,17 +1,17 @@
%!PS-Adobe-3.0 Resource-Encoding
% @psencodingfile{
-% author = "See file t1.etx",
-% version = "See file t1.etx",
-% date = "generated 2011/04/06",
-% filename = "cantarell-t1.enc",
-% email = "See file t1.etx",
+% author = "See file cantarell-01.etx",
+% version = "See file cantarell-01.etx",
+% date = "generated 2011/08/21",
+% filename = "cantarell-01.enc",
+% email = "See file cantarell-01.etx",
% codetable = "ISO/ASCII",
% checksum = "",
-% abstract = "This is a postscript encoding file, automatically generated by fontinst from t1.etx."
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from cantarell-01.etx."
% }
% Created by: tex cantarell-map
-% Created using: \etxtoenc{t1}{cantarell-t1}
+% Created using: \etxtoenc{cantarell-01}{cantarell-01}
% This file should be installed somewhere that your DVI
% to postscript driver looks for files. It is needed for
@@ -19,56 +19,20 @@
% After installing this file, you should add the following
% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{t1}{fontinst-autoenc-t1}{\download{cantarell-t1.enc}}
+% \declarepsencoding{cantarell-01}{fontinst-autoenc-cantarell-01}{\download{cantarell-01.enc}}
-%%BeginResource: encoding fontinst-autoenc-t1
-/fontinst-autoenc-t1 [
+%%BeginResource: encoding fontinst-autoenc-cantarell-01
+/fontinst-autoenc-cantarell-01 [
% 0
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-% 8
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-% 16
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/rangedash
-/punctdash
-/compwordmark
-% 24
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 32
-/visiblespace
+/space
/exclam
/quotedbl
/numbersign
/dollar
/percent
/ampersand
-/quoteright
-% 40
+/quotesingle
+% 8
/parenleft
/parenright
/asterisk
@@ -77,7 +41,7 @@
/hyphen
/period
/slash
-% 48
+% 16
/zero
/one
/two
@@ -86,7 +50,7 @@
/five
/six
/seven
-% 56
+% 24
/eight
/nine
/colon
@@ -95,7 +59,7 @@
/equal
/greater
/question
-% 64
+% 32
/at
/A
/B
@@ -104,7 +68,7 @@
/E
/F
/G
-% 72
+% 40
/H
/I
/J
@@ -113,7 +77,7 @@
/M
/N
/O
-% 80
+% 48
/P
/Q
/R
@@ -122,7 +86,7 @@
/U
/V
/W
-% 88
+% 56
/X
/Y
/Z
@@ -131,8 +95,8 @@
/bracketright
/asciicircum
/underscore
-% 96
-/quoteleft
+% 64
+/grave
/a
/b
/c
@@ -140,7 +104,7 @@
/e
/f
/g
-% 104
+% 72
/h
/i
/j
@@ -149,7 +113,7 @@
/m
/n
/o
-% 112
+% 80
/p
/q
/r
@@ -158,7 +122,7 @@
/u
/v
/w
-% 120
+% 88
/x
/y
/z
@@ -166,81 +130,44 @@
/bar
/braceright
/asciitilde
-/hyphenchar
-% 128
-/Abreve
-/Aogonek
-/Cacute
-/Ccaron
-/Dcaron
-/Ecaron
-/Eogonek
-/Gbreve
-% 136
-/Lacute
-/Lcaron
-/Lslash
-/Nacute
-/Ncaron
-/Ng
-/Ohungarumlaut
-/Racute
-% 144
-/Rcaron
-/Sacute
-/Scaron
-/Scedilla
-/Tcaron
-/Tcedilla
-/Uhungarumlaut
-/Uring
-% 152
-/Ydieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/IJ
-/Idotaccent
-/dbar
-/section
-% 160
-/abreve
-/aogonek
-/cacute
-/ccaron
-/dcaron
-/ecaron
-/eogonek
-/gbreve
-% 168
-/lacute
-/lcaron
-/lslash
-/nacute
-/ncaron
-/ng
-/ohungarumlaut
-/racute
-% 176
-/rcaron
-/sacute
-/scaron
-/scedilla
-/tcaron
-/tcedilla
-/uhungarumlaut
-/uring
-% 184
-/ydieresis
-/zacute
-/zcaron
-/zdotaccent
-/ij
+/uni00A0
+% 96
/exclamdown
-/questiondown
+/cent
/sterling
-% 192
+/currency
+/yen
+/brokenbar
+/section
+/dieresis
+% 104
+/copyright
+/ordfeminine
+/guillemotleft
+/logicalnot
+/uni00AD
+/registered
+/macron
+/degree
+% 112
+/plusminus
+/uni00B2
+/uni00B3
+/acute
+/uni00B5
+/paragraph
+/periodcentered
+/cedilla
+% 120
+/uni00B9
+/ordmasculine
+/guillemotright
+/onequarter
+/onehalf
+/threequarters
+/questiondown
/Agrave
+% 128
/Aacute
/Acircumflex
/Atilde
@@ -248,8 +175,8 @@
/Aring
/AE
/Ccedilla
-% 200
/Egrave
+% 136
/Eacute
/Ecircumflex
/Edieresis
@@ -257,26 +184,26 @@
/Iacute
/Icircumflex
/Idieresis
-% 208
/Eth
+% 144
/Ntilde
/Ograve
/Oacute
/Ocircumflex
/Otilde
/Odieresis
-/OE
-% 216
+/multiply
/Oslash
+% 152
/Ugrave
/Uacute
/Ucircumflex
/Udieresis
/Yacute
/Thorn
-/SS
-% 224
+/germandbls
/agrave
+% 160
/aacute
/acircumflex
/atilde
@@ -284,8 +211,8 @@
/aring
/ae
/ccedilla
-% 232
/egrave
+% 168
/eacute
/ecircumflex
/edieresis
@@ -293,25 +220,98 @@
/iacute
/icircumflex
/idieresis
-% 240
/eth
+% 176
/ntilde
/ograve
/oacute
/ocircumflex
/otilde
/odieresis
-/oe
-% 248
+/divide
/oslash
+% 184
/ugrave
/uacute
/ucircumflex
/udieresis
/yacute
/thorn
-/germandbls
+/ydieresis
+/Amacron
+% 192
+/amacron
+/Abreve
+/abreve
+/Aogonek
+/aogonek
+/Cacute
+/cacute
+/Ccircumflex
+% 200
+/ccircumflex
+/Cdotaccent
+/cdotaccent
+/Ccaron
+/ccaron
+/Dcaron
+/dcaron
+/Dcroat
+% 208
+/dcroat
+/Emacron
+/emacron
+/Ebreve
+/ebreve
+/Edotaccent
+/edotaccent
+/Eogonek
+% 216
+/eogonek
+/Ecaron
+/ecaron
+/Gcircumflex
+/gcircumflex
+/Gbreve
+/gbreve
+/Gdotaccent
+% 224
+/gdotaccent
+/Gcommaaccent
+/gcommaaccent
+/Hcircumflex
+/hcircumflex
+/Hbar
+/hbar
+/Itilde
+% 232
+/itilde
+/Imacron
+/imacron
+/Ibreve
+/ibreve
+/Iogonek
+/iogonek
+/Idotaccent
+% 240
+/dotlessi
+/IJ
+/ij
+/Jcircumflex
+/jcircumflex
+/Kcommaaccent
+/kcommaaccent
+/kgreenlandic
+% 248
+/Lacute
+/lacute
+/Lcommaaccent
+/lcommaaccent
+/Lcaron
+/lcaron
+/Ldot
+/ldot
] def
%%EndResource
-% End of file cantarell-t1.enc.
+% End of file cantarell-01.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
index 5892e0e0122..baeb5b661ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
@@ -1,17 +1,17 @@
%!PS-Adobe-3.0 Resource-Encoding
% @psencodingfile{
-% author = "See file ot1.etx",
-% version = "See file ot1.etx",
-% date = "generated 2011/04/06",
-% filename = "cantarell-ot1.enc",
-% email = "See file ot1.etx",
+% author = "See file cantarell-02.etx",
+% version = "See file cantarell-02.etx",
+% date = "generated 2011/08/21",
+% filename = "cantarell-02.enc",
+% email = "See file cantarell-02.etx",
% codetable = "ISO/ASCII",
% checksum = "",
-% abstract = "This is a postscript encoding file, automatically generated by fontinst from ot1.etx."
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from cantarell-02.etx."
% }
% Created by: tex cantarell-map
-% Created using: \etxtoenc{ot1}{cantarell-ot1}
+% Created using: \etxtoenc{cantarell-02}{cantarell-02}
% This file should be installed somewhere that your DVI
% to postscript driver looks for files. It is needed for
@@ -19,159 +19,159 @@
% After installing this file, you should add the following
% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{ot1}{fontinst-autoenc-ot1}{\download{cantarell-ot1.enc}}
+% \declarepsencoding{cantarell-02}{fontinst-autoenc-cantarell-02}{\download{cantarell-02.enc}}
-%%BeginResource: encoding fontinst-autoenc-ot1
-/fontinst-autoenc-ot1 [
+%%BeginResource: encoding fontinst-autoenc-cantarell-02
+/fontinst-autoenc-cantarell-02 [
% 0
-/Gamma
-/Delta
-/Theta
-/Lambda
-/Xi
-/Pi
-/Sigma
-/Upsilon
+/Lslash
+/lslash
+/Nacute
+/nacute
+/Ncommaaccent
+/ncommaaccent
+/Ncaron
+/ncaron
% 8
-/Phi
-/Psi
-/Omega
-/ff
-/fi
-/fl
-/ffi
-/ffl
+/napostrophe
+/Eng
+/eng
+/Omacron
+/omacron
+/Obreve
+/obreve
+/Ohungarumlaut
% 16
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ringfitted
-% 24
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
+/ohungarumlaut
/OE
-/Oslash
+/oe
+/Racute
+/racute
+/Rcommaaccent
+/rcommaaccent
+/Rcaron
+% 24
+/rcaron
+/Sacute
+/sacute
+/Scircumflex
+/scircumflex
+/Scedilla
+/scedilla
+/Scaron
% 32
-/lslashslash
-/exclam
-/quotedblright
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+/scaron
+/Tcommaaccent
+/tcommaaccent
+/Tcaron
+/tcaron
+/Tbar
+/tbar
+/Utilde
% 40
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+/utilde
+/Umacron
+/umacron
+/Ubreve
+/ubreve
+/Uring
+/uring
+/Uhungarumlaut
% 48
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+/uhungarumlaut
+/Uogonek
+/uogonek
+/Wcircumflex
+/wcircumflex
+/Ycircumflex
+/ycircumflex
+/Ydieresis
% 56
-/eight
-/nine
-/colon
-/semicolon
-/exclamdown
-/equal
-/questiondown
-/question
+/Zacute
+/zacute
+/Zdotaccent
+/zdotaccent
+/Zcaron
+/zcaron
+/uni0191
+/florin
% 64
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+/uni022C
+/uni0237
+/circumflex
+/caron
+/breve
+/dotaccent
+/ring
+/ogonek
% 72
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+/tilde
+/hungarumlaut
+/uni02EE
+/uni0302
+/uni1E02
+/uni1E03
+/uni1E0A
+/uni1E0B
% 80
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+/uni1E1E
+/uni1E1F
+/uni1E40
+/uni1E41
+/uni1E56
+/uni1E57
+/uni1E60
+/uni1E61
% 88
-/X
-/Y
-/Z
-/bracketleft
-/quotedblleft
-/bracketright
-/circumflex
-/dotaccent
+/uni1E6A
+/uni1E6B
+/Wgrave
+/wgrave
+/Wacute
+/wacute
+/Wdieresis
+/wdieresis
% 96
+/Ygrave
+/ygrave
+/endash
+/emdash
+/afii00208
/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+/quoteright
+/quotesinglbase
% 104
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+/quotereversed
+/quotedblleft
+/quotedblright
+/quotedblbase
+/uni201F
+/dagger
+/daggerdbl
+/bullet
% 112
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+/ellipsis
+/perthousand
+/minute
+/second
+/uni2034
+/uni2035
+/guilsinglleft
+/guilsinglright
% 120
-/x
-/y
-/z
-/rangedash
-/punctdash
-/hungarumlaut
-/tilde
-/dieresis
+/exclamdbl
+/interrobang
+/fraction
+/uni204B
+/Euro
+/trademark
+/H18533
+/uniFB00
% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+/uniFB01
+/uniFB02
+/uniFB03
+/uniFB04
/.notdef
/.notdef
/.notdef
@@ -179,7 +179,7 @@
% 136
/.notdef
/.notdef
-/Lslash
+/.notdef
/.notdef
/.notdef
/.notdef
@@ -215,7 +215,7 @@
% 168
/.notdef
/.notdef
-/lslash
+/.notdef
/.notdef
/.notdef
/.notdef
@@ -314,4 +314,4 @@
] def
%%EndResource
-% End of file cantarell-ot1.enc.
+% End of file cantarell-02.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc
deleted file mode 100644
index 5edb7ad34a2..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-% author = "See file cantarell-fixlatin.etx",
-% version = "See file cantarell-fixlatin.etx",
-% date = "generated 2011/04/06",
-% filename = "cantarell-fixlatin.enc",
-% email = "See file cantarell-fixlatin.etx",
-% codetable = "ISO/ASCII",
-% checksum = "",
-% abstract = "This is a postscript encoding file, automatically generated by fontinst from cantarell-fixlatin.etx."
-% }
-
-% Created by: tex cantarell-map
-% Created using: \etxtoenc{cantarell-fixlatin}{cantarell-fixlatin}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{cantarell-fixlatin}{fontinst-autoenc-cantarell-fixlatin}{\download{cantarell-fixlatin.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-cantarell-fixlatin
-/fontinst-autoenc-cantarell-fixlatin [
-% 0
-/dcroat
-/Eng
-/eng
-/Tcommaaccent
-/tcommaaccent
-/uni0237
-/ring
-/endash
-% 8
-/emdash
-/uniFB00
-/uniFB01
-/uniFB02
-/uniFB03
-/uniFB04
-/.notdef
-/.notdef
-% 16
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 24
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 32
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 40
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 48
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 56
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 88
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 96
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 136
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 144
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 152
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 160
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 168
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 176
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 184
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file cantarell-fixlatin.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc
deleted file mode 100644
index fb64444832b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-% author = "See file cantarell-fixtextcomp.etx",
-% version = "See file cantarell-fixtextcomp.etx",
-% date = "generated 2011/04/06",
-% filename = "cantarell-fixtextcomp.enc",
-% email = "See file cantarell-fixtextcomp.etx",
-% codetable = "ISO/ASCII",
-% checksum = "",
-% abstract = "This is a postscript encoding file, automatically generated by fontinst from cantarell-fixtextcomp.etx."
-% }
-
-% Created by: tex cantarell-map
-% Created using: \etxtoenc{cantarell-fixtextcomp}{cantarell-fixtextcomp}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{cantarell-fixtextcomp}{fontinst-autoenc-cantarell-fixtextcomp}{\download{cantarell-fixtextcomp.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-cantarell-fixtextcomp
-/fontinst-autoenc-cantarell-fixtextcomp [
-% 0
-/parenleft
-/asterisk
-/C
-/g
-/bracketleft
-/bracketright
-/grave
-/bar
-% 8
-/asciitilde
-/dieresis
-/macron
-/uni00B2
-/uni00B3
-/acute
-/uni00B5
-/cedilla
-% 16
-/uni00B9
-/circumflex
-/caron
-/breve
-/dotaccent
-/ring
-/ogonek
-/tilde
-% 24
-/hungarumlaut
-/endash
-/quotesinglebase
-/quotedblbase
-/Euro
-/.notdef
-/.notdef
-/.notdef
-% 32
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 40
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 48
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 56
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 88
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 96
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 128
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 136
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 144
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 152
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 160
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 168
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 176
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 184
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file cantarell-fixtextcomp.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc
deleted file mode 100644
index c330b5ca0bc..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc
+++ /dev/null
@@ -1,317 +0,0 @@
-%!PS-Adobe-3.0 Resource-Encoding
-% @psencodingfile{
-% author = "See file ts1.etx",
-% version = "See file ts1.etx",
-% date = "generated 2011/04/06",
-% filename = "cantarell-ts1.enc",
-% email = "See file ts1.etx",
-% codetable = "ISO/ASCII",
-% checksum = "",
-% abstract = "This is a postscript encoding file, automatically generated by fontinst from ts1.etx."
-% }
-
-% Created by: tex cantarell-map
-% Created using: \etxtoenc{ts1}{cantarell-ts1}
-
-% This file should be installed somewhere that your DVI
-% to postscript driver looks for files. It is needed for
-% reencoding some font you have transformed.
-
-% After installing this file, you should add the following
-% line (minus %) to your finstmsc.rc file:
-% \declarepsencoding{ts1}{fontinst-autoenc-ts1}{\download{cantarell-ts1.enc}}
-
-%%BeginResource: encoding fontinst-autoenc-ts1
-/fontinst-autoenc-ts1 [
-% 0
-/capitalgrave
-/capitalacute
-/capitalcircumflex
-/capitaltilde
-/capitaldieresis
-/capitalhungarumlaut
-/capitalring
-/capitalcaron
-% 8
-/capitalbreve
-/capitalmacron
-/capitaldotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/.notdef
-/.notdef
-% 16
-/.notdef
-/.notdef
-/quotedblbase
-/.notdef
-/.notdef
-/twelveudash
-/threequartersemdash
-/capitalcompwordmark
-% 24
-/arrowleft
-/arrowright
-/tieaccentlowercase
-/tieaccentcapital
-/newtieaccentlowercase
-/newtieaccentcapital
-/.notdef
-/ascendercompwordmark
-% 32
-/blank
-/.notdef
-/.notdef
-/.notdef
-/dollar
-/.notdef
-/.notdef
-/quotesingle
-% 40
-/.notdef
-/.notdef
-/asteriskcentered
-/.notdef
-/comma
-/hyphendbl
-/period
-/fraction
-% 48
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-% 56
-/eightoldstyle
-/nineoldstyle
-/.notdef
-/.notdef
-/angbracketleft
-/minus
-/angbracketright
-/.notdef
-% 64
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 72
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/Omegainv
-/.notdef
-/bigcircle
-% 80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/Omega
-% 88
-/.notdef
-/.notdef
-/.notdef
-/openbracketleft
-/.notdef
-/openbracketright
-/arrowup
-/arrowdown
-% 96
-/asciigrave
-/.notdef
-/born
-/divorced
-/died
-/.notdef
-/.notdef
-/.notdef
-% 104
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/leaf
-/married
-/musicalnote
-/.notdef
-% 112
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 120
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/tildelow
-/hyphendblchar
-% 128
-/asciibreve
-/asciicaron
-/asciiacutedbl
-/asciigravedbl
-/dagger
-/daggerdbl
-/bardbl
-/perthousand
-% 136
-/bullet
-/centigrade
-/dollaroldstyle
-/centoldstyle
-/florin
-/colonmonetary
-/won
-/naira
-% 144
-/guarani
-/peso
-/lira
-/recipe
-/interrobang
-/interrobangdown
-/dong
-/trademark
-% 152
-/pertenthousand
-/pilcrow
-/baht
-/numero
-/discount
-/estimated
-/openbullet
-/servicemark
-% 160
-/quillbracketleft
-/quillbracketright
-/cent
-/sterling
-/currency
-/yen
-/brokenbar
-/section
-% 168
-/asciidieresis
-/copyright
-/ordfeminine
-/copyleft
-/logicalnot
-/circledP
-/registered
-/asciimacron
-% 176
-/degree
-/plusminus
-/twosuperior
-/threesuperior
-/asciiacute
-/mu
-/paragraph
-/periodcentered
-% 184
-/referencemark
-/onesuperior
-/ordmasculine
-/radical
-/onequarter
-/onehalf
-/threequarters
-/euro
-% 192
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 200
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 208
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/multiply
-/.notdef
-% 216
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 224
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 232
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-% 240
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/divide
-/.notdef
-% 248
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-] def
-%%EndResource
-
-% End of file cantarell-ts1.enc.
diff --git a/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map b/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map
index 7e18899459b..056d129d51b 100644
--- a/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map
+++ b/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map
@@ -1,20 +1,8 @@
-raw-fixlatin-Cantarell-Regular Cantarell-Regular <cantarell-fixlatin.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont "
-raw-ot1-Cantarell-Regular Cantarell-Regular <cantarell-ot1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ot1 ReEncodeFont "
-raw-fixlatin-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-fixlatin.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont 0.167 SlantFont "
-raw-ot1-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-ot1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
-raw-fixlatin-Cantarell-Bold Cantarell-Bold <cantarell-fixlatin.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont "
-raw-ot1-Cantarell-Bold Cantarell-Bold <cantarell-ot1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont "
-raw-fixlatin-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-fixlatin.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont 0.167 SlantFont "
-raw-ot1-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-ot1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
-raw-t1-Cantarell-Regular Cantarell-Regular <cantarell-t1.enc <Cantarell-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont "
-raw-t1-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-t1.enc <Cantarell-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
-raw-t1-Cantarell-Bold Cantarell-Bold <cantarell-t1.enc <Cantarell-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont "
-raw-t1-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-t1.enc <Cantarell-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
-raw-fixtextcomp-Cantarell-Regular Cantarell-Regular <cantarell-fixtextcomp.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont "
-raw-ts1-Cantarell-Regular Cantarell-Regular <cantarell-ts1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont "
-raw-fixtextcomp-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-fixtextcomp.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont 0.167 SlantFont "
-raw-ts1-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-ts1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
-raw-fixtextcomp-Cantarell-Bold Cantarell-Bold <cantarell-fixtextcomp.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont "
-raw-ts1-Cantarell-Bold Cantarell-Bold <cantarell-ts1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont "
-raw-fixtextcomp-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-fixtextcomp.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont 0.167 SlantFont "
-raw-ts1-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-ts1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
+Cantarell-Regular-02 Cantarell-Regular <cantarell-02.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-02 ReEncodeFont "
+Cantarell-Regular-01 Cantarell-Regular <cantarell-01.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-01 ReEncodeFont "
+Cantarell-Regular-Slanted-02 Cantarell-Regular <cantarell-02.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-02 ReEncodeFont 0.287 SlantFont "
+Cantarell-Regular-Slanted-01 Cantarell-Regular <cantarell-01.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-01 ReEncodeFont 0.287 SlantFont "
+Cantarell-Bold-02 Cantarell-Bold <cantarell-02.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-02 ReEncodeFont "
+Cantarell-Bold-01 Cantarell-Bold <cantarell-01.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-01 ReEncodeFont "
+Cantarell-Bold-Slanted-02 Cantarell-Bold <cantarell-02.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-02 ReEncodeFont 0.287 SlantFont "
+Cantarell-Bold-Slanted-01 Cantarell-Bold <cantarell-01.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-01 ReEncodeFont 0.287 SlantFont "
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
new file mode 100644
index 00000000000..7eb62fec9b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
new file mode 100644
index 00000000000..2fdc3f90ec3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
new file mode 100644
index 00000000000..f023d050d85
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm
new file mode 100644
index 00000000000..c416d345466
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
index a10d4f903ea..df07ab0a67f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
new file mode 100644
index 00000000000..8928b3bc859
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm
new file mode 100644
index 00000000000..95c6a512006
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm
new file mode 100644
index 00000000000..5b3b5a15307
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
new file mode 100644
index 00000000000..65872b9887f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
index 2d4f1d69f36..2d4f1d69f36 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm
index ef4da8fe7cc..ef4da8fe7cc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
index ec0a40e9be3..ec0a40e9be3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm
index 7f8be42a635..7f8be42a635 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
new file mode 100644
index 00000000000..6b17f685586
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
new file mode 100644
index 00000000000..1f37b506acd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
new file mode 100644
index 00000000000..8d26d83371e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
new file mode 100644
index 00000000000..531b1d25831
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
new file mode 100644
index 00000000000..f6845d628b9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm
new file mode 100644
index 00000000000..4632b625623
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm
new file mode 100644
index 00000000000..d260ed7571d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
new file mode 100644
index 00000000000..586cdf7d3a9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm
new file mode 100644
index 00000000000..4ad7203f987
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
new file mode 100644
index 00000000000..5f8cc9323dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
index 11e0e5fa41e..11e0e5fa41e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
index 798b8d68c6c..798b8d68c6c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
index 0626fda2824..0626fda2824 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
index 96de665b57b..96de665b57b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
new file mode 100644
index 00000000000..a46a7cfb604
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 269d38fe690..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index 831004500cc..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index 32cfa32f9e5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 6cf7c3455f8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm
deleted file mode 100644
index 5574ec92424..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index 612abe407a5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm
deleted file mode 100644
index ce775f61548..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 44f2fda4112..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm
deleted file mode 100644
index d0edbdc5257..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index 5e2c44db443..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm
deleted file mode 100644
index 4d5f1ad9d58..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 17f3693ebea..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm
deleted file mode 100644
index 83a84672e1e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index 73afbdf4b9e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm
deleted file mode 100644
index 1cc7417c9ab..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 9837364bc24..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm
deleted file mode 100644
index f0ada3edb7f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index ecb73eda4a3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm
deleted file mode 100644
index f33d723addf..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 770a4837795..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm
deleted file mode 100644
index 67cdbc79643..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index e7a9f789ace..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm
deleted file mode 100644
index 0427dbe6e51..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm
deleted file mode 100644
index 6e9b7587b21..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index a6b8236c0b3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm
deleted file mode 100644
index 185b5292f7b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index 2f2eaf4b3b2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm
deleted file mode 100644
index 60d56d5ae54..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm
deleted file mode 100644
index a7fd2fbd12c..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm
deleted file mode 100644
index bdba275f435..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm
deleted file mode 100644
index 36dd31077f9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
index f77774f8212..0c6abd5134e 100644
--- a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
index eb0b91817fd..5661a382637 100644
--- a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..fbeb06d3b77
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf
new file mode 100644
index 00000000000..2ee7d3e5efd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
new file mode 100644
index 00000000000..89935d5a216
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
new file mode 100644
index 00000000000..bc797cbc8b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
new file mode 100644
index 00000000000..4655a8178ed
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..177f1c2cd27
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf
new file mode 100644
index 00000000000..8d0e0c5357f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
new file mode 100644
index 00000000000..24284558449
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
new file mode 100644
index 00000000000..668ff466fc7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
new file mode 100644
index 00000000000..26e8be49d1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..285f185f6c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
new file mode 100644
index 00000000000..260007a0571
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
new file mode 100644
index 00000000000..4059bcd1704
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
new file mode 100644
index 00000000000..8bcb55c4103
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
new file mode 100644
index 00000000000..46c791ccb07
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf
new file mode 100644
index 00000000000..f1f901dfd85
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf
new file mode 100644
index 00000000000..3dc1fee66fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
new file mode 100644
index 00000000000..19ee9c2f9b9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-t1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-t1.vf
new file mode 100644
index 00000000000..5daf47459ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf
new file mode 100644
index 00000000000..7f5c94fe913
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 883afb78711..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf
deleted file mode 100644
index 0a49cf441b8..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf
deleted file mode 100644
index 3fa466de015..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf
deleted file mode 100644
index 9d1861b033a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index dd06c325b18..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf
deleted file mode 100644
index 8e9f2fda564..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf
deleted file mode 100644
index 97be8fe5ef2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf
deleted file mode 100644
index 6baf910ff99..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf
deleted file mode 100644
index 8f9566409b4..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf
deleted file mode 100644
index 14bcbabd76a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf
deleted file mode 100644
index 479e1c7965a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vf
deleted file mode 100644
index 869027db39b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf
deleted file mode 100644
index 9989508eb23..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf
deleted file mode 100644
index e2151626eb6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf
deleted file mode 100644
index 192aadba2ed..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vf
deleted file mode 100644
index 6cb4ed214a4..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf
deleted file mode 100644
index acfda4389a2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf
deleted file mode 100644
index 34033d7aa95..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf
deleted file mode 100644
index bd81f7da9fc..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf
deleted file mode 100644
index 2f199e9c376..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf
+++ /dev/null
Binary files differ