summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-09-08 00:00:54 +0000
committerKarl Berry <karl@freefriends.org>2006-09-08 00:00:54 +0000
commit99bebf5ca1a722256a732d6cd630b1a2165b85d7 (patch)
tree24759c8e2c931963a38badf1b0d1e38276bdba21 /Master/texmf-dist/fonts
parent5c6d8279370b75ec409c087237a798f1fe547cf1 (diff)
archaic update for sarabian, archaicprw.map (10feb06)
git-svn-id: svn://tug.org/texlive/trunk@2101 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts')
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/etr10.afm88
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/fut10.afm58
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/givbc10.afm24
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/gvibc10.afm60
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/oandsi10.afm10
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/oandsu10.afm12
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/phnc10.afm22
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/pmhg.afm102
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/proto10.afm84
-rw-r--r--Master/texmf-dist/fonts/afm/public/archaic/sarab10.afm277
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/archaicprw.map18
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/etruscan.map1
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/fut10.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/greek4cbc.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/greek6cbc.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/hieroglf.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/oands.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/phoenician.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/proto10.map1
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/protosem.map1
-rw-r--r--Master/texmf-dist/fonts/map/dvips/archaic/sarabian.map1
-rw-r--r--Master/texmf-dist/fonts/source/archaic/copsn10.mf1001
-rw-r--r--Master/texmf-dist/fonts/source/archaic/givbc10.mf921
-rw-r--r--Master/texmf-dist/fonts/source/archaic/gvibc10.mf354
-rw-r--r--Master/texmf-dist/fonts/source/archaic/vik10.mf38
-rw-r--r--Master/texmf-dist/fonts/source/archaic/vikglyph.mf394
-rw-r--r--Master/texmf-dist/fonts/source/archaic/viktitle.mf52
-rw-r--r--Master/texmf-dist/fonts/tfm/archaic/phnc10.tfmbin496 -> 496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/archaic/proto10.tfmbin1268 -> 500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/archaic/sarab10.tfmbin0 -> 484 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/etr10.pfbbin19266 -> 32292 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/fut10.pfbbin23523 -> 23379 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/givbc10.pfbbin16351 -> 26557 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/gvibc10.pfbbin22251 -> 22289 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/oandsi10.pfbbin9294 -> 9383 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/oandsu10.pfbbin9254 -> 14044 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/phnc10.pfbbin24435 -> 25708 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/pmhg.pfbbin41535 -> 41357 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/proto10.pfbbin50429 -> 27907 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/archaic/sarab10.pfbbin0 -> 25245 bytes
40 files changed, 534 insertions, 2999 deletions
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/etr10.afm b/Master/texmf-dist/fonts/afm/public/archaic/etr10.afm
index 35d142a5392..67605cad09d 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/etr10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/etr10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Tue Apr 12 17:01:39 2005
-FontName etr10
-FullName Archaic-Etruscan
+Comment Creation Date: Fri Nov 11 16:39:55 2005
+FontName Archaic-Etruscan
+FullName Archaic Etruscan
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
@@ -12,7 +12,7 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 113 -33 886 742
+FontBBox 113 -32 886 741
XHeight 700
Ascender 732
Descender -5
@@ -83,62 +83,62 @@ C 62 ; WX 0 ; N greater ; B 0 0 0 0 ;
C 63 ; WX 0 ; N question ; B 0 0 0 0 ;
C 64 ; WX 0 ; N at ; B 0 0 0 0 ;
C 65 ; WX 0 ; N A ; B 0 0 0 0 ;
-C 66 ; WX 720 ; N B ; B 114 -6 606 701 ;
-C 67 ; WX 720 ; N C ; B 114 -6 606 701 ;
-C 68 ; WX 720 ; N D ; B 115 -15 605 742 ;
+C 66 ; WX 720 ; N B ; B 114 -7 606 701 ;
+C 67 ; WX 720 ; N C ; B 115 -5 606 700 ;
+C 68 ; WX 720 ; N D ; B 116 -15 605 741 ;
C 69 ; WX 720 ; N E ; B 115 -5 605 732 ;
-C 70 ; WX 720 ; N F ; B 114 -5 606 732 ;
-C 71 ; WX 720 ; N G ; B 114 -6 606 732 ;
-C 72 ; WX 720 ; N H ; B 114 -6 606 701 ;
+C 70 ; WX 720 ; N F ; B 114 -5 605 732 ;
+C 71 ; WX 720 ; N G ; B 115 -5 605 732 ;
+C 72 ; WX 720 ; N H ; B 115 -5 606 700 ;
C 73 ; WX 0 ; N I ; B 0 0 0 0 ; L J IJ ;
-C 74 ; WX 720 ; N J ; B 115 -6 605 700 ;
-C 75 ; WX 720 ; N K ; B 114 -6 606 733 ;
-C 76 ; WX 580 ; N L ; B 114 -6 465 733 ;
-C 77 ; WX 1000 ; N M ; B 114 -5 886 701 ;
-C 78 ; WX 720 ; N N ; B 114 -5 606 701 ;
+C 74 ; WX 720 ; N J ; B 116 -5 605 700 ;
+C 75 ; WX 720 ; N K ; B 115 -5 606 732 ;
+C 76 ; WX 580 ; N L ; B 115 -5 465 732 ;
+C 77 ; WX 1000 ; N M ; B 115 -5 886 700 ;
+C 78 ; WX 720 ; N N ; B 115 -5 606 700 ;
C 79 ; WX 0 ; N O ; B 0 0 0 0 ;
-C 80 ; WX 720 ; N P ; B 114 -5 606 701 ;
-C 81 ; WX 580 ; N Q ; B 114 -6 466 734 ;
-C 82 ; WX 580 ; N R ; B 115 -6 466 700 ;
+C 80 ; WX 720 ; N P ; B 115 -5 605 700 ;
+C 81 ; WX 580 ; N Q ; B 115 -5 466 733 ;
+C 82 ; WX 580 ; N R ; B 115 -5 466 700 ;
C 83 ; WX 860 ; N S ; B 115 -5 746 700 ;
-C 84 ; WX 1000 ; N T ; B 114 -33 886 734 ;
-C 85 ; WX 720 ; N U ; B 115 -5 606 732 ;
+C 84 ; WX 1000 ; N T ; B 115 -32 885 733 ;
+C 85 ; WX 720 ; N U ; B 115 -5 605 731 ;
C 86 ; WX 0 ; N V ; B 0 0 0 0 ;
C 87 ; WX 0 ; N W ; B 0 0 0 0 ;
-C 88 ; WX 720 ; N X ; B 114 -7 605 701 ;
-C 89 ; WX 720 ; N Y ; B 114 -6 606 701 ;
-C 90 ; WX 580 ; N Z ; B 115 -6 466 700 ;
+C 88 ; WX 720 ; N X ; B 115 -6 605 701 ;
+C 89 ; WX 720 ; N Y ; B 115 -5 605 700 ;
+C 90 ; WX 580 ; N Z ; B 115 -5 465 700 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
C 93 ; WX 0 ; N bracketright ; B 0 0 0 0 ;
C 94 ; WX 0 ; N asciicircum ; B 0 0 0 0 ;
C 95 ; WX 0 ; N underscore ; B 0 0 0 0 ;
C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
-C 97 ; WX 720 ; N a ; B 115 -6 606 701 ;
-C 98 ; WX 720 ; N b ; B 114 -6 607 702 ;
+C 97 ; WX 720 ; N a ; B 116 -6 605 700 ;
+C 98 ; WX 720 ; N b ; B 114 -7 607 702 ;
C 99 ; WX 0 ; N c ; B 0 0 0 0 ;
-C 100 ; WX 720 ; N d ; B 115 -15 607 742 ;
-C 101 ; WX 720 ; N e ; B 115 -5 606 733 ;
-C 102 ; WX 720 ; N f ; B 114 -13 606 733 ; L l fl ; L i fi ; L f ff ;
-C 103 ; WX 720 ; N g ; B 114 -6 606 732 ;
-C 104 ; WX 720 ; N h ; B 114 -6 605 701 ;
-C 105 ; WX 440 ; N i ; B 184 -6 257 701 ; L j ij ;
+C 100 ; WX 720 ; N d ; B 115 -14 606 741 ;
+C 101 ; WX 720 ; N e ; B 115 -5 605 732 ;
+C 102 ; WX 720 ; N f ; B 115 -13 605 732 ; L l fl ; L i fi ; L f ff ;
+C 103 ; WX 720 ; N g ; B 115 -5 605 732 ;
+C 104 ; WX 720 ; N h ; B 114 -5 605 700 ;
+C 105 ; WX 440 ; N i ; B 185 -5 257 701 ; L j ij ;
C 106 ; WX 0 ; N j ; B 0 0 0 0 ;
-C 107 ; WX 720 ; N k ; B 114 -5 663 733 ;
-C 108 ; WX 580 ; N l ; B 114 -6 466 733 ;
-C 109 ; WX 1000 ; N m ; B 114 -5 886 701 ;
-C 110 ; WX 720 ; N n ; B 115 -5 606 701 ;
-C 111 ; WX 1000 ; N o ; B 114 -33 886 734 ;
-C 112 ; WX 580 ; N p ; B 114 -6 466 734 ;
-C 113 ; WX 720 ; N q ; B 114 -6 606 733 ;
-C 114 ; WX 580 ; N r ; B 114 -6 466 700 ;
-C 115 ; WX 580 ; N s ; B 114 -5 466 700 ;
-C 116 ; WX 720 ; N t ; B 115 -6 605 700 ;
+C 107 ; WX 720 ; N k ; B 114 -5 663 732 ;
+C 108 ; WX 580 ; N l ; B 114 -5 466 732 ;
+C 109 ; WX 1000 ; N m ; B 115 -5 885 700 ;
+C 110 ; WX 720 ; N n ; B 115 -5 606 700 ;
+C 111 ; WX 1000 ; N o ; B 115 -32 885 733 ;
+C 112 ; WX 580 ; N p ; B 114 -5 465 733 ;
+C 113 ; WX 720 ; N q ; B 115 -5 605 732 ;
+C 114 ; WX 580 ; N r ; B 114 -5 465 700 ;
+C 115 ; WX 580 ; N s ; B 115 -5 465 700 ;
+C 116 ; WX 720 ; N t ; B 115 -5 605 700 ;
C 117 ; WX 0 ; N u ; B 0 0 0 0 ;
-C 118 ; WX 720 ; N v ; B 114 -6 607 701 ;
+C 118 ; WX 720 ; N v ; B 115 -6 606 700 ;
C 119 ; WX 0 ; N w ; B 0 0 0 0 ;
-C 120 ; WX 720 ; N x ; B 113 -6 606 701 ;
-C 121 ; WX 720 ; N y ; B 115 -6 606 700 ;
+C 120 ; WX 720 ; N x ; B 113 -5 606 700 ;
+C 121 ; WX 720 ; N y ; B 115 -5 605 700 ;
C 122 ; WX 440 ; N z ; B 115 -5 325 700 ;
C 123 ; WX 0 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/fut10.afm b/Master/texmf-dist/fonts/afm/public/archaic/fut10.afm
index 2f1f78dbabb..db29bcd9b33 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/fut10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/fut10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Thu Mar 31 20:04:41 2005
-FontName fut10
-FullName Archaic-Futharc
+Comment Creation Date: Fri Nov 11 18:27:44 2005
+FontName Archaic-Futharc
+FullName Archaic Futharc
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R Wilson)
@@ -12,18 +12,18 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 114 -33 607 733
-CapHeight 700
+FontBBox 114 -32 606 732
+CapHeight 701
StartCharMetrics 256
C 0 ; WX 0 ; N grave ; B 0 0 0 0 ;
C 1 ; WX 0 ; N acute ; B 0 0 0 0 ;
-C 2 ; WX 580 ; N circumflex ; B 114 -6 466 701 ;
+C 2 ; WX 580 ; N circumflex ; B 114 -5 465 701 ;
C 3 ; WX 0 ; N tilde ; B 0 0 0 0 ;
C 4 ; WX 0 ; N dieresis ; B 0 0 0 0 ;
C 5 ; WX 0 ; N hungarumlaut ; B 0 0 0 0 ;
C 6 ; WX 0 ; N ring ; B 0 0 0 0 ;
C 7 ; WX 0 ; N caron ; B 0 0 0 0 ;
-C 8 ; WX 720 ; N breve ; B 114 -6 606 701 ;
+C 8 ; WX 720 ; N breve ; B 115 -5 606 700 ;
C 9 ; WX 0 ; N macron ; B 0 0 0 0 ;
C 10 ; WX 0 ; N dotaccent ; B 0 0 0 0 ;
C 11 ; WX 0 ; N cedilla ; B 0 0 0 0 ;
@@ -73,38 +73,38 @@ C 54 ; WX 0 ; N six ; B 0 0 0 0 ;
C 55 ; WX 0 ; N seven ; B 0 0 0 0 ;
C 56 ; WX 0 ; N eight ; B 0 0 0 0 ;
C 57 ; WX 0 ; N nine ; B 0 0 0 0 ;
-C 58 ; WX 440 ; N colon ; B 183 107 258 593 ;
+C 58 ; WX 440 ; N colon ; B 184 108 257 592 ;
C 59 ; WX 0 ; N semicolon ; B 0 0 0 0 ;
C 60 ; WX 0 ; N less ; B 0 0 0 0 ;
C 61 ; WX 0 ; N equal ; B 0 0 0 0 ;
C 62 ; WX 0 ; N greater ; B 0 0 0 0 ;
C 63 ; WX 0 ; N question ; B 0 0 0 0 ;
C 64 ; WX 0 ; N at ; B 0 0 0 0 ;
-C 65 ; WX 720 ; N A ; B 114 -5 606 733 ;
-C 66 ; WX 580 ; N B ; B 114 -6 466 701 ;
+C 65 ; WX 720 ; N A ; B 115 -5 606 732 ;
+C 66 ; WX 580 ; N B ; B 114 -5 465 700 ;
C 67 ; WX 0 ; N C ; B 0 0 0 0 ;
C 68 ; WX 720 ; N D ; B 114 -5 606 701 ;
-C 69 ; WX 720 ; N E ; B 114 -6 606 701 ;
-C 70 ; WX 580 ; N F ; B 114 -6 466 732 ;
-C 71 ; WX 720 ; N G ; B 114 -7 605 701 ;
-C 72 ; WX 720 ; N H ; B 114 -6 606 701 ;
-C 73 ; WX 440 ; N I ; B 184 -6 257 701 ; L J IJ ;
-C 74 ; WX 580 ; N J ; B 114 -6 466 701 ;
-C 75 ; WX 580 ; N K ; B 114 -6 466 700 ;
-C 76 ; WX 580 ; N L ; B 114 -6 466 701 ;
-C 77 ; WX 720 ; N M ; B 114 -6 606 701 ;
-C 78 ; WX 580 ; N N ; B 114 -5 466 700 ;
-C 79 ; WX 720 ; N O ; B 114 -33 607 733 ;
-C 80 ; WX 720 ; N P ; B 114 -6 606 700 ;
+C 69 ; WX 720 ; N E ; B 114 -5 606 700 ;
+C 70 ; WX 580 ; N F ; B 114 -5 466 732 ;
+C 71 ; WX 720 ; N G ; B 115 -6 605 701 ;
+C 72 ; WX 720 ; N H ; B 114 -5 606 700 ;
+C 73 ; WX 440 ; N I ; B 184 -5 257 701 ; L J IJ ;
+C 74 ; WX 580 ; N J ; B 115 -5 465 701 ;
+C 75 ; WX 580 ; N K ; B 114 -5 465 700 ;
+C 76 ; WX 580 ; N L ; B 114 -5 466 701 ;
+C 77 ; WX 720 ; N M ; B 114 -5 606 700 ;
+C 78 ; WX 580 ; N N ; B 115 -5 466 700 ;
+C 79 ; WX 720 ; N O ; B 115 -32 606 732 ;
+C 80 ; WX 720 ; N P ; B 115 -5 605 700 ;
C 81 ; WX 0 ; N Q ; B 0 0 0 0 ;
-C 82 ; WX 580 ; N R ; B 114 -6 466 700 ;
-C 83 ; WX 580 ; N S ; B 114 -6 466 700 ;
-C 84 ; WX 580 ; N T ; B 114 -5 466 700 ;
-C 85 ; WX 720 ; N U ; B 114 -5 607 700 ;
+C 82 ; WX 580 ; N R ; B 114 -5 466 700 ;
+C 83 ; WX 580 ; N S ; B 114 -5 466 700 ;
+C 84 ; WX 580 ; N T ; B 115 -5 465 700 ;
+C 85 ; WX 720 ; N U ; B 114 -5 606 700 ;
C 86 ; WX 0 ; N V ; B 0 0 0 0 ;
-C 87 ; WX 580 ; N W ; B 114 -6 467 701 ;
-C 88 ; WX 720 ; N X ; B 114 -5 606 701 ;
-C 89 ; WX 720 ; N Y ; B 114 -6 607 701 ;
+C 87 ; WX 580 ; N W ; B 114 -5 466 700 ;
+C 88 ; WX 720 ; N X ; B 115 -5 605 700 ;
+C 89 ; WX 720 ; N Y ; B 115 -5 606 700 ;
C 90 ; WX 0 ; N Z ; B 0 0 0 0 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/givbc10.afm b/Master/texmf-dist/fonts/afm/public/archaic/givbc10.afm
index 9027522fef2..e805c4450eb 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/givbc10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/givbc10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Wed Apr 6 14:34:59 2005
-FontName givbc10
-FullName Archaic-Greek-4th-Century-BC
+Comment Creation Date: Fri Nov 11 17:41:46 2005
+FontName Archaic-Greek-4th-Century-BC
+FullName Archaic Greek 4th Century BC
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
@@ -86,7 +86,7 @@ C 66 ; WX 678 ; N B ; B 111 -68 566 751 ;
C 67 ; WX 0 ; N C ; B 0 0 0 0 ;
C 68 ; WX 0 ; N D ; B 0 0 0 0 ;
C 69 ; WX 0 ; N E ; B 0 0 0 0 ;
-C 70 ; WX 658 ; N F ; B 55 -68 602 751 ;
+C 70 ; WX 658 ; N F ; B 56 -68 602 751 ;
C 71 ; WX 0 ; N G ; B 0 0 0 0 ;
C 72 ; WX 0 ; N H ; B 0 0 0 0 ;
C 73 ; WX 0 ; N I ; B 0 0 0 0 ; L J IJ ;
@@ -95,17 +95,17 @@ C 75 ; WX 0 ; N K ; B 0 0 0 0 ;
C 76 ; WX 0 ; N L ; B 0 0 0 0 ;
C 77 ; WX 946 ; N M ; B 61 -76 887 683 ;
C 78 ; WX 906 ; N N ; B 111 -76 794 759 ;
-C 79 ; WX 1022 ; N O ; B 55 0 966 684 ;
-C 80 ; WX 681 ; N P ; B 56 0 624 683 ;
-C 81 ; WX 794 ; N Q ; B 56 -68 737 751 ;
-C 82 ; WX 567 ; N R ; B 55 -68 436 751 ;
+C 79 ; WX 1022 ; N O ; B 55 0 966 683 ;
+C 80 ; WX 681 ; N P ; B 57 0 623 683 ;
+C 81 ; WX 794 ; N Q ; B 57 -68 736 751 ;
+C 82 ; WX 567 ; N R ; B 55 -68 435 751 ;
C 83 ; WX 0 ; N S ; B 0 0 0 0 ;
-C 84 ; WX 794 ; N T ; B 55 -1 739 684 ;
+C 84 ; WX 794 ; N T ; B 56 0 739 684 ;
C 85 ; WX 0 ; N U ; B 0 0 0 0 ;
C 86 ; WX 0 ; N V ; B 0 0 0 0 ;
C 87 ; WX 0 ; N W ; B 0 0 0 0 ;
C 88 ; WX 794 ; N X ; B 57 0 739 683 ;
-C 89 ; WX 931 ; N Y ; B 56 -68 874 751 ;
+C 89 ; WX 931 ; N Y ; B 57 -68 873 751 ;
C 90 ; WX 0 ; N Z ; B 0 0 0 0 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
@@ -118,7 +118,7 @@ C 98 ; WX 602 ; N b ; B 111 0 489 683 ;
C 99 ; WX 0 ; N c ; B 0 0 0 0 ;
C 100 ; WX 946 ; N d ; B 42 0 904 682 ;
C 101 ; WX 719 ; N e ; B 56 0 663 683 ;
-C 102 ; WX 567 ; N f ; B 55 0 511 683 ; L l fl ; L i fi ; L f ff ;
+C 102 ; WX 567 ; N f ; B 56 0 510 683 ; L l fl ; L i fi ; L f ff ;
C 103 ; WX 643 ; N g ; B 56 0 586 683 ;
C 104 ; WX 906 ; N h ; B 111 0 794 683 ;
C 105 ; WX 298 ; N i ; B 111 0 187 683 ; L j ij ;
@@ -127,7 +127,7 @@ C 107 ; WX 567 ; N k ; B 55 0 511 683 ;
C 108 ; WX 946 ; N l ; B 65 0 881 682 ;
C 109 ; WX 946 ; N m ; B 61 0 887 683 ;
C 110 ; WX 906 ; N n ; B 111 0 794 683 ;
-C 111 ; WX 794 ; N o ; B 55 -1 739 684 ;
+C 111 ; WX 794 ; N o ; B 56 0 739 684 ;
C 112 ; WX 906 ; N p ; B 111 0 794 683 ;
C 113 ; WX 0 ; N q ; B 0 0 0 0 ;
C 114 ; WX 491 ; N r ; B 55 0 436 684 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/gvibc10.afm b/Master/texmf-dist/fonts/afm/public/archaic/gvibc10.afm
index 2bcd0017831..586c5e2427f 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/gvibc10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/gvibc10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Wed Apr 6 12:50:15 2005
-FontName gvibc10
-FullName Archaic-Greek-6th-Century-BC
+Comment Creation Date: Fri Nov 11 17:50:29 2005
+FontName Archaic-Greek-6th-Century-BC
+FullName Archaic Greek 6th Century BC
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
@@ -12,10 +12,10 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 113 -34 886 734
-XHeight 700
-Ascender 732
-Descender -4
+FontBBox 114 -34 885 733
+XHeight 701
+Ascender 733
+Descender -5
StartCharMetrics 256
C 0 ; WX 0 ; N grave ; B 0 0 0 0 ;
C 1 ; WX 0 ; N acute ; B 0 0 0 0 ;
@@ -87,7 +87,7 @@ C 66 ; WX 0 ; N B ; B 0 0 0 0 ;
C 67 ; WX 0 ; N C ; B 0 0 0 0 ;
C 68 ; WX 0 ; N D ; B 0 0 0 0 ;
C 69 ; WX 0 ; N E ; B 0 0 0 0 ;
-C 70 ; WX 720 ; N F ; B 114 -5 606 702 ;
+C 70 ; WX 720 ; N F ; B 114 -5 605 702 ;
C 71 ; WX 0 ; N G ; B 0 0 0 0 ;
C 72 ; WX 0 ; N H ; B 0 0 0 0 ;
C 73 ; WX 0 ; N I ; B 0 0 0 0 ; L J IJ ;
@@ -96,16 +96,16 @@ C 75 ; WX 0 ; N K ; B 0 0 0 0 ;
C 76 ; WX 0 ; N L ; B 0 0 0 0 ;
C 77 ; WX 0 ; N M ; B 0 0 0 0 ;
C 78 ; WX 0 ; N N ; B 0 0 0 0 ;
-C 79 ; WX 1000 ; N O ; B 115 -34 885 733 ;
-C 80 ; WX 720 ; N P ; B 118 -5 606 700 ;
+C 79 ; WX 1000 ; N O ; B 116 -34 885 732 ;
+C 80 ; WX 720 ; N P ; B 117 -5 605 700 ;
C 81 ; WX 0 ; N Q ; B 0 0 0 0 ;
C 82 ; WX 0 ; N R ; B 0 0 0 0 ;
C 83 ; WX 0 ; N S ; B 0 0 0 0 ;
-C 84 ; WX 1000 ; N T ; B 114 -33 886 734 ;
+C 84 ; WX 1000 ; N T ; B 115 -32 885 733 ;
C 85 ; WX 0 ; N U ; B 0 0 0 0 ;
C 86 ; WX 0 ; N V ; B 0 0 0 0 ;
C 87 ; WX 0 ; N W ; B 0 0 0 0 ;
-C 88 ; WX 720 ; N X ; B 114 -7 605 701 ;
+C 88 ; WX 720 ; N X ; B 115 -6 605 701 ;
C 89 ; WX 0 ; N Y ; B 0 0 0 0 ;
C 90 ; WX 0 ; N Z ; B 0 0 0 0 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
@@ -114,31 +114,31 @@ C 93 ; WX 0 ; N bracketright ; B 0 0 0 0 ;
C 94 ; WX 0 ; N asciicircum ; B 0 0 0 0 ;
C 95 ; WX 0 ; N underscore ; B 0 0 0 0 ;
C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
-C 97 ; WX 720 ; N a ; B 115 -5 606 701 ;
-C 98 ; WX 720 ; N b ; B 114 -8 607 704 ;
+C 97 ; WX 720 ; N a ; B 115 -5 605 700 ;
+C 98 ; WX 720 ; N b ; B 114 -9 607 704 ;
C 99 ; WX 0 ; N c ; B 0 0 0 0 ;
-C 100 ; WX 720 ; N d ; B 115 -1 606 701 ;
-C 101 ; WX 720 ; N e ; B 114 -7 606 702 ;
-C 102 ; WX 720 ; N f ; B 115 -33 605 733 ; L l fl ; L i fi ; L f ff ;
-C 103 ; WX 580 ; N g ; B 113 -5 466 701 ;
+C 100 ; WX 720 ; N d ; B 115 -1 605 700 ;
+C 101 ; WX 720 ; N e ; B 114 -7 605 702 ;
+C 102 ; WX 720 ; N f ; B 115 -32 605 732 ; L l fl ; L i fi ; L f ff ;
+C 103 ; WX 580 ; N g ; B 114 -5 465 701 ;
C 104 ; WX 720 ; N h ; B 114 -6 606 701 ;
-C 105 ; WX 440 ; N i ; B 184 -6 257 701 ; L j ij ;
+C 105 ; WX 440 ; N i ; B 184 -5 257 701 ; L j ij ;
C 106 ; WX 0 ; N j ; B 0 0 0 0 ;
-C 107 ; WX 720 ; N k ; B 113 -5 663 733 ;
-C 108 ; WX 580 ; N l ; B 113 -6 466 733 ;
-C 109 ; WX 1000 ; N m ; B 114 -5 886 701 ;
-C 110 ; WX 720 ; N n ; B 114 -32 607 732 ;
-C 111 ; WX 1000 ; N o ; B 114 -33 886 734 ;
-C 112 ; WX 580 ; N p ; B 114 -5 467 702 ;
-C 113 ; WX 720 ; N q ; B 114 -6 606 733 ;
-C 114 ; WX 580 ; N r ; B 114 -5 466 701 ;
-C 115 ; WX 860 ; N s ; B 114 -33 745 733 ;
-C 116 ; WX 720 ; N t ; B 115 -6 606 701 ;
+C 107 ; WX 720 ; N k ; B 114 -5 663 732 ;
+C 108 ; WX 580 ; N l ; B 114 -5 465 733 ;
+C 109 ; WX 1000 ; N m ; B 114 -5 885 700 ;
+C 110 ; WX 720 ; N n ; B 114 -32 606 732 ;
+C 111 ; WX 1000 ; N o ; B 115 -32 885 733 ;
+C 112 ; WX 580 ; N p ; B 114 -5 467 701 ;
+C 113 ; WX 720 ; N q ; B 115 -5 605 732 ;
+C 114 ; WX 580 ; N r ; B 114 -5 465 701 ;
+C 115 ; WX 860 ; N s ; B 115 -32 745 732 ;
+C 116 ; WX 720 ; N t ; B 116 -5 606 701 ;
C 117 ; WX 0 ; N u ; B 0 0 0 0 ;
C 118 ; WX 0 ; N v ; B 0 0 0 0 ;
C 119 ; WX 0 ; N w ; B 0 0 0 0 ;
C 120 ; WX 720 ; N x ; B 115 -6 606 701 ;
-C 121 ; WX 720 ; N y ; B 114 -6 606 700 ;
+C 121 ; WX 720 ; N y ; B 115 -5 605 700 ;
C 122 ; WX 440 ; N z ; B 115 -6 325 701 ;
C 123 ; WX 0 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/oandsi10.afm b/Master/texmf-dist/fonts/afm/public/archaic/oandsi10.afm
index cd001080af6..fb53448c518 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/oandsi10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/oandsi10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Sat Apr 2 14:52:41 2005
-FontName oandsi10
-FullName Archaic-OandS-Italic
+Comment Creation Date: Fri Nov 11 18:11:25 2005
+FontName Archaic-OandS-Italic
+FullName Archaic OandS Italic
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
@@ -13,7 +13,7 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 16 -215 554 697
+FontBBox 17 -215 554 697
StartCharMetrics 164
C 0 ; WX 0 ; N Gamma ; B 0 0 0 0 ;
C 1 ; WX 0 ; N Delta ; B 0 0 0 0 ;
@@ -137,7 +137,7 @@ C 118 ; WX 0 ; N v ; B 0 0 0 0 ;
C 119 ; WX 0 ; N w ; B 0 0 0 0 ;
C 120 ; WX 0 ; N x ; B 0 0 0 0 ;
C 121 ; WX 0 ; N y ; B 0 0 0 0 ;
-C 122 ; WX 460 ; N z ; B 16 -215 554 463 ;
+C 122 ; WX 460 ; N z ; B 17 -215 554 463 ;
C 123 ; WX 0 ; N endash ; B 0 0 0 0 ;
C 124 ; WX 0 ; N emdash ; B 0 0 0 0 ;
C 125 ; WX 0 ; N hungarumlaut ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/oandsu10.afm b/Master/texmf-dist/fonts/afm/public/archaic/oandsu10.afm
index e5d98b4d487..103b2585b17 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/oandsu10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/oandsu10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Sat Apr 2 14:44:07 2005
-FontName oandsu10
-FullName Archaic-OandS
+Comment Creation Date: Fri Nov 11 18:09:09 2005
+FontName Archaic-OandS
+FullName Archaic OandS
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
@@ -12,7 +12,7 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 57 -217 512 698
+FontBBox 57 -216 511 698
StartCharMetrics 164
C 0 ; WX 0 ; N Gamma ; B 0 0 0 0 ;
C 1 ; WX 0 ; N Delta ; B 0 0 0 0 ;
@@ -110,7 +110,7 @@ C 92 ; WX 0 ; N quotedblleft ; B 0 0 0 0 ;
C 93 ; WX 0 ; N bracketright ; B 0 0 0 0 ;
C 94 ; WX 0 ; N circumflex ; B 0 0 0 0 ;
C 95 ; WX 0 ; N dotaccent ; B 0 0 0 0 ;
-C 96 ; WX 329 ; N quoteleft ; B 95 390 219 698 ;
+C 96 ; WX 329 ; N quoteleft ; B 95 391 219 698 ;
C 97 ; WX 0 ; N a ; B 0 0 0 0 ;
C 98 ; WX 0 ; N b ; B 0 0 0 0 ;
C 99 ; WX 0 ; N c ; B 0 0 0 0 ;
@@ -136,7 +136,7 @@ C 118 ; WX 0 ; N v ; B 0 0 0 0 ;
C 119 ; WX 0 ; N w ; B 0 0 0 0 ;
C 120 ; WX 0 ; N x ; B 0 0 0 0 ;
C 121 ; WX 0 ; N y ; B 0 0 0 0 ;
-C 122 ; WX 551 ; N z ; B 57 -217 512 463 ;
+C 122 ; WX 551 ; N z ; B 57 -216 511 463 ;
C 123 ; WX 0 ; N endash ; B 0 0 0 0 ;
C 124 ; WX 0 ; N emdash ; B 0 0 0 0 ;
C 125 ; WX 0 ; N hungarumlaut ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/phnc10.afm b/Master/texmf-dist/fonts/afm/public/archaic/phnc10.afm
index ccd399a5579..08d3f3b1e05 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/phnc10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/phnc10.afm
@@ -1,18 +1,18 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Mon Apr 4 20:12:51 2005
-FontName phnc10
-FullName Archaic-Phoenician
+Comment Creation Date: Mon Feb 6 12:27:01 2006
+FontName Archaic-Phoenician
+FullName Archaic Phoenician
FamilyName Archaic
Weight Regular
-Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
+Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005-2006 Peter R. Wilson)
ItalicAngle 0
IsFixedPitch false
UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 96 -33 886 734
+FontBBox 113 -33 886 734
XHeight 732
Ascender 732
Descender -5
@@ -82,7 +82,7 @@ C 61 ; WX 0 ; N equal ; B 0 0 0 0 ;
C 62 ; WX 0 ; N greater ; B 0 0 0 0 ;
C 63 ; WX 0 ; N question ; B 0 0 0 0 ;
C 64 ; WX 0 ; N at ; B 0 0 0 0 ;
-C 65 ; WX 0 ; N A ; B 0 0 0 0 ;
+C 65 ; WX 720 ; N A ; B 114 38 606 662 ;
C 66 ; WX 720 ; N B ; B 150 -6 607 701 ;
C 67 ; WX 0 ; N C ; B 0 0 0 0 ;
C 68 ; WX 0 ; N D ; B 0 0 0 0 ;
@@ -93,7 +93,7 @@ C 72 ; WX 720 ; N H ; B 113 -6 606 701 ;
C 73 ; WX 0 ; N I ; B 0 0 0 0 ; L J IJ ;
C 74 ; WX 0 ; N J ; B 0 0 0 0 ;
C 75 ; WX 720 ; N K ; B 114 -32 606 733 ;
-C 76 ; WX 580 ; N L ; B 114 -6 467 733 ;
+C 76 ; WX 580 ; N L ; B 113 -6 466 733 ;
C 77 ; WX 1000 ; N M ; B 114 -5 886 701 ;
C 78 ; WX 720 ; N N ; B 114 -5 606 701 ;
C 79 ; WX 0 ; N O ; B 0 0 0 0 ;
@@ -106,7 +106,7 @@ C 85 ; WX 0 ; N U ; B 0 0 0 0 ;
C 86 ; WX 0 ; N V ; B 0 0 0 0 ;
C 87 ; WX 0 ; N W ; B 0 0 0 0 ;
C 88 ; WX 720 ; N X ; B 113 -33 605 733 ;
-C 89 ; WX 0 ; N Y ; B 0 0 0 0 ;
+C 89 ; WX 720 ; N Y ; B 115 -33 605 733 ;
C 90 ; WX 0 ; N Z ; B 0 0 0 0 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
@@ -125,7 +125,7 @@ C 104 ; WX 720 ; N h ; B 115 -5 606 733 ;
C 105 ; WX 0 ; N i ; B 0 0 0 0 ; L j ij ;
C 106 ; WX 0 ; N j ; B 0 0 0 0 ;
C 107 ; WX 720 ; N k ; B 115 -32 606 733 ;
-C 108 ; WX 580 ; N l ; B 113 -6 466 733 ;
+C 108 ; WX 580 ; N l ; B 114 -6 467 733 ;
C 109 ; WX 1000 ; N m ; B 114 -5 886 701 ;
C 110 ; WX 720 ; N n ; B 114 -5 606 701 ;
C 111 ; WX 1000 ; N o ; B 114 -33 886 734 ;
@@ -138,8 +138,8 @@ C 117 ; WX 0 ; N u ; B 0 0 0 0 ;
C 118 ; WX 0 ; N v ; B 0 0 0 0 ;
C 119 ; WX 720 ; N w ; B 115 0 606 732 ;
C 120 ; WX 720 ; N x ; B 115 -33 607 733 ;
-C 121 ; WX 440 ; N y ; B 184 -6 257 701 ;
-C 122 ; WX 440 ; N z ; B 96 -6 338 701 ;
+C 121 ; WX 720 ; N y ; B 115 -33 605 733 ;
+C 122 ; WX 440 ; N z ; B 115 -6 325 701 ;
C 123 ; WX 0 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
C 125 ; WX 0 ; N braceright ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/pmhg.afm b/Master/texmf-dist/fonts/afm/public/archaic/pmhg.afm
index bc72460d6fe..e1d493d3a6a 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/pmhg.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/pmhg.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Sat Apr 2 12:34:16 2005
-FontName pmhg
-FullName Archaic-Poor-Mans-Hieroglyphs
+Comment Creation Date: Fri Nov 11 17:59:42 2005
+FontName Archaic-Poor-Mans-Hieroglyphs
+FullName Archaic Poor Mans Hieroglyphs
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyleft 2005 Peter R. Wilson)
@@ -15,20 +15,20 @@ EncodingScheme FontSpecific
FontBBox -3 -740 1474 1288
CapHeight 1268
XHeight 1196
-Ascender 501
+Ascender 502
StartCharMetrics 256
C 0 ; WX 0 ; N grave ; B 0 0 0 0 ;
C 1 ; WX 780 ; N acute ; B 0 -1 580 1207 ;
-C 2 ; WX 1373 ; N circumflex ; B 0 0 1173 1229 ;
+C 2 ; WX 1373 ; N circumflex ; B 0 0 1173 1228 ;
C 3 ; WX 1427 ; N tilde ; B 0 0 1230 1264 ;
-C 4 ; WX 1408 ; N dieresis ; B -1 0 1208 882 ;
-C 5 ; WX 1673 ; N hungarumlaut ; B 0 0 1474 751 ;
+C 4 ; WX 1408 ; N dieresis ; B -1 1 1208 882 ;
+C 5 ; WX 1673 ; N hungarumlaut ; B 0 0 1474 750 ;
C 6 ; WX 1472 ; N ring ; B 0 0 1271 654 ;
-C 7 ; WX 1164 ; N caron ; B 0 17 963 1278 ;
+C 7 ; WX 1164 ; N caron ; B 0 17 963 1277 ;
C 8 ; WX 1439 ; N breve ; B -1 0 1238 946 ;
-C 9 ; WX 1228 ; N macron ; B -1 0 1028 1250 ;
+C 9 ; WX 1228 ; N macron ; B 0 0 1028 1250 ;
C 10 ; WX 1439 ; N dotaccent ; B 0 0 1239 379 ;
-C 11 ; WX 726 ; N cedilla ; B 0 0 525 455 ;
+C 11 ; WX 726 ; N cedilla ; B 0 0 524 455 ;
C 12 ; WX 0 ; N ogonek ; B 0 0 0 0 ;
C 13 ; WX 0 ; N quotesinglbase ; B 0 0 0 0 ;
C 14 ; WX 0 ; N guilsinglleft ; B 0 0 0 0 ;
@@ -64,15 +64,15 @@ C 43 ; WX 957 ; N plus ; B 0 0 757 1222 ;
C 44 ; WX 0 ; N comma ; B 0 0 0 0 ;
C 45 ; WX 0 ; N hyphen ; B 0 0 0 0 ;
C 46 ; WX 0 ; N period ; B 0 0 0 0 ;
-C 47 ; WX 544 ; N slash ; B 0 0 345 1206 ;
+C 47 ; WX 544 ; N slash ; B 0 0 344 1205 ;
C 48 ; WX 0 ; N zero ; B 0 0 0 0 ;
C 49 ; WX 0 ; N one ; B 0 0 0 0 ;
-C 50 ; WX 616 ; N two ; B -1 0 417 443 ;
-C 51 ; WX 515 ; N three ; B -1 -1 317 652 ;
-C 52 ; WX 613 ; N four ; B 0 0 413 1272 ;
-C 53 ; WX 456 ; N five ; B -1 0 257 1238 ;
-C 54 ; WX 1143 ; N six ; B -1 0 943 1223 ;
-C 55 ; WX 1198 ; N seven ; B 0 -1 998 1225 ;
+C 50 ; WX 616 ; N two ; B 0 0 417 443 ;
+C 51 ; WX 515 ; N three ; B 0 -1 317 652 ;
+C 52 ; WX 613 ; N four ; B 0 0 413 1271 ;
+C 53 ; WX 456 ; N five ; B 0 -1 256 1238 ;
+C 54 ; WX 1143 ; N six ; B 0 0 943 1223 ;
+C 55 ; WX 1198 ; N seven ; B 0 0 998 1225 ;
C 56 ; WX 0 ; N eight ; B 0 0 0 0 ;
C 57 ; WX 0 ; N nine ; B 0 0 0 0 ;
C 58 ; WX 0 ; N colon ; B 0 0 0 0 ;
@@ -80,34 +80,34 @@ C 59 ; WX 0 ; N semicolon ; B 0 0 0 0 ;
C 60 ; WX 0 ; N less ; B 0 0 0 0 ;
C 61 ; WX 0 ; N equal ; B 0 0 0 0 ;
C 62 ; WX 0 ; N greater ; B 0 0 0 0 ;
-C 63 ; WX 475 ; N question ; B 28 17 294 1235 ;
+C 63 ; WX 475 ; N question ; B 28 17 293 1235 ;
C 64 ; WX 0 ; N at ; B 0 0 0 0 ;
-C 65 ; WX 1509 ; N A ; B 0 -1 1316 401 ;
+C 65 ; WX 1509 ; N A ; B 0 0 1316 401 ;
C 66 ; WX 751 ; N B ; B 17 12 568 946 ;
-C 67 ; WX 784 ; N C ; B -3 0 584 591 ;
-C 68 ; WX 1336 ; N D ; B 8 -740 1136 483 ;
-C 69 ; WX 1391 ; N E ; B -1 -6 1193 624 ;
-C 70 ; WX 1461 ; N F ; B 0 0 1263 631 ;
-C 71 ; WX 784 ; N G ; B -1 0 585 567 ;
+C 67 ; WX 784 ; N C ; B -3 1 584 591 ;
+C 68 ; WX 1336 ; N D ; B 8 -740 1136 482 ;
+C 69 ; WX 1391 ; N E ; B -1 -6 1192 624 ;
+C 70 ; WX 1461 ; N F ; B 1 0 1263 631 ;
+C 71 ; WX 784 ; N G ; B 0 0 585 567 ;
C 72 ; WX 518 ; N H ; B 0 0 318 1233 ;
-C 73 ; WX 1111 ; N I ; B -2 0 911 1269 ; L J IJ ;
-C 74 ; WX 441 ; N J ; B 0 0 242 1252 ;
+C 73 ; WX 1111 ; N I ; B -2 0 911 1268 ; L J IJ ;
+C 74 ; WX 441 ; N J ; B 0 0 241 1252 ;
C 75 ; WX 733 ; N K ; B 0 0 533 548 ;
-C 76 ; WX 917 ; N L ; B 0 0 719 571 ;
-C 77 ; WX 1404 ; N M ; B 17 17 1222 292 ;
+C 76 ; WX 917 ; N L ; B 0 0 718 570 ;
+C 77 ; WX 1404 ; N M ; B 17 17 1222 291 ;
C 78 ; WX 1404 ; N N ; B 0 0 1204 293 ;
-C 79 ; WX 641 ; N O ; B -1 -6 445 623 ;
-C 80 ; WX 1455 ; N P ; B -3 -1 1256 310 ;
-C 81 ; WX 857 ; N Q ; B -1 -1 659 634 ;
-C 82 ; WX 1422 ; N R ; B -2 0 1222 821 ;
-C 83 ; WX 1404 ; N S ; B -1 31 1206 156 ;
-C 84 ; WX 1400 ; N T ; B -1 -1 1201 315 ;
+C 79 ; WX 641 ; N O ; B -1 -5 444 622 ;
+C 80 ; WX 1455 ; N P ; B -2 0 1255 310 ;
+C 81 ; WX 857 ; N Q ; B 0 -1 659 634 ;
+C 82 ; WX 1422 ; N R ; B -1 0 1222 820 ;
+C 83 ; WX 1404 ; N S ; B -1 32 1206 155 ;
+C 84 ; WX 1400 ; N T ; B 0 -1 1201 314 ;
C 85 ; WX 424 ; N U ; B 0 0 224 1239 ;
C 86 ; WX 492 ; N V ; B 26 0 292 1239 ;
-C 87 ; WX 609 ; N W ; B -1 0 411 668 ;
-C 88 ; WX 773 ; N X ; B 0 -1 575 577 ;
-C 89 ; WX 1009 ; N Y ; B 0 -1 809 1288 ;
-C 90 ; WX 1365 ; N Z ; B -1 -2 1166 1016 ;
+C 87 ; WX 609 ; N W ; B 0 1 410 667 ;
+C 88 ; WX 773 ; N X ; B 0 0 575 577 ;
+C 89 ; WX 1009 ; N Y ; B 0 0 809 1288 ;
+C 90 ; WX 1365 ; N Z ; B -1 -2 1166 1015 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
C 93 ; WX 0 ; N bracketright ; B 0 0 0 0 ;
@@ -115,30 +115,30 @@ C 94 ; WX 0 ; N asciicircum ; B 0 0 0 0 ;
C 95 ; WX 0 ; N underscore ; B 0 0 0 0 ;
C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
C 97 ; WX 1336 ; N a ; B 0 0 1136 1230 ;
-C 98 ; WX 903 ; N b ; B 0 -1 704 1169 ;
-C 99 ; WX 562 ; N c ; B -2 0 362 1225 ;
-C 100 ; WX 1414 ; N d ; B -3 0 1214 395 ;
+C 98 ; WX 903 ; N b ; B 0 -1 703 1169 ;
+C 99 ; WX 562 ; N c ; B -1 0 361 1225 ;
+C 100 ; WX 1414 ; N d ; B -3 1 1214 395 ;
C 101 ; WX 1425 ; N e ; B 0 0 1225 359 ;
-C 102 ; WX 1456 ; N f ; B -2 -1 1256 412 ; L l fl ; L i fi ; L f ff ;
+C 102 ; WX 1456 ; N f ; B -1 0 1256 412 ; L l fl ; L i fi ; L f ff ;
C 103 ; WX 871 ; N g ; B 0 32 676 602 ;
C 104 ; WX 940 ; N h ; B 0 0 740 585 ;
C 105 ; WX 500 ; N i ; B -1 0 301 1273 ; L j ij ;
C 106 ; WX 1215 ; N j ; B 0 0 1015 533 ;
-C 107 ; WX 1432 ; N k ; B 0 0 1234 376 ;
-C 108 ; WX 1435 ; N l ; B 0 -1 1235 502 ;
-C 109 ; WX 1370 ; N m ; B 0 -2 1170 1262 ;
-C 110 ; WX 1300 ; N n ; B 0 0 1100 168 ;
+C 107 ; WX 1432 ; N k ; B 0 0 1233 375 ;
+C 108 ; WX 1435 ; N l ; B 0 -1 1234 502 ;
+C 109 ; WX 1370 ; N m ; B 0 -1 1170 1261 ;
+C 110 ; WX 1300 ; N n ; B 0 0 1100 167 ;
C 111 ; WX 1232 ; N o ; B 0 1 1033 1171 ;
C 112 ; WX 579 ; N p ; B 0 0 379 499 ;
-C 113 ; WX 739 ; N q ; B -1 0 540 579 ;
-C 114 ; WX 1452 ; N r ; B 0 -1 1252 352 ;
-C 115 ; WX 430 ; N s ; B 0 0 233 1199 ;
+C 113 ; WX 739 ; N q ; B 0 0 540 579 ;
+C 114 ; WX 1452 ; N r ; B 0 -1 1252 351 ;
+C 115 ; WX 430 ; N s ; B 0 0 232 1198 ;
C 116 ; WX 837 ; N t ; B 0 0 637 344 ;
-C 117 ; WX 475 ; N u ; B -1 0 276 1246 ;
+C 117 ; WX 475 ; N u ; B 0 0 276 1245 ;
C 118 ; WX 1422 ; N v ; B 14 16 1240 644 ;
C 119 ; WX 1071 ; N w ; B 0 0 871 1241 ;
C 120 ; WX 486 ; N x ; B 0 0 286 1196 ;
-C 121 ; WX 928 ; N y ; B -1 0 729 1273 ;
+C 121 ; WX 928 ; N y ; B -1 0 728 1273 ;
C 122 ; WX 1456 ; N z ; B 0 0 1256 310 ;
C 123 ; WX 0 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 252 ; N bar ; B 0 0 52 516 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/proto10.afm b/Master/texmf-dist/fonts/afm/public/archaic/proto10.afm
index a4e7be2ac8c..f5cf2df6ea2 100644
--- a/Master/texmf-dist/fonts/afm/public/archaic/proto10.afm
+++ b/Master/texmf-dist/fonts/afm/public/archaic/proto10.afm
@@ -1,8 +1,8 @@
StartFontMetrics 2.0
Comment Generated by pfaedit
-Comment Creation Date: Mon Mar 28 19:33:38 2005
-FontName proto10
-FullName Archaic-ProtoSemitic
+Comment Creation Date: Fri Nov 11 18:21:51 2005
+FontName Archaic-ProtoSemitic
+FullName Archaic ProtoSemitic
FamilyName Archaic
Weight Regular
Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright 2005 Peter R. Wilson)
@@ -12,8 +12,8 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 118 -29 974 727
-XHeight 724
+FontBBox 118 -29 973 726
+XHeight 725
Ascender 726
Descender 80
StartCharMetrics 256
@@ -56,7 +56,7 @@ C 35 ; WX 0 ; N numbersign ; B 0 0 0 0 ;
C 36 ; WX 0 ; N dollar ; B 0 0 0 0 ;
C 37 ; WX 0 ; N percent ; B 0 0 0 0 ;
C 38 ; WX 0 ; N ampersand ; B 0 0 0 0 ;
-C 39 ; WX 860 ; N quoteright ; B 119 -25 741 725 ;
+C 39 ; WX 860 ; N quoteright ; B 120 -24 740 725 ;
C 40 ; WX 0 ; N parenleft ; B 0 0 0 0 ;
C 41 ; WX 0 ; N parenright ; B 0 0 0 0 ;
C 42 ; WX 0 ; N asterisk ; B 0 0 0 0 ;
@@ -82,64 +82,64 @@ C 61 ; WX 0 ; N equal ; B 0 0 0 0 ;
C 62 ; WX 0 ; N greater ; B 0 0 0 0 ;
C 63 ; WX 0 ; N question ; B 0 0 0 0 ;
C 64 ; WX 0 ; N at ; B 0 0 0 0 ;
-C 65 ; WX 860 ; N A ; B 119 -25 741 725 ;
-C 66 ; WX 860 ; N B ; B 119 44 741 725 ;
+C 65 ; WX 860 ; N A ; B 119 -24 740 725 ;
+C 66 ; WX 860 ; N B ; B 120 44 740 725 ;
C 67 ; WX 0 ; N C ; B 0 0 0 0 ;
-C 68 ; WX 720 ; N D ; B 120 -26 601 725 ;
-C 69 ; WX 580 ; N E ; B 118 -25 602 704 ;
+C 68 ; WX 720 ; N D ; B 120 -25 600 725 ;
+C 69 ; WX 580 ; N E ; B 119 -25 601 703 ;
C 70 ; WX 0 ; N F ; B 0 0 0 0 ;
C 71 ; WX 0 ; N G ; B 0 0 0 0 ;
-C 72 ; WX 860 ; N H ; B 120 185 741 515 ;
+C 72 ; WX 860 ; N H ; B 121 186 741 514 ;
C 73 ; WX 0 ; N I ; B 0 0 0 0 ; L J IJ ;
C 74 ; WX 0 ; N J ; B 0 0 0 0 ;
C 75 ; WX 860 ; N K ; B 119 -25 740 725 ;
-C 76 ; WX 860 ; N L ; B 120 -25 741 727 ;
+C 76 ; WX 860 ; N L ; B 121 -24 741 726 ;
C 77 ; WX 0 ; N M ; B 0 0 0 0 ;
C 78 ; WX 0 ; N N ; B 0 0 0 0 ;
-C 79 ; WX 1000 ; N O ; B 119 193 880 508 ;
-C 80 ; WX 860 ; N P ; B 120 72 742 621 ;
-C 81 ; WX 650 ; N Q ; B 120 -26 531 726 ;
-C 82 ; WX 860 ; N R ; B 176 -25 741 657 ;
-C 83 ; WX 1000 ; N S ; B 120 -25 880 549 ;
-C 84 ; WX 580 ; N T ; B 118 -25 461 726 ;
+C 79 ; WX 1000 ; N O ; B 120 193 880 507 ;
+C 80 ; WX 860 ; N P ; B 121 72 741 620 ;
+C 81 ; WX 650 ; N Q ; B 120 -26 530 725 ;
+C 82 ; WX 860 ; N R ; B 176 -24 740 656 ;
+C 83 ; WX 1000 ; N S ; B 120 -24 880 549 ;
+C 84 ; WX 580 ; N T ; B 119 -24 460 725 ;
C 85 ; WX 0 ; N U ; B 0 0 0 0 ;
-C 86 ; WX 860 ; N V ; B 119 -25 742 725 ;
+C 86 ; WX 860 ; N V ; B 120 -24 741 725 ;
C 87 ; WX 0 ; N W ; B 0 0 0 0 ;
-C 88 ; WX 860 ; N X ; B 119 -25 741 725 ;
-C 89 ; WX 1000 ; N Y ; B 119 -25 881 725 ;
+C 88 ; WX 860 ; N X ; B 120 -25 741 725 ;
+C 89 ; WX 1000 ; N Y ; B 120 -25 880 724 ;
C 90 ; WX 0 ; N Z ; B 0 0 0 0 ;
C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
C 93 ; WX 0 ; N bracketright ; B 0 0 0 0 ;
C 94 ; WX 0 ; N asciicircum ; B 0 0 0 0 ;
C 95 ; WX 0 ; N underscore ; B 0 0 0 0 ;
-C 96 ; WX 1000 ; N quoteleft ; B 119 193 880 508 ;
-C 97 ; WX 860 ; N a ; B 119 -25 741 725 ;
-C 98 ; WX 860 ; N b ; B 119 113 741 586 ;
+C 96 ; WX 1000 ; N quoteleft ; B 120 193 880 507 ;
+C 97 ; WX 860 ; N a ; B 120 -24 740 725 ;
+C 98 ; WX 860 ; N b ; B 120 113 741 586 ;
C 99 ; WX 0 ; N c ; B 0 0 0 0 ;
-C 100 ; WX 1000 ; N d ; B 118 63 880 637 ;
-C 101 ; WX 720 ; N e ; B 118 -25 602 726 ;
+C 100 ; WX 1000 ; N d ; B 119 63 880 637 ;
+C 101 ; WX 720 ; N e ; B 118 -24 601 725 ;
C 102 ; WX 0 ; N f ; B 0 0 0 0 ; L l fl ; L i fi ; L f ff ;
-C 103 ; WX 790 ; N g ; B 120 207 670 492 ;
-C 104 ; WX 720 ; N h ; B 118 -25 461 725 ;
+C 103 ; WX 790 ; N g ; B 120 207 670 491 ;
+C 104 ; WX 720 ; N h ; B 119 -24 460 725 ;
C 105 ; WX 0 ; N i ; B 0 0 0 0 ; L j ij ;
C 106 ; WX 0 ; N j ; B 0 0 0 0 ;
-C 107 ; WX 860 ; N k ; B 119 -26 741 726 ;
-C 108 ; WX 860 ; N l ; B 120 -25 740 727 ;
-C 109 ; WX 1000 ; N m ; B 120 281 881 419 ;
-C 110 ; WX 1000 ; N n ; B 119 193 879 638 ;
-C 111 ; WX 1000 ; N o ; B 119 193 880 508 ;
+C 107 ; WX 860 ; N k ; B 120 -25 740 725 ;
+C 108 ; WX 860 ; N l ; B 120 -24 740 726 ;
+C 109 ; WX 1000 ; N m ; B 120 282 880 419 ;
+C 110 ; WX 1000 ; N n ; B 120 194 879 637 ;
+C 111 ; WX 1000 ; N o ; B 120 193 880 507 ;
C 112 ; WX 860 ; N p ; B 119 80 741 620 ;
-C 113 ; WX 1000 ; N q ; B 120 193 880 507 ;
-C 114 ; WX 860 ; N r ; B 120 -25 706 726 ;
-C 115 ; WX 1000 ; N s ; B 119 -25 880 725 ;
-C 116 ; WX 860 ; N t ; B 119 46 740 654 ;
+C 113 ; WX 1000 ; N q ; B 120 193 880 506 ;
+C 114 ; WX 860 ; N r ; B 120 -24 705 725 ;
+C 115 ; WX 1000 ; N s ; B 120 -24 880 725 ;
+C 116 ; WX 860 ; N t ; B 120 46 740 654 ;
C 117 ; WX 0 ; N u ; B 0 0 0 0 ;
-C 118 ; WX 860 ; N v ; B 119 -24 741 725 ;
-C 119 ; WX 580 ; N w ; B 120 -6 460 726 ;
-C 120 ; WX 1000 ; N x ; B 119 -25 881 725 ;
-C 121 ; WX 1000 ; N y ; B 119 -29 974 638 ;
-C 122 ; WX 860 ; N z ; B 120 185 741 515 ;
+C 118 ; WX 860 ; N v ; B 120 -24 741 725 ;
+C 119 ; WX 580 ; N w ; B 120 -5 460 725 ;
+C 120 ; WX 1000 ; N x ; B 120 -24 880 725 ;
+C 121 ; WX 1000 ; N y ; B 119 -29 973 637 ;
+C 122 ; WX 860 ; N z ; B 121 185 741 515 ;
C 123 ; WX 0 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
C 125 ; WX 0 ; N braceright ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/archaic/sarab10.afm b/Master/texmf-dist/fonts/afm/public/archaic/sarab10.afm
new file mode 100644
index 00000000000..051d0fa7289
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/archaic/sarab10.afm
@@ -0,0 +1,277 @@
+StartFontMetrics 2.0
+Comment Generated by pfaedit
+Comment Creation Date: Sat Nov 12 10:15:49 2005
+FontName Archaic-South-Arabian
+FullName Archaic South Arabian
+FamilyName Archaic
+Weight Regular
+Notice (Generated from MetaFont bitmap by mftrace 1.1.5, http://www.cs.uu.nl/~hanwen/mftrace/ Copyright Peter R. Wilson 2005)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.001
+EncodingScheme FontSpecific
+FontBBox -30 -19 390 739
+CapHeight 737
+XHeight 737
+Ascender 737
+StartCharMetrics 256
+C 0 ; WX 0 ; N grave ; B 0 0 0 0 ;
+C 1 ; WX 0 ; N acute ; B 0 0 0 0 ;
+C 2 ; WX 0 ; N circumflex ; B 0 0 0 0 ;
+C 3 ; WX 0 ; N tilde ; B 0 0 0 0 ;
+C 4 ; WX 0 ; N dieresis ; B 0 0 0 0 ;
+C 5 ; WX 0 ; N hungarumlaut ; B 0 0 0 0 ;
+C 6 ; WX 0 ; N ring ; B 0 0 0 0 ;
+C 7 ; WX 0 ; N caron ; B 0 0 0 0 ;
+C 8 ; WX 0 ; N breve ; B 0 0 0 0 ;
+C 9 ; WX 0 ; N macron ; B 0 0 0 0 ;
+C 10 ; WX 0 ; N dotaccent ; B 0 0 0 0 ;
+C 11 ; WX 0 ; N cedilla ; B 0 0 0 0 ;
+C 12 ; WX 0 ; N ogonek ; B 0 0 0 0 ;
+C 13 ; WX 0 ; N quotesinglbase ; B 0 0 0 0 ;
+C 14 ; WX 0 ; N guilsinglleft ; B 0 0 0 0 ;
+C 15 ; WX 0 ; N guilsinglright ; B 0 0 0 0 ;
+C 16 ; WX 0 ; N quotedblleft ; B 0 0 0 0 ;
+C 17 ; WX 0 ; N quotedblright ; B 0 0 0 0 ;
+C 18 ; WX 0 ; N quotedblbase ; B 0 0 0 0 ;
+C 19 ; WX 0 ; N guillemotleft ; B 0 0 0 0 ;
+C 20 ; WX 0 ; N guillemotright ; B 0 0 0 0 ;
+C 21 ; WX 0 ; N endash ; B 0 0 0 0 ;
+C 22 ; WX 0 ; N emdash ; B 0 0 0 0 ;
+C 23 ; WX 0 ; N cwm ; B 0 0 0 0 ;
+C 24 ; WX 0 ; N perthousand ; B 0 0 0 0 ;
+C 25 ; WX 0 ; N dotlessi ; B 0 0 0 0 ;
+C 26 ; WX 0 ; N dotlessj ; B 0 0 0 0 ;
+C 27 ; WX 0 ; N ff ; B 0 0 0 0 ; L l ffl ; L i ffi ;
+C 28 ; WX 0 ; N fi ; B 0 0 0 0 ;
+C 29 ; WX 0 ; N fl ; B 0 0 0 0 ;
+C 30 ; WX 0 ; N ffi ; B 0 0 0 0 ;
+C 31 ; WX 0 ; N ffl ; B 0 0 0 0 ;
+C 32 ; WX 0 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 0 ; N exclam ; B 0 0 0 0 ;
+C 34 ; WX 0 ; N quotedbl ; B 0 0 0 0 ;
+C 35 ; WX 0 ; N numbersign ; B 0 0 0 0 ;
+C 36 ; WX 0 ; N dollar ; B 0 0 0 0 ;
+C 37 ; WX 0 ; N percent ; B 0 0 0 0 ;
+C 38 ; WX 0 ; N ampersand ; B 0 0 0 0 ;
+C 39 ; WX 424 ; N quoteright ; B -28 103 268 379 ;
+C 40 ; WX 0 ; N parenleft ; B 0 0 0 0 ;
+C 41 ; WX 0 ; N parenright ; B 0 0 0 0 ;
+C 42 ; WX 0 ; N asterisk ; B 0 0 0 0 ;
+C 43 ; WX 0 ; N plus ; B 0 0 0 0 ;
+C 44 ; WX 0 ; N comma ; B 0 0 0 0 ;
+C 45 ; WX 0 ; N hyphen ; B 0 0 0 0 ;
+C 46 ; WX 0 ; N period ; B 0 0 0 0 ;
+C 47 ; WX 0 ; N slash ; B 0 0 0 0 ;
+C 48 ; WX 0 ; N zero ; B 0 0 0 0 ;
+C 49 ; WX 0 ; N one ; B 0 0 0 0 ;
+C 50 ; WX 0 ; N two ; B 0 0 0 0 ;
+C 51 ; WX 0 ; N three ; B 0 0 0 0 ;
+C 52 ; WX 0 ; N four ; B 0 0 0 0 ;
+C 53 ; WX 0 ; N five ; B 0 0 0 0 ;
+C 54 ; WX 0 ; N six ; B 0 0 0 0 ;
+C 55 ; WX 0 ; N seven ; B 0 0 0 0 ;
+C 56 ; WX 0 ; N eight ; B 0 0 0 0 ;
+C 57 ; WX 0 ; N nine ; B 0 0 0 0 ;
+C 58 ; WX 0 ; N colon ; B 0 0 0 0 ;
+C 59 ; WX 0 ; N semicolon ; B 0 0 0 0 ;
+C 60 ; WX 0 ; N less ; B 0 0 0 0 ;
+C 61 ; WX 0 ; N equal ; B 0 0 0 0 ;
+C 62 ; WX 0 ; N greater ; B 0 0 0 0 ;
+C 63 ; WX 0 ; N question ; B 0 0 0 0 ;
+C 64 ; WX 0 ; N at ; B 0 0 0 0 ;
+C 65 ; WX 0 ; N A ; B 0 0 0 0 ;
+C 66 ; WX 560 ; N B ; B -30 -18 390 739 ;
+C 67 ; WX 0 ; N C ; B 0 0 0 0 ;
+C 68 ; WX 560 ; N D ; B -30 -18 390 738 ;
+C 69 ; WX 0 ; N E ; B 0 0 0 0 ;
+C 70 ; WX 0 ; N F ; B 0 0 0 0 ;
+C 71 ; WX 560 ; N G ; B -28 -18 390 739 ;
+C 72 ; WX 560 ; N H ; B -29 -18 389 738 ;
+C 73 ; WX 560 ; N I ; B -29 -17 390 738 ; L J IJ ;
+C 74 ; WX 424 ; N J ; B -29 -17 269 738 ;
+C 75 ; WX 0 ; N K ; B 0 0 0 0 ;
+C 76 ; WX 0 ; N L ; B 0 0 0 0 ;
+C 77 ; WX 0 ; N M ; B 0 0 0 0 ;
+C 78 ; WX 0 ; N N ; B 0 0 0 0 ;
+C 79 ; WX 0 ; N O ; B 0 0 0 0 ;
+C 80 ; WX 0 ; N P ; B 0 0 0 0 ;
+C 81 ; WX 0 ; N Q ; B 0 0 0 0 ;
+C 82 ; WX 0 ; N R ; B 0 0 0 0 ;
+C 83 ; WX 560 ; N S ; B -29 -18 390 738 ;
+C 84 ; WX 560 ; N T ; B -30 -18 390 739 ;
+C 85 ; WX 0 ; N U ; B 0 0 0 0 ;
+C 86 ; WX 0 ; N V ; B 0 0 0 0 ;
+C 87 ; WX 0 ; N W ; B 0 0 0 0 ;
+C 88 ; WX 560 ; N X ; B -28 -18 388 738 ;
+C 89 ; WX 0 ; N Y ; B 0 0 0 0 ;
+C 90 ; WX 424 ; N Z ; B -28 -18 270 738 ;
+C 91 ; WX 0 ; N bracketleft ; B 0 0 0 0 ;
+C 92 ; WX 0 ; N backslash ; B 0 0 0 0 ;
+C 93 ; WX 0 ; N bracketright ; B 0 0 0 0 ;
+C 94 ; WX 0 ; N asciicircum ; B 0 0 0 0 ;
+C 95 ; WX 0 ; N underscore ; B 0 0 0 0 ;
+C 96 ; WX 560 ; N quoteleft ; B -30 -18 390 738 ;
+C 97 ; WX 424 ; N a ; B -28 103 268 379 ;
+C 98 ; WX 560 ; N b ; B -29 -18 389 739 ;
+C 99 ; WX 0 ; N c ; B 0 0 0 0 ;
+C 100 ; WX 424 ; N d ; B -29 -18 270 738 ;
+C 101 ; WX 0 ; N e ; B 0 0 0 0 ;
+C 102 ; WX 560 ; N f ; B -28 -17 388 737 ; L l fl ; L i fi ; L f ff ;
+C 103 ; WX 560 ; N g ; B -28 -18 390 739 ;
+C 104 ; WX 560 ; N h ; B -29 -18 389 738 ;
+C 105 ; WX 0 ; N i ; B 0 0 0 0 ; L j ij ;
+C 106 ; WX 0 ; N j ; B 0 0 0 0 ;
+C 107 ; WX 560 ; N k ; B -29 -18 389 739 ;
+C 108 ; WX 560 ; N l ; B -28 -18 390 738 ;
+C 109 ; WX 560 ; N m ; B -28 -18 390 738 ;
+C 110 ; WX 560 ; N n ; B -30 -18 389 738 ;
+C 111 ; WX 560 ; N o ; B -30 -18 390 738 ;
+C 112 ; WX 0 ; N p ; B 0 0 0 0 ;
+C 113 ; WX 424 ; N q ; B -29 -18 269 738 ;
+C 114 ; WX 560 ; N r ; B -28 -19 389 739 ;
+C 115 ; WX 560 ; N s ; B -28 -18 388 738 ;
+C 116 ; WX 560 ; N t ; B -28 -18 388 738 ;
+C 117 ; WX 0 ; N u ; B 0 0 0 0 ;
+C 118 ; WX 0 ; N v ; B 0 0 0 0 ;
+C 119 ; WX 560 ; N w ; B -28 162 388 559 ;
+C 120 ; WX 424 ; N x ; B -30 -18 269 738 ;
+C 121 ; WX 424 ; N y ; B -28 -18 269 739 ;
+C 122 ; WX 560 ; N z ; B -28 -18 388 739 ;
+C 123 ; WX 0 ; N braceleft ; B 0 0 0 0 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 0 ; N braceright ; B 0 0 0 0 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 0 ; N sfthyphen ; B 0 0 0 0 ;
+C 128 ; WX 0 ; N Abreve ; B 0 0 0 0 ;
+C 129 ; WX 0 ; N Aogonek ; B 0 0 0 0 ;
+C 130 ; WX 0 ; N Cacute ; B 0 0 0 0 ;
+C 131 ; WX 0 ; N Ccaron ; B 0 0 0 0 ;
+C 132 ; WX 0 ; N Dcaron ; B 0 0 0 0 ;
+C 133 ; WX 0 ; N Ecaron ; B 0 0 0 0 ;
+C 134 ; WX 0 ; N Eogonek ; B 0 0 0 0 ;
+C 135 ; WX 0 ; N Gbreve ; B 0 0 0 0 ;
+C 136 ; WX 0 ; N Lacute ; B 0 0 0 0 ;
+C 137 ; WX 0 ; N Lcaron ; B 0 0 0 0 ;
+C 138 ; WX 0 ; N Lslash ; B 0 0 0 0 ;
+C 139 ; WX 0 ; N Nacute ; B 0 0 0 0 ;
+C 140 ; WX 0 ; N Ncaron ; B 0 0 0 0 ;
+C 141 ; WX 0 ; N Eng ; B 0 0 0 0 ;
+C 142 ; WX 0 ; N Ohungarumlaut ; B 0 0 0 0 ;
+C 143 ; WX 0 ; N Racute ; B 0 0 0 0 ;
+C 144 ; WX 0 ; N Rcaron ; B 0 0 0 0 ;
+C 145 ; WX 0 ; N Sacute ; B 0 0 0 0 ;
+C 146 ; WX 0 ; N Scaron ; B 0 0 0 0 ;
+C 147 ; WX 0 ; N Scedilla ; B 0 0 0 0 ;
+C 148 ; WX 0 ; N Tcaron ; B 0 0 0 0 ;
+C 149 ; WX 0 ; N Tcedilla ; B 0 0 0 0 ;
+C 150 ; WX 0 ; N Uhungarumlaut ; B 0 0 0 0 ;
+C 151 ; WX 0 ; N Uring ; B 0 0 0 0 ;
+C 152 ; WX 0 ; N Ydieresis ; B 0 0 0 0 ;
+C 153 ; WX 0 ; N Zacute ; B 0 0 0 0 ;
+C 154 ; WX 0 ; N Zcaron ; B 0 0 0 0 ;
+C 155 ; WX 0 ; N Zdotaccent ; B 0 0 0 0 ;
+C 156 ; WX 0 ; N IJ ; B 0 0 0 0 ;
+C 157 ; WX 0 ; N Idotaccent ; B 0 0 0 0 ;
+C 158 ; WX 0 ; N dcroat ; B 0 0 0 0 ;
+C 159 ; WX 0 ; N section ; B 0 0 0 0 ;
+C 160 ; WX 0 ; N abreve ; B 0 0 0 0 ;
+C 161 ; WX 0 ; N aogonek ; B 0 0 0 0 ;
+C 162 ; WX 0 ; N cacute ; B 0 0 0 0 ;
+C 163 ; WX 0 ; N ccaron ; B 0 0 0 0 ;
+C 164 ; WX 0 ; N dcaron ; B 0 0 0 0 ;
+C 165 ; WX 0 ; N ecaron ; B 0 0 0 0 ;
+C 166 ; WX 0 ; N eogonek ; B 0 0 0 0 ;
+C 167 ; WX 0 ; N gbreve ; B 0 0 0 0 ;
+C 168 ; WX 0 ; N lacute ; B 0 0 0 0 ;
+C 169 ; WX 0 ; N lcaron ; B 0 0 0 0 ;
+C 170 ; WX 0 ; N lslash ; B 0 0 0 0 ;
+C 171 ; WX 0 ; N nacute ; B 0 0 0 0 ;
+C 172 ; WX 0 ; N ncaron ; B 0 0 0 0 ;
+C 173 ; WX 0 ; N eng ; B 0 0 0 0 ;
+C 174 ; WX 0 ; N ohungarumlaut ; B 0 0 0 0 ;
+C 175 ; WX 0 ; N racute ; B 0 0 0 0 ;
+C 176 ; WX 0 ; N rcaron ; B 0 0 0 0 ;
+C 177 ; WX 0 ; N sacute ; B 0 0 0 0 ;
+C 178 ; WX 0 ; N scaron ; B 0 0 0 0 ;
+C 179 ; WX 0 ; N scedilla ; B 0 0 0 0 ;
+C 180 ; WX 0 ; N tcaron ; B 0 0 0 0 ;
+C 181 ; WX 0 ; N tcedilla ; B 0 0 0 0 ;
+C 182 ; WX 0 ; N uhungarumlaut ; B 0 0 0 0 ;
+C 183 ; WX 0 ; N uring ; B 0 0 0 0 ;
+C 184 ; WX 0 ; N ydieresis ; B 0 0 0 0 ;
+C 185 ; WX 0 ; N zacute ; B 0 0 0 0 ;
+C 186 ; WX 0 ; N zcaron ; B 0 0 0 0 ;
+C 187 ; WX 0 ; N zdotaccent ; B 0 0 0 0 ;
+C 188 ; WX 0 ; N ij ; B 0 0 0 0 ;
+C 189 ; WX 0 ; N exclamdown ; B 0 0 0 0 ;
+C 190 ; WX 0 ; N questiondown ; B 0 0 0 0 ;
+C 191 ; WX 0 ; N sterling ; B 0 0 0 0 ;
+C 192 ; WX 0 ; N Agrave ; B 0 0 0 0 ;
+C 193 ; WX 0 ; N Aacute ; B 0 0 0 0 ;
+C 194 ; WX 0 ; N Acircumflex ; B 0 0 0 0 ;
+C 195 ; WX 0 ; N Atilde ; B 0 0 0 0 ;
+C 196 ; WX 0 ; N Adieresis ; B 0 0 0 0 ;
+C 197 ; WX 0 ; N Aring ; B 0 0 0 0 ;
+C 198 ; WX 0 ; N AE ; B 0 0 0 0 ;
+C 199 ; WX 0 ; N Ccedilla ; B 0 0 0 0 ;
+C 200 ; WX 0 ; N Egrave ; B 0 0 0 0 ;
+C 201 ; WX 0 ; N Eacute ; B 0 0 0 0 ;
+C 202 ; WX 0 ; N Ecircumflex ; B 0 0 0 0 ;
+C 203 ; WX 0 ; N Edieresis ; B 0 0 0 0 ;
+C 204 ; WX 0 ; N Igrave ; B 0 0 0 0 ;
+C 205 ; WX 0 ; N Iacute ; B 0 0 0 0 ;
+C 206 ; WX 0 ; N Icircumflex ; B 0 0 0 0 ;
+C 207 ; WX 0 ; N Idieresis ; B 0 0 0 0 ;
+C 208 ; WX 0 ; N Eth ; B 0 0 0 0 ;
+C 209 ; WX 0 ; N Ntilde ; B 0 0 0 0 ;
+C 210 ; WX 0 ; N Ograve ; B 0 0 0 0 ;
+C 211 ; WX 0 ; N Oacute ; B 0 0 0 0 ;
+C 212 ; WX 0 ; N Ocircumflex ; B 0 0 0 0 ;
+C 213 ; WX 0 ; N Otilde ; B 0 0 0 0 ;
+C 214 ; WX 0 ; N Odieresis ; B 0 0 0 0 ;
+C 215 ; WX 0 ; N OE ; B 0 0 0 0 ;
+C 216 ; WX 0 ; N Oslash ; B 0 0 0 0 ;
+C 217 ; WX 0 ; N Ugrave ; B 0 0 0 0 ;
+C 218 ; WX 0 ; N Uacute ; B 0 0 0 0 ;
+C 219 ; WX 0 ; N Ucircumflex ; B 0 0 0 0 ;
+C 220 ; WX 0 ; N Udieresis ; B 0 0 0 0 ;
+C 221 ; WX 0 ; N Yacute ; B 0 0 0 0 ;
+C 222 ; WX 0 ; N Thorn ; B 0 0 0 0 ;
+C 223 ; WX 0 ; N SS ; B 0 0 0 0 ;
+C 224 ; WX 0 ; N agrave ; B 0 0 0 0 ;
+C 225 ; WX 0 ; N aacute ; B 0 0 0 0 ;
+C 226 ; WX 0 ; N acircumflex ; B 0 0 0 0 ;
+C 227 ; WX 0 ; N atilde ; B 0 0 0 0 ;
+C 228 ; WX 0 ; N adieresis ; B 0 0 0 0 ;
+C 229 ; WX 0 ; N aring ; B 0 0 0 0 ;
+C 230 ; WX 0 ; N ae ; B 0 0 0 0 ;
+C 231 ; WX 0 ; N ccedilla ; B 0 0 0 0 ;
+C 232 ; WX 0 ; N egrave ; B 0 0 0 0 ;
+C 233 ; WX 0 ; N eacute ; B 0 0 0 0 ;
+C 234 ; WX 0 ; N ecircumflex ; B 0 0 0 0 ;
+C 235 ; WX 0 ; N edieresis ; B 0 0 0 0 ;
+C 236 ; WX 0 ; N igrave ; B 0 0 0 0 ;
+C 237 ; WX 0 ; N iacute ; B 0 0 0 0 ;
+C 238 ; WX 0 ; N icircumflex ; B 0 0 0 0 ;
+C 239 ; WX 0 ; N idieresis ; B 0 0 0 0 ;
+C 240 ; WX 0 ; N eth ; B 0 0 0 0 ;
+C 241 ; WX 0 ; N ntilde ; B 0 0 0 0 ;
+C 242 ; WX 0 ; N ograve ; B 0 0 0 0 ;
+C 243 ; WX 0 ; N oacute ; B 0 0 0 0 ;
+C 244 ; WX 0 ; N ocircumflex ; B 0 0 0 0 ;
+C 245 ; WX 0 ; N otilde ; B 0 0 0 0 ;
+C 246 ; WX 0 ; N odieresis ; B 0 0 0 0 ;
+C 247 ; WX 0 ; N oe ; B 0 0 0 0 ;
+C 248 ; WX 0 ; N oslash ; B 0 0 0 0 ;
+C 249 ; WX 0 ; N ugrave ; B 0 0 0 0 ;
+C 250 ; WX 0 ; N uacute ; B 0 0 0 0 ;
+C 251 ; WX 0 ; N ucircumflex ; B 0 0 0 0 ;
+C 252 ; WX 0 ; N udieresis ; B 0 0 0 0 ;
+C 253 ; WX 0 ; N yacute ; B 0 0 0 0 ;
+C 254 ; WX 0 ; N thorn ; B 0 0 0 0 ;
+C 255 ; WX 0 ; N germandbls ; B 0 0 0 0 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/archaicprw.map b/Master/texmf-dist/fonts/map/dvips/archaic/archaicprw.map
new file mode 100644
index 00000000000..ca106a6d8af
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/archaicprw.map
@@ -0,0 +1,18 @@
+aram10 Archaic-Aramaic <aram10.pfb
+cypr10 Archaic-Cypriot <cypr10.pfb
+etr10 Archaic-Etruscan <etr10.pfb
+fut10 Archaic-Futharc <fut10.pfb
+givbc10 Archaic-Greek-4th-Century-BC <givbc10.pfb
+gvibc10 Archaic-Greek-6th-Century-BC <gvibc10.pfb
+linb10 Archaic-Linear-B <linb10.pfb
+nab10 Archaic-Nabatean <nab10.pfb
+oandsu10 Archaic-OandS <oandsu10.pfb
+oandsi10 Archaic-OandS-Italic <oandsi10.pfb
+copsn10 Archaic-Old-Persian <copsn10.pfb
+phnc10 Archaic-Phoenician <phnc10.pfb
+pmhg Archaic-Poor-Mans-Hieroglyphs <pmhg.pfb
+proto10 Archaic-ProtoSemitic <proto10.pfb
+sarab10 Archaic-South-Arabian <sarab10.pfb
+cugar10 Archaic-Ugaritic-Cuneiform <cugar10.pfb
+
+
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/etruscan.map b/Master/texmf-dist/fonts/map/dvips/archaic/etruscan.map
index 0580633ba9b..e69de29bb2d 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/etruscan.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/etruscan.map
@@ -1 +0,0 @@
-etr10 etr10 <etr10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/fut10.map b/Master/texmf-dist/fonts/map/dvips/archaic/fut10.map
index 590690a15a2..b1ea02dea70 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/fut10.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/fut10.map
@@ -1 +1 @@
-fut10 fut10 <fut10.pfb
+fut10 Archaic-Futharc <fut10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/greek4cbc.map b/Master/texmf-dist/fonts/map/dvips/archaic/greek4cbc.map
index 3a313fdac3c..d895c354bdc 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/greek4cbc.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/greek4cbc.map
@@ -1 +1 @@
-givbc10 givbc10 <givbc10.pfb
+givbc10 Archaic-Greek-4th-Century-BC <givbc10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/greek6cbc.map b/Master/texmf-dist/fonts/map/dvips/archaic/greek6cbc.map
index 33ecb3e6f67..1375cc398ce 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/greek6cbc.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/greek6cbc.map
@@ -1 +1 @@
-gvibc10 gvibc10 <gvibc10.pfb
+gvibc10 Archaic-Greek-6th-Century-BC <gvibc10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/hieroglf.map b/Master/texmf-dist/fonts/map/dvips/archaic/hieroglf.map
index 98eaf0f63c7..7b91546ef58 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/hieroglf.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/hieroglf.map
@@ -1 +1 @@
-pmhg pmhg <pmhg.pfb
+pmhg Archaic-Poor-Mans-Hieroglyphs <pmhg.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/oands.map b/Master/texmf-dist/fonts/map/dvips/archaic/oands.map
index 62d957b64b2..5f8ecfcab05 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/oands.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/oands.map
@@ -1,2 +1,2 @@
-oandsu10 oandsu10 <oandsu10.pfb
-oandsi10 oandsi10 <oandsi10.pfb
+oandsu10 Archaic-OandS <oandsu10.pfb
+oandsi10 Archaic-OandS-Italic <oandsi10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/phoenician.map b/Master/texmf-dist/fonts/map/dvips/archaic/phoenician.map
index b2b9c3265fd..0c19d5256b4 100644
--- a/Master/texmf-dist/fonts/map/dvips/archaic/phoenician.map
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/phoenician.map
@@ -1 +1 @@
-phnc10 phnc10 <phnc10.pfb
+phnc10 Archaic-Phoenician <phnc10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/proto10.map b/Master/texmf-dist/fonts/map/dvips/archaic/proto10.map
deleted file mode 100644
index 1ad4a6ebfe8..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/archaic/proto10.map
+++ /dev/null
@@ -1 +0,0 @@
-proto10 proto10 <proto10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/protosem.map b/Master/texmf-dist/fonts/map/dvips/archaic/protosem.map
new file mode 100644
index 00000000000..1bb6eb096d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/protosem.map
@@ -0,0 +1 @@
+proto10 Archaic-ProtoSemitic <proto10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/archaic/sarabian.map b/Master/texmf-dist/fonts/map/dvips/archaic/sarabian.map
new file mode 100644
index 00000000000..050057e682f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/archaic/sarabian.map
@@ -0,0 +1 @@
+sarab10 Archaic-South-Arabian <sarab10.pfb
diff --git a/Master/texmf-dist/fonts/source/archaic/copsn10.mf b/Master/texmf-dist/fonts/source/archaic/copsn10.mf
deleted file mode 100644
index 5cba60ec790..00000000000
--- a/Master/texmf-dist/fonts/source/archaic/copsn10.mf
+++ /dev/null
@@ -1,1001 +0,0 @@
-%%
-%% This is file `copsn10.mf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% oldprsn.dtx (with options: `up')
-%% ------------------------------------------------------------------
-%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%% Copyright 1999--2005 Peter R. Wilson
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the Latex Project Public License, either
-%% version 1.3 of this license or (at your option) any
-%% later version.
-%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
-%%
-%% This work has the LPPL maintenance status "author-maintained".
-%%
-%% This work consists of the files listed in the README file.
-%% ------------------------------------------------------------------
-%%% COPSN10.MF Computer Old Persian Cuneiform font 10 point design size.
-
-
-font_identifier:="oldprsn"; font_size 10pt#;
-
-u#:=.2pt#; % unit width
-ht#:=8pt#; % height of characters (CM cap-height is approx 6.8pt)
-s#:=1.5pt#; % width correction (right and left)
-o#:=1/20pt#; % overshoot
-px#:=.4pt#; % horizontal width of pen
-font_normal_space:=7pt#; % width of a blank space
-font_normal_shrink:=.9pt#; % width correction for blank space
-font_x_height:=4.5pt#; % height of one ex
-font_quad:=10pt#; % an em
-
-font_coding_scheme:="Old Persian glyphs";
-mode_setup;
-
-ho#:=o#; % horizontal overshoot
-leftloc#:=s#; % leftmost xcoord of character
-py#:=px#; % vertical thickness of the pen
-
-define_pixels(s,u);
-define_blacker_pixels(px,py);
-define_good_x_pixels(leftloc);
-define_corrected_pixels(o); % turn on overshoot correction
-define_horizontal_corrected_pixels(ho);
-
-numeric midloc, rightloc, aw;
-pickup pencircle xscaled px yscaled py;
-stylus:=savepen;
-
-numeric trht, trbs;
-numeric th, tb;
-th = 6/24; tb = 8/24;
-numeric wiht, wibs;
-numeric wh, wb;
-wh = 10/24; wb = 20/24;
-def beginglyph(expr code, unit_width) =
- beginchar(code, unit_width*ht#+2s#, ht#, 0);
- midloc:=1/2w; rightloc:=(w-s); aw := rightloc-leftloc;
- trht := th*h; trbs := tb*h;
- wiht := wh*h; wibs := wb*h;
- pickup stylus enddef;
-
-let cmchar=\;
-
-
-def triangle(suffix $)(expr ht, bs, ang) =
- path pth[];
- pair pr[];
- pr1 := (x$-ht,y$); % midpoint of base in default position
- pr2 := pr1 shifted (1/2bs*up); % base points
- pr3 := pr1 shifted (1/2bs*down);
- z$trl = pr2 rotatedaround(z$, ang);
- z$trr = pr3 rotatedaround(z$, ang);
- z$trc = 1/2[z$trl,z$trr];
- z$tic = 1/2[z$,z$trc];
- pth$ := z$--z$trl--z$trr--cycle;
-enddef;
-
-
-def trir(suffix $)(expr ht, bs) =
- path pth[];
- z$trc = (x$-ht, y$); % midpoint of base
- z$trl = (x$trc, y$trc+1/2bs); % base points
- z$trr = (x$trc, y$trc-1/2bs);
- z$tic = 1/2[z$,z$trc];
- pth$ := z$--z$trl--z$trr--cycle;
-enddef;
-
-
-def triu(suffix $)(expr ht, bs) =
- path pth[];
- z$trc = (x$, y$-ht); % midpoint of base
- z$trl = (x$-1/2bs, y$trc); % base points
- z$trr = (x$+1/2bs, y$trc); % base points
- z$tic = 1/2[z$,z$trc];
- pth$ := z$--z$trl--z$trr--cycle;
-enddef;
-
-
-def tril(suffix $)(expr ht, bs) =
- path pth[];
- z$trc = (x$+ht, y$); % midpoint of base
- z$trl = (x$trc, y$trc-1/2bs); % base points
- z$trr = (x$trc, y$trc+1/2bs);
- z$tic = 1/2[z$,z$trc];
- pth$ := z$--z$trl--z$trr--cycle;
-enddef;
-
-
-def tril(suffix $)(expr ht, bs) =
- path pth[];
- z$trc = (x$+ht, y$); % midpoint of base
- z$trl = (x$trc, y$trc-1/2bs); % base points
- z$trr = (x$trc, y$trc+1/2bs);
- z$tic = 1/2[z$,z$trc];
- pth$ := z$--z$trl--z$trr--cycle;
-enddef;
-
-
-def trid(suffix $)(expr ht, bs) =
- path pth[];
- z$trc = (x$, y$+ht); % midpoint of base
- z$trl = (x$+1/2bs, y$trc); % base points
- z$trr = (x$-1/2bs, y$trc); % base points
- z$tic = 1/2[z$,z$trc];
- pth$ := z$--z$trl--z$trr--cycle;
-enddef;
-
-
-def wing(suffix $)(expr ht, bs, ang) =
- path pth[];
- pair pr[];
- pr1 := (x$+ht,y$); % midpoint of base in default position
- pr2 := pr1 shifted (1/2bs*down); % base points
- pr3 := pr1 shifted (1/2bs*up);
- pr4 := pr1 rotatedaround(z$, ang);
- z$wil = pr2 rotatedaround(z$, ang);
- z$wir = pr3 rotatedaround(z$, ang);
- z$wic = 1/2[z$,pr4];
- pth$ := z$--z$wil{(z$wic-z$wil)}..z$wic..{(z$wir-z$wic)}z$wir--cycle;
-enddef;
-
-
-def wingl(suffix $)(expr ht, bs) =
- path pth[];
- z$wil = (x$+ht, y$-1/2bs); % base points
- z$wir = (x$wil, y$+1/2bs);
- z$wic = (1/2[x$,x$wil], y$); % midpoint of base curve
- pth$ := z$--z$wil{(z$wic-z$wil)}..z$wic..{(z$wir-z$wic)}z$wir--cycle;
-enddef;
-
-
-def wingd(suffix $)(expr ht, bs) =
- path pth[];
- z$wil = (x$+1/2bs, y$+ht); % base points
- z$wir = (x$-1/2bs, y$wil);
- z$wic = (x$, 1/2[y$,y$wil]); % midpoint of base curve
- pth$ := z$--z$wil{(z$wic-z$wil)}..z$wic..{(z$wir-z$wic)}z$wir--cycle;
-enddef;
-
-
-def wingr(suffix $)(expr ht, bs) =
- path pth[];
- z$wil = (x$-ht, y$+1/2bs); % base points
- z$wir = (x$wil, y$-1/2bs);
- z$wic = (1/2[x$,x$wil], y$); % midpoint of base curve
- pth$ := z$--z$wil{(z$wic-z$wil)}..z$wic..{(z$wir-z$wic)}z$wir--cycle;
-enddef;
-
-
-def wingu(suffix $)(expr ht, bs) =
- path pth[];
- z$wil = (x$-1/2bs, y$-ht); % base points
- z$wir = (x$+1/2bs, y$wil);
- z$wic = (x$, 1/2[y$,y$wil]); % midpoint of base curve
- pth$ := z$--z$wil{(z$wic-z$wil)}..z$wic..{(z$wir-z$wic)}z$wir--cycle;
-enddef;
-
-cmchar "Old Persian letter a";
-beginglyph("a", (3tb+2th));
- z1trl=(leftloc,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(rightloc,y1); draw z1tic--z1';
- z12trc=(midloc,y1trr); % middle pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z11trl=z12trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z13trr=z12trl; % right pin
- trid(13, trht, trbs); fill pth13;
- z13'=(x13,0); draw z13tic--z13';
- labels(1,11,12,13);
-endchar;
-
-cmchar "Old Persian letter i";
-beginglyph("i", (2tb)); %% 3tb too large
- z1trl=(leftloc,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(rightloc,y1); draw z1tic--z1';
- z11trr=z1trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % middle pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z2trc=(x11trl,y1); % second top head
- trir(2, trht, trbs); fill pth2;
- labels(1,2,11,12,13);
-endchar;
-
-cmchar "Old Persian letter u";
-beginglyph("u", (2tb+wh)); %% 3tb+wh too large
- z31=(leftloc,1/2h); % left wing
- wingl(31, wiht, wibs); fill pth31;
- z1trl=(x31wil,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(rightloc,y1); draw z1tic--z1';
- z11trr=z1trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % middle pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- labels(1,2,11,12,13);
-endchar;
-
-cmchar "Old Persian syllable ka (k)";
-beginglyph("k", (3tb)); %% 4tb too large
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z11trr=(x1trl,1/2h); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(rightloc,y12); draw z12tic--z12';
- labels(1,11,12);
-endchar;
-
-cmchar "Old Persian syllable ku (K)";
-beginglyph("K", (tb+wh));
- z1=(leftloc,1/2h); % wing
- wingl(1, wiht, wibs); fill pth1;
- z2trr=(x1wil,h); % pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- labels(1,2);
-endchar;
-
-cmchar "Old Persian syllable xa (x)";
-beginglyph("x", (2tb+2wh));
- z1=(leftloc,1/2h); % left wing
- wingl(1, wiht, wibs); fill pth1;
- z2=(x1wil,y1); % right wing
- wingl(2, wiht, wibs); fill pth2;
- z11trr=(x2wil,h); % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % right pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian syllable ga (g)";
-beginglyph("g", (3tb+wh));
- z1=(leftloc,1/2h); % wing
- wingl(1, wiht, wibs); fill pth1;
- z11trr=(x1wil,h); % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % right pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z21trc=(x12trl,y1); % small pin
- trir(21, trht, trbs); fill pth21;
- z21'=(rightloc,y21); draw z21tic--z21';
- labels(1,2,11,12,21);
-endchar;
-
-cmchar "Old Persian syllable gu (G)";
-beginglyph("G", (2tb+th+wh)); %% 3tb+wh too large
- z1=(leftloc,1/2h); % wing
- wingl(1, wiht, wibs); fill pth1;
- z12trc=(x1wil, 1/2h); % middle pin
- trir(12, trht, trbs); fill pth12;
- z12'=(rightloc,y12); draw z12tic--z12';
- z13trl=z12trr; % bottom pin
- trir(13, trht, trbs); fill pth13;
- z13'=(rightloc,y13); draw z13tic--z13';
- z11trr=z12trl; % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- z111trc=1/2[z11trc,z11'];
- trir(111, trht, trbs); fill pth111;
- labels(1,2,3,4,5,6,11,12,13,111);
-endchar;
-
-cmchar "Old Persian syllable ca (c)";
-beginglyph("c", (4tb));
- z1trl=(leftloc,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z11trr=(x1, y1trr); % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % middle pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z2trl=z12trl; % bottom pin
- trir(2, trht, trbs); fill pth2;
- z2'=(rightloc,y2); draw z2tic--z2';
- z1'=(x2trl,y1); draw z1tic--z1'; % body of top pin
- labels(1,2,3,4,5,6,11,12,13);
-endchar;
-
-cmchar "Old Persian syllable ja (j)";
-beginglyph("j", (th+tb+wh));
- z1trc=(leftloc,1/2h); % hor pin
- trir(1, trht, trbs); fill pth1;
- z2=(rightloc-wiht,y1); % wing
- wingl(2, wiht, wibs); fill pth2;
- draw z1tic--z2;
- z11trc=(1/2[x1,x2], h); % vert pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- labels(1,2,3,4,11,12,13);
-endchar;
-
-cmchar "Old Persian syllable ji (J)";
-beginglyph("J",(7/2tb+wh)); %% 4tb+wh too large
- z1trc=(leftloc, 1/2h); % left pin
- trir(1, trht, trbs); fill pth1;
- z2=(x1+trbs, y1); % wing
- draw z1tic--z2;
- wingl(2, wiht, wibs); fill pth2;
- z12trc=(x2wil,y1); % middle pin
- trir(12, trht, trbs); fill pth12;
- z12'=(rightloc, y12); draw z12tic--z12';
- z11trr=z12trl; % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc, y11); draw z11tic--z11';
- z13trl=z12trr; % bottom pin
- trir(13, trht, trbs); fill pth13;
- z13'=(rightloc, y13); draw z13tic--z13';
- labels(1,2,3,4,5,6,7,8,9,10,11,12,13);
-endchar;
-
-cmchar "Old Persian syllable ta (t)";
-beginglyph("t", (4tb+th)); %% 5tb too large
- z3trl=(rightloc,h); % right pin
- trid(3, trht, trbs); fill pth3;
- z3'=(x3,0); draw z3tic--z3';
- z1trl=(x3trr-trbs,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z11trr=(leftloc,1/2h); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x1,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(x1,y12); draw z12tic--z12';
- z2trc=(1/2[x1,x3], y11trl); % middle pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- labels(1,2,3,4,5,6,7,8,9,10,11,12);
-endchar;
-
-cmchar "Old Persian syllable tu (T)";
-beginglyph("T", (4tb+th)); %% 5tb too large
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2trr=z1trl; % center pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- z3trr=z2trl; % right pin
- trid(3, trht, trbs); fill pth3;
- z3'=(x3,0); draw z3tic--z3';
- z11trl=(x3trl, 1/2h); % short hor pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- labels(1,2,3,11);
-endchar;
-
-cmchar "Old Persian syllable tha (o)";
-beginglyph("o", (2tb+wh));
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2=(x1,1/2h); % wing
- wingl(2, wiht, wibs); fill pth2;
- z3trr=(x2wil,h); % right pin
- trid(3, trht, trbs); fill pth3;
- z3'=(x3,0); draw z3tic--z3';
- labels(1,2,3);
-endchar;
-
-cmchar "Old Persian syllable c(cedilla)a (C)";
-beginglyph("C", (2tb));
- z1trl=(leftloc,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(rightloc,y1); draw z1tic--z1';
- z2trl=z1trr; % center pin
- trir(2, trht, trbs); fill pth2;
- z2'=(rightloc,y2); draw z2tic--z2';
- z11trr=z2trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % right pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian syllable da (d)";
-beginglyph("d", (2tb));
- z1trl=(leftloc,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(rightloc,y1); draw z1tic--z1';
- z11trr=z1trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % right pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian syllable di (P)";
-beginglyph("P", (3tb+th)); %% 4tb too large
- z2trl=(rightloc,h); % right pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- z1trl=z2trr; % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z12trc=(leftloc,1/2h); % center pin
- trir(12, trht, trbs); fill pth12;
- z12'=(x1,y12); draw z12tic--z12';
- z11trr=z12trl; % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x1,y11); draw z11tic--z11';
- z13trl=z12trr; % bottom pin
- trir(13, trht, trbs); fill pth13;
- z13'=(x1,y13); draw z13tic--z13';
- labels(1,2,11,12,13);
-endchar;
-
-cmchar "Old Persian syllable du (D)";
-beginglyph("D", (2tb+th+wh)); %% 3tb+wh too large
- z1=(leftloc,h/2); % wing
- wingl(1, wiht, wibs); fill pth1;
- z2trl=(rightloc,h); % right pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- z12trc=(x1wil,h/2); % center pin
- trir(12, trht, trbs); fill pth12;
- z12'=(x2,y12); draw z12tic--z12';
- z11trr=z12trl; % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x2,y11); draw z11tic--z11';
- z13trl=z12trr; % bottom pin
- trir(13, trht, trbs); fill pth13;
- z13'=(x2,y13); draw z13tic--z13';
- labels(1,2,11,12,13);
-endchar;
-
-cmchar "Old Persian syllable na (n)";
-beginglyph("n", (2tb+wh));
- z1=(rightloc-wiht, h/2); % wing
- wingl(1, wiht, wibs); fill pth1;
- z11trr=(leftloc,h/2); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x1,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(x1,y12); draw z12tic--z12';
- labels(1,11,12);
-endchar;
-
-cmchar "Old Persian syllable nu (N)";
-beginglyph("N", (2tb+2wh));
- z1=(leftloc, h/2); % left wing
- wingl(1, wiht, wibs); fill pth1;
- z2=(x1wil, y1); % right wing
- wingl(2, wiht, wibs); fill pth2;
- z11trr=(x2wil,h/2); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(rightloc,y12); draw z12tic--z12';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian syllable pa (p)";
-beginglyph("p", (2tb));
- z1trc=(leftloc,h); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(rightloc,y1); draw z1tic--z1';
- z2trl=(x1,y1); % middle pin
- trir(2, trht, trbs); fill pth2;
- z2'=(rightloc,y2); draw z2tic--z2';
- z3trl=(x1trc,y2); % bottom pin
- trir(3, trht, trbs); fill pth3;
- z3'=(rightloc,y3); draw z3tic--z3';
- z11trr=z3trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z12trr=z11trl; % right pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- labels(1,2,3,11,12);
-endchar;
-
-cmchar "Old Persian syllable fa (f)";
-beginglyph("f", (tb+2wh));
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z11=(x1,h/2); % left wing
- wingl(11, wiht, wibs); fill pth11;
- z12=(x11wil,y11); % right wing
- wingl(12, wiht, wibs); fill pth12;
- labels(1,11,12);
-endchar;
-
-cmchar "Old Persian syllable ba (b)";
-beginglyph("b", (3tb));
- z1trl=(rightloc,h); % right pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z11trr=(leftloc,h/2); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x1,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(x1,y12); draw z12tic--z12';
- labels(1,11,12);
-endchar;
-
-cmchar "Old Persian syllable ma (m)";
-beginglyph("m", (4tb+th)); %% 5tb too large
- z3trl=(rightloc,h); % right pin
- trid(3, trht, trbs); fill pth3;
- z3'=(x3,0); draw z3tic--z3';
- z2trl=(x3trr,y3); % center pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- z1trl=(x2trr,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z11trc=(leftloc, h/2); % hor pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x1,y11); draw z11tic--z11';
- labels(1,2,3,11);
-endchar;
-
-cmchar "Old Persian syllable mi (w)";
-beginglyph("w", (2tb+wh));
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2=(x1,h/2); % wing
- wingl(2, wiht, wibs); fill pth2;
- z11trr=(x2wil, h/2); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(rightloc,y12); draw z12tic--z12';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian syllable mu (M)";
-beginglyph("M", (5tb+wh));
- z5trc=(rightloc-2trbs, h/2); % right pin
- trir(5, trht, trbs); fill pth5;
- z5'=(rightloc,y5); draw z5tic--z5';
- z4=(x5trc-wiht,y5); % wing
- wingl(4, wiht, wibs); fill pth4;
- z2trc=(leftloc+trht,y5); % middle pin
- trir(2, trht, trbs); fill pth2;
- z2'=z4; draw z2tic--z2';
- z1trr=(leftloc,y2trl); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(3/4[x1,x2'],y1); draw z1tic--z1';
- z3trl=(leftloc,y2trr); % bottom pin
- trir(3, trht, trbs); fill pth3;
- z3'=(x1',y3); draw z3tic--z3';
- labels(1,2,3,4);
-endchar;
-
-cmchar "Old Persian syllable ya (y)";
-beginglyph("y", (2tb+wh));
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2=(x1,h/2); % wing
- wingl(2, wiht, wibs); fill pth2;
- z11trc=(x2wil, h/2); % right pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian syllable ra (r)";
-beginglyph("r", (3tb+th)); %% 4tb too large
- z11trl=(rightloc, h); % right pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z2trc=(leftloc+trht,h/2); % middle pin
- trir(2, trht, trbs); fill pth2;
- z2'=(x11,y2); draw z2tic--z2';
- z1trr=(leftloc,y2trl); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(x2',y1); draw z1tic--z1';
- z3trl=(leftloc,y2trr); % bottom pin
- trir(3, trht, trbs); fill pth3;
- z3'=(x2',y3); draw z3tic--z3';
- labels(1,2,3,4);
-endchar;
-
-cmchar "Old Persian syllable ru (R)";
-beginglyph("R", (tb+th+2wh)); %% 2tb+2wh too large
- z3=(rightloc-wiht,h/2); % right wing
- wingl(3, wiht, wibs); fill pth3;
- z2=(x3-wiht,y3); % left wing
- wingl(2, wiht, wibs); fill pth2;
- z1trc=(leftloc,y3); % pin
- trir(1, trht, trbs); fill pth1;
- z1'=z2; draw z1tic--z1';
- labels(1,2,3);
-endchar;
-
-cmchar "Old Persian syllable la (l)";
-beginglyph("l", (3tb+th)); %% 4tb too large
- z11trl=(rightloc,h); % right pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z2trc=(leftloc,h/2); % middle pin
- trir(2, trht, trbs); fill pth2;
- z2'=(x11,y2); draw z2tic--z2';
- z1trr=(x2,y2trl); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(x2',y1); draw z1tic--z1';
- z3trl=(x1trr,y2trr); % bottom pin
- trir(3, trht, trbs); fill pth3;
- z3'=(x2',y3); draw z3tic--z3';
- labels(1,2,3,11);
-endchar;
-
-cmchar "Old Persian syllable va (v)";
-beginglyph("v", (5tb));
- z11trc=(leftloc,h/2); % left hor pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x11+trbs,y11); draw z11tic--z11';
- z12trc=(x11',h); % vert pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z2=(x12+1/2trbs+2trht, h/2); % middle pin
- trir(2, trht, trbs); fill pth2;
- z2'=(rightloc,y2); draw z2tic--z2';
- z1trr=(x2trc-trht,y2trl); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(x2',y1); draw z1tic--z1';
- z3trl=(x1trr,y2trr); % bottom pin
- trir(3, trht, trbs); fill pth3;
- z3'=(x2',y3); draw z3tic--z3';
- labels(1,2,3,11);
-endchar;
-
-cmchar "Old Persian syllable vi (V)";
-beginglyph("V", (2tb));
- z1trl=(midloc,1/3h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2trr=z1trl; % right pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- z3trc=(x1trl,h); % top pin
- trid(3, trht, trbs); fill pth3;
- z3'=(x3,y1trl); draw z3tic--z3';
- z11trc=(leftloc, 1/2[y1trl,y3trl]); % hor pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- labels(1,2,3,4,11);
-endchar;
-
-cmchar "Old Persian syllable sa (s)";
-beginglyph("s", (3tb+th)); %% 4tb too large
- z12trr=(leftloc,h); % vert pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z2=(x12+1/2trbs+2trht, h/2); % middle pin
- trir(2, trht, trbs); fill pth2;
- z2'=(rightloc,y2); draw z2tic--z2';
- z1trr=(x2trc-trht,y2trl); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(x2',y1); draw z1tic--z1';
- z3trl=(x1trr,y2trr); % bottom pin
- trir(3, trht, trbs); fill pth3;
- z3'=(x2',y3); draw z3tic--z3';
- labels(1,2,3,11,12);
-endchar;
-
-cmchar "Old Persian syllable sva (S)";
-beginglyph("S", (2wh));
- z1=(leftloc,1/2wibs); % left wing
- wingl(1, wiht, wibs); fill pth1;
- z2=(x1+wiht,y1); % right wing
- wingl(2, wiht, wibs); fill pth2;
- z3trl=(leftloc,h); % pin
- trir(3, trht, trbs); fill pth3;
- z3'=(rightloc,y3); draw z3tic--z3';
- labels(1,2,3);
-endchar;
-
-cmchar "Old Persian syllable za (z)";
-beginglyph("z", (4tb));
- z1trr=(leftloc,h); % left pin
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2trl=(rightloc,h); % right pin
- trid(2, trht, trbs); fill pth2;
- z2'=(x2,0); draw z2tic--z2';
- z11trc=(x1trl,h/2); % hor pins
- trir(11, trht, trbs); fill pth11;
- z11'=(x2trr,y11); draw z11tic--z11';
- z12trc=1/2[z11trc,z11'];
- trir(12, trht, trbs); fill pth12;
- labels(1,2,11);
-endchar;
-
-cmchar "Old Persian syllable ha (h)";
-beginglyph("h", (2tb+2wh));
- z1=(leftloc,h/2); % left wing
- wingl(1, wiht, wibs); fill pth1;
- z2=(rightloc-wiht,y1); % right wing
- wingl(2, wiht, wibs); fill pth2;
- z11trr=(x1wil,y1); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(x2,y11); draw z11tic--z11';
- z12trl=z11trr; % bottom pin
- trir(12, trht, trbs); fill pth12;
- z12'=(x2,y12); draw z12tic--z12';
- labels(1,2,11,12);
-endchar;
-
-cmchar "Old Persian word: king (X)";
-beginglyph("X", (3tb+2wh));
- z4=(rightloc-wiht, h/2); % right wing
- wingl(4, wiht, wibs); fill pth4;
- z11trc=(x4,h); % center vert pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z3wir=(x11trr,y4wir); % left wing
- wingl(3, wiht, wibs); fill pth3;
- z1trr=(leftloc,y4); % top pin
- trir(1, trht, trbs); fill pth1;
- z1'=(x3,y1); draw z1tic--z1';
- z2trl=z1trr; % bottom pin
- trir(2, trht, trbs); fill pth2;
- z2'=(x1',y2); draw z2tic--z2';
- labels(1,2,3,4,11);
-endchar;
-
-cmchar "Old Persian word: country (version a) (q)";
-beginglyph("q", (9/4tb+wh)); %% 5/2tb+wh too large
- numeric n[];
- n1 := 1/2wiht;
- n2 := 1/2wibs;
- z12trl=(rightloc,h); % right pin
- trid(12, trht, trbs); fill pth12;
- z12'=(x12,0); draw z12tic--z12';
- z11trl=z12trr; % left pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z1=(leftloc, h-1/2n2); % top left wing
- wingl(1, n1, n2); fill pth1;
- z2=(x1wil, y1); % top right wing
- wingl(2, n1, n2); fill pth2;
- z3=(x1, 1/2n2); % bottom left wing
- wingl(3, n1, n2); fill pth3;
- z4=(x2, y3); % bottom right wing
- wingl(4, n1, n2); fill pth4;
- labels(1,2,3,4,11,12);
-endchar;
-
-cmchar "Old Persian word: country (version b) (Q)";
-beginglyph("Q", (5/4tb+wh)); %% 3/2tb+wh too large
- numeric n[];
- n1 := 1/2wiht;
- n2 := 1/2wibs;
- z11trl=(rightloc,h); % right pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- z1=(leftloc, h-1/2n2); % top left wing
- wingl(1, n1, n2); fill pth1;
- z2=(x1wil, y1); % top right wing
- wingl(2, n1, n2); fill pth2;
- z3=(x1, 1/2n2); % bottom left wing
- wingl(3, n1, n2); fill pth3;
- z4=(x2, y3); % bottom right wing
- wingl(4, n1, n2); fill pth4;
- labels(1,2,3,4,11,12);
-endchar;
-
-cmchar "Old Persian word: earth (L)";
-beginglyph("L", (3wh));
- z1=(leftloc, wiht); % left wing
- wingl(1, wiht, wibs); fill pth1;
- z2=(x1wil, y1); % center wing
- wingl(2, wiht, wibs); fill pth2;
- z3=(x2wil, y1); % right wing
- wingl(3, wiht, wibs); fill pth3;
- z11trr=(x1,y1wir); % top pin
- trir(11, trht, trbs); fill pth11;
- z11'=(rightloc,y11); draw z11tic--z11';
- z12trc=(x2,y11);
- trir(12, trht, trbs); fill pth12;
- z13trc=(x3,y11);
- trir(13, trht, trbs); fill pth13;
- labels(1,2,3,11,12,13);
-endchar;
-
-cmchar "Old Persian word: god (B)";
-beginglyph("B", (2tb+2wh));
- z4=(rightloc-wiht, h/2); % right wing
- wingl(4, wiht, wibs); fill pth4;
- z3=(x4-wiht, y4); % left wing
- wingl(3, wiht, wibs); fill pth3;
- z1trc=(leftloc,y4); % pin
- trir(1, trht, trbs); fill pth1;
- z1'=z3; draw z1tic--z1';
- z2trc=1/2[z1trc,z1'];
- trir(2, trht, trbs); fill pth2;
- labels(1,2,3,4);
-endchar;
-
-cmchar "Old Persian word: Auramazda (version a) (e)";
-beginglyph("e", (3tb+wh));
- z43=(rightloc-wiht, h/2); % wing
- wingl(43, wiht, wibs); fill pth43;
- z46trc=(x43,h); % vert pin
- trid(46, trht, trbs); fill pth46;
- z46'=(x46,0); draw z46tic--z46';
- z14trr=(leftloc,h/2); % pin 3
- trir(14, trht, trbs); fill pth14;
- z14'=(x46,y14); draw z14tic--z14';
- z24trc=1/2[z14trc,z14']; z34trc=2/3[z14trc,z14'];
- trir(24, trht, trbs); fill pth24;
-
- z12trl=z14trr; % pin 2
- trir(12, trht, trbs); fill pth12;
- z12'=(x46,y12); draw z12tic--z12';
- z22=(x24,y12); z32=(x34,y12);
- trir(22, trht, trbs); fill pth22;
-
- labels(12,14,21,22,23,24,25,31,32,33,34,35,41,42,43,44,45,46);
-endchar;
-
-cmchar "Old Persian word: Auramazda (version b) (E)";
-beginglyph("E", (4tb));
-%% z43=(rightloc-wiht, h/2); % wing
-%% wingl(43, wiht, wibs); fill pth43;
- z46trc=(rightloc,h+trht); % vert pin
- trid(46, trht, trbs); fill pth46;
- z46'=(x46,-1/2trbs); draw z46tic--z46';
- z14trr=(leftloc,h/2); % pin 3
- trir(14, trht, trbs); fill pth14;
- z14'=(x46,y14); draw z14tic--z14';
- z24trc=1/3[z14trc,z14']; z34trc=2/3[z14trc,z14'];
- trir(24, trht, trbs); fill pth24;
- trir(34, trht, trbs); fill pth34;
-
- z12trl=z14trr; % pin 2
- trir(12, trht, trbs); fill pth12;
- z12'=(x46,y12); draw z12tic--z12';
- z22=(x24,y12); z32=(x34,y12);
- trir(22, trht, trbs); fill pth22;
- trir(32, trht, trbs); fill pth32;
-
- z21trl=(x24trc, y12trr); % pin 1
- trir(21, trht, trbs); fill pth21;
- z21'=(x46,y21); draw z21tic--z21';
- z31=(x34,y21);
- trir(31, trht, trbs); fill pth31;
-
- z25trr=(x24trc, y14trl); % pin 4
- trir(25, trht, trbs); fill pth25;
- z25'=(x46,y25); draw z25tic--z25';
- z35=(x34,y25);
- trir(35, trht, trbs); fill pth35;
- labels(12,14,21,22,23,24,25,31,32,33,34,35,41,42,43,44,45,46);
-endchar;
-
-cmchar "Old Persian word: Auramazda (version c) (F)";
-beginglyph("F", (4tb+wh));
- z43=(rightloc-wiht, h/2); % wing
- wingl(43, wiht, wibs); fill pth43;
- z46trc=(x43,h+trht); % vert pin
- trid(46, trht, trbs); fill pth46;
- z46'=(x46,-1/2trbs); draw z46tic--z46';
- z14trr=(leftloc,y43); % pin 3
- trir(14, trht, trbs); fill pth14;
- z14'=(x46,y14); draw z14tic--z14';
- z24trc=1/3[z14trc,z14']; z34trc=2/3[z14trc,z14'];
- trir(24, trht, trbs); fill pth24;
- trir(34, trht, trbs); fill pth34;
-
- z12trl=z14trr; % pin 2
- trir(12, trht, trbs); fill pth12;
- z12'=(x46,y12); draw z12tic--z12';
- z22=(x24,y12); z32=(x34,y12);
- trir(22, trht, trbs); fill pth22;
- trir(32, trht, trbs); fill pth32;
-
- z21trl=(x24trc, y12trr); % pin 1
- trir(21, trht, trbs); fill pth21;
- z21'=(x46,y21); draw z21tic--z21';
- z31=(x34,y21);
- trir(31, trht, trbs); fill pth31;
-
- z25trr=(x24trc, y14trl); % pin 4
- trir(25, trht, trbs); fill pth25;
- z25'=(x46,y25); draw z25tic--z25';
- z35=(x34,y25);
- trir(35, trht, trbs); fill pth35;
- labels(12,14,21,22,23,24,25,31,32,33,34,35,41,42,43,44,45,46);
-endchar;
-
-cmchar "Old Persian numeral 1 (1)";
-beginglyph("1", (tb));
- z1trc=(midloc,h);
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- labels(1,2);
-endchar;
-
-cmchar "Old Persian numeral 2 (2)";
-beginglyph("2", (tb));
- z1trc=(midloc,h);
- trid(1, trht, trbs); fill pth1;
- z1'=(x1,0); draw z1tic--z1';
- z2trc=1/2[z1trc,z1'];
- trid(2, trht, trbs); fill pth2;
- labels(1,2);
-endchar;
-
-cmchar "Old Persian numeral 10 (3)";
-beginglyph("3", (wh));
- z1=(leftloc,h/2);
- wingl(1, wiht, wibs); fill pth1;
- labels(1,2);
-endchar;
-
-cmchar "Old Persian numeral 20 (4)";
-beginglyph("4", (1/2wh));
- z1=(leftloc,3/4h);
- wingl(1, 1/2wiht, 1/2wibs); fill pth1;
- z2=(leftloc,1/4h);
- wingl(2, 1/2wiht, 1/2wibs); fill pth2;
- labels(1,2);
-endchar;
-
-cmchar "Old Persian numeral 100 (5)";
-beginglyph("5", (tb+2th));
- z1trl=(leftloc,h); % top pins
- trir(1, trht, trbs); fill pth1;
- z2trr=(rightloc,h);
- tril(2, trht, trbs); fill pth2;
- draw z1tic--z2tic;
- z11trc=(1/2[x1,x2],y1trr); % vertical pin
- trid(11, trht, trbs); fill pth11;
- z11'=(x11,0); draw z11tic--z11';
- labels(1,2,11);
-endchar;
-
-cmchar "Old Persian word divider (:)";
-beginglyph(":", (3tb));
- numeric alpha;
- alpha := trbs;
- z1=(leftloc+alpha, h-alpha);
- z2=(rightloc-alpha, alpha);
- triangle(1, trht, trbs, angle((z2-z1)));
- fill pth1; draw z1tic--z2;
- labels(1,2);
-endchar;
-
-end
-
diff --git a/Master/texmf-dist/fonts/source/archaic/givbc10.mf b/Master/texmf-dist/fonts/source/archaic/givbc10.mf
deleted file mode 100644
index e2e190fa50c..00000000000
--- a/Master/texmf-dist/fonts/source/archaic/givbc10.mf
+++ /dev/null
@@ -1,921 +0,0 @@
-%%
-%% This is file `givbc10.mf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% greek4cbc.dtx (with options: `up')
-%% ------------------------------------------------------------------
-%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%% Copyright 1999--2005 Peter R. Wilson
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the Latex Project Public License, either
-%% version 1.3 of this license or (at your option) any
-%% later version.
-%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
-%%
-%% This work has the LPPL maintenance status "author-maintained".
-%%
-%% This work consists of the files listed in the README file.
-%% ------------------------------------------------------------------
- %%% GIVBC10.MF Computer Greek 4 century BC font 10 point design size.
-
-if unknown cmbase: input cmbase fi
-
-font_identifier:="GIVBC"; font_size 10pt#;
-
-u#:=20/36pt#; % unit width
-letter_fit#:=0pt#; % extra space added to all sidebars
-
-body_height#:=270/36pt#; % height of tallest characters
-asc_height#:=250/36pt#; % height of lowercase ascenders
-cap_height#:=246/36pt#; % height of caps
-fig_height#:=232/36pt#; % height of numerals
-x_height#:=155/36pt#; % height of lowercase without ascenders
-desc_depth#:=70/36pt#; % depth of lowercase descenders
-half_height#:=1/2cap_height#; % half the height of caps
-
-side#:=cap_height#; % Height and width of the square
-thickfudge:=1/9;
-thick#:=thickfudge*side#; % thickness of all lines in the font
-
-rule_thickness#:=.4pt#; % thickness of lines
-
-cap_stem#:=thick#; % thickness of majuscule stems
-
-o#:=8/36pt#; % amount of overshoot for curves
-apex_o#:=thin#; % amount of overshoot for diagonal junctions
-apex_corr#=0pt#; % fine tuning of overshoot
-
-slant:=0; % tilt ratio $(\Delta x/\Delta y)$
-
-serifs:=false; % should serifs and bulbs be attached?
-monospace:=false; % should all characters have the same width?
-
-dot_size#:=38/36pt#; % size of dots
-square_dots:=false; % should dots be square?
-
-boolean whole_font; % try generating a complete font?
-whole_font:=false;
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% MACRO SECTION %%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-def makebox(text rule) =
- for y=0,half_height,cap_height,body_height,x_height,-desc_depth,-body_depth:
- rule((l,y)t_,(r,y)t_); endfor % horizontals
- for x=l,r: rule((x,-body_depth)t_,(x,body_height)t_); endfor % verticals
- for x=u*(1+floor(1/u)) step u until r-1:
- rule((x,-body_depth)t_,(x,body_height)t_); endfor % more verticals
- if charic<>0:
- rule((r+charic*pt,h.o_),(r+charic*pt,.5h.o_)); fi % italic correction
-enddef;
-
-
-def proofpcbb(suffix $)(expr xoff, yoff) =
-if proofing > 0:
- x$bl = x$ - xoff; y$bl = y$ - yoff; % Bottom Left Hand Corner
- z$br = (x$bl+cap_height, y$bl); % BRHC
- z$tr = (x$bl+cap_height, y$bl+cap_height); % TRHC
- z$tl = (x$bl, y$bl+cap_height); % TLHC
- z$bc = 1/2[z$bl,z$br]; z$tc = 1/2[z$tl,z$tr]; % horizontal mid points
- pair hc, vc;
- hc = (2u,0); vc = (0,2u);
- pickup pensquare scaled 2;
- for s = z$bl, z$br, z$tr, z$tl, z$bc, z$tc:
- draw s-hc--s+hc;
- draw s-vc--s+vc;
- endfor
-fi
-enddef;
-
-
-let cm_font_setup=font_setup; % Knuth's original font_setup
-
-
-def greek_font_setup= % contains special stuff for archaic Greek font
- define_pixels(u);
- define_pixels(side,thick,half_height);
- let adjust_fit=normal_adjust_fit;
- define_whole_pixels(letter_fit);
- define_whole_vertical_pixels(body_height,asc_height,
- cap_height,x_height,desc_depth);
- body_depth:=desc_depth+body_height-asc_height;
- define_pixels(dot_size);
- shrink_fit:=1+hround(2letter_fit#*hppp)-2letter_fit;
- if not string mode:
- if mode<=smoke:
- shrink_fit:=0;
- fi
- fi
-enddef;
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% END OF MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-font_coding_scheme:="ASCII caps and miniscules";
-
-mode_setup;
-
-greek_font_setup;
-
-numeric pcshiftx#; % x value of LHS of box wrt origin of char box
-define_pixels(pcshiftx);
-
-
-font_slant slant;
-font_x_height x_height#;
-if monospace: font_normal_space 9u#; % no stretching or shrinking
- font_quad 18u#;
- font_extra_space 9u#;
-else: font_normal_space 6u#+2letter_fit#;
- font_normal_stretch 3u#; font_normal_shrink 2u#;
- font_quad 18u#+4letter_fit#;
- font_extra_space 2u#;
-fi
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-cmchar "Greek 394BC letter alpha (a)";
-beginchar("a", 2u#+side#+2thick#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u+thick;
-y100 = h/2; x100 = pcshiftx+y100; % center point
-numeric alpha[], hor, vert, hypot, theta;
-pair greek[];
-hor := 0.5h; vert := h-thick;
-greek1 = (hor, vert);
-theta = 270 + angle(greek1);
- % for left leg
-penpos1(thick,theta); penpos2(thick,theta);
- % and for the right leg
-penpos3(thick,-theta); penpos4(thick,-theta);
-rt x1r=pcshiftx; lft x4l=x1r+side;
-bot y1r=bot y4l=0;
-top y3r= top y2l=h;
-x3r=x2l = 0.5[x1r,x4l];
-z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- % draw the legs
-filldraw z1l--z2l--z4r--z4l--z0--z1r--cycle;
- % now for the bar
-y5l=y6l=hround(1/3h);
-y5r-y5l=y6r-y6l=thick;
-penpos5(whatever, angle(z2-z1)); penpos6(whatever, angle(z3-z4));
-z5=whatever[z1,z2]; z6=whatever[z3,z4];
-penstroke z5e--z6e; % bar line
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,100); endchar;
-
-
-cmchar "Greek 394BC letter beta (b)";
-beginchar("b",4u#+5/9side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := 2u;
-y100=h/2; x100=pcshiftx+y100; % square center
-penpos1(thick,0); penpos2(thick,0);
-y2l=0; y1l=h; x1l=x2l=pcshiftx;
-numeric alpha, long, short, hypot;
-long=(w-2pcshiftx); short=h/4; hypot=short++long;
-alpha := hypot/long;
-penpos3(alpha*thick,90); penpos4(alpha*thick,90);
-penpos5(alpha*thick,90); penpos6(alpha*thick,90);
-z3l=z2l;
-x4l=w-pcshiftx; y4l=0.25[y2l,y1l];
-z5r=z4l;
-x6l=x2r; y6l=0.5[y2l,y1l];
-penpos7(alpha*thick,90); penpos8(alpha*thick,90);
-penpos9(alpha*thick,90); penpos10(alpha*thick,90);
-z7r=z6l;
-x8l=x4l; y8l=0.75[y2l,y1l];
-z9r=z8l;
-z10r=z1l;
-z11=whatever[z2r,z1r]=whatever[z3r,z4r]; % bottom bowl and stem
-z12=whatever[z3r,z4r]=whatever[z6l,z5l]; % bottom bowl inner
-z13=whatever[z5r,z6r]=whatever[z7l,z8l]; % between the bowls
-z14=whatever[z7r,z8r]=whatever[z9l,z10l]; % top bowl inner
-z15=whatever[z2r,z1r]=whatever[z9l,z10l]; % top bowl and stem
-filldraw z1l--z2l--z4l--z13--z8l--cycle;
-unfilldraw z6l--z12--z11--cycle;
-unfilldraw z7r--z15--z14--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,100);
-endchar;
-
-
-cmchar "Greek 394BC letter gamma (g)";
-beginchar("g",2u#+thick#+2/3side#, cap_height#, 0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-penpos1(thick,0); penpos2(thick,0);
-x1l=x2l=pcshiftx; top y1l=h; bot y2l=0;
-filldraw stroke z1e--z2e;
-penpos3(thick,90); penpos4(thick,90);
-y3r=y4r=y1l; x3l=x1l; x4l=w-pcshiftx;
-filldraw stroke z3e--z4e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,100); endchar;
-
-
-cmchar "Greek 394BC letter delat (d)";
-beginchar("d", 2u#+side#+2thick#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u+thick;
-y100 = h/2; x100 = pcshiftx+y100; % center point
-numeric alpha, hor, vert, hypot, theta;
-pair greek[];
-hor := 0.5h; vert := h-thick;
-greek1 = (hor, vert);
-theta = 270 + angle(greek1);
- % for left leg
-penpos1(thick,theta); penpos2(thick,theta);
- % and for the right leg
-penpos3(thick,-theta); penpos4(thick,-theta);
-rt x1r=pcshiftx; lft x4l=x1r+side;
-bot y1r=bot y4l=0;
-top y2l= top y3r=h;
-x3r=x2l = 0.5[x1r,x4l];
-z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- % now for the bar
-penpos5(thick,90); penpos6(thick,90);
-bot y5l=bot y6l=0;
-x5l=pcshiftx; x6l=w-pcshiftx;
-z7=whatever[z1l,z2l]=whatever[z5l,z6l];
-z8=whatever[z3r,z4r]=whatever[z5l,z6l];
-z9=whatever[z1r,z2r]=whatever[z5r,z6r];
-z10=whatever[z3l,z4l]=whatever[z5r,z6r];
-filldraw z7--z2l--z8--cycle;
-unfilldraw z9--z0--z10--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,7,8,9,10,100); endchar;
-
-
-cmchar "Greek 394BC letter epsilon (e)";
-beginchar("e", 2u#+2/3side#+2thick#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % center point
-penpos1(thick,0); penpos2(thick,0);
-lft x1l=lft x2l=pcshiftx; top y1=h; bot y2=0;
-filldraw stroke z1e--z2e; % stem
-penpos5(thick,90); penpos6(thick,90);
-x5=x1; y5=y6=h/2; rt x6=pcshiftx + 2/3side;
-filldraw stroke z5e--z6e;
-penpos3(thick,90); penpos4(thick,90);
-x3=x1; top y3r=top y4r=h; x4=x6+thick;
-filldraw stroke z3e--z4e;
-penpos7(thick,90); penpos8(thick,90);
-x7=x1; bot y7l=bot y8l=0; x8=x6+2thick;
-filldraw stroke z7e--z8e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,100); endchar; % end of "E"
-
-
-cmchar "Greek 394BC letter zeta (z)";
-beginchar("z", 2u#+side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % center of square
-numeric alpha, hor, vert, hypot;
-vert=h; hor=4/5side; hypot=vert++hor;
-alpha=hypot/vert;
-penpos1(thick,90); penpos2(thick,90); penpos3(alpha*thick, 0);
-penpos4(alpha*thick, 0);
-top y1r=h; lft x1=pcshiftx;
-y2=y1; rt x2=x3;
-rt x3r=x1+4/5side;; top y3=h; x4l=x1; bot y4=0;
-filldraw stroke z1e--z2e; % top bar
-filldraw stroke z3e--z4e; % diagonal
-penpos8(thick,90); penpos9(thick,90);
-x8=x4; bot y8l=0;
-x9=pcshiftx+side; y9=y8;
-filldraw stroke z8e--z9e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,9,100); endchar;
-
-
-cmchar "Greek 394BC letter eta (h)";
-beginchar("h", 4u#+side#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := 2u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-penpos1(thick,0); penpos2(thick,0);
-lft x1l=lft x2l=pcshiftx; bot y1=0; top y2=h;
-filldraw stroke z1e--z2e;
-penpos3(thick,0); penpos4(thick,0);
-rt x3r= rt x4r= x1l+side; bot y3=0; top y4=h;
-filldraw stroke z3e--z4e;
-penpos5(thick,90); penpos6(thick,90);
-x5=x1; x6=x3; y5=y6=h/2;
-filldraw stroke z5e--z6e;
-proofpcbb(100, y100, y100);
-labels(1,2,3,4,5,6,100); endchar;
-
-
-cmchar "Greek 394BC letter theta (T)";
-beginchar("T", 2u#+side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % square center
-numeric alpha; alpha=0.75;
-x2r=pcshiftx; x4r=x2r+h; y2r=y4r=y100;
-y1r=h; y3r=0; x1r=x3r=x100;
-x2l=x2r+thick; x4l=x4r-thick; y2l=y4l=y2r;
-y1l=y1r-thick; y3l=y3r+thick; x1l=x3l=x1r;
-filldraw z1r..z2r..z3r..z4r..cycle;
-unfilldraw z1l..z2l..z3l..z4l..cycle;
-x12=x100-alpha*thick; x14=x100+alpha*thick; y12=y14=y100;
-y11=y100+alpha*thick; y13=y100-alpha*thick; x11=x13=x100;
-path p;
-p= z11..z12..z13..z14..cycle;
-filldraw p; filldraw p;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,100); endchar;
-
-
-cmchar "Greek 394BC letter iota (i)";
-beginchar("i", 4u#+thick#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := 2u;
-y100 = h/2; x100 = pcshiftx + 0.5thick; % center point
-penpos1(thick,0); penpos2(thick,0);
-x1=x2=hround(w/2); top y1=h; bot y2=0;
-filldraw stroke z1e--z2e; % vertical stem
-proofpcbb(100, y100, y100);
-penlabels(1, 2, 100);
-endchar;
-
-
-cmchar "Greek 394BC letter kappa (k)";
-beginchar("k", 2u#+2/3side#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % square center
-penpos1(thick,0); penpos2(thick,0);
-lft x1l=lft x2l=pcshiftx;
- top y1=h; bot y2=0;
- filldraw stroke z1e--z2e; % left stem
-numeric hor, vert, theta[];
-pair greek[];
-hor := 2/3side; vert := side/2;
-greek1 = (hor,vert);
-theta1=270+angle(greek1);
-penpos3(thick,theta1); penpos4(thick,theta1);
-x3l=x2r; y3l=side/2;
-y4l=h; x4r=x1l+2/3side;
-vert := -side/4;
-greek2 = (hor,vert);
-theta2=270+angle(greek2);
-penpos5(thick,theta2); penpos6(thick,theta2);
-z5r=z3l;
-x6l=x4r; y6l=side/4;
-z0=whatever[z3r,z4r]=whatever[z5l,z6l];
-filldraw z3l--z4l--z4r--z0--z6l--z6r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,100); endchar;
-
-
-cmchar "Greek 394BC letter lambda (l)";
-beginchar("l", 2u#+side#+2thick#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := u+thick;
-y100 = h/2; x100 = pcshiftx+y100; % center point
-numeric alpha[], hor, vert, hypot, theta;
-pair greek[];
-hor := 0.5h; vert := h-thick;
-greek1 = (hor, vert);
-theta = 270 + angle(greek1);
- % for left leg
-penpos1(thick,theta); penpos2(thick,theta);
- % and for the right leg
-penpos3(thick,-theta); penpos4(thick,-theta);
-rt x1r=pcshiftx; lft x4l=x1r+side;
-bot y1r=bot y4l=0;
-top y3r= top y2l=h;
-x3r=x2l = 0.5[x1r,x4l];
-z0=whatever[z1r,z2r]=whatever[z3l,z4l];
- % draw the legs
-filldraw z1l--z2l--z4r--z4l--z0--z1r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,100); endchar; % end of "L"
-
-
-cmchar"Greek 394BC letter mu (m)";
-beginchar("m", 2u#+side#+2thick#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u+thick;
-y100=h/2; x100=pcshiftx+y100; % square center
-numeric alpha, hor, vert, hypot, theta[];
-pair greek[];
-hor := 3thick; vert := side;
-greek1 = (hor, vert);
-theta1 = 270 + angle(greek1);
-penpos1(thick,theta1); penpos2(thick,theta1);
-z1r=(pcshiftx,0); z2l=(pcshiftx+2thick,h);
-penpos3(thick,-theta1); penpos4(thick,-theta1);
-z3l=(pcshiftx+side,0); z4r=(pcshiftx+side-2thick,h);
-z0=z100;
-theta2 = 270 + angle(z4r-z0);
-penpos5(thick,-theta2); penpos6(thick,-theta2);
-z5r=z0; z6r=z2l;
-penpos7(thick,theta2); penpos8(thick,theta2);
-z7l=z0; z8l=z4r;
-z9=whatever[z1r,z2r]=whatever[z5l,z6l];
-z10=whatever[z5l,z6l]=whatever[z7r,z8r];
-z11=whatever[z7r,z8r]=whatever[z3l,z4l];
-filldraw z1l--z2l--z0--z4r--z3r--z3l--z11--z10--z9--z1r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,7,8,9,10,100); endchar;
-
-
-cmchar "Greek 394BC letter nu (n)";
-beginchar("n", 4u#+side#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := 2u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-numeric hor, vert, theta;
-pair greek[];
-hor = side-thick; vert = h;
-greek1=(hor,vert);
-theta=270 + angle(greek1);
-penpos1(thick,0); penpos2(thick,0);
-z1l=(pcshiftx,0); z2l=(pcshiftx,h);
-penpos3(thick,0); penpos4(thick,0);
-z3r=(pcshiftx+side,0); z4r=(pcshiftx+side,h);
-penpos5(thick,-theta); penpos6(thick,-theta);
-z5l=z3r; z6r=z2l;
-z7=whatever[z1r,z2r]=whatever[z5l,z6l];
-z8=whatever[z5r,z6r]=whatever[z3l,z4l];
-filldraw z1l--z2l--z8--z4l--z4r--z3r--z7--z1r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,100); endchar;
-
-
-cmchar "Greek 394BC letter xi (x)";
-beginchar("x", 2u#+side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-penpos1(thick,0); penpos2(thick,0);
-z1=(x100,0); z2=(x100,h);
-filldraw stroke z1e--z2e;
-penpos3(thick,90); penpos4(thick,90);
-z3r=(pcshiftx,h); z4r=(pcshiftx+side,h);
-filldraw stroke z3e--z4e;
-penpos5(thick,90); penpos6(thick,90);
-z5=(pcshiftx,h/2); z6=(pcshiftx+side,h/2);
-filldraw stroke z5e--z6e;
-penpos7(thick,90); penpos8(thick,90);
-z7l=(pcshiftx,0); z8l=(pcshiftx+side,0);
-filldraw stroke z7e--z8e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,100);
-endchar;
-
-
-cmchar "Greek 394BC letter omicron (o)";
-beginchar("o", 2u#+side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % square center
-x2r=pcshiftx; x4r=x2r+h; y2r=y4r=y100;
-y1r=h; y3r=0; x1r=x3r=x100;
-x2l=x2r+thick; x4l=x4r-thick; y2l=y4l=y2r;
-y1l=y1r-thick; y3l=y3r+thick; x1l=x3l=x1r;
-filldraw z1r..z2r..z3r..z4r..cycle;
-unfilldraw z1l..z2l..z3l..z4l..cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,100); endchar;
-
-
-cmchar "Greek 394BC letter pi (p)";
-beginchar("p", 4u#+side#, cap_height#, 0);
-adjust_fit(0, 0);
-pcshiftx := 2u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-penpos1(thick,0); penpos2(thick,0);
-x1l=x2l=pcshiftx; top y1l=h; bot y2l=0;
-filldraw stroke z1e--z2e;
-penpos3(thick,90); penpos4(thick,90);
-y3r=y4r=y1l; x3l=x1l; x4l=w-pcshiftx;
-filldraw stroke z3e--z4e;
-penpos5(thick,0); penpos6(thick,0);
-x5r=x6r=x4; top y5=h; bot y6=h/2;
-filldraw stroke z5e--z6e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,100); endchar;
-
-
-cmchar "Greek 394BC letter rho (r)";
-beginchar("r", 2u#+5/9side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % square center
-penpos1(thick,0); penpos2(thick,0);
- top lft z1l=(pcshiftx,h); bot lft z2l=(pcshiftx,0);
-filldraw stroke z1e--z2e; % vertical stem
-penpos3(thick,90); penpos4(thick,0); penpos5(thick,-90);
-top y3r=top y1; x3r=x1r;
-bot y5r=5/9[y1,y2]; x5=x3;
-x4r=x1l+5/9side; y4=0.5[y5r,y3r];
-filldraw z3r{right}..z4r{down}..z5r{left}--z5l{right}..z4l{up}..z3l{left}--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,100);
-endchar;
-
-
-cmchar "Greek 394BC letter sigma (s)";
-beginchar("s", 2u#+2/3side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx+y100; % square center
-pair greek[];
-numeric theta[];
-numeric hor, vert;
-hor := 2/3side; vert := 1/3h;
-greek1=(hor,vert);
-theta1=270+angle(greek1);
-penpos1(thick,-theta1); penpos2(thick,-theta1);
-penpos7(thick,theta1); penpos8(thick,theta1);
-hor := 2/3side-thick; vert := h/2 - h/3;
-greek2=(hor,vert);
-theta2=270-angle(greek2);
-penpos3(thick,theta2); penpos4(thick,theta2);
-penpos5(thick,-theta2); penpos6(thick,-theta2);
-y1l=0; x1r=pcshiftx+2/3side;
-z2l=(pcshiftx,h/3);
-z3l=z2l;
-z4r=(pcshiftx+2/3side-thick, h/2);
-z5r=z4r;
-z6l=(pcshiftx,2/3h);
-z7l=z6l;
-y8l=h; x8r=x1r;
-z10=whatever[z1r,z2r]=whatever[z3r,z4r];
-z11=whatever[z3l,z4l]=whatever[z5l,z6l];
-z12=whatever[z5r,z6r]=whatever[z7r,z8r];
-filldraw z1l--z2l--z11--z6l--z8l--z8r--z12--z4r--z10--z1r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,10,11,12,100); endchar;
-
-
-cmchar "Greek 394BC letter tau (t)";
-beginchar("t",2u#+side#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % square center
-numeric hor, vert, theta;
-numeric alpha[]; pair greek[];
-alpha1=h-thick;
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,0); z2=(w/2,alpha1);
-filldraw stroke z1e--z2e;
-penpos3(thick,90); penpos4(thick,90);
-z3r=(pcshiftx,alpha1); z4r=(w/2,alpha1);
-filldraw stroke z3e--z4e;
-hor := w/2; vert := h/5;
-greek1=(hor,vert);
-theta = 270 + angle(greek1);
-penpos5(thick,theta);
-y5l=h; x5r=w-pcshiftx;
-filldraw z4l{right}..{greek1}z5r--z5l{-greek1}..{left}z4r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,100); endchar;
-
-
-cmchar "Greek 394BC letter upsilon (y)";
-beginchar("y", 2u#+side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % center of square
-numeric alpha, theta;
-numeric hor, vert;
-pair greek[];
-alpha=h/3;
-hor := h; vert := 0.75h;
-greek1 = (hor,vert); greek2 = (-hor, -vert);
-greek3 = (-hor,vert); greek4 = (hor, -vert);
-theta = 270 + angle(greek1);
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,0); z2=(w/2,alpha);
-penpos3(thick,theta);
-y3l=h; x3r=w-pcshiftx;
-penpos4(thick,-theta);
-y4r=h; x4l=pcshiftx;
-filldraw z1l--z1r--z2r{up}..{greek1}z3r--z3l{greek2}..{down}z2l--cycle;
-filldraw z1l--z1r--z2r{up}..{greek3}z4r--z4l{greek4}..{down}z2l--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,100); endchar; % End of "U"
-
-
-cmchar "Greek 394BC letter chi (X)";
-beginchar("X", 2u#+side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % center of square
-numeric theta;
-theta = 270+45;
-penpos1(thick,theta); penpos2(thick,theta);
-x1l=pcshiftx; y1r=0; x2r=pcshiftx+side; y2l=h;
-filldraw stroke z1e--z2e;
-penpos3(thick,-theta); penpos4(thick,-theta);
-x3l=pcshiftx; y3r=h; x4r=pcshiftx+side; y4l=0;
-filldraw stroke z3e--z4e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,100); endchar;
-
-
-cmchar "Greek 394BC letter phi (f)";
-beginchar("f", 2u#+2/3side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,0); z2=(w/2,h);
-z0=(w/2,h/2);
-numeric alpha;
-alpha := 1/3h;
-y3o=y3i=y5i=y5o=h/2;
-x3o=x0-alpha; x3i=x3o+thick; x5o=x0+alpha; x5i=x5o-thick;
-x4o=x4i=x6i=x6o=w/2;
-y4o=y0+alpha; y4i=y4o-thick; y6o=y0-alpha; y6i=y6o+thick;
-unfilldraw z3i..z4i..z5i..z6i..cycle;
-filldraw z3o..z4o..z5o..z6o..cycle;
-filldraw stroke z1e--z2e; filldraw stroke z1e--z2e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,100);
-endchar;
-
-
-cmchar "Greek 394BC letter psi (P)";
-beginchar("P", 2u#+5/6side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-numeric alpha, beta;
-numeric hor, vert, theta;
-pair greek;
-alpha=5/6; % scale factor
-beta=1/3alpha*side+thick; % arm seperation height
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,0); z2=(w/2,h);
-filldraw stroke z1e--z2e;
-hor := w/2; vert := h-beta;
-greek = (hor,vert);
-theta=270+angle(greek);
-penpos3(thick,theta); penpos4(thick,theta);
-z3l=(w/2,beta); y4l=alpha*h; x4r=w-pcshiftx;
-penpos5(thick,-theta); penpos6(thick,-theta);
-z5r=z3l; x6l=pcshiftx; y6r=y4l;
-z10=whatever[z1r,z2r]=whatever[z3r,z4r];
-z11=whatever[z1l,z2l]=whatever[z5l,z6l];
-filldraw z3l--z4l--z4r--z10--cycle; % right arm
-filldraw z5r--z6r--z6l--z11--cycle; % left arm
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,10,11,100);
-endchar;
-
-
-cmchar "Greek 394BC letter omega (O)";
-beginchar("O", 2u#+4/3side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-penpos1(thick,90); penpos2(thick,90); penpos3(thick,90); penpos4(thick,90);
-z1l=(pcshiftx,0); z4l=(w-pcshiftx,0);
-x2l = w/2-side/4; x3l=w/2+side/4; y2l=y3l=0;
-numeric theta, hor, vert;
-pair greek[];
-hor := x2r-pcshiftx; vert := h;
-greek1=(hor,vert); greek2=(-hor,-vert);
-greek3=(-hor,vert); greek4=(hor,-vert);
-theta = 270+angle(greek1);
-penpos5(thick,-theta); penpos9(thick,theta);
-z5r=z2l; z9l=z3l;
-penpos6(thick,0); penpos8(thick,0);
-z6l=(w/2-side/2, h/2); z8r=(w/2+side/2, h/2);
-penpos7(thick,90);
-z7r=(w/2,h);
-path p[];
-p1=z5l{greek3}..z6l{up}..{right}z7r;
-p2=z7r{right}..z8r{down}..{greek2}z9r;
-p3=z1r--z4r;
-z10 = p3 intersectionpoint p1;
-z11 = p3 intersectionpoint p2;
-filldraw z1r--z10{greek3}..z6l{up}..z7r{right}..z8r{down}..{greek2}z11--z4r
- --z4l--z3l{greek1}..z8l{up}..z7l{left}..z6r{down}..{greek4}z2l--z1l--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,9,10,11,100);
-endchar;
-
-
-cmchar "Greek 394BC letter beta (rough, B)";
-beginchar("B",4u#+2/3side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := 2u;
-y100=h/2; x100=pcshiftx+y100; % square center
-numeric beta;
-beta := side/10; % amount to extend top and bottom
-penpos1(thick,0); penpos2(thick,0);
-y2l=-beta; y1l=h+beta; x1l=x2l=pcshiftx;
-numeric alpha, long, short, hypot;
-long=(w-2pcshiftx); short=h/4; hypot=short++long;
-alpha := hypot/long;
-penpos3(alpha*thick,90); penpos4(alpha*thick,90);
-penpos5(alpha*thick,90); penpos6(alpha*thick,90);
-z3l=z2l;
-x4l=w-pcshiftx; y4l=0.25[y2l,y1l];
-z5r=z4l;
-x6l=x2r; y6l=0.5[y2l,y1l];
-penpos7(alpha*thick,90); penpos8(alpha*thick,90);
-penpos9(alpha*thick,90); penpos10(alpha*thick,90);
-z7r=z6l;
-x8l=x4l; y8l=0.75[y2l,y1l];
-z9r=z8l;
-z10r=z1l;
-z11=whatever[z2r,z1r]=whatever[z3r,z4r]; % bottom bowl and stem
-z12=whatever[z3r,z4r]=whatever[z6l,z5l]; % bottom bowl inner
-z13=whatever[z5r,z6r]=whatever[z7l,z8l]; % between the bowls
-z14=whatever[z7r,z8r]=whatever[z9l,z10l]; % top bowl inner
-z15=whatever[z2r,z1r]=whatever[z9l,z10l]; % top bowl and stem
-filldraw z1l--z2l--z4l--z13--z8l--cycle;
-unfilldraw z6l--z12--z11--cycle;
-unfilldraw z7r--z15--z14--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,100);
-endchar;
-
-
-cmchar"Greek 394BC letter mu (rough, M)";
-beginchar("M", 2u#+side#+2thick#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u+thick;
-y100=h/2; x100=pcshiftx+y100; % square center
-numeric alpha, hor, vert, hypot, theta[];
-pair greek[];
-hor := 3thick; vert := side;
-greek1 = (hor, vert);
-theta1 = 270 + angle(greek1);
-numeric beta;
-beta := thick; % extra depth below baseline
-penpos1(thick,theta1); penpos2(thick,theta1);
-z1r=(pcshiftx,-beta); z2l=(pcshiftx+2thick,h);
-penpos3(thick,-theta1); penpos4(thick,-theta1);
-z3l=(pcshiftx+side,0); z4r=(pcshiftx+side-2thick,h);
-z0=z100;
-theta2 = 270 + angle(z4r-z0);
-penpos5(thick,-theta2); penpos6(thick,-theta2);
-z5r=z0; z6r=z2l;
-penpos7(thick,theta2); penpos8(thick,theta2);
-z7l=z0; z8l=z4r;
-z9=whatever[z1r,z2r]=whatever[z5l,z6l];
-z10=whatever[z5l,z6l]=whatever[z7r,z8r];
-z11=whatever[z7r,z8r]=whatever[z3l,z4l];
-filldraw z1l--z2l--z0--z4r--z3r--z3l--z11--z10--z9--z1r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,7,8,9,10,100); endchar;
-
-
-cmchar "Greek 394BC letter nu (rough, N)";
-beginchar("N", 4u#+side#, cap_height#,0);
-adjust_fit(0,0);
-pcshiftx := 2u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-numeric hor, vert, theta;
-pair greek[];
-hor = side-thick; vert = h;
-greek1=(hor,vert);
-theta=270 + angle(greek1);
-numeric beta;
-beta := thick; % extra extensions of the legs
-penpos1(thick,0); penpos2(thick,0);
-z1l=(pcshiftx,-beta); z2l=(pcshiftx,h);
-penpos3(thick,0); penpos4(thick,0);
-z3r=(pcshiftx+side,0); z4r=(pcshiftx+side,h+beta);
-penpos5(thick,-theta); penpos6(thick,-theta);
-z5l=z3r; z6r=z2l;
-z7=whatever[z1r,z2r]=whatever[z5l,z6l];
-z8=whatever[z5r,z6r]=whatever[z3l,z4l];
-filldraw z1l--z2l--z8--z4l--z4r--z3r--z7--z1r--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,7,8,100); endchar;
-
-
-cmchar "Greek 394BC letter rho (rough, R)";
-beginchar("R", 2u#+2/3side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % square center
-numeric beta;
-beta := side/10; % extra top and bottom extensions
-penpos1(thick,0); penpos2(thick,0);
- top lft z1l=(pcshiftx,h+beta); bot lft z2l=(pcshiftx,-beta);
-filldraw stroke z1e--z2e; % vertical stem
-penpos3(thick,90); penpos4(thick,0); penpos5(thick,-90);
-top y3r=top y1; x3r=x1r;
-bot y5r=5/9[y1,y2]; x5=x3;
-x4r=x1l+5/9side; y4=0.5[y5r,y3r];
-filldraw z3r{right}..z4r{down}..z5r{left}--z5l{right}..z4l{up}..z3l{left}--cycle;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,100);
-endchar;
-
-
-cmchar "Greek 394BC letter upsilon (rough, Y)";
-beginchar("Y", 2u#+6/5side#, cap_height#, 0);
-adjust_fit(0,0);
-pcshiftx := u;
-y100=h/2; x100=pcshiftx+y100; % center of square
-numeric beta;
-beta := side/10; % extra at top and bottom
-numeric alpha, theta;
-numeric hor, vert;
-pair greek[];
-alpha=h/3;
-hor := h; vert := 0.75h;
-greek1 = (hor,vert); greek2 = (-hor, -vert);
-greek3 = (-hor,vert); greek4 = (hor, -vert);
-theta = 270 + angle(greek1);
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,-beta); z2=(w/2,alpha);
-penpos3(thick,theta);
-y3l=h+beta; x3r=w-pcshiftx;
-penpos4(thick,-theta);
-y4r=h+beta; x4l=pcshiftx;
-filldraw z1l--z1r--z2r{up}..{greek1}z3r--z3l{greek2}..{down}z2l--cycle;
-filldraw z1l--z1r--z2r{up}..{greek3}z4r--z4l{greek4}..{down}z2l--cycle;
-proofpcbb(100, y100, y100);
-penlabels(0,1,2,3,4,5,6,100); endchar; % End of "u"
-
-
-cmchar "Greek 394BC letter phi (rough, F)";
-beginchar("F", 2u#+4/5side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-numeric beta;
-beta := side/10; % extra at top and bottom
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,-beta); z2=(w/2,h+beta);
-z0=(w/2,h/2);
-numeric alpha;
-alpha := 2/5side;
-y3o=y3i=y5i=y5o=h/2;
-x3o=x0-alpha; x3i=x3o+thick; x5o=x0+alpha; x5i=x5o-thick;
-x4o=x4i=x6i=x6o=w/2;
-y4o=y0+alpha; y4i=y4o-thick; y6o=y0-alpha; y6i=y6o+thick;
-unfilldraw z3i..z4i..z5i..z6i..cycle;
-filldraw z3o..z4o..z5o..z6o..cycle;
-filldraw stroke z1e--z2e; filldraw stroke z1e--z2e;
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,100);
-endchar;
-
-
-cmchar "Greek 394BC letter psi (rough, Q)";
-beginchar("Q", 2u#+side#, cap_height#,0);
-adjust_fit(0, 0);
-pcshiftx := u;
-y100 = h/2; x100 = pcshiftx + y100; % center point
-numeric alpha, beta;
-numeric hor, vert, theta;
-pair greek;
-alpha=1; % scale factor
-beta=1/3alpha*side+thick; % arm seperation height
-numeric gamma;
-gamma := side/10; % extra at top and bottom
-penpos1(thick,0); penpos2(thick,0);
-z1=(w/2,-gamma); z2=(w/2,h+gamma);
-filldraw stroke z1e--z2e;
-hor := w/2; vert := h-beta;
-greek = (hor,vert);
-theta=270+angle(greek);
-penpos3(thick,theta); penpos4(thick,theta);
-z3l=(w/2,beta); y4l=alpha*h; x4r=w-pcshiftx;
-penpos5(thick,-theta); penpos6(thick,-theta);
-z5r=z3l; x6l=pcshiftx; y6r=y4l;
-z10=whatever[z1r,z2r]=whatever[z3r,z4r];
-z11=whatever[z1l,z2l]=whatever[z5l,z6l];
-filldraw z3l--z4l--z4r--z10--cycle; % right arm
-filldraw z5r--z6r--z6l--z11--cycle; % left arm
-proofpcbb(100, y100, y100);
-penlabels(1,2,3,4,5,6,10,11,100);
-endchar;
-
-
-end
-
diff --git a/Master/texmf-dist/fonts/source/archaic/gvibc10.mf b/Master/texmf-dist/fonts/source/archaic/gvibc10.mf
deleted file mode 100644
index 07fab0a4262..00000000000
--- a/Master/texmf-dist/fonts/source/archaic/gvibc10.mf
+++ /dev/null
@@ -1,354 +0,0 @@
-%%
-%% This is file `gvibc10.mf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% greek6cbc.dtx (with options: `up')
-%% ------------------------------------------------------------------
-%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%% Copyright 1999--2005 Peter R. Wilson
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the Latex Project Public License, either
-%% version 1.3 of this license or (at your option) any
-%% later version.
-%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
-%%
-%% This work has the LPPL maintenance status "author-maintained".
-%%
-%% This work consists of the files listed in the README file.
-%% ------------------------------------------------------------------
-%%% GVIBC10.MF Computer Greek font (6th century BC) 10 point design size.
-
-
-font_identifier:="Greek"; font_size 10pt#;
-
-u#:=.2pt#; % unit width
-ht#:=7pt#; % height of characters (CM cap-height is approx 6.8pt)
-s#:=1.5pt#; % width correction (right and left)
-o#:=1/20pt#; % overshoot
-px#:=.7pt#; % horizontal width of pen
-font_normal_space:=7pt#; % width of a blank space
-font_normal_shrink:=.9pt#; % width correction for blank space
-font_x_height:=4.5pt#; % height of one ex
-font_quad:=10pt#; % an em
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-font_coding_scheme:="Greek glyphs";
-mode_setup;
-
-ho#:=o#; % horizontal overshoot
-leftloc#:=s#; % leftmost xcoord of character
-py#:=.9px#; % vertical thickness of the pen
-
-define_pixels(s,u);
-define_blacker_pixels(px,py);
-define_good_x_pixels(leftloc);
-define_corrected_pixels(o); % turn on overshoot correction
-define_horizontal_corrected_pixels(ho);
-
-numeric midloc, rightloc;
-pickup pencircle xscaled px yscaled py;
-stylus:=savepen;
-
-def beginglyph(expr code, unit_width) =
- beginchar(code, unit_width*ht#+2s#, ht#, 0);
- midloc:=1/2w; rightloc:=(w-s);
- pickup stylus enddef;
-
-let cmchar=\;
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-cmchar "Greek letter alpha (a)";
-beginglyph("a",0.6);
-x1=leftloc; x3=rightloc; % base points
-bot y1 = bot y3 = -o;
-x2 = midloc; top y2 = h; % apex
-draw z1--z2--z3; % draw the legs
-z4 = 0.4[z1, z2];
-draw z3--z4; % draw the bar
-labels(1,2,3,4);
-endchar;
-
-
-cmchar "Greek letter beta (b)";
-beginglyph("b",0.6);
-x1=x3=x5=leftloc;
-x2=x4=rightloc;
-bot y1=-o; top y5=h;
-y2=1/4h; y3=1/2h; y4=3/4h;
-draw z1--z5; % the upright
-draw z1{right}..z2..z3{left}; % lower bowl
-draw z3{right}..z4..z5{left}; % upper bowl
-labels(1,2,3,4,5); endchar;
-
-
-cmchar "Greek letter gamma (g)";
-beginglyph("g", 0.4);
-x1=x2=leftloc; x3=rightloc;
-bot y1=-o; top y2 = top y3= h;
-draw z1--z2--z3;
-labels(1,2,3); endchar;
-
-
-cmchar "Greek letter delta (d)";
-beginglyph("d",0.6);
-x1=leftloc; x2=midloc; x3=rightloc;
-bot y1 = bot y3= 0;
-top y2=h;
-draw z1--z2--z3--cycle;
-labels(1,2,3); endchar;
-
-
-cmchar "Greek letter epsilon (e)";
-beginglyph("e",0.6);
-x1=x3=leftloc; x4=x6=rightloc;
-bot y1= bot y4= -o; top y3= top y6= h;
-z2=0.5[z1,z3]; z5=0.5[z4,z6];
-draw z4--z1--z3--z6;
-draw z2--z5;
-labels(1,2,3,4,5,6); endchar;
-
-
-cmchar "Greek letter digamma (F)";
-beginglyph("F",0.6);
-x1=x3=leftloc; x4=x6=rightloc;
-bot y1= bot y4= -o; top y3= top y6= h;
-z2=0.65[z1,z3]; z5=0.65[z4,z6];
-draw z1--z3--z6;
-draw z2--z5;
-labels(1,2,3,4,5,6); endchar;
-
-
-cmchar "Greek letter zeta (z)";
-beginglyph("z",0.2);
-x1=x2=midloc;
-bot y1=-o; top y2=h;
-draw z1--z2; % the upright
-x3=x5=leftloc; x4=x6=rightloc;
-y3=y4=y1; y5=y6=y2;
-draw z3--z4; % lower bar
-draw z5--z6; % upper bar
-labels(1,2); endchar;
-
-
-cmchar "Greek letter eta (h)";
-beginglyph("h", 0.6);
-numeric alpha;
-x1=x3=leftloc; x4=x6=rightloc;
-bot y1 = bot y4= -o; top y3= top y6= h;
-z2=0.5[z1,z3]; z5=0.5[z4,z6];
-draw z1--z3--z6--z4--cycle; % rectangle
-draw z2--z5; % bar
-labels(1,2,3,4,5,6); endchar;
-
-
-cmchar "Greek letter theta (T)";
-beginglyph("T",1.0);
-path p;
-x1=leftloc; x3=rightloc;
-y2=h; y4=0;
-x2=x4=midloc;
-y1=y3=h/2;
-z100=(x2,y3); % circle center
-p = z1..z2..z3..z4..cycle; % the circle
-draw p;
-draw z1--z3; draw z2--z4; % the cross
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter iota (i)";
-beginglyph("i",0.2);
-x1=x2=midloc;
-bot y1=-o; top y2=h;
-draw z1--z2;
-labels(1,2); endchar;
-
-
-cmchar "Greek letter kappa (k)";
-beginglyph("k",0.6);
-numeric alpha;
-alpha:=0.1;
-x1=rightloc;
-x2=x1+alpha*(w-s);
-x3=x4=x5=leftloc;
-bot y1= bot y3=-o;
-y2=y5=h; y4=1/2h;
-draw z3--z5; % the upright
-draw z1--z4; draw z4--z2; % the arms
-labels(1,2,3,4,5); endchar;
-
-
-cmchar "Greek letter lambda (l)";
-beginglyph("l",0.4);
-x1=x2=leftloc; x3=rightloc;
-bot y1=-o; y2=h;
-y3=.7h;
-draw z1--z2--z3;
-labels(1,2,3); endchar;
-
-
-cmchar"Greek letter mu (m)";
-beginglyph("m",1.0);
-x1=rightloc;
-x5=x6=leftloc;
-x2=3/4[x5,x1]; x3=1/2[x5,x1]; x4=1/4[x5,x1];
-bot y6= -o;
-top y5= top y3 = h;
-top y1=.8h;
-y2=.6h;
-y4=.7h;
-draw z6--z5;
-draw z1--z2--z3--z4--z5;
-labels(1,2,3,4,5,6); endchar;
-
-
-cmchar "Greek letter nu (n)";
-beginglyph("n",0.6);
-x1=x2=leftloc; x3=x4=rightloc;
-y1=0; y2=0.8h; y3=0.3h; y4=h;
-draw z1--z2--z3--z4;
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter xi (x)";
-beginglyph("x", 0.6);
-x1=x3=leftloc; x4=x6=rightloc;
-bot y1= bot y4= -o; top y3= top y6= h;
-z2=0.5[z1,z3]; z5=0.5[z4,z6];
-z7=0.5[z1,z4]; z8=0.5[z3,z6];
-draw z1--z4; draw z2--z5; draw z3--z6; % horizontals
-draw z7--z8; % vertical
-labels(1,2,3,4,5,6,7,8); endchar;
-
-
-cmchar "Greek letter omicron (o)";
-beginglyph("o",1.0);
-x1=leftloc; x3=rightloc;
-y2=h; y4=0;
-x2=x4=midloc;
-y1=y3=h/2;
-draw z1..z2..z3..z4..cycle;
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter pi (p)";
-beginglyph("p", 0.4);
-x1=x2=leftloc; x3=x4=rightloc;
-bot y1=-o; top y2= top y3= h; y4=0.6h;
-draw z1--z2--z3--z4;
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter (koppa) q";
-beginglyph("q",0.6);
-numeric alpha;
-x1=leftloc;
-x3=rightloc;
-alpha=0.5(x3-x1); % circle radius
-y2=h;
-y4=y2-2alpha;
-bot y5=-o;
-x2=x4=x5=midloc;
-y1=y3=h-alpha;
-draw z1..z2..z3..z4..cycle; % the circle
-draw z5--z4; % the upright
-labels(1,2,3,4,5); endchar;
-
-
-cmchar "Greek letter rho (r)";
-beginglyph("r", 0.4);
-x1=x2=x3=leftloc; x4=rightloc;
-bot y1=-o; top y2=h;
-y3=y4=0.5h;
-draw z1--z2--z4--z3; % the P shape
-x5=midloc; y5=0.2h;
-draw z3--z5; % a little leg
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter sigma (s)";
-beginglyph("s", 0.8);
-x2=x4=leftloc; x1=x5=rightloc;
-y1=0; y5=h;
-y2=0.1h; y4=0.9h;
-z3=(midloc,0.5h);
-draw z1--z2--z3--z4--z5;
-labels(1,2,3,4,5); endchar;
-
-
-cmchar "Greek letter tau (t)";
-beginglyph("t", 0.6);
-x1=midloc; x2=leftloc; x4=rightloc;
-bot y1=-o; top y2= top y4= h;
-z3=0.5[z2,z4];
-draw z1--z3; % upright
-draw z2--z4; % bar
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter upsilon (y)";
-beginglyph("y", 0.6);
-x1=x3=midloc; x2=leftloc; x4=rightloc;
-bot y1=-o; top y2= top y4= h;
-y3=0.6h;
-draw z1--z3; % upright
-draw z2--z3--z4; % V
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter chi (X)";
-beginglyph("X", 0.6);
-x1=x2=leftloc; x3=x4=rightloc;
-bot y1= bot y3=-o; top y2= top y4=h;
-draw z1--z4; draw z2--z3;
-labels(1,2,3,4); endchar;
-
-
-cmchar "Greek letter phi (f)";
-beginglyph("f",0.6);
-x1=leftloc; x3=rightloc;
-x2=x4=midloc;
-y1=y3=0.5h;
-y2=h; y4=0;
-draw z1..z2..z3..z4..cycle; % the oval
-draw z4--z2; % the upright
-labels(1,2,3,4,5); endchar;
-
-
-cmchar "Greek letter psi (P)";
-beginglyph("P", 0.6);
-x1=x3=midloc; x2=leftloc; x4=rightloc;
-bot y1=-o; top y2= top y4= h;
-y3=0.5h;
-z5=0.5[z2,z4];
-draw z1--z5; % upright
-draw z2--z3--z4; % V
-labels(1,2,3,4,5); endchar;
-
-
-cmchar "Greek letter omega (O)";
-beginglyph("O", 1.0);
-x1=leftloc; x4=rightloc;
-y1=y4=0;
-z2=0.35[z1,z4]; z3=0.35[z4,z1];
-x7=midloc; y7=h;
-x5=0.1[x1,x4]; x6=0.1[x4,x1];
-y5=y6=0.5h;
-draw z1--z2..z5..z7..z6..z3--z4;
-labels(1,2,3,4,5,6,7); endchar;
-
-
-end
-
diff --git a/Master/texmf-dist/fonts/source/archaic/vik10.mf b/Master/texmf-dist/fonts/source/archaic/vik10.mf
deleted file mode 100644
index fedc7050ea6..00000000000
--- a/Master/texmf-dist/fonts/source/archaic/vik10.mf
+++ /dev/null
@@ -1,38 +0,0 @@
-%%
-%% This is file `vik10.mf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% viking.dtx (with options: `up')
-%%
-%% Copyright 2003 Uwe Zimmermann
-%%
-%% This program is provided under the terms of the
-%% LaTeX Project Public License distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
-%%
-%% Author: Uwe Zimmermann
-%% uwe.zimmermann@sciencetronics.com
-%%
-%% based on runic.ins by Peter R. Wilson
-%%
-%%% VIK10.MF Computer Runic font 10 point design size.
-
-
-font_identifier:="Viking"; font_size 10pt#;
-
-u#:=.2pt#; % unit width
-ht#:=7pt#; % height of characters (CM cap-height is approx 6.8pt)
-s#:=1.5pt#; % width correction (right and left)
-o#:=1/20pt#; % overshoot
-px#:=.7pt#; % horizontal width of pen
-font_normal_space:=7pt#; % width of a blank space
-font_normal_shrink:=.9pt#; % width correction for blank space
-font_x_height:=4.5pt#; % height of one ex
-font_quad:=10pt#; % an em
-
-input viktitle %% switch to the driver file---Runic title
-
-end
-
diff --git a/Master/texmf-dist/fonts/source/archaic/vikglyph.mf b/Master/texmf-dist/fonts/source/archaic/vikglyph.mf
deleted file mode 100644
index aa2408f2e8b..00000000000
--- a/Master/texmf-dist/fonts/source/archaic/vikglyph.mf
+++ /dev/null
@@ -1,394 +0,0 @@
-%%
-%% This is file `vikglyph.mf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% viking.dtx (with options: `maj')
-%%
-%% Copyright 2003 Uwe Zimmermann
-%%
-%% This program is provided under the terms of the
-%% LaTeX Project Public License distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
-%%
-%% Author: Uwe Zimmermann
-%% uwe.zimmermann@sciencetronics.com
-%%
-%% based on runic.ins by Peter R. Wilson
-%%
-cmchar "Runic letter F";
-beginglyph("F",0.6);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.4h);
-z3 = (leftloc, 0.7h);
-z4 = (leftloc, 1.0h);
-z5 = (midloc, 1.0h);
-z6 = (rightloc, 1.0h);
-draw z1--z4;
-draw z2--z6;
-draw z3--z5;
-labels(1,2,3,4,5,6);
-endchar;
-cmchar "Runic letter U";
-beginglyph("U",0.6);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z3 = (0.75rightloc, 0.65h);
-z4 = (rightloc, 0.0h);
-draw z1--z2--z3--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter TH";
-beginglyph("D",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.2h);
-z3 = (leftloc, 0.8h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 0.5h);
-draw z1--z4;
-draw z2--z5;
-draw z3--z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter O";
-beginglyph("O",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.4h);
-z3 = (leftloc, 0.7h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 0.5h);
-z6 = (rightloc, 0.2h);
-draw z1--z4;
-draw z2--z6;
-draw z3--z5;
-labels(1,2,3,4,5,6);
-endchar;
-cmchar "Runic letter R";
-beginglyph("R",0.6);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z3 = (0.7(leftloc+rightloc), 0.75h);
-z4 = (0.3(leftloc+rightloc), 0.5h);
-z5 = (rightloc, 0.0h);
-draw z1--z2--z3--z4--z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter K";
-beginglyph("K",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.5h);
-z3 = (leftloc, 1.0h);
-z4 = (rightloc, 1.0h);
-draw z1--z3;
-draw z2--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter G";
-beginglyph("G",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.5h);
-z3 = (leftloc, 1.0h);
-z4 = (rightloc, 1.0h);
-z5 = (midloc, 0.95h);
-draw z1--z3;
-draw z2--z4;
-draw z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter H";
-beginglyph("H",0.4);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z3 = (leftloc, 0.3h);
-z4 = (leftloc, 0.7h);
-z5 = (rightloc, 0.7h);
-z6 = (rightloc, 0.3h);
-draw z1--z2;
-draw z3--z5;
-draw z4--z6;
-labels(1,2,3,4,5,6);
-endchar;
-cmchar "Runic letter N";
-beginglyph("N",0.4);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z4 = (leftloc, 0.7h);
-z6 = (rightloc, 0.3h);
-draw z1--z2;
-draw z4--z6;
-labels(1,2,4,6);
-endchar;
-cmchar "Runic letter I";
-beginglyph("I",0.4);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-draw z1--z2;
-labels(1,2);
-endchar;
-cmchar "Runic letter E";
-beginglyph("E",0.4);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z3 = (midloc, 0.5h);
-draw z1--z2;
-pickup stugna
-draw z3;
-labels(1,2,3);
-endchar;
-cmchar "Runic letter A";
-beginglyph("A",0.4);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z4 = (leftloc, 0.3h);
-z6 = (rightloc, 0.7h);
-draw z1--z2;
-draw z4--z6;
-labels(1,2,4,6);
-endchar;
-cmchar "Runic letter S";
-beginglyph("S",0.4);
-z1 = (rightloc, 0.0h);
-z2 = (rightloc, 0.7h);
-z3 = (leftloc, 0.3h);
-z4 = (leftloc, 1.0h);
-draw z1--z2--z3--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter Z";
-beginglyph("Z",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.7h);
-z3 = (rightloc, 0.3h);
-z4 = (rightloc, 1.0h);
-draw z1--z2--z3--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter T";
-beginglyph("T",0.4);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z3 = (leftloc, 0.8h);
-z4 = (rightloc, 0.8h);
-draw z1--z2;
-draw z2--z3;
-draw z2--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter B";
-beginglyph("B",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.5h);
-z3 = (leftloc, 1.0h);
-z4 = (rightloc, 0.75h);
-z5 = (rightloc, 0.25h);
-draw z1--z3;
-draw z3--z4--z2;
-draw z2--z5--z1;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter M";
-beginglyph("M",0.6);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 0.7h);
-z3 = (midloc, 1.0h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 1.0h);
-draw z1--z3;
-draw z2--z4;
-draw z2--z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter L";
-beginglyph("L",0.4);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z3 = (rightloc, 0.8h);
-draw z1--z2--z3;
-labels(1,2,3);
-endchar;
-cmchar "Runic letter Y";
-beginglyph("Y",0.6);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 0.3h);
-z3 = (midloc, 1.0h);
-z4 = (leftloc, 0.0h);
-z5 = (rightloc, 0.0h);
-draw z1--z3;
-draw z2--z4;
-draw z2--z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter :";
-beginglyph(":",0.2);
-z3 = (leftloc, 0.4h);
-z4 = (leftloc, 0.6h);
-z5 = (rightloc, 0.6h);
-z6 = (rightloc, 0.4h);
-draw z3--z5;
-draw z4--z6;
-labels(3,4,5,6);
-endchar;
-cmchar "Runic letter .";
-beginglyph(".",0.2);
-z3 = (midloc, 0.5h);
-draw z3;
-labels(3);
-endchar;
-cmchar "Runic letter F";
-beginglyph("f",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.5h);
-z3 = (leftloc, 0.75h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 1.0h);
-z6 = (rightloc, 0.75h);
-draw z1--z4;
-draw z2--z6;
-draw z3--z5;
-labels(1,2,3,4,5,6);
-endchar;
-cmchar "Runic letter U";
-beginglyph("u",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z4 = (rightloc, 0.0h);
-draw z1--z2--z4;
-labels(1,2,4);
-endchar;
-cmchar "Runic letter TH";
-beginglyph("d",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.2h);
-z3 = (leftloc, 0.8h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 0.5h);
-draw z1--z4;
-draw z2--z5;
-draw z3--z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter O";
-beginglyph("o",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.4h);
-z3 = (leftloc, 0.7h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 0.5h);
-z6 = (rightloc, 0.2h);
-draw z1--z4;
-draw z2--z6;
-draw z3--z5;
-labels(1,2,3,4,5,6);
-endchar;
-cmchar "Runic letter R";
-beginglyph("r",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z3 = (0.7(leftloc+rightloc), 0.75h);
-z4 = (0.3(leftloc+rightloc), 0.5h);
-z5 = (rightloc, 0.0h);
-draw z1--z2--z3--z4--z5;
-labels(1,2,3,4,5);
-endchar;
-cmchar "Runic letter K";
-beginglyph("k",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.5h);
-z3 = (leftloc, 1.0h);
-z4 = (rightloc, 1.0h);
-draw z1--z3;
-draw z2--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter H";
-beginglyph("h",0.2);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z3 = (leftloc, 0.5h);
-z5 = (rightloc, 0.5h);
-draw z1--z2;
-draw z3--z5;
-labels(1,2,3,5);
-endchar;
-cmchar "Runic letter N";
-beginglyph("n",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z4 = (leftloc, 0.6h);
-z6 = (rightloc, 0.3h);
-draw z1--z2;
-draw z4--z6;
-labels(1,2,4,6);
-endchar;
-cmchar "Runic letter I";
-beginglyph("i",0.2);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-draw z1--z2;
-labels(1,2);
-endchar;
-cmchar "Runic letter A";
-beginglyph("a",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z4 = (leftloc, 0.4h);
-z6 = (rightloc, 0.7h);
-draw z1--z2;
-draw z4--z6;
-labels(1,2,4,6);
-endchar;
-cmchar "Runic letter S";
-beginglyph("s",0.2);
-z1 = (midloc, 0.5h);
-z2 = (midloc, 1.0h);
-draw z1--z2;
-labels(1,2);
-endchar;
-cmchar "Runic letter T";
-beginglyph("t",0.3);
-z1 = (rightloc, 0.0h);
-z2 = (rightloc, 1.0h);
-z3 = (leftloc, 0.8h);
-draw z1--z2;
-draw z2--z3;
-labels(1,2,3);
-endchar;
-cmchar "Runic letter B";
-beginglyph("b",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 0.3h);
-z3 = (leftloc, 0.6h);
-z4 = (leftloc, 1.0h);
-z5 = (rightloc, 0.8h);
-z6 = (rightloc, 0.5h);
-draw z1--z4;
-draw z2--z6;
-draw z3--z5;
-labels(1,2,3,4,5,6);
-endchar;
-cmchar "Runic letter M";
-beginglyph("m",0.3);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 1.0h);
-z3 = (leftloc, 1.0h);
-z4 = (rightloc, 1.0h);
-draw z1--z2;
-draw z3--z4;
-labels(1,2,3,4);
-endchar;
-cmchar "Runic letter L";
-beginglyph("l",0.3);
-z1 = (leftloc, 0.0h);
-z2 = (leftloc, 1.0h);
-z3 = (rightloc, 0.8h);
-draw z1--z2--z3;
-labels(1,2,3);
-endchar;
-cmchar "Runic letter Y";
-beginglyph("y",0.2);
-z1 = (midloc, 0.0h);
-z2 = (midloc, 0.5h);
-draw z1--z2;
-labels(1,2);
-endchar;
diff --git a/Master/texmf-dist/fonts/source/archaic/viktitle.mf b/Master/texmf-dist/fonts/source/archaic/viktitle.mf
deleted file mode 100644
index 0b3a96e83c3..00000000000
--- a/Master/texmf-dist/fonts/source/archaic/viktitle.mf
+++ /dev/null
@@ -1,52 +0,0 @@
-%%
-%% This is file `viktitle.mf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% viking.dtx (with options: `mfd')
-%%
-%% Copyright 2003 Uwe Zimmermann
-%%
-%% This program is provided under the terms of the
-%% LaTeX Project Public License distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
-%%
-%% Author: Uwe Zimmermann
-%% uwe.zimmermann@sciencetronics.com
-%%
-%% based on runic.ins by Peter R. Wilson
-%%
-
-font_coding_scheme:="Runic glyphs";
-mode_setup;
-
-ho#:=o#; % horizontal overshoot
-leftloc#:=s#; % leftmost xcoord of character
-py#:=.9px#; % vertical thickness of the pen
-
-define_pixels(s,u);
-define_blacker_pixels(px,py);
-define_good_x_pixels(leftloc);
-define_corrected_pixels(o); % turn on overshoot correction
-define_horizontal_corrected_pixels(ho);
-
-numeric midloc, rightloc;
-pickup pencircle xscaled px yscaled py;
-stylus:=savepen;
-
-pickup pencircle xscaled 2px yscaled 2px;
-stugna:=savepen;
-
-def beginglyph(expr code, unit_width) =
- beginchar(code, unit_width*ht#+2s#, ht#, 0);
- midloc:=1/2w; rightloc:=(w-s);
- pickup stylus enddef;
-
-let cmchar=\;
-
-
-input vikglyph; % Runic glyphs
-
-end
-
diff --git a/Master/texmf-dist/fonts/tfm/archaic/phnc10.tfm b/Master/texmf-dist/fonts/tfm/archaic/phnc10.tfm
index 9c9d2e0bfa3..6c34c8b16da 100644
--- a/Master/texmf-dist/fonts/tfm/archaic/phnc10.tfm
+++ b/Master/texmf-dist/fonts/tfm/archaic/phnc10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/archaic/proto10.tfm b/Master/texmf-dist/fonts/tfm/archaic/proto10.tfm
index cb81abc4613..ba1fc39d82e 100644
--- a/Master/texmf-dist/fonts/tfm/archaic/proto10.tfm
+++ b/Master/texmf-dist/fonts/tfm/archaic/proto10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/archaic/sarab10.tfm b/Master/texmf-dist/fonts/tfm/archaic/sarab10.tfm
new file mode 100644
index 00000000000..1ade68d2da8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/archaic/sarab10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/etr10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/etr10.pfb
index 992284c8b50..5edd580103b 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/etr10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/etr10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/fut10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/fut10.pfb
index 6d33d541d4a..cd3a88d0335 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/fut10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/fut10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/givbc10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/givbc10.pfb
index b813b5d82fd..a389e15ac8d 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/givbc10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/givbc10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/gvibc10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/gvibc10.pfb
index 130db8fa12f..8999ee40830 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/gvibc10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/gvibc10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/oandsi10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/oandsi10.pfb
index 61e4659b22b..9d10fd09b6e 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/oandsi10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/oandsi10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/oandsu10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/oandsu10.pfb
index 38826ee3070..615b21e4de7 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/oandsu10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/oandsu10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/phnc10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/phnc10.pfb
index 9ff9be8ff0f..aad8c3fb6bc 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/phnc10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/phnc10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/pmhg.pfb b/Master/texmf-dist/fonts/type1/public/archaic/pmhg.pfb
index 68e5beb560c..be3ef29b3d3 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/pmhg.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/pmhg.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/proto10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/proto10.pfb
index 4b9a80afdba..97082da51e3 100644
--- a/Master/texmf-dist/fonts/type1/public/archaic/proto10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/archaic/proto10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/archaic/sarab10.pfb b/Master/texmf-dist/fonts/type1/public/archaic/sarab10.pfb
new file mode 100644
index 00000000000..c8c51bb79d5
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/archaic/sarab10.pfb
Binary files differ