summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-30 22:58:43 +0000
committerKarl Berry <karl@freefriends.org>2011-11-30 22:58:43 +0000
commitf6d4631c1851682556b20974144699820a88e931 (patch)
tree9c12314388f7345e0b591169d9c7cf721be2a877 /Master/texmf-dist
parent5c63da2734ae21074f559e9d9fb26dc6a308d47e (diff)
cantarell 2.1 for 0.0.7 (30nov11)
git-svn-id: svn://tug.org/texlive/trunk@24705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/CHANGES3
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/README2
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdfbin99701 -> 101079 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell.pdfbin76330 -> 68864 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/manifest.txt110
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm53
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc2
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-01.tfmbin1828 -> 1840 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-02.tfmbin1020 -> 1024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfmbin2068 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfmbin1200 -> 1204 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfmbin1508 -> 1508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfmbin2188 -> 2200 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfmbin1392 -> 1392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfmbin1964 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfmbin1028 -> 1032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfmbin1184 -> 1188 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfbbin68121 -> 65762 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfbbin46707 -> 47337 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vfbin1468 -> 1468 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vfbin1884 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ot1.vfbin1452 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vfbin1868 -> 1868 bytes
-rw-r--r--Master/texmf-dist/source/fonts/cantarell/Cantarell-Bold.sfd1099
-rw-r--r--Master/texmf-dist/source/fonts/cantarell/Cantarell-Regular.sfd323
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ot1fca.fd4
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t1fca.fd4
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ts1fca.fd4
31 files changed, 888 insertions, 735 deletions
diff --git a/Master/texmf-dist/doc/fonts/cantarell/CHANGES b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
index 85748a6f7f3..4a0f4148d48 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/CHANGES
+++ b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
@@ -5,3 +5,6 @@ Changelog for version 2.0:
italics versions of Cantarell
- modify paths of the archive: documentation is now in
doc/fonts/cantarell/ and sources in source/fonts/cantarell/
+
+Changelog for version 2.1:
+ - update .ttf files to version 0.0.7
diff --git a/Master/texmf-dist/doc/fonts/cantarell/README b/Master/texmf-dist/doc/fonts/cantarell/README
index 736d88c6ad4..194cdbfb136 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/README
+++ b/Master/texmf-dist/doc/fonts/cantarell/README
@@ -1,5 +1,5 @@
------------------------
- Cantarell, version 2.0
+ Cantarell, version 2.1
------------------------
Cantarell is a contemporary Humanist sans serif designed by Dave Crossland and
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
index 03f156e01b9..4f4d5d19dfa 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
index e54a67cc4f1..e5f9e74382c 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
index 76e3e040689..594a6660579 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
@@ -38,7 +38,7 @@
\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
\newcommand{\program}{}
-\title{\LaTeX{} support for Cantarell\\Version~2.0}
+\title{\LaTeX{} support for Cantarell\\Version~2.1}
\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
diff --git a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
index e556d574a61..5f4ded651b7 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
@@ -1,77 +1,77 @@
-./README
-./tex/latex/cantarell/ts1fca.fd
-./tex/latex/cantarell/t1fca.fd
-./tex/latex/cantarell/ot1fca.fd
-./tex/latex/cantarell/cantarell.sty
-./doc/fonts/cantarell/README
-./doc/fonts/cantarell/cantarell-samples.pdf
-./doc/fonts/cantarell/cantarell.tex
-./doc/fonts/cantarell/cantarell-samples.tex
-./doc/fonts/cantarell/cantarell.pdf
-./doc/fonts/cantarell/CHANGES
+./source/fonts/cantarell/cantarell-02.etx
./source/fonts/cantarell/sfd2type1.pe
-./source/fonts/cantarell/Makefile
-./source/fonts/cantarell/cantarell-fixtextcomp.mtx
-./source/fonts/cantarell/cantarell-drv.tex
+./source/fonts/cantarell/cantarell-01.etx
./source/fonts/cantarell/Cantarell-Regular.sfd
-./source/fonts/cantarell/Cantarell-Bold.sfd
./source/fonts/cantarell/cantarell-map.tex
+./source/fonts/cantarell/cantarell-drv.tex
+./source/fonts/cantarell/cantarell-fixtextcomp.mtx
+./source/fonts/cantarell/Cantarell-Bold.sfd
./source/fonts/cantarell/cantarell-fixlatin.mtx
-./source/fonts/cantarell/cantarell-01.etx
-./source/fonts/cantarell/cantarell-02.etx
-./manifest.txt
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
+./source/fonts/cantarell/Makefile
+./fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
./fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
./fonts/map/dvips/cantarell/cantarell.map
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
+./fonts/afm/public/cantarell/Cantarell-Bold.afm
+./fonts/afm/public/cantarell/Cantarell-Regular.afm
./fonts/vf/public/cantarell/Cantarell-Regular-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
./fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf
./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
-./fonts/afm/public/cantarell/Cantarell-Regular.afm
-./fonts/afm/public/cantarell/Cantarell-Bold.afm
-./fonts/enc/dvips/cantarell/cantarell-02.enc
+./fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
./fonts/enc/dvips/cantarell/cantarell-01.enc
-./fonts/type1/public/cantarell/Cantarell-Bold.pfb
+./fonts/enc/dvips/cantarell/cantarell-02.enc
./fonts/type1/public/cantarell/Cantarell-Regular.pfb
+./fonts/type1/public/cantarell/Cantarell-Bold.pfb
+./tex/latex/cantarell/ot1fca.fd
+./tex/latex/cantarell/cantarell.sty
+./tex/latex/cantarell/t1fca.fd
+./tex/latex/cantarell/ts1fca.fd
+./manifest.txt
+./doc/fonts/cantarell/CHANGES
+./doc/fonts/cantarell/cantarell.tex
+./doc/fonts/cantarell/cantarell-samples.tex
+./doc/fonts/cantarell/cantarell-samples.pdf
+./doc/fonts/cantarell/cantarell.pdf
+./doc/fonts/cantarell/README
+./README
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 bc4e225cea7..a57ce4fb202 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: Sun Aug 21 19:51:40 2011
+Comment Creation Date: Fri Nov 11 10:41:48 2011
FontName Cantarell-Bold
FullName Cantarell Bold
FamilyName Cantarell
@@ -17,12 +17,12 @@ UnderlinePosition -113
UnderlineThickness 56
Version 0.0.6
EncodingScheme ISO10646-1
-FontBBox -60 -286 1157 1053
+FontBBox -384 -286 1157 1053
CapHeight 694
XHeight 482
Ascender 694
Descender -259
-StartCharMetrics 389
+StartCharMetrics 394
C 32 ; WX 273 ; N space ; B 0 0 0 0 ;
C 33 ; WX 266 ; N exclam ; B 64 -20 203 714 ;
C 34 ; WX 368 ; N quotedbl ; B 24 509 345 758 ;
@@ -84,7 +84,7 @@ C 89 ; WX 658 ; N Y ; B 31 0 665 694 ;
C 90 ; WX 671 ; N Z ; B 49 0 648 694 ;
C 91 ; WX 350 ; N bracketleft ; B 73 -220 338 758 ;
C 92 ; WX 361 ; N backslash ; B -13 -64 369 714 ;
-C 93 ; WX 346 ; N bracketright ; B 13 -220 278 758 ;
+C 93 ; WX 346 ; N bracketright ; B 14 -220 278 758 ;
C 94 ; WX 608 ; N asciicircum ; B 135 541 455 782 ;
C 95 ; WX 535 ; N underscore ; B 38 -20 499 93 ;
C 96 ; WX 487 ; N grave ; B 76 543 413 802 ;
@@ -101,7 +101,7 @@ C 106 ; WX 270 ; N j ; B 6 -266 220 694 ;
C 107 ; WX 558 ; N k ; B 62 0 544 694 ;
C 108 ; WX 322 ; N l ; B 68 -10 310 694 ;
C 109 ; WX 877 ; N m ; B 62 0 809 492 ;
-C 110 ; WX 580 ; N n ; B 62 0 512 492 ;
+C 110 ; WX 579 ; N n ; B 63 0 512 492 ;
C 111 ; WX 608 ; N o ; B 44 -10 560 492 ;
C 112 ; WX 591 ; N p ; B 62 -259 541 492 ;
C 113 ; WX 584 ; N q ; B 44 -259 519 492 ;
@@ -182,18 +182,18 @@ C 220 ; WX 851 ; N Udieresis ; B 142 -10 749 927 ;
C 221 ; WX 696 ; N Yacute ; B 49 0 710 965 ;
C 222 ; WX 727 ; N Thorn ; B 142 0 684 694 ;
C 223 ; WX 694 ; N germandbls ; B 98 -13 636 698 ;
-C 224 ; WX 602 ; N agrave ; B 60 -10 514 760 ;
-C 225 ; WX 602 ; N aacute ; B 60 -10 514 765 ;
-C 226 ; WX 602 ; N acircumflex ; B 60 -10 514 737 ;
-C 227 ; WX 602 ; N atilde ; B 60 -10 528 708 ;
-C 228 ; WX 602 ; N adieresis ; B 60 -10 516 694 ;
-C 229 ; WX 602 ; N aring ; B 60 -10 514 768 ;
+C 224 ; WX 563 ; N agrave ; B 42 -10 497 760 ;
+C 225 ; WX 563 ; N aacute ; B 42 -10 497 765 ;
+C 226 ; WX 564 ; N acircumflex ; B 42 -10 497 737 ;
+C 227 ; WX 563 ; N atilde ; B 42 -10 510 708 ;
+C 228 ; WX 564 ; N adieresis ; B 42 -10 497 694 ;
+C 229 ; WX 563 ; N aring ; B 42 -10 497 768 ;
C 230 ; WX 897 ; N ae ; B 60 -10 833 491 ;
C 231 ; WX 568 ; N ccedilla ; B 63 -243 518 488 ;
-C 232 ; WX 618 ; N egrave ; B 63 -10 555 765 ;
-C 233 ; WX 618 ; N eacute ; B 63 -10 555 765 ;
-C 234 ; WX 618 ; N ecircumflex ; B 63 -10 555 737 ;
-C 235 ; WX 618 ; N edieresis ; B 63 -10 555 694 ;
+C 232 ; WX 564 ; N egrave ; B 44 -9 520 765 ;
+C 233 ; WX 565 ; N eacute ; B 44 -9 520 765 ;
+C 234 ; WX 562 ; N ecircumflex ; B 44 -9 520 737 ;
+C 235 ; WX 564 ; N edieresis ; B 44 -9 520 694 ;
C 236 ; WX 295 ; N igrave ; B 0 0 278 765 ;
C 237 ; WX 295 ; N iacute ; B 55 0 333 765 ;
C 238 ; WX 298 ; N icircumflex ; B 8 0 296 739 ;
@@ -215,9 +215,9 @@ C 253 ; WX 592 ; N yacute ; B 24 -259 587 765 ;
C 254 ; WX 676 ; N thorn ; B 93 -259 613 694 ;
C 255 ; WX 592 ; N ydieresis ; B 24 -259 587 694 ;
C -1 ; WX 755 ; N Amacron ; B 63 0 748 829 ;
-C -1 ; WX 602 ; N amacron ; B 60 -10 514 651 ;
+C -1 ; WX 563 ; N amacron ; B 42 -10 497 651 ;
C -1 ; WX 755 ; N Abreve ; B 63 0 748 926 ;
-C -1 ; WX 602 ; N abreve ; B 60 -10 555 714 ;
+C -1 ; WX 566 ; N abreve ; B 42 -10 530 714 ;
C -1 ; WX 795 ; N Aogonek ; B 63 -266 788 694 ;
C -1 ; WX 602 ; N aogonek ; B 60 -265 517 485 ;
C -1 ; WX 788 ; N Cacute ; B 134 -10 765 973 ;
@@ -233,15 +233,15 @@ C -1 ; WX 841 ; N dcaron ; B 63 -10 825 738 ;
C -1 ; WX 863 ; N Dcroat ; B 57 0 808 694 ;
C -1 ; WX 684 ; N dcroat ; B 63 -10 633 738 ;
C -1 ; WX 706 ; N Emacron ; B 142 0 628 829 ;
-C -1 ; WX 618 ; N emacron ; B 63 -10 555 651 ;
+C -1 ; WX 564 ; N emacron ; B 44 -9 520 651 ;
C -1 ; WX 706 ; N Ebreve ; B 142 0 634 926 ;
-C -1 ; WX 618 ; N ebreve ; B 63 -10 584 714 ;
+C -1 ; WX 570 ; N ebreve ; B 44 -9 535 714 ;
C -1 ; WX 706 ; N Edotaccent ; B 142 0 628 893 ;
-C -1 ; WX 618 ; N edotaccent ; B 63 -10 555 694 ;
+C -1 ; WX 564 ; N edotaccent ; B 44 -9 520 694 ;
C -1 ; WX 706 ; N Eogonek ; B 142 -265 633 694 ;
C -1 ; WX 618 ; N eogonek ; B 63 -266 555 487 ;
C -1 ; WX 706 ; N Ecaron ; B 142 0 628 952 ;
-C -1 ; WX 618 ; N ecaron ; B 63 -10 555 740 ;
+C -1 ; WX 564 ; N ecaron ; B 44 -9 520 740 ;
C -1 ; WX 856 ; N Gcircumflex ; B 105 -10 784 953 ;
C -1 ; WX 654 ; N gcircumflex ; B 62 -264 566 741 ;
C -1 ; WX 856 ; N Gbreve ; B 105 -10 784 926 ;
@@ -355,7 +355,7 @@ C -1 ; WX 529 ; N ogonek ; B 205 -286 477 95 ;
C -1 ; WX 683 ; N tilde ; B 124 313 583 514 ;
C -1 ; WX 806 ; N hungarumlaut ; B 106 533 691 811 ;
C -1 ; WX 407 ; N uni02EE ; B 34 509 354 758 ;
-C -1 ; WX 722 ; N uni0302 ; B 188 541 507 782 ;
+C -1 ; WX 0 ; N uni0302 ; B -384 541 -65 782 ;
C -1 ; WX 775 ; N uni1E02 ; B 142 0 714 927 ;
C -1 ; WX 657 ; N uni1E03 ; B 93 -10 595 927 ;
C -1 ; WX 864 ; N uni1E0A ; B 142 0 786 927 ;
@@ -406,10 +406,15 @@ C -1 ; WX 505 ; N fraction ; B -25 -20 531 714 ;
C -1 ; WX 647 ; N uni204B ; B 92 -20 624 758 ;
C -1 ; WX 651 ; N Euro ; B 4 -30 638 719 ;
C -1 ; WX 695 ; N trademark ; B 42 448 629 750 ;
-C -1 ; WX 680 ; N H18533 ; B 102 99 578 575 ;
+C -1 ; WX 625 ; N uni2328 ; B 13 3 612 472 ;
+C -1 ; WX 748 ; N uni232B ; B 14 0 657 482 ;
+C -1 ; WX 859 ; N circle ; B 63 -27 796 694 ;
+C -1 ; WX 680 ; N H18533 ; B 107 95 571 560 ;
+C -1 ; WX 680 ; N uni25FE ; B 102 99 578 575 ;
+C -1 ; WX 585 ; N uni2759 ; B 230 -1 354 621 ;
C -1 ; WX 863 ; N uniFB00 ; B 47 0 868 698 ;
C -1 ; WX 776 ; N uniFB01 ; B 66 0 696 698 ;
-C -1 ; WX 772 ; N uniFB02 ; B 66 -10 760 698 ;
+C -1 ; WX 772 ; N uniFB02 ; B 66 -10 761 698 ;
C -1 ; WX 1132 ; N uniFB03 ; B 66 0 1066 698 ;
C -1 ; WX 1162 ; N uniFB04 ; B 66 -10 1150 698 ;
EndCharMetrics
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 d9081ba8528..f34cf964691 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: Sun Aug 21 19:51:41 2011
+Comment Creation Date: Fri Nov 11 10:41:48 2011
FontName Cantarell-Regular
FullName Cantarell Regular
FamilyName Cantarell
@@ -17,12 +17,12 @@ UnderlinePosition -113
UnderlineThickness 56
Version 0.0.6
EncodingScheme ISO10646-1
-FontBBox -61 -278 982 1058
+FontBBox -391 -278 982 1058
CapHeight 694
XHeight 482
Ascender 671
Descender -261
-StartCharMetrics 388
+StartCharMetrics 393
C 32 ; WX 273 ; N space ; B 0 0 0 0 ;
C 33 ; WX 317 ; N exclam ; B 110 0 208 694 ;
C 34 ; WX 388 ; N quotedbl ; B 54 529 334 738 ;
@@ -354,7 +354,7 @@ C -1 ; WX 529 ; N ogonek ; B 223 -267 453 70 ;
C -1 ; WX 683 ; N tilde ; B 149 604 554 753 ;
C -1 ; WX 806 ; N hungarumlaut ; B 139 561 664 784 ;
C -1 ; WX 407 ; N uni02EE ; B 54 529 334 738 ;
-C -1 ; WX 722 ; N uni0302 ; B 186 537 512 752 ;
+C -1 ; WX 0 ; N uni0302 ; B -391 537 -65 752 ;
C -1 ; WX 632 ; N uni1E02 ; B 90 0 582 928 ;
C -1 ; WX 553 ; N uni1E03 ; B 65 -9 498 928 ;
C -1 ; WX 762 ; N uni1E0A ; B 126 0 705 928 ;
@@ -405,7 +405,12 @@ C -1 ; WX 505 ; N fraction ; B 10 0 496 694 ;
C -1 ; WX 653 ; N uni204B ; B 92 0 590 738 ;
C -1 ; WX 651 ; N Euro ; B 24 -10 613 699 ;
C -1 ; WX 695 ; N trademark ; B 54 460 617 738 ;
-C -1 ; WX 680 ; N H18533 ; B 102 99 578 575 ;
+C -1 ; WX 625 ; N uni2328 ; B 13 3 612 472 ;
+C -1 ; WX 656 ; N uni232B ; B 11 1 722 472 ;
+C -1 ; WX 859 ; N circle ; B 83 -7 776 674 ;
+C -1 ; WX 680 ; N H18533 ; B 130 129 548 548 ;
+C -1 ; WX 680 ; N uni25FE ; B 102 99 578 575 ;
+C -1 ; WX 585 ; N uni2759 ; B 250 0 334 621 ;
C -1 ; WX 720 ; N uniFB00 ; B 35 0 682 698 ;
C -1 ; WX 656 ; N uniFB01 ; B 25 0 542 698 ;
C -1 ; WX 635 ; N uniFB02 ; B 25 -10 629 698 ;
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
index 1b3b66f66f2..cf2195a3c54 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file cantarell-01.etx",
% version = "See file cantarell-01.etx",
-% date = "generated 2011/08/21",
+% date = "generated 2011/11/11",
% filename = "cantarell-01.enc",
% email = "See file cantarell-01.etx",
% codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
index baeb5b661ab..bbafffab076 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file cantarell-02.etx",
% version = "See file cantarell-02.etx",
-% date = "generated 2011/08/21",
+% date = "generated 2011/11/11",
% filename = "cantarell-02.enc",
% email = "See file cantarell-02.etx",
% codetable = "ISO/ASCII",
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
index 7eb62fec9b0..1e2f718e6e6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
+++ 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
index 2fdc3f90ec3..169cc32cb84 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
+++ 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
index f023d050d85..884f69ecda7 100644
--- 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
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
index c416d345466..770897a8503 100644
--- 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
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
index 95c6a512006..0dbf2093e6a 100644
--- 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
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
index 5b3b5a15307..d1a70bf355c 100644
--- 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
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
index ec0a40e9be3..a5914fe0741 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-ot1.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/Cantarell-Bold-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm
index 7f8be42a635..a2d5c22aa77 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Bold-t1.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-Regular-02.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
index 8d26d83371e..60c55832fac 100644
--- a/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
+++ 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-02.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
index f6845d628b9..a733989b84e 100644
--- 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
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 0c6abd5134e..5be94474f76 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 5661a382637..25cf9ed2729 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-ot1.vf b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
index 89935d5a216..38a0a329c22 100644
--- 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
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
index bc797cbc8b3..57e36674fd6 100644
--- 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
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
index 24284558449..49eeb858ee5 100644
--- a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
+++ 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
index 668ff466fc7..503cbd6047f 100644
--- a/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/cantarell/Cantarell-Bold.sfd b/Master/texmf-dist/source/fonts/cantarell/Cantarell-Bold.sfd
index 9c8324945fd..5bed9d46b7d 100644
--- a/Master/texmf-dist/source/fonts/cantarell/Cantarell-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/cantarell/Cantarell-Bold.sfd
@@ -15,13 +15,14 @@ LayerCount: 3
Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
Layer: 2 0 "temp" 0
+NeedsXUIDChange: 1
XUID: [1021 472 1916768597 5236576]
FSType: 0
OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1236980653
-ModificationTime: 1301942837
+ModificationTime: 1318344116
PfmFamily: 33
TTFWeight: 700
TTFWidth: 5
@@ -46,14 +47,29 @@ MarkAttachClasses: 1
DEI: 91125
LangName: 1033 "" "" "" "" "" "" "" "" "" "Dave Crossland" "" "http://live.gnome.org/CantarellFonts+AAoA" "http://abattis.org" "This Font Software is licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is copied below, and is also available with a FAQ at:+AAoA-http://scripts.sil.org/OFL" "http://scripts.sil.org/OFL" "" "" "" "" "" "Cantarell"
Encoding: UnicodeFull
-Compacted: 1
UnicodeInterp: none
NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 60 10 6
+WinInfo: 260 10 6
Grid
+-10.2539 694.336 m 29
+ 798.34 694.336 l 29
+-232.91 670.898 m 5
+ 625.488 670.898 l 5
+ Spiro
+ -232.91 670.898 {
+ 625.488 670.898 v
+ 0 0 z
+ EndSpiro
+-231.445 481.934 m 5
+ 632.812 481.934 l 5
+ Spiro
+ -231.445 481.934 {
+ 632.812 481.934 v
+ 0 0 z
+ EndSpiro
-1000 1056.64 m 0
2000 1056.64 l 0
-1000 737.793 m 0
@@ -68,13 +84,13 @@ Grid
127.93 -760.742 l 0
EndSplineSet
TeXData: 1 0 0 250299 125149 83433 441600 -782188 83433 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 1114112 389
+BeginChars: 1114112 394
StartChar: a
Encoding: 97 97 0
Width: 563
VWidth: 1023
-Flags: MW
+Flags: HMW
HStem: 0 90 200 65 400 90
LayerCount: 3
Back
@@ -105,27 +121,27 @@ SplineSet
EndSplineSet
Fore
SplineSet
-274.769 492 m 0
- 455.769 492 496.769 409 496.769 316 c 2
- 496.769 0 l 1
- 406.769 0 l 1
- 393.769 32 l 1
- 355.769 8 303.769 -10 245.769 -10 c 0
- 120.769 -10 42.7686 59 42.7686 133 c 0
- 42.7686 274 179.769 286 376.769 286 c 1
- 376.769 293 l 2
- 376.769 333 367.769 385 258.769 385 c 0
- 229.769 385 183.769 381 113.769 364 c 1
- 94.7686 358 l 1
- 69.7686 455 l 1
- 86.7686 460 l 2
- 148.769 481 215.769 492 274.769 492 c 0
-376.769 125 m 1
- 376.769 195 l 1
- 364.769 195 l 2
- 237.769 195 169.769 193 169.769 142 c 0
- 169.769 110 210.769 93 270.769 93 c 0
- 281.769 93 331.769 94 376.769 125 c 1
+274.769 492 m 4
+ 455.769 492 496.769 409 496.769 316 c 6
+ 496.769 0 l 5
+ 406.769 0 l 5
+ 393.769 32 l 5
+ 355.769 8 303.769 -10 245.769 -10 c 4
+ 120.769 -10 42.7686 59 42.7686 133 c 4
+ 42.7686 274 179.769 283 376.769 283 c 5
+ 376.769 290 l 6
+ 376.769 330 367.769 385 258.769 385 c 4
+ 229.769 385 183.769 381 113.769 364 c 5
+ 94.7686 358 l 5
+ 69.7686 455 l 5
+ 86.7686 460 l 6
+ 148.769 481 215.769 492 274.769 492 c 4
+376.769 125 m 5
+ 376.769 195 l 5
+ 364.769 195 l 6
+ 237.769 195 169.769 193 169.769 142 c 4
+ 169.769 110 210.769 93 270.769 93 c 4
+ 281.769 93 331.769 94 376.769 125 c 5
EndSplineSet
EndChar
@@ -162,7 +178,7 @@ StartChar: e
Encoding: 101 101 2
Width: 562
VWidth: 1023
-Flags: MW
+Flags: HMW
HStem: 0 90 200 65 400 90
LayerCount: 3
Back
@@ -191,16 +207,16 @@ SplineSet
467.007 8 l 2
415.007 -5 372.907 -9 308.106 -9 c 0
99.9072 -9 44.9072 115 44.9072 227 c 0
- 44.9072 412 172.907 492 300.907 492 c 0
+ 44.9072 412 155.6 492 300.907 492 c 0
458.007 492 519.007 348 519.007 246 c 2
519.007 184 l 1
173.907 184 l 1
184.807 141 225.307 98 339.606 98 c 0
402.007 98 483.007 115 483.007 115 c 1
-291.907 382 m 0
- 220.807 382 174.907 333 174.907 273 c 1
- 399.007 273 l 1
- 399.007 356 349.507 382 291.907 382 c 0
+291.907 388 m 0
+ 209.6 388 174.907 328 174.907 268 c 5
+ 399.007 268 l 5
+ 399.007 351 349.507 388 291.907 388 c 0
EndSplineSet
Layer: 2
SplineSet
@@ -293,11 +309,11 @@ EndChar
StartChar: n
Encoding: 110 110 5
-Width: 580
+Width: 579
VWidth: 1023
Flags: W
-HStem: 0 21G<62.7266 182.727 390.627 511.627> 380 112<215.307 363.434> 462 20G<62.7266 156.424>
-VStem: 62.7266 120<0 361.288> 390.627 121<0 354.174>
+HStem: 0 21G<63 183 390.9 511.9> 380 112<215.58 363.707> 462 20G<63 156.697>
+VStem: 63 120<0 361.288> 390.9 121<0 354.174>
LayerCount: 3
Back
SplineSet
@@ -317,19 +333,19 @@ SplineSet
EndSplineSet
Fore
SplineSet
-62.7266 482 m 5xb8
- 146.727 482 l 5xb8
- 162.727 449 l 5
- 236.727 483 294.326 492 333.026 492 c 4
- 488.627 492 511.627 383 511.627 285 c 6
- 511.627 0 l 5
- 390.627 0 l 5
- 390.627 283 l 6
- 390.627 317 387.026 380 297.026 380 c 4xd8
- 253.826 380 208.826 364 182.727 353 c 5
- 182.727 0 l 5
- 62.7266 0 l 5
- 62.7266 482 l 5xb8
+63 482 m 1xb8
+ 147 482 l 1xb8
+ 163 449 l 1
+ 237 483 294.6 492 333.3 492 c 0
+ 488.9 492 511.9 383 511.9 285 c 2
+ 511.9 0 l 1
+ 390.9 0 l 1
+ 390.9 283 l 2
+ 390.9 317 387.3 380 297.3 380 c 0xd8
+ 254.1 380 209.1 364 183 353 c 1
+ 183 0 l 1
+ 63 0 l 1
+ 63 482 l 1xb8
EndSplineSet
EndChar
@@ -337,8 +353,8 @@ StartChar: o
Encoding: 111 111 6
Width: 608
VWidth: 1023
-Flags: W
-HStem: -10 109<230.691 379.874> 383 109<222.82 374.127>
+Flags: MW
+HStem: -10 90<230.691 379.874> 400 90<222.82 374.127>
VStem: 44.9072 119<168.275 325.09> 441.106 118<159.172 317.512>
LayerCount: 3
Fore
@@ -360,19 +376,19 @@ StartChar: s
Encoding: 115 115 7
Width: 524
VWidth: 1023
-Flags: W
-HStem: -10 103<131.439 340.099> 372 99<314.613 433.891> 389 103<207.774 438.54>
+Flags: HMW
+HStem: -10 90<131.439 340.099> 400 90<314.613 433.891>
VStem: 62.9072 127<318.934 371.287> 354.807 129<108.717 162.947>
LayerCount: 3
Fore
SplineSet
-354.807 144 m 1xb8
+354.807 144 m 1
350.307 205 62.9072 183 62.9072 341 c 0
- 62.9072 400 116.907 492 311.407 492 c 0xb8
+ 62.9072 400 116.907 492 311.407 492 c 0
380.407 492 410.407 481 444.407 471 c 2
464.407 465 l 1
431.407 367 l 1
- 412.407 372 l 2xd8
+ 412.407 372 l 2
380.407 381 348.307 389 297.007 389 c 0
200.707 389 189.907 352 189.907 340 c 0
189.907 285 485.407 292 483.807 143 c 0
@@ -382,7 +398,7 @@ SplineSet
81.9072 133 l 1
99.9072 126 l 1
163.907 102 203.606 93 245.907 93 c 0
- 321.507 93 354.807 110 354.807 144 c 1xb8
+ 321.507 93 354.807 110 354.807 144 c 1
EndSplineSet
EndChar
@@ -452,11 +468,11 @@ Fore
SplineSet
252.645 94.3193 m 4
271.645 94.3193 287.895 98.4863 310 105.1 c 5
- 310 14.0996 l 1
- 292.645 8.09961 277.4 -9.90039 173 -9.90039 c 0
- 110 -9.90039 68.9541 37.0928 69 105.1 c 2
- 69.4004 693.75 l 1
- 189.4 693.75 l 1
+ 310 14.0996 l 5
+ 292.645 8.09961 277.4 -9.90039 173 -9.90039 c 4
+ 110 -9.90039 68.9541 37.0928 69 105.1 c 6
+ 69.4004 693.75 l 5
+ 189.4 693.75 l 5
189.145 163.32 l 5
189.145 126.1 191.046 94.3193 252.645 94.3193 c 4
EndSplineSet
@@ -658,8 +674,8 @@ StartChar: c
Encoding: 99 99 18
Width: 518
VWidth: 1023
-Flags: W
-HStem: -10 106<232.52 435.388> 382 109<221.782 439.724>
+Flags: MW
+HStem: -10 90<232.52 435.388> 400 90<221.782 439.724>
VStem: 44.9072 118<159.813 323.276>
LayerCount: 3
Fore
@@ -2168,21 +2184,21 @@ StartChar: bracketleft
Encoding: 91 91 70
Width: 350
VWidth: 1023
-Flags: W
+Flags: MW
HStem: -220 113<193.439 337.439> 645 113<193.439 337.439>
-VStem: 73.4395 264<-220 -107 645 758> 73.4395 120<-107 645>
+VStem: 73.4395 120<-107 645>
LayerCount: 3
Fore
SplineSet
-73.4395 758 m 1xe0
+73.4395 758 m 1
337.439 758 l 1
- 337.439 645 l 1xe0
+ 337.439 645 l 1
193.439 645 l 1
- 193.439 -107 l 1xd0
+ 193.439 -107 l 1
337.439 -107 l 1
337.439 -220 l 1
73.4395 -220 l 1
- 73.4395 758 l 1xe0
+ 73.4395 758 l 1
EndSplineSet
EndChar
@@ -2190,21 +2206,21 @@ StartChar: bracketright
Encoding: 93 93 71
Width: 346
VWidth: 1023
-Flags: W
-HStem: -220 113<13.6797 157.68> 645 113<13.6797 157.68>
-VStem: 13.6797 264<-220 -107 645 758> 157.68 120<-107 645>
+Flags: HMW
+HStem: -220 113<14 158> 645 113<14 158>
+VStem: 158 120<-107 645>
LayerCount: 3
Fore
SplineSet
-13.6797 758 m 5xe0
- 277.68 758 l 5
- 277.68 -220 l 5
- 13.6797 -220 l 5
- 13.6797 -107 l 5xe0
- 157.68 -107 l 5
- 157.68 645 l 5xd0
- 13.6797 645 l 5
- 13.6797 758 l 5xe0
+14 758 m 5
+ 278 758 l 5
+ 278 -220 l 5
+ 14 -220 l 5
+ 14 -107 l 5
+ 158 -107 l 5
+ 158 645 l 5
+ 14 645 l 5
+ 14 758 l 5
EndSplineSet
EndChar
@@ -4201,85 +4217,50 @@ EndChar
StartChar: adieresis
Encoding: 228 228 134
-Width: 602
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 103<201.821 369.537> 0 21G<415.875 514> 193 91<202.292 393> 358 97<111.742 159.087> 385 106<132.191 366.52> 563 131<126 274 383 516>
-VStem: 60 120<114.834 170.45> 126 148<563 694> 383 133<563 694> 393 121<112.555 193 284 360.94>
+HStem: 0 90 200 65 400 90 563 131<93 241 350 483>
+VStem: 93 148<563 694> 350 133<563 694>
LayerCount: 3
Fore
SplineSet
-383 694 m 1x2480
- 516 694 l 1
- 516 563 l 1
- 383 563 l 1
- 383 694 l 1x2480
-126 694 m 1x25
- 274 694 l 1
- 274 563 l 1
- 126 563 l 1
- 126 694 l 1x25
-393 125 m 1xa640
- 393 193 l 1
- 381 193 l 2
- 250 193 180 180 180 142 c 0
- 180 120 223 93 284 93 c 0
- 295 93 347 94 393 125 c 1xa640
-288 491 m 0x2e40
- 474 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6e40
- 411 32 l 1
- 372 8 317 -10 257 -10 c 0
- 137 -10 60 59 60 133 c 0
- 60 257 212 282 393 284 c 1
- 393 301 l 2
- 393 341 385 385 272 385 c 0xae40
- 242 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x3640
- 104 460 l 1
- 166 483 233 491 288 491 c 0x2e40
+350 694 m 1
+ 483 694 l 1
+ 483 563 l 1
+ 350 563 l 1
+ 350 694 l 1
+93 694 m 1
+ 241 694 l 1
+ 241 563 l 1
+ 93 563 l 1
+ 93 694 l 1
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: edieresis
Encoding: 235 235 135
-Width: 618
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 104<260.943 496.175> 184 100<187 437> 382 110<238.834 400.942> 563 131<144 292 397 534>
-VStem: 144 148<563 694> 397 137<563 694>
-LayerCount: 3
-Fore
-SplineSet
-340 492 m 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 187 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
- 63 412 194 492 340 492 c 0
-320 382 m 0
- 238 382 194 336 186 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
-144 694 m 1
- 292 694 l 1
- 292 563 l 1
- 144 563 l 1
- 144 694 l 1
-397 694 m 1
- 534 694 l 1
- 534 563 l 1
- 397 563 l 1
- 397 694 l 1
+HStem: 0 90 200 65 400 90 563 131<104 252 357 494>
+VStem: 104 148<563 694> 357 137<563 694>
+LayerCount: 3
+Fore
+SplineSet
+104 694 m 1
+ 252 694 l 1
+ 252 563 l 1
+ 104 563 l 1
+ 104 694 l 1
+357 694 m 1
+ 494 694 l 1
+ 494 563 l 1
+ 357 563 l 1
+ 357 694 l 1
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: idieresis
@@ -5160,313 +5141,164 @@ EndChar
StartChar: agrave
Encoding: 224 224 166
-Width: 602
+Width: 563
VWidth: 0
Flags: W
-HStem: -10 103<199.675 370.114> 0 21G<415.875 514> 193 91<202.292 394> 358 97<111.742 159.087> 385 106<132.191 366.724>
-VStem: 60 120<114.834 170.45> 394 120<112.555 193 284 356.982>
-LayerCount: 3
-Fore
-SplineSet
-288 491 m 0x2e
- 474 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6e
- 411 32 l 1
- 372 8 318 -10 258 -10 c 0
- 138 -10 60 59 60 133 c 0
- 60 257 213 282 394 284 c 1
- 394 301 l 2
- 394 341 385 385 272 385 c 0xae
- 242 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x36
- 104 460 l 1
- 166 483 233 491 288 491 c 0x2e
-394 125 m 1
- 394 193 l 1
- 381 193 l 2
- 250 193 180 180 180 142 c 0
- 180 120 222 93 284 93 c 0xa6
- 295 93 348 94 394 125 c 1
+HStem: 0 90 200 65 400 90
+LayerCount: 3
+Fore
+SplineSet
248 760 m 1
482 576 l 1
419 496 l 1
164 676 l 1
248 760 l 1
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: aacute
Encoding: 225 225 167
-Width: 602
+Width: 563
VWidth: 0
Flags: W
-HStem: -10 103<199.675 370.114> 0 21G<415.875 514> 193 91<202.292 394> 358 97<111.742 159.087> 385 106<132.191 366.724>
-VStem: 60 120<114.834 170.45> 394 120<112.555 193 284 356.982>
+HStem: 0 90 200 65 400 90
LayerCount: 3
Fore
SplineSet
-392 765 m 1x26
+392 765 m 1
463 681 l 1
215 501 l 1
145 581 l 1
- 392 765 l 1x26
-394 125 m 1
- 394 193 l 1
- 381 193 l 2
- 250 193 180 180 180 142 c 0
- 180 120 222 93 284 93 c 0xa6
- 295 93 348 94 394 125 c 1
-288 491 m 0x2e
- 474 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6e
- 411 32 l 1
- 372 8 318 -10 258 -10 c 0
- 138 -10 60 59 60 133 c 0
- 60 257 213 282 394 284 c 1
- 394 301 l 2
- 394 341 385 385 272 385 c 0xae
- 242 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x36
- 104 460 l 1
- 166 483 233 491 288 491 c 0x2e
+ 392 765 l 1
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: acircumflex
Encoding: 226 226 168
-Width: 602
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 103<199.675 370.114> 0 21G<415.875 514> 193 91<202.292 394> 358 97<111.742 159.087> 385 106<132.191 366.724> 717 20G<289.057 330.765>
-VStem: 60 120<114.834 170.45> 394 120<112.555 193 284 356.982>
-LayerCount: 3
-Fore
-SplineSet
-311 737 m 1x27
- 479 567 l 1
- 404 496 l 1
- 302 591 l 1
- 195 498 l 1
- 119 562 l 1
- 311 737 l 1x27
-394 125 m 1
- 394 193 l 1
- 381 193 l 2
- 250 193 180 180 180 142 c 0
- 180 120 222 93 284 93 c 0xa7
- 295 93 348 94 394 125 c 1
-288 491 m 0x2f
- 474 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6f
- 411 32 l 1
- 372 8 318 -10 258 -10 c 0
- 138 -10 60 59 60 133 c 0
- 60 257 213 282 394 284 c 1
- 394 301 l 2
- 394 341 385 385 272 385 c 0xaf
- 242 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x37
- 104 460 l 1
- 166 483 233 491 288 491 c 0x2f
+HStem: 0 90 200 65 400 90
+LayerCount: 3
+Fore
+SplineSet
+294 737 m 5
+ 462 567 l 5
+ 387 496 l 5
+ 285 591 l 5
+ 178 498 l 5
+ 102 562 l 5
+ 294 737 l 5
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: atilde
Encoding: 227 227 169
-Width: 602
+Width: 563
VWidth: 0
Flags: W
-HStem: -10 103<199.357 368.899> 0 21G<415.875 514> 193 91<201.969 391> 358 97<111.742 159.022> 385 106<132.126 364.842> 517 98<365.396 419.099> 605 99<195.108 254.764>
-VStem: 60 120<114.834 170.995> 391 123<112.555 193 284 360.94>
-LayerCount: 3
-Fore
-SplineSet
-436 708 m 5x2580
- 528 693 l 5
- 516 631 l 6
- 513 613 497 517 405 517 c 5x2580
- 296 521 248 605 217 605 c 4
- 196 605 191 571 188 557 c 6
- 178 514 l 5
- 85 527 l 5
- 98 589 l 6
- 102 608 115 704 213 704 c 5x2380
- 320 700 372 615 401 615 c 4
- 421 615 426 658 427 664 c 6
- 436 708 l 5x2580
-391 125 m 1
- 391 193 l 1
- 378 193 l 2
- 249 193 180 180 180 142 c 0
- 180 120 222 93 283 93 c 0xa180
- 294 93 345 94 391 125 c 1
-286 491 m 0x2980
- 473 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6980
- 411 32 l 1
- 369 8 316 -10 257 -10 c 0
- 138 -10 60 59 60 133 c 0
- 60 257 212 282 391 284 c 1
- 391 301 l 2
- 391 341 383 385 271 385 c 0xa980
- 241 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x3180
- 104 460 l 1
- 166 483 231 491 286 491 c 0x2980
+HStem: 0 90 200 65 400 90 517 98<347.396 401.099> 605 99<177.108 236.764>
+LayerCount: 3
+Fore
+SplineSet
+418 708 m 5xf0
+ 510 693 l 5
+ 498 631 l 6
+ 495 613 479 517 387 517 c 5xf0
+ 278 521 230 605 199 605 c 4
+ 178 605 173 571 170 557 c 6
+ 160 514 l 5
+ 67 527 l 5
+ 80 589 l 6
+ 84 608 97 704 195 704 c 5xe8
+ 302 700 354 615 383 615 c 4
+ 403 615 408 658 409 664 c 6
+ 418 708 l 5xf0
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: aring
Encoding: 229 229 170
-Width: 602
+Width: 563
VWidth: 0
Flags: W
-HStem: -10 103<199.675 370.114> 0 21G<415.875 514> 193 91<202.292 394> 358 97<111.742 159.087> 385 106<132.191 366.724> 509 84<270.344 356.539> 684 84<269.831 357.633>
-VStem: 60 120<114.834 170.45> 162 99<602.609 674.844> 366 90<602.609 675.021> 394 120<112.555 193 284 356.982>
+HStem: 0 90 200 65 400 90 509 84<270.344 356.539> 684 84<269.831 357.633>
+VStem: 162 99<602.609 674.844> 366 90<602.609 675.021>
LayerCount: 3
Fore
SplineSet
-314 684 m 0x26c0
+314 684 m 0
283 684 261 663 261 639 c 0
261 615 282 593 314 593 c 0
343 593 366 615 366 639 c 0
- 366 663 343 684 314 684 c 0x26c0
+ 366 663 343 684 314 684 c 0
313 768 m 0
397 768 456 711 456 639 c 0
456 567 399 509 314 509 c 0
229 509 162 567 162 639 c 0
162 710 227 768 313 768 c 0
-394 125 m 1xa720
- 394 193 l 1
- 381 193 l 2
- 250 193 180 180 180 142 c 0
- 180 120 222 93 284 93 c 0
- 295 93 348 94 394 125 c 1xa720
-288 491 m 0x2f20
- 474 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6f20
- 411 32 l 1
- 372 8 318 -10 258 -10 c 0
- 138 -10 60 59 60 133 c 0
- 60 257 213 282 394 284 c 1
- 394 301 l 2
- 394 341 385 385 272 385 c 0xaf20
- 242 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x3720
- 104 460 l 1
- 166 483 233 491 288 491 c 0x2f20
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: egrave
Encoding: 232 232 171
-Width: 618
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 104<260.906 496.175> 184 100<187 437> 382 110<239.237 400.942>
+HStem: 0 90 200 65 400 90
LayerCount: 3
Fore
SplineSet
-340 492 m 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
- 63 412 194 492 340 492 c 0
-320 382 m 0
- 239 382 195 336 187 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
254 765 m 1
490 581 l 1
425 501 l 1
171 681 l 1
254 765 l 1
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: eacute
Encoding: 233 233 172
-Width: 618
+Width: 565
VWidth: 0
Flags: W
-HStem: -10 104<260.906 496.175> 184 100<187 437> 382 110<239.237 400.942>
+HStem: 0 90 200 65 400 90
LayerCount: 3
Fore
SplineSet
-340 492 m 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
- 63 412 194 492 340 492 c 0
-320 382 m 0
- 239 382 195 336 187 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
-441 765 m 1
- 512 681 l 1
- 271 501 l 1
- 196 581 l 1
- 441 765 l 1
+400 765 m 1
+ 471 681 l 1
+ 230 501 l 1
+ 155 581 l 1
+ 400 765 l 1
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: ecircumflex
Encoding: 234 234 173
-Width: 618
+Width: 562
VWidth: 0
Flags: W
-HStem: -10 104<260.906 496.175> 184 100<187 437> 382 110<239.237 400.942> 717 20G<333.829 375.412>
+HStem: 0 90 200 65 400 90
LayerCount: 3
Fore
SplineSet
-340 492 m 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
- 63 412 194 492 340 492 c 0
-320 382 m 0
- 239 382 195 336 187 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
-356 737 m 1
- 521 567 l 1
- 447 496 l 1
- 348 591 l 1
- 245 498 l 1
- 162 562 l 1
- 356 737 l 1
+316 737 m 1
+ 481 567 l 1
+ 407 496 l 1
+ 308 591 l 1
+ 205 498 l 1
+ 122 562 l 1
+ 316 737 l 1
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: igrave
@@ -6970,41 +6802,20 @@ EndChar
StartChar: amacron
Encoding: 257 257 227
-Width: 602
+Width: 563
VWidth: 0
Flags: W
-HStem: -10 103<199.675 370.114> 0 21G<415.875 514> 193 91<202.292 394> 358 97<111.742 159.087> 385 107<137.033 368.259> 548 103<129 469>
-VStem: 60 120<114.834 170.45> 394 120<112.555 193 284 356.919>
-LayerCount: 3
-Fore
-SplineSet
-129 651 m 1x27
- 469 651 l 1
- 469 548 l 1
- 129 548 l 1
- 129 651 l 1x27
-394 125 m 1
- 394 193 l 1
- 381 193 l 2
- 250 193 180 180 180 142 c 0
- 180 120 222 93 284 93 c 0xa7
- 295 93 348 94 394 125 c 1
-288 492 m 0x2f
- 464 492 514 419 514 315 c 2
- 514 0 l 1
- 424 0 l 1x6f
- 411 32 l 1
- 372 8 318 -10 258 -10 c 0
- 138 -10 60 59 60 133 c 0
- 60 257 213 282 394 284 c 1
- 394 301 l 2
- 394 341 385 385 272 385 c 0xaf
- 242 385 193 381 131 364 c 1
- 112 358 l 1
- 87 455 l 1x37
- 104 460 l 1
- 162 481 227 492 288 492 c 0x2f
+HStem: 0 90 200 65 400 90 548 103<118 458>
+LayerCount: 3
+Fore
+SplineSet
+118 651 m 5
+ 458 651 l 5
+ 458 548 l 5
+ 118 548 l 5
+ 118 651 l 5
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: Abreve
@@ -7045,47 +6856,26 @@ EndChar
StartChar: abreve
Encoding: 259 259 229
-Width: 602
+Width: 566
VWidth: 0
Flags: W
-HStem: -10 103<200.826 366.215> 0 21G<414 514> 193 91<205.947 386> 358 97<111.742 158.952> 385 106<132.122 362.008> 508 108<236.499 382.771>
-VStem: 60 120<114.356 170.995> 388 126<112.555 193 284 356.982>
-LayerCount: 3
-Fore
-SplineSet
-79 664 m 1x27
- 173 714 l 1
- 183 696 l 1
- 193 678 232 616 307 616 c 0
- 368 616 426 662 455 699 c 2
- 467 714 l 1
- 555 654 l 1
- 542 637 l 1
- 490 569 404 508 298 508 c 0
- 177 508 110 581 85 648 c 2
- 79 664 l 1x27
-388 125 m 1
- 388 193 l 1
- 376 193 l 2
- 248 193 180 180 180 142 c 0
- 180 120 221 93 281 93 c 0xa7
- 292 93 343 94 388 125 c 1
-284 491 m 0x2f
- 473 491 514 408 514 314 c 2
- 514 0 l 1
- 424 0 l 1x6f
- 408 32 l 1
- 366 8 314 -10 255 -10 c 0
- 137 -10 60 59 60 133 c 0
- 60 257 211 282 386 284 c 1
- 386 301 l 2
- 386 341 378 385 269 385 c 0xaf
- 240 385 193 381 131 364 c 2
- 112 358 l 1
- 87 455 l 1x37
- 104 460 l 1
- 166 483 231 491 284 491 c 0x2f
+HStem: 0 90 200 65 400 90 508 108<211.499 357.771>
+LayerCount: 3
+Fore
+SplineSet
+54 664 m 1
+ 148 714 l 1
+ 158 696 l 1
+ 168 678 207 616 282 616 c 0
+ 343 616 401 662 430 699 c 2
+ 442 714 l 1
+ 530 654 l 1
+ 517 637 l 1
+ 465 569 379 508 273 508 c 0
+ 152 508 85 581 60 648 c 2
+ 54 664 l 1
EndSplineSet
+Refer: 0 97 N 1 0 0 1 0 0 2
EndChar
StartChar: Cacute
@@ -7549,35 +7339,20 @@ EndChar
StartChar: emacron
Encoding: 275 275 242
-Width: 618
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 104<260.906 496.175> 184 100<187 437> 382 110<239.237 400.942> 538 113<130 499>
+HStem: 0 90 200 65 400 90 538 113<112 481>
LayerCount: 3
Fore
SplineSet
-63 227 m 0
- 63 412 194 492 340 492 c 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
-320 382 m 0
- 239 382 195 336 187 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
-130 651 m 1
- 499 651 l 1
- 499 538 l 1
- 130 538 l 1
- 130 651 l 1
+112 651 m 5
+ 481 651 l 5
+ 481 538 l 5
+ 112 538 l 5
+ 112 651 l 5
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: Ebreve
@@ -7619,41 +7394,26 @@ EndChar
StartChar: ebreve
Encoding: 277 277 244
-Width: 618
+Width: 570
VWidth: 0
Flags: W
-HStem: -10 104<258.67 495.86> 184 100<187 432> 382 110<237.851 393.342> 508 108<268.987 413.028>
-LayerCount: 3
-Fore
-SplineSet
-63 227 m 0
- 63 412 194 492 337 492 c 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 198 141 259 94 371 94 c 0
- 416 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 407 -10 335 -10 c 0
- 118 -10 63 115 63 227 c 0
-317 382 m 0
- 237 382 195 336 187 284 c 1
- 432 284 l 1
- 426 358 381 382 317 382 c 0
-108 664 m 1
- 206 714 l 1
- 216 696 l 2
- 226 678 265 616 338 616 c 0
- 398 616 455 662 484 699 c 2
- 496 714 l 1
- 584 654 l 1
- 572 637 l 1
- 520 569 434 508 330 508 c 0
- 211 508 139 581 114 648 c 2
- 108 664 l 1
+HStem: 0 90 200 65 400 90 508 108<219.987 364.028>
+LayerCount: 3
+Fore
+SplineSet
+59 664 m 1
+ 157 714 l 1
+ 167 696 l 2
+ 177 678 216 616 289 616 c 0
+ 349 616 406 662 435 699 c 2
+ 447 714 l 1
+ 535 654 l 1
+ 523 637 l 1
+ 471 569 385 508 281 508 c 0
+ 162 508 90 581 65 648 c 2
+ 59 664 l 1
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: Edotaccent
@@ -7689,36 +7449,21 @@ EndChar
StartChar: edotaccent
Encoding: 279 279 246
-Width: 618
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 104<260.906 496.175> 184 100<187 437> 382 110<239.237 400.942> 552 142<254 424>
-VStem: 254 170<552 694>
+HStem: 0 90 200 65 400 90 552 142<204 374>
+VStem: 204 170<552 694>
LayerCount: 3
Fore
SplineSet
-63 227 m 0
- 63 412 194 492 340 492 c 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
-320 382 m 0
- 239 382 195 336 187 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
-254 694 m 1
- 424 694 l 1
- 424 552 l 1
- 254 552 l 1
- 254 694 l 1
+204 694 m 5
+ 374 694 l 5
+ 374 552 l 5
+ 204 552 l 5
+ 204 694 l 5
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: Ecaron
@@ -7756,37 +7501,22 @@ EndChar
StartChar: ecaron
Encoding: 283 283 248
-Width: 618
+Width: 564
VWidth: 0
Flags: W
-HStem: -10 104<260.906 496.175> 184 100<187 437> 382 110<239.237 400.942> 719 20G<426.28 470.812>
+HStem: 0 90 200 65 400 90
LayerCount: 3
Fore
SplineSet
-63 227 m 0
- 63 412 194 492 340 492 c 0
- 545 492 555 340 555 238 c 2
- 555 184 l 1
- 186 184 l 1
- 199 141 260 94 375 94 c 0
- 421 94 461 103 488 111 c 2
- 508 117 l 1
- 532 24 l 1
- 515 18 l 2
- 472 3 413 -10 339 -10 c 0
- 119 -10 63 115 63 227 c 0
-320 382 m 0
- 239 382 195 336 187 284 c 1
- 437 284 l 1
- 432 358 386 382 320 382 c 0
-339 500 m 1
- 162 669 l 1
- 246 740 l 1
- 347 646 l 1
- 448 739 l 1
- 521 675 l 1
- 339 500 l 1
+293 500 m 1
+ 116 669 l 1
+ 200 740 l 1
+ 301 646 l 1
+ 402 739 l 1
+ 475 675 l 1
+ 293 500 l 1
EndSplineSet
+Refer: 2 101 N 1 0 0 1 0 0 2
EndChar
StartChar: Gcircumflex
@@ -10592,21 +10322,21 @@ EndChar
StartChar: uni0302
Encoding: 770 770 332
-Width: 722
+Width: 0
VWidth: 1023
Flags: W
HStem: 541 241
-VStem: 188 319
+VStem: -384 319
LayerCount: 3
Fore
SplineSet
-354 782 m 1
- 507 612 l 1
- 433 541 l 1
- 347 636 l 1
- 261 542 l 1
- 188 607 l 1
- 354 782 l 1
+-218 782 m 5
+ -65 612 l 5
+ -139 541 l 5
+ -225 636 l 5
+ -311 542 l 5
+ -384 607 l 5
+ -218 782 l 5
EndSplineSet
EndChar
@@ -10977,17 +10707,17 @@ Encoding: 261 261 341
Width: 602
VWidth: 0
Flags: W
-HStem: -265 99<347.122 450.335> -8 105<199.793 351.48> 213 71<209.011 393> 379 106<129.218 366.687>
-VStem: 60 120<118.219 187.149> 210 136<-162.177 -96.9349> 393 121<117.39 213 284 351.917>
+HStem: -265 99<347.122 450.335> -8 105<189.502 351.48> 198 92<209.011 393> 379 106<129.218 371.771>
+VStem: 60 120<111.113 173.063> 210 136<-162.177 -96.9349> 393 121<117.39 198 290 356.05>
LayerCount: 3
Fore
SplineSet
-180 151 m 0
- 180 125 215 97 277 97 c 0
+180 138 m 4
+ 180 112 215 97 277 97 c 0
322 97 363 111 393 128 c 1
- 393 213 l 1
- 280 213 226 209 196 183 c 0
- 186 175 180 162 180 151 c 0
+ 393 198 l 5
+ 280 198 226 195 196 169 c 4
+ 186 161 180 149 180 138 c 4
272 379 m 0
242 379 193 375 131 358 c 1
112 353 l 1
@@ -11008,10 +10738,10 @@ SplineSet
210 -78 288 -24 353 8 c 1
321 -2 287 -8 250 -8 c 0
138 -8 60 59 60 133 c 0
- 60 181 93 248 209 271 c 1
- 246 277 295 283 393 284 c 1
- 393 295 l 2
- 393 335 385 379 272 379 c 0
+ 60 181 93 254 209 277 c 1
+ 246 283 295 289 393 290 c 1
+ 393 301 l 2
+ 393 341 385 379 272 379 c 0
EndSplineSet
EndChar
@@ -12402,20 +12132,20 @@ Encoding: 64258 64258 384
Width: 772
VWidth: 0
Flags: W
-HStem: -9.90039 75.2197<591.5 754.592> 0 21G<146 266> 379 103<66 146 266 458> 591 107<296.209 479.734>
-VStem: 146 120<0 379 482 563.17> 519 120.145<74.8596 693.75>
+HStem: -9.90039 104.22<592.5 755.592> 0 21G<146 266> 379 103<66 146 266 458> 591 107<296.209 479.734>
+VStem: 146 120<0 379 482 563.17> 520 120.145<102.826 693.75>
LayerCount: 3
Fore
SplineSet
-702.645 65.3193 m 0xbc
- 721.645 65.3193 737.895 69.4863 760 76.0996 c 1
- 760 14.0996 l 1
- 742.645 8.09961 727.4 -9.90039 623 -9.90039 c 0
- 560 -9.90039 518.954 37.0928 519 105.1 c 2
- 519.4 693.75 l 1
- 639.4 693.75 l 1
- 639.145 134.32 l 1
- 639.145 97.0996 641.046 65.3193 702.645 65.3193 c 0xbc
+703.645 94.3193 m 4xbc
+ 722.645 94.3193 738.895 98.4863 761 105.1 c 5
+ 761 14.0996 l 5
+ 743.645 8.09961 728.4 -9.90039 624 -9.90039 c 4
+ 561 -9.90039 519.954 37.0928 520 105.1 c 6
+ 520.4 693.75 l 5
+ 640.4 693.75 l 5
+ 640.145 163.32 l 5
+ 640.145 126.1 642.046 94.3193 703.645 94.3193 c 4xbc
146 511 m 2
146 584 148 698 351 698 c 0
379 698 420 696 479 678 c 2
@@ -12499,20 +12229,20 @@ Encoding: 64260 64260 386
Width: 1162
VWidth: 0
Flags: W
-HStem: -9.90039 75.2197<981.5 1144.59> 0 21G<146 266 516 636> 379 103<66 146 266 516 636 829> 591 107<296.209 479.734 666.459 850.648>
-VStem: 146 120<0 379 482 563.17> 516 120<0 379 482 563.17> 909 120.145<74.8596 693.75>
+HStem: -9.90039 104.22<981.5 1144.59> 0 21G<146 266 516 636> 379 103<66 146 266 516 636 829> 591 107<296.209 479.734 666.459 850.648>
+VStem: 146 120<0 379 482 563.17> 516 120<0 379 482 563.17> 909 120.14<102.826 693.75>
LayerCount: 3
Fore
SplineSet
-1092.64 65.3193 m 0xbe
- 1111.64 65.3193 1127.89 69.4863 1150 76.0996 c 1
- 1150 14.0996 l 1
- 1132.64 8.09961 1117.4 -9.90039 1013 -9.90039 c 0
- 950 -9.90039 908.954 37.0928 909 105.1 c 2
- 909.4 693.75 l 1
- 1029.4 693.75 l 1
- 1029.14 134.32 l 1
- 1029.14 97.0996 1031.05 65.3193 1092.64 65.3193 c 0xbe
+1092.64 94.3193 m 4xbe
+ 1111.64 94.3193 1127.89 98.4863 1150 105.1 c 5
+ 1150 14.0996 l 5
+ 1132.64 8.09961 1117.4 -9.90039 1013 -9.90039 c 4
+ 950 -9.90039 908.954 37.0928 909 105.1 c 6
+ 909.4 693.75 l 5
+ 1029.4 693.75 l 5
+ 1029.14 163.32 l 5
+ 1029.14 126.1 1031.05 94.3193 1092.64 94.3193 c 4xbe
146 511 m 2
146 584 148 698 351 698 c 0
379 698 420 696 479 678 c 2
@@ -12595,6 +12325,211 @@ Encoding: 9679 9679 388
Width: 680
VWidth: 0
Flags: W
+HStem: 95.4004 464<243.552 434.448>
+VStem: 107 464<231.952 422.848>
+LayerCount: 3
+Fore
+SplineSet
+107 327.4 m 0
+ 107 455.464 210.936 559.4 339 559.4 c 0
+ 467.064 559.4 571 455.464 571 327.4 c 0
+ 571 199.336 467.064 95.4004 339 95.4004 c 0
+ 210.936 95.4004 107 199.336 107 327.4 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni2759
+Encoding: 10073 10073 389
+Width: 585
+VWidth: 1023
+Flags: W
+HStem: -1 21G<230.8 353.8>
+VStem: 230.8 123<-1 621>
+LayerCount: 3
+Fore
+SplineSet
+353.8 621 m 1
+ 353.8 -1 l 1
+ 230.8 -1 l 1
+ 230.8 621 l 1
+ 353.8 621 l 1
+EndSplineSet
+EndChar
+
+StartChar: circle
+Encoding: 9675 9675 390
+Width: 859
+VWidth: 1023
+Flags: W
+HStem: -27 105<325.298 534.289> 589 105<325.457 534.762>
+VStem: 63 105<232.112 434.388> 691 105<232.112 434.541>
+LayerCount: 3
+Fore
+SplineSet
+430 589 m 0
+ 396.601 589 363.169 582.527 330.428 569.43 c 0
+ 297.747 556.358 268.975 537.768 244.862 514.583 c 0
+ 220.948 491.589 202.405 463.902 188.298 431.927 c 0
+ 174.534 400.728 168 366.428 168 333 c 0
+ 168 299.589 174.481 266.393 188.298 235.073 c 0
+ 202.405 203.098 220.949 175.411 244.862 152.417 c 0
+ 268.975 129.232 297.747 110.642 330.428 97.5695 c 0
+ 363.169 84.473 396.601 78 430 78 c 0
+ 463.399 78 496.831 84.473 529.572 97.5695 c 0
+ 562.114 110.586 589.842 129.055 614.138 152.417 c 0
+ 638.052 175.411 656.596 203.098 670.702 235.073 c 0
+ 684.519 266.394 691 299.589 691 333 c 0
+ 691 366.427 684.466 400.728 670.702 431.927 c 0
+ 656.596 463.902 638.051 491.589 614.138 514.583 c 0
+ 589.842 537.945 562.114 556.413 529.572 569.43 c 0
+ 496.832 582.527 463.399 589 430 589 c 0
+289.496 665.539 m 0
+ 333.457 683.332 380.018 694 428 694 c 0
+ 475.684 694 522.261 684.428 567.353 666.599 c 0
+ 612.592 648.713 652.926 623.292 686.916 590.365 c 0
+ 720.741 557.597 748.374 518.295 767.449 472.723 c 0
+ 786.41 427.422 796 380.685 796 333 c 0
+ 796 285.323 786.428 238.56 767.383 194.122 c 0
+ 748.416 149.867 721.901 110.557 687.916 77.6352 c 0
+ 654.091 44.8687 613.849 18.3879 568.353 0.400785 c 0
+ 523.358 -17.3885 477.697 -27 430 -27 c 0
+ 382.315 -27 335.74 -17.4266 290.647 0.400785 c 0
+ 245.039 18.4317 205.758 45.0135 172.084 77.6352 c 0
+ 138.261 110.401 110.692 149.614 91.6171 194.122 c 0
+ 72.572 238.56 63 285.324 63 333 c 0
+ 63 380.677 72.5723 427.44 91.6171 471.878 c 0
+ 110.533 516.015 136.949 556.296 171.084 589.365 c 0
+ 205.07 622.289 245.321 647.659 289.496 665.539 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni232B
+Encoding: 9003 9003 391
+Width: 748
+VWidth: 0
+Flags: W
+HStem: 0.171875 120.44<295.042 374.495 456.476 535.924> 361.494 120.441<295.042 372.887 459.12 535.924>
+VStem: 535.924 120.442<120.612 199.81 279.98 361.494>
+LayerCount: 3
+Fore
+SplineSet
+254.9 481.935 m 1
+ 615.868 481.935 l 2
+ 642.489 481.935 656.366 463.115 656.366 441.785 c 2
+ 656.366 40.3154 l 2
+ 656.366 19.9326 638.918 1.07617 617.632 0.171875 c 2
+ 254.9 0.171875 l 1
+ 14.0186 241.054 l 1
+ 254.9 481.935 l 1
+295.042 361.494 m 1
+ 295.042 321.345 l 2
+ 294.182 310.059 297.869 299.034 306.337 291.231 c 2
+ 357.771 239.796 l 1
+ 306.337 189.618 l 2
+ 298.771 182.049 295.042 171.426 295.042 160.757 c 2
+ 295.042 120.612 l 1
+ 335.191 120.612 l 2
+ 345.855 120.612 356.483 124.338 364.047 131.905 c 2
+ 415.482 183.343 l 1
+ 466.925 131.905 l 2
+ 474.489 124.338 485.117 120.612 495.782 120.612 c 2
+ 535.924 120.612 l 1
+ 535.924 160.757 l 2
+ 535.924 171.426 532.2 182.049 524.637 189.618 c 2
+ 474.452 239.796 l 1
+ 525.888 291.231 l 2
+ 534.55 299.23 535.924 309.856 535.924 321.345 c 2
+ 535.924 361.494 l 1
+ 495.782 361.494 l 2
+ 486.093 361.214 478.84 358.197 468.177 348.944 c 2
+ 415.482 297.508 l 1
+ 364.047 348.944 l 2
+ 356.911 356.317 346.68 361.019 336.449 361.494 c 0
+ 336.016 361.494 335.625 361.494 335.191 361.494 c 2
+ 295.042 361.494 l 1
+EndSplineSet
+EndChar
+
+StartChar: uni2328
+Encoding: 9000 9000 392
+Width: 625
+VWidth: 0
+Flags: W
+LayerCount: 3
+Fore
+SplineSet
+574 471.935 m 6
+ 50.5752 471.935 l 6
+ 29.877 471.935 13.1895 454.505 13.1895 432.887 c 6
+ 13.1895 42.3662 l 6
+ 13.1895 20.748 29.877 3.31836 50.5752 3.31836 c 6
+ 574 3.31836 l 6
+ 594.697 3.31836 611.385 20.748 611.385 42.3662 c 6
+ 611.385 432.887 l 6
+ 611.385 454.505 594.697 471.935 574 471.935 c 6
+536.607 393.838 m 5
+ 536.607 315.731 l 5
+ 461.836 315.731 l 5
+ 461.836 393.838 l 5
+ 536.607 393.838 l 5
+424.443 393.838 m 5
+ 424.443 315.731 l 5
+ 349.664 315.731 l 5
+ 349.664 393.838 l 5
+ 424.443 393.838 l 5
+312.278 393.838 m 5
+ 312.278 315.731 l 5
+ 237.501 315.731 l 5
+ 237.501 393.838 l 5
+ 312.278 393.838 l 5
+200.115 393.838 m 5
+ 200.115 315.731 l 5
+ 125.353 315.731 l 5
+ 125.353 393.838 l 5
+ 200.115 393.838 l 5
+499.222 275.454 m 5
+ 499.222 197.364 l 5
+ 424.443 197.364 l 5
+ 424.443 275.454 l 5
+ 499.222 275.454 l 5
+387.059 275.454 m 5
+ 387.059 197.364 l 5
+ 312.278 197.364 l 5
+ 312.278 275.454 l 5
+ 387.059 275.454 l 5
+274.887 275.454 m 5
+ 274.887 197.364 l 5
+ 200.115 197.364 l 5
+ 200.115 275.454 l 5
+ 274.887 275.454 l 5
+162.738 275.454 m 5
+ 162.738 197.364 l 5
+ 87.958 197.364 l 5
+ 87.958 275.454 l 5
+ 162.738 275.454 l 5
+536.607 158.309 m 5
+ 536.607 80.2021 l 5
+ 461.836 80.2021 l 5
+ 461.836 158.309 l 5
+ 536.607 158.309 l 5
+424.443 158.309 m 5
+ 424.443 80.2021 l 5
+ 200.115 80.2021 l 5
+ 200.115 158.309 l 5
+ 424.443 158.309 l 5
+162.738 158.309 m 5
+ 162.738 80.2021 l 5
+ 50.5752 80.2021 l 5
+ 50.5752 158.309 l 5
+ 162.738 158.309 l 5
+EndSplineSet
+EndChar
+
+StartChar: uni25FE
+Encoding: 9726 9726 393
+Width: 680
+VWidth: 0
+Flags: W
HStem: 99 476<242.083 437.917>
VStem: 102 476<239.083 434.917>
LayerCount: 3
diff --git a/Master/texmf-dist/source/fonts/cantarell/Cantarell-Regular.sfd b/Master/texmf-dist/source/fonts/cantarell/Cantarell-Regular.sfd
index d5b842ba291..7bd9eeb4734 100644
--- a/Master/texmf-dist/source/fonts/cantarell/Cantarell-Regular.sfd
+++ b/Master/texmf-dist/source/fonts/cantarell/Cantarell-Regular.sfd
@@ -16,13 +16,14 @@ Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
Layer: 2 0 "Temp" 1
Layer: 3 0 "Spiro" 1
+NeedsXUIDChange: 1
XUID: [1021 472 1916768597 5236576]
FSType: 0
OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1236980653
-ModificationTime: 1301942702
+ModificationTime: 1318341534
PfmFamily: 33
TTFWeight: 400
TTFWidth: 5
@@ -47,13 +48,12 @@ MarkAttachClasses: 1
DEI: 91125
LangName: 1033 "" "" "" "" "" "" "" "" "" "Dave Crossland" "" "" "http://abattis.org" "This Font Software is licensed under the SIL Open Font License, Version 1.1.+AA0ACgAA-This license is copied below, and is also available with a FAQ at:+AA0ACgAA-http://scripts.sil.org/OFL" "http://scripts.sil.org/OFL" "" "" "" "" "" "" "Cantarell"
Encoding: UnicodeFull
-Compacted: 1
UnicodeInterp: none
NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 36 9 7
+WinInfo: 9660 10 7
BeginPrivate: 0
EndPrivate
Grid
@@ -75,13 +75,13 @@ Grid
EndSpiro
EndSplineSet
TeXData: 1 0 0 250299 125149 83433 441600 -782186 83433 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 1114112 388
+BeginChars: 1114112 393
StartChar: a
Encoding: 97 97 0
Width: 491
VWidth: 1023
-Flags: HMW
+Flags: MW
HStem: 0 73 217 73<197 355> 408 73
VStem: 345 82<91 224 284 384>
LayerCount: 4
@@ -377,7 +377,7 @@ StartChar: d
Encoding: 100 100 1
Width: 576
VWidth: 1023
-Flags: MW
+Flags: HMW
HStem: 0 73 408 73 651 20
VStem: 56 85<138 347> 420 83<79 415 471 671>
LayerCount: 4
@@ -444,9 +444,9 @@ EndSplineSet
Fore
SplineSet
406 407 m 1
- 371 422 336 430 298 430 c 0
- 249 430 210 413 182 379 c 0
- 154 345 141 300 141 243 c 0
+ 371 422 336 428 298 428 c 0
+ 249 428 205.9 408 182 379 c 0
+ 153.988 345.01 141 300 141 243 c 0
141 186 154 141 181 108 c 0
208 75 247 59 297 59 c 0
320 59 339 62 355 67 c 0
@@ -913,7 +913,7 @@ Encoding: 115 115 7
Width: 497
VWidth: 1023
Flags: MW
-HStem: -10 68<112.539 330.762> 408 67<295.706 414.2>
+HStem: 0 73<112.539 330.762> 408 73<295.706 414.2>
VStem: 80 85 360 85
LayerCount: 4
Back
@@ -1010,7 +1010,7 @@ StartChar: b
Encoding: 98 98 9
Width: 553
VWidth: 1023
-Flags: MW
+Flags: HMW
HStem: 0 73<176.849 341.916> 408 73<151.423 339.129> 651 20
VStem: 65 85<77.1611 89 407 415.828> 413 85<137.983 349.728>
LayerCount: 4
@@ -1077,15 +1077,15 @@ SplineSet
EndSplineSet
Fore
SplineSet
-148 407 m 1
- 183 422 218 430 256 430 c 0
- 305 430 344 413 372 379 c 0
+148 406 m 1
+ 183 421 218 428 256 428 c 0
+ 305 428 344 413 372 379 c 0
400 345 413 300 413 243 c 0
413 186 400 141 373 108 c 0
346 75 307 59 257 59 c 0
234 59 215 62 199 67 c 0
183 72 166 79 148 89 c 1
- 148 407 l 1
+ 148 406 l 1
148 471 m 1
148 671 l 1
65 671 l 1
@@ -1678,25 +1678,25 @@ StartChar: c
Encoding: 99 99 18
Width: 467
VWidth: 1023
-Flags: WO
-HStem: -10 67<209.074 393.763> 408 68<206.038 398.764>
+Flags: MW
+HStem: 0 73<209.074 393.763> 408 73<206.038 398.764>
LayerCount: 4
Fore
SplineSet
-296.636 491 m 4
- 337.636 492 380.636 482 426.636 462 c 5
- 406.636 404 l 5
- 366.636 418 330.636 424 299.636 423 c 4
- 182.636 418 128.636 353 135.636 226 c 4
- 139.636 157 163.636 108 210.636 81 c 4
- 231.636 69 258.636 61 291.636 57 c 4
- 324.636 53 361.636 58 401.636 72 c 5
- 420.636 17 l 5
- 374.636 -1 331.636 -10 289.636 -10 c 4
- 202.636 -11 139.636 17 99.6357 73 c 4
- 71.6357 112 57.6357 164 56.6357 227 c 4
- 55.6357 307 75.6357 370 115.636 418 c 4
- 155.636 466 215.636 490 296.636 491 c 4
+296.636 491 m 0
+ 337.636 492 380.636 482 426.636 462 c 1
+ 406.636 404 l 1
+ 366.636 418 330.636 424 299.636 423 c 0
+ 182.636 418 128.636 353 135.636 226 c 0
+ 139.636 157 163.636 108 210.636 81 c 0
+ 231.636 69 258.636 61 291.636 57 c 0
+ 324.636 53 361.636 58 401.636 72 c 1
+ 420.636 17 l 1
+ 374.636 -1 331.636 -10 289.636 -10 c 0
+ 202.636 -11 139.636 17 99.6357 73 c 0
+ 71.6357 112 57.6357 164 56.6357 227 c 0
+ 55.6357 307 75.6357 370 115.636 418 c 0
+ 155.636 466 215.636 490 296.636 491 c 0
EndSplineSet
Layer: 3
SplineSet
@@ -2073,8 +2073,8 @@ StartChar: z
Encoding: 122 122 25
Width: 526
VWidth: 1023
-Flags: W
-HStem: 0 63<177 453> 419 63<73 336>
+Flags: MW
+HStem: 0 73<177 453> 408 73<73 336>
LayerCount: 4
Fore
SplineSet
@@ -2359,8 +2359,8 @@ SplineSet
142 441 169 461 202 475 c 0
406 83 m 1
406 400 l 1
- 323 434 258 435 211 404 c 0
- 173 379 150 338 143 283 c 0
+ 323 434 258 433 211 402 c 0
+ 173 377 150 338 143 283 c 0
136 229 143 181 164 139 c 0
178 110 199 89 226 74 c 128
253 59 283 54 316 57 c 128
@@ -4723,9 +4723,9 @@ StartChar: bracketright
Encoding: 93 93 71
Width: 370
VWidth: 1023
-Flags: W
+Flags: MWO
HStem: -200 73<24 168> 665 73<24 168>
-VStem: 24 224<-200 -127 665 738> 168 80<-127 665>
+VStem: 24 224<-200 -127 665 738> 168 83<-127 665>
LayerCount: 4
Fore
SplineSet
@@ -7665,8 +7665,8 @@ StartChar: ccedilla
Encoding: 231 231 125
Width: 467
VWidth: 0
-Flags: HW
-HStem: -10 67<209.074 393.763> 408 68<206.038 398.764>
+Flags: W
+HStem: 0 73<209.074 393.763> 408 73<206.038 398.764>
VStem: 166.636 211
LayerCount: 4
Fore
@@ -9666,7 +9666,7 @@ Encoding: 382 382 197
Width: 526
VWidth: 0
Flags: W
-HStem: 0 63<177 453> 419 63<73 336> 549 215
+HStem: 0 73<177 453> 408 73<73 336> 549 215
VStem: 95 326
LayerCount: 4
Fore
@@ -9714,7 +9714,7 @@ Encoding: 353 353 200
Width: 497
VWidth: 0
Flags: W
-HStem: -10 68<112.539 330.762> 408 67<295.706 414.2> 549 215
+HStem: 0 73<112.539 330.762> 408 73<295.706 414.2> 549 215
VStem: 80 85 107.2 326 360 85
LayerCount: 4
Fore
@@ -10842,8 +10842,8 @@ StartChar: cacute
Encoding: 263 263 231
Width: 467
VWidth: 0
-Flags: HW
-HStem: -10 67<209.074 393.763> 408 68<206.038 398.764>
+Flags: W
+HStem: 0 73<209.074 393.763> 408 73<206.038 398.764>
LayerCount: 4
Fore
SplineSet
@@ -10885,8 +10885,8 @@ StartChar: ccircumflex
Encoding: 265 265 233
Width: 467
VWidth: 0
-Flags: HW
-HStem: -10 67<209.074 393.763> 408 68<206.038 398.764> 549 182
+Flags: W
+HStem: 0 73<209.074 393.763> 408 73<206.038 398.764> 549 182
VStem: 126.636 263
LayerCount: 4
Fore
@@ -10917,8 +10917,8 @@ StartChar: cdotaccent
Encoding: 267 267 235
Width: 467
VWidth: 0
-Flags: HW
-HStem: -10 67<209.074 393.763> 408 68<206.038 398.764> 592 103<234.636 336.636>
+Flags: W
+HStem: 0 73<209.074 393.763> 408 73<206.038 398.764> 592 103<234.636 336.636>
VStem: 234.636 102<592 695>
LayerCount: 4
Fore
@@ -10949,8 +10949,8 @@ StartChar: ccaron
Encoding: 269 269 237
Width: 467
VWidth: 0
-Flags: HW
-HStem: -10 67<209.074 393.763> 408 68<206.038 398.764> 547 215
+Flags: W
+HStem: 0 73<209.074 393.763> 408 73<206.038 398.764> 547 215
VStem: 111.636 326
LayerCount: 4
Fore
@@ -12152,7 +12152,7 @@ Encoding: 347 347 296
Width: 497
VWidth: 0
Flags: W
-HStem: -10 68<112.539 330.762> 408 67<295.706 414.2>
+HStem: 0 73<112.539 330.762> 408 73<295.706 414.2>
VStem: 80 85 360 85
LayerCount: 4
Fore
@@ -12196,7 +12196,7 @@ Encoding: 349 349 298
Width: 497
VWidth: 0
Flags: W
-HStem: -10 68<112.539 330.762> 408 67<295.706 414.2> 549 182
+HStem: 0 73<112.539 330.762> 408 73<295.706 414.2> 549 182
VStem: 80 85 140.2 263 360 85
LayerCount: 4
Fore
@@ -12274,7 +12274,7 @@ Encoding: 351 351 300
Width: 497
VWidth: 0
Flags: W
-HStem: -10 68<112.539 330.762> 408 67<295.706 414.2>
+HStem: 0 73<112.539 330.762> 408 73<295.706 414.2>
VStem: 80 85 140.2 211 360 85
LayerCount: 4
Fore
@@ -12651,7 +12651,7 @@ Encoding: 378 378 318
Width: 526
VWidth: 0
Flags: W
-HStem: 0 63<177 453> 419 63<73 336>
+HStem: 0 73<177 453> 408 73<73 336>
LayerCount: 4
Fore
SplineSet
@@ -13136,14 +13136,14 @@ EndChar
StartChar: uni0302
Encoding: 770 770 332
-Width: 722
+Width: 0
VWidth: 1023
Flags: W
HStem: 537 215
-VStem: 186 326
+VStem: -391 326
LayerCount: 4
Fore
-Refer: 90 94 S 1 0 0 1 0 0 2
+Refer: 90 94 S 1 0 0 1 -577 0 2
Layer: 3
Refer: 90 94 S 1 0 0 1 0 0 2
EndChar
@@ -14629,7 +14629,7 @@ Encoding: 7777 7777 381
Width: 497
VWidth: 0
Flags: W
-HStem: -10 68<112.539 330.762> 408 67<295.706 414.2> 592 103<216.2 318.2>
+HStem: 0 73<112.539 330.762> 408 73<295.706 414.2> 592 103<216.2 318.2>
VStem: 80 85 216.2 102<592 695> 360 85
LayerCount: 4
Fore
@@ -14963,8 +14963,8 @@ Encoding: 9679 9679 387
Width: 680
VWidth: 0
Flags: W
-HStem: 99 476<102 578>
-VStem: 102 476<99 575>
+HStem: 129.601 417.6<248.502 429.498>
+VStem: 130.2 417.6<247.903 428.898>
LayerCount: 4
Back
SplineSet
@@ -14976,6 +14976,211 @@ SplineSet
EndSplineSet
Fore
SplineSet
+130.2 338.4 m 4
+ 130.2 453.657 223.742 547.2 339 547.2 c 4
+ 454.258 547.2 547.8 453.657 547.8 338.4 c 4
+ 547.8 223.143 454.258 129.601 339 129.601 c 4
+ 223.742 129.601 130.2 223.143 130.2 338.4 c 4
+EndSplineSet
+EndChar
+
+StartChar: circle
+Encoding: 9675 9675 388
+Width: 859
+VWidth: 1023
+Flags: W
+HStem: -7 65<321.828 538.727> 609 65<321.096 538.188>
+VStem: 83 65<227.422 439.078> 711 65<227.422 439.331>
+LayerCount: 4
+Fore
+SplineSet
+430 609 m 0
+ 394 609 358 602 323 588 c 0
+ 288 574 257 554 231 529 c 0
+ 205 504 185 474 170 440 c 0
+ 155 406 148 369 148 333 c 0
+ 148 297 155 261 170 227 c 0
+ 185 193 205 163 231 138 c 0
+ 257 113 288 93 323 79 c 0
+ 358 65 394 58 430 58 c 0
+ 466 58 502 65 537 79 c 0
+ 572 93 602 113 628 138 c 0
+ 654 163 674 193 689 227 c 0
+ 704 261 711 297 711 333 c 0
+ 711 369 704 406 689 440 c 0
+ 674 474 654 504 628 529 c 0
+ 602 554 572 574 537 588 c 0
+ 502 602 466 609 430 609 c 0
+297 647 m 0
+ 339 664 383 674 428 674 c 0
+ 473 674 517 665 560 648 c 0
+ 603 631 641 607 673 576 c 0
+ 705 545 731 508 749 465 c 0
+ 767 422 776 378 776 333 c 0
+ 776 288 767 244 749 202 c 0
+ 731 160 706 123 674 92 c 0
+ 642 61 604 36 561 19 c 0
+ 518 2 475 -7 430 -7 c 0
+ 385 -7 341 2 298 19 c 0
+ 255 36 218 61 186 92 c 0
+ 154 123 128 160 110 202 c 0
+ 92 244 83 288 83 333 c 0
+ 83 378 92 422 110 464 c 0
+ 128 506 153 544 185 575 c 0
+ 217 606 255 630 297 647 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni2759
+Encoding: 10073 10073 389
+Width: 585
+VWidth: 1023
+Flags: W
+HStem: 0 21G<250.8 333.8>
+VStem: 250.8 83<0 621>
+LayerCount: 4
+Fore
+SplineSet
+333.8 621 m 5
+ 333.8 0 l 5
+ 250.8 0 l 5
+ 250.8 621 l 5
+ 333.8 621 l 5
+EndSplineSet
+EndChar
+
+StartChar: uni232B
+Encoding: 9003 9003 390
+Width: 656
+VWidth: 0
+Flags: W
+HStem: 1.94336 91.3867<315.674 405.618 512.95 602.891> 380.547 91.387<315.674 404.66 515.239 602.891>
+VStem: 602.891 118.322<93.3301 184.022 287.187 380.547>
+LayerCount: 4
+Fore
+SplineSet
+246.4 471.934 m 5
+ 681.704 471.934 l 6
+ 707.677 471.934 721.213 453.572 721.213 432.766 c 6
+ 721.213 41.1064 l 6
+ 721.213 21.2227 704.192 2.8252 683.427 1.94336 c 6
+ 246.4 1.94336 l 5
+ 11.4053 236.938 l 5
+ 246.4 471.934 l 5
+315.674 380.547 m 5
+ 315.674 332.675 l 6
+ 314.646 319.217 319.044 306.072 329.14 296.77 c 6
+ 390.469 235.438 l 5
+ 329.14 175.609 l 6
+ 320.12 166.583 315.674 153.919 315.674 141.195 c 6
+ 315.674 93.3301 l 5
+ 363.545 93.3301 l 6
+ 376.26 93.3301 388.933 97.7715 397.952 106.796 c 6
+ 459.281 168.127 l 5
+ 520.617 106.796 l 6
+ 529.638 97.7715 542.311 93.3301 555.025 93.3301 c 6
+ 602.891 93.3301 l 5
+ 602.891 141.195 l 6
+ 602.891 153.919 598.449 166.583 589.429 175.609 c 6
+ 529.593 235.438 l 5
+ 590.922 296.77 l 6
+ 601.25 306.305 602.891 318.976 602.891 332.675 c 6
+ 602.891 380.547 l 5
+ 555.025 380.547 l 6
+ 543.472 380.211 534.825 376.615 522.111 365.581 c 6
+ 459.281 304.252 l 5
+ 397.952 365.581 l 6
+ 389.441 374.374 377.243 379.979 365.044 380.547 c 4
+ 364.528 380.547 364.062 380.547 363.545 380.547 c 6
+ 315.674 380.547 l 5
+EndSplineSet
+EndChar
+
+StartChar: uni2328
+Encoding: 9000 9000 391
+Width: 625
+VWidth: 0
+Flags: W
+LayerCount: 4
+Fore
+SplineSet
+574 471.935 m 2
+ 50.5752 471.935 l 2
+ 29.877 471.935 13.1895 454.505 13.1895 432.887 c 2
+ 13.1895 42.3662 l 2
+ 13.1895 20.748 29.877 3.31836 50.5752 3.31836 c 2
+ 574 3.31836 l 2
+ 594.697 3.31836 611.385 20.748 611.385 42.3662 c 2
+ 611.385 432.887 l 2
+ 611.385 454.505 594.697 471.935 574 471.935 c 2
+536.607 393.838 m 1
+ 536.607 315.731 l 1
+ 461.836 315.731 l 1
+ 461.836 393.838 l 1
+ 536.607 393.838 l 1
+424.443 393.838 m 1
+ 424.443 315.731 l 1
+ 349.664 315.731 l 1
+ 349.664 393.838 l 1
+ 424.443 393.838 l 1
+312.278 393.838 m 1
+ 312.278 315.731 l 1
+ 237.501 315.731 l 1
+ 237.501 393.838 l 1
+ 312.278 393.838 l 1
+200.115 393.838 m 1
+ 200.115 315.731 l 1
+ 125.353 315.731 l 1
+ 125.353 393.838 l 1
+ 200.115 393.838 l 1
+499.222 275.454 m 1
+ 499.222 197.364 l 1
+ 424.443 197.364 l 1
+ 424.443 275.454 l 1
+ 499.222 275.454 l 1
+387.059 275.454 m 1
+ 387.059 197.364 l 1
+ 312.278 197.364 l 1
+ 312.278 275.454 l 1
+ 387.059 275.454 l 1
+274.887 275.454 m 1
+ 274.887 197.364 l 1
+ 200.115 197.364 l 1
+ 200.115 275.454 l 1
+ 274.887 275.454 l 1
+162.738 275.454 m 1
+ 162.738 197.364 l 1
+ 87.958 197.364 l 1
+ 87.958 275.454 l 1
+ 162.738 275.454 l 1
+536.607 158.309 m 1
+ 536.607 80.2021 l 1
+ 461.836 80.2021 l 1
+ 461.836 158.309 l 1
+ 536.607 158.309 l 1
+424.443 158.309 m 1
+ 424.443 80.2021 l 1
+ 200.115 80.2021 l 1
+ 200.115 158.309 l 1
+ 424.443 158.309 l 1
+162.738 158.309 m 1
+ 162.738 80.2021 l 1
+ 50.5752 80.2021 l 1
+ 50.5752 158.309 l 1
+ 162.738 158.309 l 1
+EndSplineSet
+EndChar
+
+StartChar: uni25FE
+Encoding: 9726 9726 392
+Width: 680
+VWidth: 0
+Flags: W
+HStem: 99 476<102 578>
+VStem: 102 476<99 575>
+LayerCount: 4
+Fore
+SplineSet
578 99 m 1
102 99 l 1
102 575 l 1
diff --git a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
index 5210df0ab40..c232d20c85e 100644
--- a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
+++ b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
@@ -1,11 +1,11 @@
%Filename: ot1fca.fd
%Created by: tex cantarell-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ot1fca.fd}
- [2011/08/21 Fontinst v1.927 font definitions for OT1/fca.]
+ [2011/11/11 Fontinst v1.933 font definitions for OT1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
index eb6fc55ac9a..140305e4d24 100644
--- a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
+++ b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
@@ -1,11 +1,11 @@
%Filename: t1fca.fd
%Created by: tex cantarell-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1fca.fd}
- [2011/08/21 Fontinst v1.927 font definitions for T1/fca.]
+ [2011/11/11 Fontinst v1.933 font definitions for T1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
index d66e06fbfc5..b23a4bb700a 100644
--- a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
+++ b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
@@ -1,11 +1,11 @@
%Filename: ts1fca.fd
%Created by: tex cantarell-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1fca.fd}
- [2011/08/21 Fontinst v1.927 font definitions for TS1/fca.]
+ [2011/11/11 Fontinst v1.933 font definitions for TS1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty