Fix metric files for devps families A, BM, and font ZCMI.

Problem reported by Denis M. Wilson <dmw@oxytropis.plus.com>.

* font/devps/{AB, ABI, AI, AR, BMB, BMBI, BMI, BMR, ZCMI}:
Regenerated, using correct AFM files (from the Adobe Core 35 fonts
with 229 glyphs).

9 files changed, 4221 insertions, 1832 deletions

diff --git a/font/devps/AB b/font/devps/AB
index ff6455c6..811eac3c 100644
--- a/font/devps/AB
+++ b/font/devps/AB
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Demi
-#   Version 001.007
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:46:34 1991
-#   Comment UniqueID 34370
-#   Comment VMusage 24954 31846
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:42:33 1999
+#   Comment UniqueID 44726
+#   Comment VMusage 27573 34509
 
 name AB
 internalname AvantGarde-Demi
@@ -19,247 +19,428 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
+A T -73
+A V -127
+A W -96
+A Y -139
+A 'Y -139
+A :Y -139
+A v -50
+A w -50
 A y -50
-A w -65
-A v -70
-A u -20
-A ' -90
-A cq -90
-A Y -80
-A W -60
-A V -102
-A U -40
-A T -25
-A Q -50
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -45
-D W -25
-D V -50
-D A -50
-F . -129
-F e -20
-F , -162
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -15
-J . -15
-J a -20
-J A -30
-K y -20
-K u -15
-K o -45
-K e -40
-K O -30
-L y -23
-L ' -30
-L cq -30
-L rq -30
-L Y -80
-L W -55
-L V -85
-L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -45
-O T -15
-O A -60
-P . -200
-P o -20
-P e -20
-P , -220
-P a -20
+A 'y -50
+A :y -50
+'A T -73
+'A V -127
+'A W -96
+'A Y -139
+'A 'Y -139
+'A :Y -139
+'A v -50
+'A w -50
+'A y -50
+'A 'y -50
+'A :y -50
+^A T -73
+^A V -127
+^A W -96
+^A Y -139
+^A 'Y -139
+^A :Y -139
+^A v -50
+^A w -50
+^A y -50
+^A 'y -50
+^A :y -50
+:A T -73
+:A V -127
+:A W -96
+:A Y -139
+:A 'Y -139
+:A :Y -139
+:A v -50
+:A w -50
+:A y -50
+:A 'y -50
+:A :y -50
+`A T -73
+`A V -127
+`A W -96
+`A Y -139
+`A 'Y -139
+`A :Y -139
+`A v -50
+`A w -50
+`A y -50
+`A 'y -50
+`A :y -50
+oA T -73
+oA V -127
+oA W -96
+oA Y -139
+oA 'Y -139
+oA :Y -139
+oA v -50
+oA w -50
+oA y -50
+oA 'y -50
+oA :y -50
+~A T -73
+~A V -127
+~A W -96
+~A Y -139
+~A 'Y -139
+~A :Y -139
+~A v -50
+~A w -50
+~A y -50
+~A 'y -50
+~A :y -50
+F A -95
+F 'A -95
+F ^A -95
+F :A -95
+F `A -95
+F oA -95
+F ~A -95
+F , -42
+F . -42
+L T -50
+L V -90
+L W -90
+L Y -90
+L 'Y -90
+L :Y -90
+L y -75
+L 'y -75
+L :y -75
+/L T -50
+/L V -90
+/L W -90
+/L Y -90
+/L 'Y -90
+/L :Y -90
+/L y -75
+/L 'y -75
+/L :y -75
 P A -100
-Q , 20
-R W 25
-R V -10
-R U 25
-R T 40
-R O 25
-S , 20
-T y -10
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -49
-T - -75
-T hy -75
-T e -49
-T , -82
-T : -15
-T a -70
-T O -15
-T A -25
-U . -20
-U , -20
-U A -40
-V u -55
-V ; -33
-V . -145
-V o -101
-V i -15
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
-V a -95
-V O -45
-V G -20
-V A -102
-W y -15
-W u -30
-W ; -33
-W . -106
-W o -46
-W i -10
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+P 'A -100
+P ^A -100
+P :A -100
+P `A -100
+P oA -100
+P ~A -100
+P , -16
+P . -16
+R T 16
+R V -26
+R W -20
+R Y -20
+R 'Y -20
+R :Y -20
+R y 31
+R 'y 31
+R :y 31
+T A -70
+T 'A -70
+T ^A -70
+T :A -70
+T `A -70
+T oA -70
+T ~A -70
+T a -40
+T 'a -40
+T ^a -40
+T :a -40
+T `a -40
+T oa -40
+T ~a -40
+T c -50
+T ,c -50
+T : -12
+T , 4
+T e -50
+T 'e -50
+T ^e -50
+T :e -50
+T `e -50
+T - -10
+T hy -10
+T i -5
+T 'i 10
+T ^i 10
+T :i 10
+T `i 10
+T o -50
+T 'o -50
+T ^o -50
+T :o -50
+T `o -50
+T /o -50
+T ~o -50
+T . 4
+T r -42
+T s -43
+T ; -12
+T u -56
+T 'u -56
+T ^u -56
+T :u -56
+T `u -56
+T w -15
+T y -12
+T 'y -12
+T :y -12
+V A -125
+V 'A -125
+V ^A -125
+V :A -125
+V `A -125
+V oA -125
+V ~A -125
+V a -80
+V 'a -80
+V ^a -80
+V :a -80
+V `a -80
+V oa -80
+V ~a -80
+V : -13
+V , -13
+V e -80
+V 'e -80
+V ^e -80
+V :e -80
+V `e -80
+V - -20
+V hy -20
+V i -9
+V 'i -9
+V o -80
+V 'o -80
+V ^o -80
+V :o -80
+V `o -80
+V /o -80
+V ~o -80
+V . -13
+V r -40
+V ; -13
+V u -68
+V 'u -68
+V ^u -68
+V :u -68
+V `u -68
+V y -15
+V 'y -15
+V :y -15
+W A -94
+W 'A -94
+W ^A -94
+W :A -94
+W `A -94
+W oA -94
+W ~A -94
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -145
-Y o -89
-Y - -100
-Y hy -100
-Y e -89
-Y , -145
-Y : -10
-Y a -93
-Y O -30
-Y A -80
-a t 5
-a p 20
-a b 5
-b y -20
-b v -20
-c y -20
-c l -15
-c k -15
-, u0020 -50
-, ' -70
-, cq -70
-, rq -70
-e y -20
-e x -20
-e w -20
-e v -20
-f . -40
-f o -20
-f l -15
-f i -15
-f f -20
-f .i -15
-f , -40
-f a -15
-g i 25
-g a 15
-h y -30
-k y -5
-k o -30
-k e -40
-m y -20
-m u -20
-n y -15
-n v -30
-o y -20
-o x -30
-o w -20
-o v -30
-p y -20
-. u0020 -50
-. ' -70
-. cq -70
-. rq -70
-lq A -50
-rq u0020 -50
-` ` -80
-` oq -80
-oq ` -80
-oq oq -80
-` A -50
-oq A -50
-' v -10
-cq v -10
-' t 10
-cq t 10
-' u0020 -50
-cq u0020 -50
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -80
-' cq -80
-cq ' -80
-cq cq -80
-' d -50
-cq d -50
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -15
-r n 21
-r m 15
-r l 20
-r k 5
-r i 20
-r - -60
-r hy -60
-r g 1
-r e -4
-r d -6
-r , -75
-r c -7
-s . 20
-s , 20
-u0020 ` -50
-u0020 oq -50
-u0020 lq -50
-u0020 Y -60
-u0020 W -25
-u0020 V -80
-u0020 T -25
-u0020 A -20
-v . -90
-v o -20
-v e -20
-v , -90
-v a -30
-w . -90
-w o -30
-w e -20
-w , -90
-w a -30
-x e -20
-y . -100
-y o -30
-y e -20
-y , -100
-y c -35
-y a -30
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -12
+W , -12
+W e -50
+W 'e -50
+W ^e -50
+W :e -50
+W `e -50
+W - -10
+W hy -10
+W i -7
+W 'i 10
+W ^i 10
+W :i 10
+W `i 10
+W o -50
+W 'o -50
+W ^o -50
+W :o -50
+W `o -50
+W /o -50
+W ~o -50
+W . -12
+W r -39
+W ; -12
+W u -40
+W 'u -40
+W ^u -40
+W :u -40
+W `u -40
+W y 1
+W 'y 1
+W :y 1
+Y A -138
+Y 'A -138
+Y ^A -138
+Y :A -138
+Y `A -138
+Y oA -138
+Y ~A -138
+Y a -100
+Y 'a -100
+Y ^a -100
+Y :a -100
+Y `a -100
+Y oa -100
+Y ~a -100
+Y : -8
+Y , -8
+Y e -100
+Y 'e -100
+Y ^e -100
+Y :e -100
+Y `e -100
+Y - -60
+Y hy -60
+Y i -5
+Y 'i -5
+Y ^i 10
+Y :i 10
+Y `i 10
+Y o -100
+Y 'o -100
+Y ^o -100
+Y :o -100
+Y `o -100
+Y /o -100
+Y ~o -100
+Y p -60
+Y . -8
+Y q -100
+Y ; -8
+Y u -82
+Y 'u -82
+Y ^u -82
+Y :u -82
+Y `u -82
+Y v -25
+'Y A -138
+'Y 'A -138
+'Y ^A -138
+'Y :A -138
+'Y `A -138
+'Y oA -138
+'Y ~A -138
+'Y a -100
+'Y 'a -100
+'Y ^a -100
+'Y :a -100
+'Y `a -100
+'Y oa -100
+'Y ~a -100
+'Y : -8
+'Y , -8
+'Y e -100
+'Y 'e -100
+'Y ^e -100
+'Y :e -100
+'Y `e -100
+'Y - -60
+'Y hy -60
+'Y i -5
+'Y 'i -5
+'Y ^i 10
+'Y :i 10
+'Y `i 10
+'Y o -100
+'Y 'o -100
+'Y ^o -100
+'Y :o -100
+'Y `o -100
+'Y /o -100
+'Y ~o -100
+'Y p -60
+'Y . -8
+'Y q -100
+'Y ; -8
+'Y u -82
+'Y 'u -82
+'Y ^u -82
+'Y :u -82
+'Y `u -82
+'Y v -25
+:Y A -138
+:Y 'A -138
+:Y ^A -138
+:Y :A -138
+:Y `A -138
+:Y oA -138
+:Y ~A -138
+:Y a -100
+:Y 'a -100
+:Y ^a -100
+:Y :a -100
+:Y `a -100
+:Y oa -100
+:Y ~a -100
+:Y : -8
+:Y , -8
+:Y e -100
+:Y 'e -100
+:Y ^e -100
+:Y :e -100
+:Y `e -100
+:Y - -60
+:Y hy -60
+:Y i -5
+:Y 'i -5
+:Y ^i 10
+:Y :i 10
+:Y `i 10
+:Y o -100
+:Y 'o -100
+:Y ^o -100
+:Y :o -100
+:Y `o -100
+:Y /o -100
+:Y ~o -100
+:Y p -60
+:Y . -8
+:Y q -100
+:Y ; -8
+:Y u -82
+:Y 'u -82
+:Y ^u -82
+:Y :u -82
+:Y `u -82
+:Y v -25
+f f 38
+r c -27
+r ,c -27
+r , 9
+r d -8
+r e -8
+r 'e -8
+r ^e -8
+r :e -8
+r `e -8
+r f 38
+r g -8
+r - -10
+r hy -10
+r m 5
+r n 5
+r ~n 5
+r o -18
+r 'o -18
+r ^o -18
+r :o -18
+r `o -18
+r /o -18
+r ~o -18
+r . 9
+r q -18
 
 charset
 ha	600,740	2	0	asciicircum
@@ -271,6 +452,7 @@ vz	460,774	2	5	zcaron
 :Y	620,939,0,2,2	2	6	Ydieresis
 tm	1000,740	2	7	trademark
 aq	220,740	2	8	quotesingle
+Eu	560,755,15,1	2	9	Euro
 space	280	0	32	space
 !	280,740	2	33	exclam
 "	360,740	2	34	quotedbl
@@ -352,7 +534,7 @@ a	660,574,18	0	97	a
 b	660,740,18	2	98	b
 c	640,574,18	0	99	c
 d	660,740,18	2	100	d
-e	640,577,18	0	101	e
+e	640,574,18	0	101	e
 f	280,755	2	102	f
 g	660,574,226	1	103	g
 h	600,740	2	104	h
@@ -376,7 +558,7 @@ y	580,555,185	1	121	y
 z	460,555	0	122	z
 {	340,747,191,0,3	3	123	braceleft
 lC	"
-|	600,740,100	2	124	bar
+|	600,750,250	3	124	bar
 ba	"
 }	340,747,191,3	3	125	braceright
 rC	"
@@ -397,7 +579,7 @@ fi	520,755	2	140	fi
 fl	520,755	2	141	fl
 .i	240,555	0	144	dotlessi
 ga	420,851	2	146	grave
-a"	700,862	2	147	hungarumlaut
+a"	700,849	2	147	hungarumlaut
 a.	280,769	2	148	dotaccent
 ab	480,770	2	149	breve
 ah	540,774	2	150	caron
@@ -415,7 +597,7 @@ ct	560,715	0	162	cent
 Po	560,755,0,2,2	2	163	sterling
 Cs	560,577	0	164	currency
 Ye	560,740,0,10,10	2	165	yen
-bb	600,740,100	2	166	brokenbar
+bb	600,675,175	0	166	brokenbar
 sc	560,755,158	2	167	section
 ad	500,769	2	168	dieresis
 co	740,752,12,12,12	2	169	copyright
@@ -429,8 +611,8 @@ de	400,712	0	176	degree
 t+-	600,556,62	0	177	plusminus
 S2	336,749	2	178	twosuperior
 S3	336,749	2	179	threesuperior
-aa	420,849	2	180	acute
-*m	576,555,187	1	181	mu
+aa	420,851	2	180	acute
+*m	600,555,192	1	181	mu
 mc	"
 ps	600,740,103,7,7	2	182	paragraph
 pc	280,320	0	183	periodcentered
@@ -443,7 +625,7 @@ fc	240,469	0	187	guilsinglright
 34	840,749	2	190	threequarters
 r?	560,555,200	1	191	questiondown
 `A	740,1021	2	192	Agrave
-'A	740,1019	2	193	Aacute
+'A	740,1021	2	193	Aacute
 ^A	740,944	2	194	Acircumflex
 ~A	740,937	2	195	Atilde
 :A	740,939	2	196	Adieresis
@@ -451,31 +633,31 @@ oA	740,969	2	197	Aring
 AE	900,740,0,0,5	2	198	AE
 ,C	780,755,251	3	199	Ccedilla
 `E	520,1021	2	200	Egrave
-'E	520,1019	2	201	Eacute
+'E	520,1021	2	201	Eacute
 ^E	520,944	2	202	Ecircumflex
 :E	520,939	2	203	Edieresis
 `I	280,1021,0,0,45	2	204	Igrave
-'I	280,1019,0,45	2	205	Iacute
+'I	280,1021,0,43	2	205	Iacute
 ^I	280,944,0,60,59	2	206	Icircumflex
 :I	280,939,0,32,32	2	207	Idieresis
 -D	742,740	2	208	Eth
 ~N	740,937	2	209	Ntilde
 `O	840,1021,15	2	210	Ograve
-'O	840,1019,15	2	211	Oacute
+'O	840,1021,15	2	211	Oacute
 ^O	840,944,15	2	212	Ocircumflex
 ~O	840,937,15	2	213	Otilde
 :O	840,939,15	2	214	Odieresis
 tmu	600,494	0	215	multiply
 /O	840,814,71	2	216	Oslash
 `U	640,1021,15	2	217	Ugrave
-'U	640,1019,15	2	218	Uacute
+'U	640,1021,15	2	218	Uacute
 ^U	640,944,15	2	219	Ucircumflex
 :U	640,939,15	2	220	Udieresis
-'Y	620,1019,0,2,2	2	221	Yacute
+'Y	620,1021,0,2,2	2	221	Yacute
 TP	560,740	2	222	Thorn
 ss	600,755,18	2	223	germandbls
 `a	660,851,18	2	224	agrave
-'a	660,849,18	2	225	aacute
+'a	660,851,18	2	225	aacute
 ^a	660,774,18	2	226	acircumflex
 ~a	660,767,18	2	227	atilde
 :a	660,769,18	2	228	adieresis
@@ -483,27 +665,27 @@ oa	660,834,18	2	229	aring
 ae	1080,574,18	0	230	ae
 ,c	640,574,251	1	231	ccedilla
 `e	640,851,18	2	232	egrave
-'e	640,849,18	2	233	eacute
+'e	640,851,18	2	233	eacute
 ^e	640,774,18	2	234	ecircumflex
 :e	640,769,18	2	235	edieresis
 `i	240,851,0,0,65	2	236	igrave
-'i	240,849,0,65	2	237	iacute
+'i	240,851,0,63	2	237	iacute
 ^i	240,774,0,80,79	2	238	icircumflex
 :i	240,769,0,52,52	2	239	idieresis
 Sd	640,754,18	2	240	eth
 ~n	600,767	2	241	ntilde
 `o	640,851,18	2	242	ograve
-'o	640,849,18	2	243	oacute
+'o	640,851,18	2	243	oacute
 ^o	640,774,18	2	244	ocircumflex
 ~o	640,767,18	2	245	otilde
 :o	640,769,18	2	246	odieresis
 tdi	600,526,20	0	247	divide
 /o	660,608,50	0	248	oslash
 `u	600,851,18	2	249	ugrave
-'u	600,849,18	2	250	uacute
+'u	600,851,18	2	250	uacute
 ^u	600,774,18	2	251	ucircumflex
 :u	600,769,18	2	252	udieresis
-'y	580,849,185	3	253	yacute
+'y	580,851,185	3	253	yacute
 Tp	660,740,185	3	254	thorn
 :y	580,769,185	3	255	ydieresis
 u2026	1000,133	0	256	ellipsis
diff --git a/font/devps/ABI b/font/devps/ABI
index 20257f78..b7748431 100644
--- a/font/devps/ABI
+++ b/font/devps/ABI
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Demi Oblique
-#   Version 001.007
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:49:44 1991
-#   Comment UniqueID 34373
-#   Comment VMusage 6550 39938
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:43:21 1999
+#   Comment UniqueID 44727
+#   Comment VMusage 9292 47373
 
 name ABI
 internalname AvantGarde-DemiOblique
@@ -20,491 +20,673 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
+A T -73
+A V -127
+A W -96
+A Y -139
+A 'Y -139
+A :Y -139
+A v -50
+A w -50
 A y -50
-A w -65
-A v -70
-A u -20
-A ' -90
-A cq -90
-A Y -80
-A W -60
-A V -102
-A U -40
-A T -25
-A Q -50
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -45
-D W -25
-D V -50
-D A -50
-F . -129
-F e -20
-F , -162
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -15
-J . -15
-J a -20
-J A -30
-K y -20
-K u -15
-K o -45
-K e -40
-K O -30
-L y -23
-L ' -30
-L cq -30
-L rq -30
-L Y -80
-L W -55
-L V -85
-L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -45
-O T -15
-O A -60
-P . -200
-P o -20
-P e -20
-P , -220
-P a -20
+A 'y -50
+A :y -50
+'A T -73
+'A V -127
+'A W -96
+'A Y -139
+'A 'Y -139
+'A :Y -139
+'A v -50
+'A w -50
+'A y -50
+'A 'y -50
+'A :y -50
+^A T -73
+^A V -127
+^A W -96
+^A Y -139
+^A 'Y -139
+^A :Y -139
+^A v -50
+^A w -50
+^A y -50
+^A 'y -50
+^A :y -50
+:A T -73
+:A V -127
+:A W -96
+:A Y -139
+:A 'Y -139
+:A :Y -139
+:A v -50
+:A w -50
+:A y -50
+:A 'y -50
+:A :y -50
+`A T -73
+`A V -127
+`A W -96
+`A Y -139
+`A 'Y -139
+`A :Y -139
+`A v -50
+`A w -50
+`A y -50
+`A 'y -50
+`A :y -50
+oA T -73
+oA V -127
+oA W -96
+oA Y -139
+oA 'Y -139
+oA :Y -139
+oA v -50
+oA w -50
+oA y -50
+oA 'y -50
+oA :y -50
+~A T -73
+~A V -127
+~A W -96
+~A Y -139
+~A 'Y -139
+~A :Y -139
+~A v -50
+~A w -50
+~A y -50
+~A 'y -50
+~A :y -50
+F A -95
+F 'A -95
+F ^A -95
+F :A -95
+F `A -95
+F oA -95
+F ~A -95
+F , -42
+F . -42
+L T -50
+L V -90
+L W -90
+L Y -90
+L 'Y -90
+L :Y -90
+L y -75
+L 'y -75
+L :y -75
+/L T -50
+/L V -90
+/L W -90
+/L Y -90
+/L 'Y -90
+/L :Y -90
+/L y -75
+/L 'y -75
+/L :y -75
 P A -100
-Q , 20
-R W 25
-R V -10
-R U 25
-R T 40
-R O 25
-S , 20
-T y -10
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -49
-T - -75
-T hy -75
-T e -49
-T , -82
-T : -15
-T a -70
-T O -15
-T A -25
-U . -20
-U , -20
-U A -40
-V u -55
-V ; -33
-V . -145
-V o -101
-V i -15
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
-V a -95
-V O -45
-V G -20
-V A -102
-W y -15
-W u -30
-W ; -33
-W . -106
-W o -46
-W i -10
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+P 'A -100
+P ^A -100
+P :A -100
+P `A -100
+P oA -100
+P ~A -100
+P , -16
+P . -16
+R T 16
+R V -26
+R W -20
+R Y -20
+R 'Y -20
+R :Y -20
+R y 31
+R 'y 31
+R :y 31
+T A -70
+T 'A -70
+T ^A -70
+T :A -70
+T `A -70
+T oA -70
+T ~A -70
+T a -40
+T 'a -40
+T ^a -40
+T :a -40
+T `a -40
+T oa -40
+T ~a -40
+T c -50
+T ,c -50
+T : -12
+T , 4
+T e -50
+T 'e -50
+T ^e -50
+T :e -50
+T `e -50
+T - -10
+T hy -10
+T i -5
+T 'i 10
+T ^i 10
+T :i 10
+T `i 10
+T o -50
+T 'o -50
+T ^o -50
+T :o -50
+T `o -50
+T /o -50
+T ~o -50
+T . 4
+T r -42
+T s -43
+T ; -12
+T u -56
+T 'u -56
+T ^u -56
+T :u -56
+T `u -56
+T w -15
+T y -12
+T 'y -12
+T :y -12
+V A -125
+V 'A -125
+V ^A -125
+V :A -125
+V `A -125
+V oA -125
+V ~A -125
+V a -80
+V 'a -80
+V ^a -80
+V :a -80
+V `a -80
+V oa -80
+V ~a -80
+V : -13
+V , -13
+V e -80
+V 'e -80
+V ^e -80
+V :e -80
+V `e -80
+V - -20
+V hy -20
+V i -9
+V 'i -9
+V o -80
+V 'o -80
+V ^o -80
+V :o -80
+V `o -80
+V /o -80
+V ~o -80
+V . -13
+V r -40
+V ; -13
+V u -68
+V 'u -68
+V ^u -68
+V :u -68
+V `u -68
+V y -15
+V 'y -15
+V :y -15
+W A -94
+W 'A -94
+W ^A -94
+W :A -94
+W `A -94
+W oA -94
+W ~A -94
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -145
-Y o -89
-Y - -100
-Y hy -100
-Y e -89
-Y , -145
-Y : -10
-Y a -93
-Y O -30
-Y A -80
-a t 5
-a p 20
-a b 5
-b y -20
-b v -20
-c y -20
-c l -15
-c k -15
-, u0020 -50
-, ' -70
-, cq -70
-, rq -70
-e y -20
-e x -20
-e w -20
-e v -20
-f . -40
-f o -20
-f l -15
-f i -15
-f f -20
-f .i -15
-f , -40
-f a -15
-g i 25
-g a 15
-h y -30
-k y -5
-k o -30
-k e -40
-m y -20
-m u -20
-n y -15
-n v -30
-o y -20
-o x -30
-o w -20
-o v -30
-p y -20
-. u0020 -50
-. ' -70
-. cq -70
-. rq -70
-lq A -50
-rq u0020 -50
-` ` -80
-` oq -80
-oq ` -80
-oq oq -80
-` A -50
-oq A -50
-' v -10
-cq v -10
-' t 10
-cq t 10
-' u0020 -50
-cq u0020 -50
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -80
-' cq -80
-cq ' -80
-cq cq -80
-' d -50
-cq d -50
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -15
-r n 21
-r m 15
-r l 20
-r k 5
-r i 20
-r - -60
-r hy -60
-r g 1
-r e -4
-r d -6
-r , -75
-r c -7
-s . 20
-s , 20
-u0020 ` -50
-u0020 oq -50
-u0020 lq -50
-u0020 Y -60
-u0020 W -25
-u0020 V -80
-u0020 T -25
-u0020 A -20
-v . -90
-v o -20
-v e -20
-v , -90
-v a -30
-w . -90
-w o -30
-w e -20
-w , -90
-w a -30
-x e -20
-y . -100
-y o -30
-y e -20
-y , -100
-y c -35
-y a -30
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -12
+W , -12
+W e -50
+W 'e -50
+W ^e -50
+W :e -50
+W `e -50
+W - -10
+W hy -10
+W i -7
+W 'i 10
+W ^i 10
+W :i 10
+W `i 10
+W o -50
+W 'o -50
+W ^o -50
+W :o -50
+W `o -50
+W /o -50
+W ~o -50
+W . -12
+W r -39
+W ; -12
+W u -40
+W 'u -40
+W ^u -40
+W :u -40
+W `u -40
+W y 1
+W 'y 1
+W :y 1
+Y A -138
+Y 'A -138
+Y ^A -138
+Y :A -138
+Y `A -138
+Y oA -138
+Y ~A -138
+Y a -100
+Y 'a -100
+Y ^a -100
+Y :a -100
+Y `a -100
+Y oa -100
+Y ~a -100
+Y : -8
+Y , -8
+Y e -100
+Y 'e -100
+Y ^e -100
+Y :e -100
+Y `e -100
+Y - -60
+Y hy -60
+Y i -5
+Y 'i -5
+Y ^i 10
+Y :i 10
+Y `i 10
+Y o -100
+Y 'o -100
+Y ^o -100
+Y :o -100
+Y `o -100
+Y /o -100
+Y ~o -100
+Y p -60
+Y . -8
+Y q -100
+Y ; -8
+Y u -82
+Y 'u -82
+Y ^u -82
+Y :u -82
+Y `u -82
+Y v -25
+'Y A -138
+'Y 'A -138
+'Y ^A -138
+'Y :A -138
+'Y `A -138
+'Y oA -138
+'Y ~A -138
+'Y a -100
+'Y 'a -100
+'Y ^a -100
+'Y :a -100
+'Y `a -100
+'Y oa -100
+'Y ~a -100
+'Y : -8
+'Y , -8
+'Y e -100
+'Y 'e -100
+'Y ^e -100
+'Y :e -100
+'Y `e -100
+'Y - -60
+'Y hy -60
+'Y i -5
+'Y 'i -5
+'Y ^i 10
+'Y :i 10
+'Y `i 10
+'Y o -100
+'Y 'o -100
+'Y ^o -100
+'Y :o -100
+'Y `o -100
+'Y /o -100
+'Y ~o -100
+'Y p -60
+'Y . -8
+'Y q -100
+'Y ; -8
+'Y u -82
+'Y 'u -82
+'Y ^u -82
+'Y :u -82
+'Y `u -82
+'Y v -25
+:Y A -138
+:Y 'A -138
+:Y ^A -138
+:Y :A -138
+:Y `A -138
+:Y oA -138
+:Y ~A -138
+:Y a -100
+:Y 'a -100
+:Y ^a -100
+:Y :a -100
+:Y `a -100
+:Y oa -100
+:Y ~a -100
+:Y : -8
+:Y , -8
+:Y e -100
+:Y 'e -100
+:Y ^e -100
+:Y :e -100
+:Y `e -100
+:Y - -60
+:Y hy -60
+:Y i -5
+:Y 'i -5
+:Y ^i 10
+:Y :i 10
+:Y `i 10
+:Y o -100
+:Y 'o -100
+:Y ^o -100
+:Y :o -100
+:Y `o -100
+:Y /o -100
+:Y ~o -100
+:Y p -60
+:Y . -8
+:Y q -100
+:Y ; -8
+:Y u -82
+:Y 'u -82
+:Y ^u -82
+:Y :u -82
+:Y `u -82
+:Y v -25
+f f 38
+r c -27
+r ,c -27
+r , 9
+r d -8
+r e -8
+r 'e -8
+r ^e -8
+r :e -8
+r `e -8
+r f 38
+r g -8
+r - -10
+r hy -10
+r m 5
+r n 5
+r ~n 5
+r o -18
+r 'o -18
+r ^o -18
+r :o -18
+r `o -18
+r /o -18
+r ~o -18
+r . 9
+r q -18
 
 charset
-ha	600,740,0,46,-92,46	2	0	asciicircum
-ti	600,347,0,29,-64,29	0	1	asciitilde
-vS	520,944,15,165,1,82	2	2	Scaron
+ha	600,740,0,47,-92,47	2	0	asciicircum
+ti	600,347,0,30,-64,30	0	1	asciitilde
+vS	520,944,15,165,2,82	2	2	Scaron
 vZ	500,944,0,200,31,82	2	3	Zcaron
-vs	440,774,18,173,1,82	2	4	scaron
-vz	460,774,0,188,30,82	2	5	zcaron
-:Y	620,939,0,189,-85,82	2	6	Ydieresis
-tm	1000,740,0,8,-81,8	2	7	trademark
-aq	220,740,0,144,-102,82	2	8	quotesingle
+vs	440,774,18,174,1,82	2	4	scaron
+vz	460,774,0,169,30,82	2	5	zcaron
+:Y	620,939,0,190,-85,82	2	6	Ydieresis
+tm	1000,740,0,9,-80,9	2	7	trademark
+aq	220,740,0,145,-102,82	2	8	quotesingle
+Eu	560,755,15,172,3,82	2	9	Euro
 space	280	0	32	space
-!	280,740,0,113,-23,82	2	33	exclam
-"	360,740,0,168,-77,82	2	34	quotedbl
+!	280,740,0,114,-23,82	2	33	exclam
+"	360,740,0,169,-77,82	2	34	quotedbl
 dq	"
-#	560,700,0,108,-16,82	0	35	numbersign
+#	560,700,0,109,-15,82	0	35	numbersign
 sh	"
 $	560,857,86,72,-49,72	2	36	dollar
 Do	"
 %	860,755,15,46,-89,46	2	37	percent
-&	680,755,15,112,-21,82	2	38	ampersand
-'	280,740,0,112,-109,82	2	39	quoteright
+&	680,755,15,112,-20,82	2	38	ampersand
+'	280,740,0,113,-109,82	2	39	quoteright
 cq	"
-(	380,754,157,160,-70,82	2	40	parenleft
-)	380,754,157,48,42,48	2	41	parenright
-*	440,755,0,102,-124,82	2	42	asterisk
-+	600,506,0,60,-34,60	0	43	plus
-,	280,133,141,1,2,1	0	44	comma
--	420,348,0,43,-64,43	0	45	hyphen
+(	380,754,157,160,-69,82	2	40	parenleft
+)	380,754,157,48,43,48	2	41	parenright
+*	440,755,0,103,-123,82	2	42	asterisk
++	600,506,0,61,-33,61	0	43	plus
+,	280,133,141,1,3,1	0	44	comma
+-	420,348,0,44,-63,44	0	45	hyphen
 hy	"
 .	280,133,0,1,-23,1	0	46	period
-/	460,740,100,181,63,82	2	47	slash
+/	460,740,100,182,63,82	2	47	slash
 sl	"
-0	560,755,15,118,-20,82	2	48	zero
+0	560,755,15,118,-19,82	2	48	zero
 1	560,740,0,0,-180	2	49	one
 2	560,755,0,112,6,82	2	50	two
-3	560,755,15,75,-17,75	2	51	three
-4	560,740,0,94,14,82	2	52	four
-5	560,740,15,90,-14,82	2	53	five
-6	560,739,15,77,-14,77	2	54	six
-7	560,740,0,125,-33,82	2	55	seven
-8	560,755,15,80,-21,80	2	56	eight
-9	560,754,0,123,-60,82	2	57	nine
+3	560,755,15,76,-17,76	2	51	three
+4	560,740,0,95,15,82	2	52	four
+5	560,740,15,91,-13,82	2	53	five
+6	560,739,15,78,-14,78	2	54	six
+7	560,740,0,126,-33,82	2	55	seven
+8	560,755,15,80,-20,80	2	56	eight
+9	560,754,0,123,-59,82	2	57	nine
 :	280,555,0,79,-23,79	0	58	colon
-;	280,555,141,79,2,79	0	59	semicolon
-<	600,514,8,99,-34,82	0	60	less
+;	280,555,141,79,3,79	0	59	semicolon
+<	600,514,8,100,-34,82	0	60	less
 =	600,425,0,81,-13,81	0	61	equal
->	600,514,8,60,5,60	0	62	greater
-?	560,755,0,83,-85,82	2	63	question
-@	740,712,12,142,-59,82	0	64	at
+>	600,514,8,60,6,60	0	62	greater
+?	560,755,0,84,-85,82	2	63	question
+@	740,712,12,142,-58,82	0	64	at
 at	"
 A	740,740,0,42,43,42	2	65	A
-B	580,740,0,80,-20,80	2	66	B
-C	780,755,15,134,-47,82	2	67	C
+B	580,740,0,81,-20,81	2	66	B
+C	780,755,15,135,-46,82	2	67	C
 D	700,740,0,82,-13,82	2	68	D
-E	520,740,0,126,-11,82	2	69	E
-F	480,740,0,145,-11,82	2	70	F
+E	520,740,0,127,-11,82	2	69	E
+F	480,740,0,146,-11,82	2	70	F
 G	840,755,15,97,-39,82	2	71	G
-H	680,740,0,117,-21,82	2	72	H
-I	280,740,0,116,-22,82	2	73	I
-J	480,740,15,116,16,82	2	74	J
-K	620,740,0,187,-39,82	2	75	K
+H	680,740,0,118,-21,82	2	72	H
+I	280,740,0,117,-22,82	2	73	I
+J	480,740,15,117,16,82	2	74	J
+K	620,740,0,188,-39,82	2	75	K
 L	440,740,0,69,-22,69	2	76	L
-M	900,740,0,124,-13,82	2	77	M
-N	740,740,0,118,-20,82	2	78	N
-O	840,755,15,92,-45,82	2	79	O
+M	900,740,0,125,-13,82	2	77	M
+N	740,740,0,119,-20,82	2	78	N
+O	840,755,15,92,-44,82	2	79	O
 P	560,740,0,135,-22,82	2	80	P
-Q	840,755,15,92,-44,82	2	81	Q
-R	580,740,0,126,-14,82	2	82	R
-S	520,755,15,108,1,82	2	83	S
-T	420,740,0,185,-69,82	2	84	T
-U	640,740,15,132,-47,82	2	85	U
-V	700,740,0,182,-95,82	2	86	V
-W	900,740,0,186,-94,82	2	87	W
-X	680,740,0,183,46,82	2	88	X
-Y	620,740,0,189,-85,82	2	89	Y
-Z	500,740,0,149,31,82	2	90	Z
-[	320,754,157,154,-39,82	2	91	bracketleft
+Q	840,755,15,92,-43,82	2	81	Q
+R	580,740,0,127,-14,82	2	82	R
+S	520,755,15,109,2,82	2	83	S
+T	420,740,0,186,-69,82	2	84	T
+U	640,740,15,133,-46,82	2	85	U
+V	700,740,0,183,-95,82	2	86	V
+W	900,740,0,187,-94,82	2	87	W
+X	680,740,0,184,46,82	2	88	X
+Y	620,740,0,190,-85,82	2	89	Y
+Z	500,740,0,150,31,82	2	90	Z
+[	320,754,157,154,-38,82	2	91	bracketleft
 lB	"
 \	640,740,100,0,-183	2	92	backslash
 rs	"
-]	320,754,157,72,43,72	2	93	bracketright
+]	320,754,157,72,44,72	2	93	bracketright
 rB	"
-^	540,774,0,98,-139,82	2	94	circumflex
+^	540,774,0,98,-138,82	2	94	circumflex
 a^	"
-_	500,0,125,36,73,36	0	95	underscore
-`	280,740,0,111,-108,82	2	96	quoteleft
+_	500,0,125,37,74,37	0	95	underscore
+`	280,740,0,112,-108,82	2	96	quoteleft
 oq	"
-a	660,574,18,106,-23,82	0	97	a
+a	660,574,18,106,-22,82	0	97	a
 b	660,740,18,79,3,79	2	98	b
-c	640,574,18,89,-34,82	0	99	c
-d	660,740,18,145,-30,82	2	100	d
-e	640,577,18,77,-27,77	0	101	e
+c	640,574,18,89,-33,82	0	99	c
+d	660,740,18,146,-29,82	2	100	d
+e	640,574,18,78,-26,78	0	101	e
 f	280,755,0,190,-12,82	2	102	f
 g	660,574,226,116,17,82	1	103	g
 h	600,740,0,64,-4,64	2	104	h
-i	240,740,0,133,-3,82	2	105	i
-j	260,740,185,132,68,82	3	106	j
+i	240,740,0,134,-3,82	2	105	i
+j	260,740,185,133,69,82	3	106	j
 k	580,740,0,118,-30,82	2	107	k
-l	240,740,0,134,-4,82	2	108	l
-m	940,574,0,64,-4,64	0	109	m
-n	600,574,0,63,-4,63	0	110	n
+l	240,740,0,135,-4,82	2	108	l
+m	940,574,0,65,-4,65	0	109	m
+n	600,574,0,64,-4,64	0	110	n
 o	640,574,18,82,-21,82	0	111	o
-p	660,574,185,76,37,76	1	112	p
+p	660,574,185,77,38,77	1	112	p
 q	660,574,185,106,-28,82	1	113	q
-r	320,574,0,153,-13,82	0	114	r
+r	320,574,0,154,-13,82	0	114	r
 s	440,574,18,93,1,82	0	115	s
 t	300,740,0,152,-36,82	2	116	t
-u	600,555,18,97,-37,82	0	117	u
-v	560,555,0,149,-56,82	0	118	v
-w	800,555,0,142,-64,82	0	119	w
+u	600,555,18,97,-36,82	0	117	u
+v	560,555,0,149,-55,82	0	118	v
+w	800,555,0,142,-63,82	0	119	w
 x	560,555,0,122,47,82	0	120	x
-y	580,555,185,144,-25,82	1	121	y
+y	580,555,185,144,-24,82	1	121	y
 z	460,555,0,118,30,82	0	122	z
-{	340,747,191,165,10,82	3	123	braceleft
+{	340,747,191,166,10,82	3	123	braceleft
 lC	"
-|	600,740,100,0,-164	2	124	bar
+|	600,750,250,0,-136	3	124	bar
 ba	"
-}	340,747,191,115,62,82	3	125	braceright
+}	340,747,191,115,63,82	3	125	braceright
 rC	"
 ~	480,767,0,134,-128,82	2	126	tilde
 a~	"
-bq	280,133,141,0,3	0	128	quotesinglbase
+bq	280,133,141,0,4	0	128	quotesinglbase
 Fo	460,469,0,77,-55,77	0	129	guillemotleft
-Fc	460,469,0,53,-31,53	0	130	guillemotright
+Fc	460,469,0,54,-31,54	0	130	guillemotright
 bu	600,532,0,0,-165	0	131	bullet
-Fn	560,824,151,154,77,82	2	132	florin
-f/	160,740,0,309,173,82	2	133	fraction
+Fn	560,824,151,155,77,82	2	132	florin
+f/	160,740,0,310,173,82	2	133	fraction
 %0	1280,755,15,26,-89,26	2	134	perthousand
-dg	560,740,142,102,-83,82	2	135	dagger
+dg	560,740,142,102,-82,82	2	135	dagger
 dd	560,740,142,108,-13,82	2	136	daggerdbl
-en	500,348,0,79,-28,79	0	137	endash
-em	1000,348,0,79,-28,79	0	138	emdash
-fi	520,755,0,128,-22,82	2	140	fi
-fl	520,755,0,128,-22,82	2	141	fl
+en	500,348,0,80,-27,80	0	137	endash
+em	1000,348,0,80,-27,80	0	138	emdash
+fi	520,755,0,129,-22,82	2	140	fi
+fl	520,755,0,129,-22,82	2	141	fl
 .i	240,555,0,99,-3,82	0	144	dotlessi
-ga	420,851,0,92,-139,82	2	146	grave
-a"	700,862,0,104,-208,82	2	147	hungarumlaut
-a.	280,769,0,120,-142,82	2	148	dotaccent
-ab	480,770,0,152,-135,82	2	149	breve
-ah	540,774,0,123,-164,82	2	150	caron
-ao	360,834,0,114,-156,82	2	151	ring
+ga	420,851,0,92,-138,82	2	146	grave
+a"	700,849,0,117,-197,82	2	147	hungarumlaut
+a.	280,769,0,120,-141,82	2	148	dotaccent
+ab	480,770,0,152,-134,82	2	149	breve
+ah	540,774,0,124,-164,82	2	150	caron
+ao	360,834,0,115,-155,82	2	151	ring
 ho	340,9,195,0,-9	1	152	ogonek
-lq	480,740,0,116,-106,82	2	153	quotedblleft
-rq	480,740,0,117,-107,82	2	154	quotedblright
-oe	1080,574,18,78,-26,78	0	155	oe
-/l	320,740,0,134,-24,82	2	156	lslash
-Bq	480,133,141,5,5,5	0	157	quotedblbase
-OE	1060,755,15,134,-48,82	2	158	OE
-/L	480,740,0,54,-18,54	2	159	Lslash
-r!	280,555,185,80,10,80	1	161	exclamdown
-ct	560,715,0,89,-60,82	0	162	cent
-Po	560,755,0,105,12,82	2	163	sterling
-Cs	560,577,0,118,-3,82	0	164	currency
-Ye	560,740,0,197,-33,82	2	165	yen
-bb	600,740,100,0,-164	2	166	brokenbar
+lq	480,740,0,117,-106,82	2	153	quotedblleft
+rq	480,740,0,118,-107,82	2	154	quotedblright
+oe	1080,574,18,79,-26,79	0	155	oe
+/l	320,740,0,135,-24,82	2	156	lslash
+Bq	480,133,141,5,6,5	0	157	quotedblbase
+OE	1060,755,15,135,-48,82	2	158	OE
+/L	480,740,0,54,-17,54	2	159	Lslash
+r!	280,555,185,80,11,80	1	161	exclamdown
+ct	560,715,0,90,-60,82	0	162	cent
+Po	560,755,0,106,12,82	2	163	sterling
+Cs	560,577,0,118,-2,82	0	164	currency
+Ye	560,740,0,198,-33,82	2	165	yen
+bb	600,675,175,0,-150	0	166	brokenbar
 sc	560,755,158,92,-15,82	2	167	section
-ad	500,769,0,115,-146,82	2	168	dieresis
-co	740,752,12,137,0,82	2	169	copyright
-Of	360,755,0,162,-77,82	2	170	ordfeminine
+ad	500,769,0,115,-145,82	2	168	dieresis
+co	740,752,12,138,0,82	2	169	copyright
+Of	360,755,0,163,-76,82	2	170	ordfeminine
 fo	240,469,0,87,-44,82	0	171	guilsinglleft
-tno	600,425,0,81,-55,81	0	172	logicalnot
-\-	600,313,0,60,-34,60	0	173	minus
-rg	740,752,12,137,0,82	2	174	registered
+tno	600,425,0,81,-54,81	0	172	logicalnot
+\-	600,313,0,61,-33,61	0	173	minus
+rg	740,752,12,138,0,82	2	174	registered
 a-	420,759,0,120,-142,82	2	175	macron
-de	400,712,0,101,-110,82	0	176	degree
-t+-	600,556,62,76,13,76	0	177	plusminus
-S2	336,749,0,150,-23,82	2	178	twosuperior
-S3	336,749,0,127,-37,82	2	179	threesuperior
-aa	420,849,0,138,-174,82	2	180	acute
-*m	576,555,187,116,47,82	1	181	mu
+de	400,712,0,101,-109,82	0	176	degree
+t+-	600,556,62,77,14,77	0	177	plusminus
+S2	336,749,0,150,-22,82	2	178	twosuperior
+S3	336,749,0,128,-37,82	2	179	threesuperior
+aa	420,851,0,137,-171,82	2	180	acute
+*m	600,555,192,97,36,82	1	181	mu
 mc	"
-ps	600,740,103,194,-40,82	2	182	paragraph
-pc	280,320,0,35,-58,35	0	183	periodcentered
-ac	340,6,251,0,-17	1	184	cedilla
-S1	336,740,0,74,-132,74	2	185	onesuperior
-Om	360,755,0,141,-81,82	2	186	ordmasculine
-fc	240,469,0,63,-20,63	0	187	guilsinglright
+ps	600,740,103,195,-39,82	2	182	paragraph
+pc	280,320,0,36,-57,36	0	183	periodcentered
+ac	340,6,251,0,-16	1	184	cedilla
+S1	336,740,0,75,-131,75	2	185	onesuperior
+Om	360,755,0,142,-80,82	2	186	ordmasculine
+fc	240,469,0,64,-20,64	0	187	guilsinglright
 14	840,740,0,0,-137	2	188	onequarter
-12	840,740,0,40,-107,40	2	189	onehalf
-34	840,749,0,46,-47,46	2	190	threequarters
-r?	560,555,200,17,-19,17	1	191	questiondown
+12	840,740,0,41,-107,41	2	189	onehalf
+34	840,749,0,47,-47,47	2	190	threequarters
+r?	560,555,200,17,-18,17	1	191	questiondown
 `A	740,1021,0,42,43,42	2	192	Agrave
-'A	740,1019,0,42,43,42	2	193	Aacute
+'A	740,1021,0,42,43,42	2	193	Aacute
 ^A	740,944,0,42,43,42	2	194	Acircumflex
 ~A	740,937,0,42,43,42	2	195	Atilde
 :A	740,939,0,42,43,42	2	196	Adieresis
 oA	740,969,0,42,43,42	2	197	Aring
-AE	900,740,0,111,55,82	2	198	AE
-,C	780,755,251,134,-47,82	3	199	Ccedilla
-`E	520,1021,0,126,-11,82	2	200	Egrave
-'E	520,1019,0,126,-11,82	2	201	Eacute
-^E	520,944,0,139,-11,82	2	202	Ecircumflex
-:E	520,939,0,136,-11,82	2	203	Edieresis
-`I	280,1021,0,168,-22,82	2	204	Igrave
-'I	280,1019,0,264,-22,82	2	205	Iacute
-^I	280,944,0,259,-22,82	2	206	Icircumflex
-:I	280,939,0,256,-22,82	2	207	Idieresis
--D	742,740,0,74,-33,74	2	208	Eth
-~N	740,937,0,118,-20,82	2	209	Ntilde
-`O	840,1021,15,92,-45,82	2	210	Ograve
-'O	840,1019,15,92,-45,82	2	211	Oacute
-^O	840,944,15,92,-45,82	2	212	Ocircumflex
-~O	840,937,15,92,-45,82	2	213	Otilde
-:O	840,939,15,92,-45,82	2	214	Odieresis
-tmu	600,494,0,67,-26,67	0	215	multiply
-/O	840,814,71,101,-44,82	2	216	Oslash
-`U	640,1021,15,132,-47,82	2	217	Ugrave
-'U	640,1019,15,132,-47,82	2	218	Uacute
-^U	640,944,15,132,-47,82	2	219	Ucircumflex
-:U	640,939,15,132,-47,82	2	220	Udieresis
-'Y	620,1019,0,189,-85,82	2	221	Yacute
+AE	900,740,0,112,55,82	2	198	AE
+,C	780,755,251,135,-46,82	3	199	Ccedilla
+`E	520,1021,0,127,-11,82	2	200	Egrave
+'E	520,1021,0,127,-11,82	2	201	Eacute
+^E	520,944,0,140,-11,82	2	202	Ecircumflex
+:E	520,939,0,137,-11,82	2	203	Edieresis
+`I	280,1021,0,169,-22,82	2	204	Igrave
+'I	280,1021,0,264,-22,82	2	205	Iacute
+^I	280,944,0,260,-22,82	2	206	Icircumflex
+:I	280,939,0,257,-22,82	2	207	Idieresis
+-D	742,740,0,74,-32,74	2	208	Eth
+~N	740,937,0,119,-20,82	2	209	Ntilde
+`O	840,1021,15,92,-44,82	2	210	Ograve
+'O	840,1021,15,92,-44,82	2	211	Oacute
+^O	840,944,15,92,-44,82	2	212	Ocircumflex
+~O	840,937,15,92,-44,82	2	213	Otilde
+:O	840,939,15,92,-44,82	2	214	Odieresis
+tmu	600,494,0,68,-26,68	0	215	multiply
+/O	840,814,71,101,-43,82	2	216	Oslash
+`U	640,1021,15,133,-46,82	2	217	Ugrave
+'U	640,1021,15,133,-46,82	2	218	Uacute
+^U	640,944,15,133,-46,82	2	219	Ucircumflex
+:U	640,939,15,133,-46,82	2	220	Udieresis
+'Y	620,1021,0,190,-85,82	2	221	Yacute
 TP	560,740,0,109,-22,82	2	222	Thorn
 ss	600,755,18,79,-1,79	2	223	germandbls
-`a	660,851,18,106,-23,82	2	224	agrave
-'a	660,849,18,106,-23,82	2	225	aacute
-^a	660,774,18,106,-23,82	2	226	acircumflex
-~a	660,767,18,106,-23,82	2	227	atilde
-:a	660,769,18,106,-23,82	2	228	adieresis
-oa	660,834,18,106,-23,82	2	229	aring
-ae	1080,574,18,75,-25,75	0	230	ae
+`a	660,851,18,106,-22,82	2	224	agrave
+'a	660,851,18,106,-22,82	2	225	aacute
+^a	660,774,18,106,-22,82	2	226	acircumflex
+~a	660,767,18,106,-22,82	2	227	atilde
+:a	660,769,18,106,-22,82	2	228	adieresis
+oa	660,834,18,106,-22,82	2	229	aring
+ae	1080,574,18,76,-25,76	0	230	ae
 ,c	640,574,251,89,-33,82	1	231	ccedilla
-`e	640,851,18,77,-27,77	2	232	egrave
-'e	640,849,18,77,-27,77	2	233	eacute
-^e	640,774,18,77,-27,77	2	234	ecircumflex
-:e	640,769,18,77,-27,77	2	235	edieresis
+`e	640,851,18,78,-26,78	2	232	egrave
+'e	640,851,18,78,-26,78	2	233	eacute
+^e	640,774,18,78,-26,78	2	234	ecircumflex
+:e	640,769,18,78,-26,78	2	235	edieresis
 `i	240,851,0,157,-3,82	2	236	igrave
-'i	240,849,0,253,-3,82	2	237	iacute
-^i	240,774,0,248,11,82	2	238	icircumflex
+'i	240,851,0,252,-3,82	2	237	iacute
+^i	240,774,0,248,12,82	2	238	icircumflex
 :i	240,769,0,245,-3,82	2	239	idieresis
 Sd	640,754,18,109,-23,82	2	240	eth
 ~n	600,767,0,74,-4,74	2	241	ntilde
 `o	640,851,18,82,-21,82	2	242	ograve
-'o	640,849,18,82,-21,82	2	243	oacute
+'o	640,851,18,82,-21,82	2	243	oacute
 ^o	640,774,18,82,-21,82	2	244	ocircumflex
 ~o	640,767,18,82,-21,82	2	245	otilde
 :o	640,769,18,82,-21,82	2	246	odieresis
-tdi	600,526,20,60,-34,60	0	247	divide
+tdi	600,526,20,61,-33,61	0	247	divide
 /o	660,608,50,75,-31,75	0	248	oslash
-`u	600,851,18,97,-37,82	2	249	ugrave
-'u	600,849,18,97,-37,82	2	250	uacute
-^u	600,774,18,97,-37,82	2	251	ucircumflex
-:u	600,769,18,97,-37,82	2	252	udieresis
-'y	580,849,185,144,-25,82	3	253	yacute
-Tp	660,740,185,76,37,76	3	254	thorn
-:y	580,769,185,144,-25,82	3	255	ydieresis
+`u	600,851,18,97,-36,82	2	249	ugrave
+'u	600,851,18,97,-36,82	2	250	uacute
+^u	600,774,18,97,-36,82	2	251	ucircumflex
+:u	600,769,18,97,-36,82	2	252	udieresis
+'y	580,851,185,144,-24,82	3	253	yacute
+Tp	660,740,185,77,38,77	3	254	thorn
+:y	580,769,185,144,-24,82	3	255	ydieresis
 u2026	1000,133,0,0,-50	0	256	ellipsis
diff --git a/font/devps/AI b/font/devps/AI
index 362fe7b5..e8e15dbf 100644
--- a/font/devps/AI
+++ b/font/devps/AI
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Book Oblique
-#   Version 001.006
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:41:11 1991
-#   Comment UniqueID 34367
-#   Comment VMusage 6555 39267
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:40:18 1999
+#   Comment UniqueID 44725
+#   Comment VMusage 9065 45991
 
 name AI
 internalname AvantGarde-BookOblique
@@ -20,428 +20,597 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
-A y -62
+A T -81
+A V -122
+A W -95
+A Y -122
+A 'Y -122
+A :Y -122
+A v -73
 A w -65
-A v -70
-A u -20
-A ' -100
-A cq -100
-A rq -100
-A Y -92
-A W -60
-A V -102
-A U -40
-A T -45
-A Q -40
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -30
-D W -10
-D V -50
-D A -50
-F . -160
-F e -20
-F , -180
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -20
-J . -15
-J a -20
-J A -30
-K o -15
-K e -20
-K O -20
-L y -23
-L ' -130
-L cq -130
-L rq -130
-L Y -91
-L W -67
-L V -113
+A y -72
+A 'y -72
+A :y -72
+'A T -81
+'A V -122
+'A W -95
+'A Y -122
+'A 'Y -122
+'A :Y -122
+'A v -73
+'A w -65
+'A y -72
+'A 'y -72
+'A :y -72
+^A T -81
+^A V -122
+^A W -95
+^A Y -122
+^A 'Y -122
+^A :Y -122
+^A v -73
+^A w -65
+^A y -72
+^A 'y -72
+^A :y -72
+:A T -81
+:A V -122
+:A W -95
+:A Y -122
+:A 'Y -122
+:A :Y -122
+:A v -73
+:A w -65
+:A y -72
+:A 'y -72
+:A :y -72
+`A T -81
+`A V -122
+`A W -95
+`A Y -122
+`A 'Y -122
+`A :Y -122
+`A v -73
+`A w -65
+`A y -72
+`A 'y -72
+`A :y -72
+oA T -81
+oA V -122
+oA W -95
+oA Y -122
+oA 'Y -122
+oA :Y -122
+oA v -73
+oA w -65
+oA y -72
+oA 'y -72
+oA :y -72
+~A T -81
+~A V -122
+~A W -95
+~A Y -122
+~A 'Y -122
+~A :Y -122
+~A v -73
+~A w -65
+~A y -72
+~A 'y -72
+~A :y -72
+F A -60
+F 'A -60
+F ^A -60
+F :A -60
+F `A -60
+F oA -60
+F ~A -60
+F , -122
+F . -79
 L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -60
-O T -30
-O A -60
-P . -300
-P o -60
-P e -20
-P , -280
-P a -20
-P A -114
-Q , 20
-R Y -10
-R W 10
-R V -10
+L V -113
+L W -67
+L Y -91
+L 'Y -91
+L :Y -91
+L y -23
+L 'y -23
+L :y -23
+/L T -46
+/L V -113
+/L W -67
+/L Y -91
+/L 'Y -91
+/L :Y -91
+/L y -23
+/L 'y -23
+/L :y -23
+P A -74
+P 'A -74
+P ^A -74
+P :A -74
+P `A -74
+P oA -74
+P ~A -74
+P , -123
+P . -91
 R T 6
-S , 20
-T y -50
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -70
-T i 10
-T - -75
-T hy -75
+R V -39
+R W 2
+R Y -20
+R 'Y -20
+R :Y -20
+R y 32
+R 'y 32
+R :y 32
+T A -81
+T 'A -81
+T ^A -81
+T :A -81
+T `A -81
+T oA -81
+T ~A -81
+T a -52
+T 'a -52
+T ^a -52
+T :a -52
+T `a -52
+T oa -52
+T ~a -52
+T c -51
+T ,c -51
+T : 3
+T , -102
 T e -49
-T , -82
-T : -15
-T a -90
-T O -30
-T A -45
-U . -20
-U , -20
-U A -40
-V u -40
-V ; -33
-V . -165
-V o -101
-V i -5
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
+T 'e -49
+T ^e -49
+T :e -49
+T `e -49
+T i 31
+T 'i 31
+T ^i 31
+T :i 31
+T `i 31
+T o -49
+T 'o -49
+T ^o -49
+T :o -49
+T `o -49
+T /o -49
+T ~o -49
+T . -71
+T r -30
+T s -23
+T ; -29
+T u -46
+T 'u -46
+T ^u -46
+T :u -46
+T `u -46
+T w 7
+T y 5
+T 'y 5
+T :y 5
+V A -122
+V 'A -122
+V ^A -122
+V :A -122
+V `A -122
+V oA -122
+V ~A -122
 V a -104
-V O -60
-V G -20
-V A -102
-W y -2
-W u -30
-W ; -33
-W . -106
-W o -46
-W i 6
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+V 'a -104
+V ^a -104
+V :a -104
+V `a -104
+V oa -104
+V ~a -104
+V : -1
+V , -106
+V e -101
+V 'e -101
+V ^e -101
+V :e -101
+V `e -101
+V i 5
+V 'i 5
+V o -101
+V 'o -101
+V ^o -101
+V :o -101
+V `o -101
+V /o -101
+V ~o -101
+V . -75
+V r -40
+V ; -33
+V u -40
+V 'u -40
+V ^u -40
+V :u -40
+V `u -40
+V y -25
+V 'y -25
+V :y -25
+W A -73
+W 'A -73
+W ^A -73
+W :A -73
+W `A -73
+W oA -73
+W ~A -73
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -175
-Y o -89
-Y - -85
-Y hy -85
-Y e -89
-Y , -145
-Y : -10
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -1
+W , -106
+W e -47
+W 'e -47
+W ^e -47
+W :e -47
+W `e -47
+W i 6
+W 'i 6
+W ^i 16
+W :i 16
+W `i 16
+W o -46
+W 'o -46
+W ^o -46
+W :o -46
+W `o -46
+W /o -46
+W ~o -46
+W . -74
+W r -29
+W ; -33
+W u -30
+W 'u -30
+W ^u -30
+W :u -30
+W `u -30
+W y -2
+W 'y -2
+W :y -2
+Y A -122
+Y 'A -122
+Y ^A -122
+Y :A -122
+Y `A -122
+Y oA -122
+Y ~A -122
 Y a -93
-Y O -30
-Y A -92
-a p 20
-a b 20
-b y -20
-b v -20
-c y -20
-c k -15
-, u0020 -110
-, ' -120
-, cq -120
-, rq -120
-e y -20
-e w -20
-e v -20
-f . -50
-f o -40
-f l -30
-f i -34
-f f -60
-f e -20
-f .i -34
-f , -50
-f a -40
-g a -15
-h y -30
-k y -5
-k e -15
-m y -20
-m u -20
-m a -20
-n y -15
-n v -20
-o y -20
-o x -15
-o w -20
-o v -30
-p y -20
-. u0020 -110
-. ' -120
-. cq -120
-. rq -120
-lq ` -35
-lq oq -35
-lq A -100
-rq u0020 -110
-` ` -203
-` oq -203
-oq ` -203
-oq oq -203
-` A -100
-oq A -100
-' v -30
-cq v -30
-' t 10
-cq t 10
-' u0020 -110
-cq u0020 -110
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -203
-' cq -203
-cq ' -203
-cq cq -203
-' rq -35
-cq rq -35
-' d -110
-cq d -110
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -20
-r n 21
-r m 28
-r l 20
-r k 20
-r i 20
-r - -60
-r hy -60
-r g -15
-r e -4
+Y 'a -93
+Y ^a -93
+Y :a -93
+Y `a -93
+Y oa -93
+Y ~a -93
+Y : 9
+Y , -97
+Y e -89
+Y 'e -89
+Y ^e -89
+Y :e -89
+Y `e -89
+Y i 13
+Y 'i 13
+Y ^i 23
+Y :i 23
+Y `i 23
+Y o -89
+Y 'o -89
+Y ^o -89
+Y :o -89
+Y `o -89
+Y /o -89
+Y ~o -89
+Y p -67
+Y . -65
+Y q -93
+Y ; -23
+Y u -69
+Y 'u -69
+Y ^u -69
+Y :u -69
+Y `u -69
+Y v -17
+'Y A -122
+'Y 'A -122
+'Y ^A -122
+'Y :A -122
+'Y `A -122
+'Y oA -122
+'Y ~A -122
+'Y a -93
+'Y 'a -93
+'Y ^a -93
+'Y :a -93
+'Y `a -93
+'Y oa -93
+'Y ~a -93
+'Y : 9
+'Y , -97
+'Y e -89
+'Y 'e -89
+'Y ^e -89
+'Y :e -89
+'Y `e -89
+'Y i 13
+'Y 'i 13
+'Y ^i 23
+'Y :i 23
+'Y `i 23
+'Y o -89
+'Y 'o -89
+'Y ^o -89
+'Y :o -89
+'Y `o -89
+'Y /o -89
+'Y ~o -89
+'Y p -67
+'Y . -65
+'Y q -93
+'Y ; -23
+'Y u -69
+'Y 'u -69
+'Y ^u -69
+'Y :u -69
+'Y `u -69
+'Y v -17
+:Y A -122
+:Y 'A -122
+:Y ^A -122
+:Y :A -122
+:Y `A -122
+:Y oA -122
+:Y ~A -122
+:Y a -93
+:Y 'a -93
+:Y ^a -93
+:Y :a -93
+:Y `a -93
+:Y oa -93
+:Y ~a -93
+:Y : 9
+:Y , -97
+:Y e -89
+:Y 'e -89
+:Y ^e -89
+:Y :e -89
+:Y `e -89
+:Y i 13
+:Y 'i 13
+:Y ^i 23
+:Y :i 23
+:Y `i 23
+:Y o -89
+:Y 'o -89
+:Y ^o -89
+:Y :o -89
+:Y `o -89
+:Y /o -89
+:Y ~o -89
+:Y p -67
+:Y . -65
+:Y q -93
+:Y ; -23
+:Y u -69
+:Y 'u -69
+:Y ^u -69
+:Y :u -69
+:Y `u -69
+:Y v -17
+f f 3
+r c -7
+r ,c -7
+r , -105
 r d -6
-r , -75
-r c -20
-r a -20
-s . 20
-s , 20
-u0020 ` -110
-u0020 oq -110
-u0020 lq -110
-u0020 Y -60
-u0020 W -25
-u0020 V -50
-u0020 T -25
-u0020 A -20
-v . -130
-v o -30
-v e -20
-v , -100
-v a -30
-w . -100
-w o -30
-w h 15
-w e -20
-w , -90
-w a -30
-y . -125
-y o -30
-y e -20
-y , -110
-y a -30
+r e -4
+r 'e -4
+r ^e -4
+r :e -4
+r `e -4
+r f 48
+r g 1
+r h 29
+r m 28
+r n 21
+r ~n 21
+r o -4
+r 'o -4
+r ^o -4
+r :o -4
+r `o -4
+r /o -4
+r ~o -4
+r . -73
+r q -8
 
 charset
-ha	606,740,0,54,-60,54	2	0	asciicircum
+ha	606,740,0,54,-59,54	2	0	asciicircum
 ti	606,319,0,28,-64,28	0	1	asciitilde
-vS	498,927,13,145,-7,81	2	2	Scaron
-vZ	480,927,0,166,38,81	2	3	Zcaron
+vS	498,927,13,145,-6,81	2	2	Scaron
+vZ	480,927,0,167,38,81	2	3	Zcaron
 vs	388,764,13,170,1,81	2	4	scaron
 vz	425,764,0,152,40,81	2	5	zcaron
-:Y	592,928,0,187,-88,81	2	6	Ydieresis
-tm	1000,740,0,3,-87,3	2	7	trademark
-aq	198,740,0,129,-103,81	2	8	quotesingle
+:Y	592,928,0,188,-88,81	2	6	Ydieresis
+tm	1000,740,0,4,-87,4	2	7	trademark
+aq	198,740,0,130,-103,81	2	8	quotesingle
+Eu	554,753,13,177,-8,81	2	9	Euro
 space	277	0	32	space
-!	295,740,0,77,-61,77	2	33	exclam
-"	309,740,0,151,-80,81	2	34	quotedbl
+!	295,740,0,78,-61,78	2	33	exclam
+"	309,740,0,152,-80,81	2	34	quotedbl
 dq	"
 #	554,740,0,116,-21,81	2	35	numbersign
 sh	"
-$	554,811,70,77,-57,77	2	36	dollar
+$	554,811,70,78,-56,78	2	36	dollar
 Do	"
 %	775,751,13,62,-74,62	2	37	percent
-&	757,753,12,68,-42,68	2	38	ampersand
-'	351,740,0,92,-145,81	2	39	quoteright
+&	757,753,12,69,-42,69	2	38	ampersand
+'	351,740,0,93,-145,81	2	39	quoteright
 cq	"
-(	369,757,205,176,-39,81	3	40	parenleft
-)	369,757,205,63,74,63	3	41	parenright
-*	425,740,0,104,-120,81	2	42	asterisk
-+	606,506,0,52,-42,52	0	43	plus
-,	277,126,67,0,48	0	44	comma
--	332,315,0,78,-26,78	0	45	hyphen
+(	369,757,205,177,-39,81	3	40	parenleft
+)	369,757,205,64,74,64	3	41	parenright
+*	425,740,0,105,-120,81	2	42	asterisk
++	606,506,0,53,-41,53	0	43	plus
+,	277,126,67,0,49	0	44	comma
+-	332,315,0,79,-25,79	0	45	hyphen
 hy	"
 .	277,126,0,0,-52	0	46	period
-/	437,740,100,153,25,81	2	47	slash
+/	437,740,100,154,25,81	2	47	slash
 sl	"
-0	554,753,13,118,-21,81	2	48	zero
-1	554,740,0,0,-210	2	49	one
-2	554,753,0,111,10,81	2	50	two
+0	554,753,13,118,-20,81	2	48	zero
+1	554,740,0,0,-209	2	49	one
+2	554,753,0,112,10,81	2	50	two
 3	554,753,13,61,-23,61	2	51	three
-4	554,740,0,94,11,81	2	52	four
-5	554,740,13,101,-19,81	2	53	five
-6	554,739,13,76,-15,76	2	54	six
-7	554,740,0,124,-60,81	2	55	seven
+4	554,740,0,95,11,81	2	52	four
+5	554,740,13,102,-18,81	2	53	five
+6	554,739,13,77,-15,77	2	54	six
+7	554,740,0,125,-60,81	2	55	seven
 8	554,753,13,76,-27,76	2	56	eight
-9	554,752,0,122,-61,81	2	57	nine
+9	554,752,0,122,-60,81	2	57	nine
 :	277,548,0,51,-52,51	0	58	colon
-;	277,548,67,51,48,51	0	59	semicolon
-<	606,514,8,93,-37,81	0	60	less
-=	606,388,0,71,-23,71	0	61	equal
->	606,514,8,57,-1,57	0	62	greater
-?	591,752,0,87,-108,81	2	63	question
-@	867,753,13,71,-76,71	2	64	at
+;	277,548,67,51,49,51	0	59	semicolon
+<	606,514,8,94,-37,81	0	60	less
+=	606,388,0,71,-22,71	0	61	equal
+>	606,514,8,57,0,57	0	62	greater
+?	591,752,0,88,-108,81	2	63	question
+@	867,753,13,72,-76,72	2	64	at
 at	"
 A	740,740,0,39,38,39	2	65	A
 B	574,740,0,82,-24,81	2	66	B
-C	813,752,13,107,-55,81	2	67	C
-D	744,740,0,79,-24,79	2	68	D
-E	536,740,0,126,-20,81	2	69	E
-F	485,740,0,146,-20,81	2	70	F
-G	872,753,13,69,-53,69	2	71	G
-H	683,740,0,111,-26,81	2	72	H
-I	226,740,0,111,-26,81	2	73	I
-J	482,740,13,107,13,81	2	74	J
-K	591,740,0,187,-31,81	2	75	K
-L	462,740,0,62,-32,62	2	76	L
-M	919,740,0,111,-26,81	2	77	M
-N	740,740,0,111,-25,81	2	78	N
-O	869,753,13,82,-55,81	2	79	O
-P	592,740,0,122,-25,81	2	80	P
-Q	871,753,13,91,-52,81	2	81	Q
-R	607,740,0,112,-20,81	2	82	R
-S	498,753,13,113,-7,81	2	83	S
-T	426,740,0,180,-81,81	2	84	T
-U	655,740,13,111,-68,81	2	85	U
-V	702,740,0,178,-95,81	2	86	V
-W	960,740,0,177,-98,81	2	87	W
-X	609,740,0,165,42,81	2	88	X
-Y	592,740,0,187,-88,81	2	89	Y
-Z	480,740,0,166,38,81	2	90	Z
-[	351,753,179,176,-95,81	2	91	bracketleft
+C	813,752,13,107,-54,81	2	67	C
+D	744,740,0,80,-24,80	2	68	D
+E	536,740,0,127,-20,81	2	69	E
+F	485,740,0,147,-20,81	2	70	F
+G	872,753,13,70,-52,70	2	71	G
+H	683,740,0,112,-26,81	2	72	H
+I	226,740,0,112,-26,81	2	73	I
+J	482,740,13,108,14,81	2	74	J
+K	591,740,0,188,-31,81	2	75	K
+L	462,740,0,63,-32,63	2	76	L
+M	919,740,0,112,-26,81	2	77	M
+N	740,740,0,112,-25,81	2	78	N
+O	869,753,13,82,-54,81	2	79	O
+P	592,740,0,123,-25,81	2	80	P
+Q	871,753,13,91,-51,81	2	81	Q
+R	607,740,0,113,-20,81	2	82	R
+S	498,753,13,113,-6,81	2	83	S
+T	426,740,0,181,-80,81	2	84	T
+U	655,740,13,112,-68,81	2	85	U
+V	702,740,0,179,-95,81	2	86	V
+W	960,740,0,178,-98,81	2	87	W
+X	609,740,0,166,42,81	2	88	X
+Y	592,740,0,188,-88,81	2	89	Y
+Z	480,740,0,167,38,81	2	90	Z
+[	351,753,179,176,-94,81	2	91	bracketleft
 lB	"
 \	605,740,100,0,-205	2	92	backslash
 rs	"
-]	351,753,179,11,69,11	2	93	bracketright
+]	351,753,179,12,70,12	2	93	bracketright
 rB	"
-^	502,764,0,94,-142,81	2	94	circumflex
+^	502,764,0,95,-142,81	2	94	circumflex
 a^	"
-_	500,0,125,36,73,36	0	95	underscore
-`	351,740,0,57,-182,57	2	96	quoteleft
+_	500,0,125,37,74,37	0	95	underscore
+`	351,740,0,58,-182,58	2	96	quoteleft
 oq	"
-a	683,561,13,89,-38,81	0	97	a
+a	683,561,13,90,-37,81	0	97	a
 b	682,740,13,71,-18,71	2	98	b
-c	647,561,13,81,-37,81	0	99	c
-d	685,740,13,120,-35,81	2	100	d
-e	650,561,13,64,-34,64	0	101	e
+c	647,561,13,81,-36,81	0	99	c
+d	685,740,13,121,-34,81	2	100	d
+e	650,561,13,64,-33,64	0	101	e
 f	314,753,0,190,-54,81	2	102	f
-g	673,561,215,84,-6,81	1	103	g
+g	673,561,215,85,-6,81	1	103	g
 h	610,740,0,46,-12,46	2	104	h
-i	200,740,0,122,-15,81	2	105	i
-j	203,740,192,121,130,81	3	106	j
-k	502,740,0,136,-20,81	2	107	k
-l	200,740,0,122,-15,81	2	108	l
+i	200,740,0,123,-15,81	2	105	i
+j	203,740,192,122,130,81	3	106	j
+k	502,740,0,137,-20,81	2	107	k
+l	200,740,0,123,-15,81	2	108	l
 m	938,561,0,50,-16,50	0	109	m
 n	610,561,0,49,-15,49	0	110	n
-o	655,561,13,64,-38,64	0	111	o
+o	655,561,13,65,-37,65	0	111	o
 p	682,561,192,67,22,67	1	112	p
-q	682,561,192,85,-33,81	1	113	q
+q	682,561,192,86,-32,81	1	113	q
 r	301,561,0,144,-15,81	0	114	r
-s	388,561,13,86,1,81	0	115	s
-t	339,740,0,142,-54,81	2	116	t
-u	608,547,13,84,-50,81	0	117	u
-v	554,547,0,143,-58,81	0	118	v
-w	831,547,0,140,-64,81	0	119	w
-x	480,547,0,139,38,81	0	120	x
-y	536,547,192,138,-47,81	1	121	y
-z	425,547,0,123,40,81	0	122	z
-{	351,740,189,167,-65,81	2	123	braceleft
+s	388,561,13,87,1,81	0	115	s
+t	339,740,0,143,-53,81	2	116	t
+u	608,547,13,85,-49,81	0	117	u
+v	554,547,0,144,-58,81	0	118	v
+w	831,547,0,141,-64,81	0	119	w
+x	480,547,0,140,38,81	0	120	x
+y	536,547,192,139,-47,81	1	121	y
+z	425,547,0,124,40,81	0	122	z
+{	351,740,189,168,-65,81	2	123	braceleft
 lC	"
-|	672,740,100,0,-230	2	124	bar
+|	672,778,222,0,-207	3	124	bar
 ba	"
-}	351,740,189,37,65,37	2	125	braceright
+}	351,740,189,37,66,37	2	125	braceright
 rC	"
-~	439,754,0,131,-129,81	2	126	tilde
+~	439,754,0,131,-128,81	2	126	tilde
 a~	"
 bq	354,126,68,0,-26	0	128	quotesinglbase
-Fo	425,481,0,94,-42,81	0	129	guillemotleft
-Fc	425,481,0,62,-10,62	0	130	guillemotright
+Fo	425,481,0,95,-42,81	0	129	guillemotleft
+Fc	425,481,0,63,-10,63	0	130	guillemotright
 bu	606,532,0,0,-167	0	131	bullet
-Fn	554,818,153,165,89,81	2	132	florin
-f/	166,740,0,301,163,81	2	133	fraction
+Fn	554,818,153,166,90,81	2	132	florin
+f/	166,740,0,302,163,81	2	133	fraction
 %0	1174,751,13,58,-78,58	2	134	perthousand
 dg	553,740,133,90,-96,81	2	135	dagger
-dd	553,740,133,90,-22,81	2	136	daggerdbl
-en	500,315,0,73,-31,73	0	137	endash
-em	1000,315,0,73,-31,73	0	138	emdash
-fi	487,753,0,122,-54,81	2	140	fi
-fl	485,753,0,122,-54,81	2	141	fl
-.i	200,547,0,86,-15,81	0	144	dotlessi
-ga	378,786,0,97,-154,81	2	146	grave
-a"	552,800,0,92,-189,81	2	147	hungarumlaut
+dd	553,740,133,90,-21,81	2	136	daggerdbl
+en	500,315,0,74,-30,74	0	137	endash
+em	1000,315,0,74,-30,74	0	138	emdash
+fi	487,753,0,123,-54,81	2	140	fi
+fl	485,753,0,123,-54,81	2	141	fl
+.i	200,547,0,87,-15,81	0	144	dotlessi
+ga	378,786,0,98,-153,81	2	146	grave
+a"	552,786,0,122,-179,81	2	147	hungarumlaut
 a.	222,765,0,118,-142,81	2	148	dotaccent
-ab	453,754,0,138,-142,81	2	149	breve
-ah	502,764,0,113,-160,81	2	150	caron
-ao	332,807,0,119,-141,81	2	151	ring
-ho	302,0,191,0,-3	1	152	ogonek
-lq	502,740,0,55,-184,55	2	153	quotedblleft
-rq	484,740,0,108,-147,81	2	154	quotedblright
-oe	1137,561,13,73,-30,73	0	155	oe
+ab	453,754,0,138,-141,81	2	149	breve
+ah	502,764,0,113,-159,81	2	150	caron
+ao	332,807,0,120,-140,81	2	151	ring
+ho	302,0,191,0,-2	1	152	ogonek
+lq	502,740,0,56,-184,56	2	153	quotedblleft
+rq	484,740,0,109,-147,81	2	154	quotedblright
+oe	1137,561,13,73,-29,73	0	155	oe
 /l	300,740,0,104,-45,81	2	156	lslash
 Bq	502,126,68,0,-26	0	157	quotedblbase
-OE	1194,753,13,135,-57,81	2	158	OE
-/L	517,740,0,62,-57,62	2	159	Lslash
+OE	1194,753,13,136,-56,81	2	158	OE
+/L	517,740,0,63,-56,63	2	159	Lslash
 r!	295,548,192,41,-24,41	1	161	exclamdown
-ct	554,707,0,92,-65,81	0	162	cent
+ct	554,707,0,92,-64,81	0	162	cent
 Po	554,753,0,110,21,81	2	163	sterling
-Cs	554,580,0,141,26,81	0	164	currency
-Ye	554,740,0,183,-25,81	2	165	yen
-bb	672,740,100,0,-230	2	166	brokenbar
-sc	615,753,141,32,-68,32	2	167	section
+Cs	554,580,0,142,27,81	0	164	currency
+Ye	554,740,0,184,-25,81	2	165	yen
+bb	672,703,147,0,-221	0	166	brokenbar
+sc	615,753,141,33,-67,33	2	167	section
 ad	369,765,0,118,-141,81	2	168	dieresis
-co	747,752,12,133,-3,81	2	169	copyright
-Of	369,753,0,175,-52,81	2	170	ordfeminine
-fo	251,481,0,94,-42,81	0	171	guilsinglleft
+co	747,752,12,134,-3,81	2	169	copyright
+Of	369,753,0,176,-51,81	2	170	ordfeminine
+fo	251,481,0,95,-42,81	0	171	guilsinglleft
 tno	606,388,0,71,-60,71	0	172	logicalnot
-\-	606,287,0,52,-42,52	0	173	minus
-rg	747,752,12,133,-3,81	2	174	registered
-a-	485,736,0,112,-147,81	0	175	macron
-de	400,709,0,101,-108,81	0	176	degree
-t+-	606,518,24,62,3,62	0	177	plusminus
-S2	332,747,0,151,-24,81	2	178	twosuperior
-S3	332,747,0,126,-48,81	2	179	threesuperior
+\-	606,287,0,53,-41,53	0	173	minus
+rg	747,752,12,134,-3,81	2	174	registered
+a-	485,736,0,113,-146,81	0	175	macron
+de	400,709,0,102,-108,81	0	176	degree
+t+-	606,518,24,63,4,63	0	177	plusminus
+S2	332,747,0,152,-23,81	2	178	twosuperior
+S3	332,747,0,126,-47,81	2	179	threesuperior
 aa	375,786,0,119,-153,81	2	180	acute
-*m	608,547,184,70,4,70	0	181	mu
+*m	608,547,192,85,24,81	1	181	mu
 mc	"
-ps	564,740,110,174,-69,81	2	182	paragraph
+ps	564,740,110,175,-68,81	2	182	paragraph
 pc	277,316,0,8,-87,8	0	183	periodcentered
-ac	324,0,222,0,-2	1	184	cedilla
-S1	332,740,0,53,-140,53	2	185	onesuperior
-Om	369,753,0,147,-66,81	2	186	ordmasculine
-fc	251,481,0,62,-10,62	0	187	guilsinglright
+ac	324,3,222,0,-2	1	184	cedilla
+S1	332,740,0,54,-140,54	2	185	onesuperior
+Om	369,753,0,148,-66,81	2	186	ordmasculine
+fc	251,481,0,63,-10,63	0	187	guilsinglright
 14	831,740,0,0,-133	2	188	onequarter
-12	831,740,0,29,-114,29	2	189	onehalf
-34	831,747,0,44,-76,44	2	190	threequarters
+12	831,740,0,30,-114,30	2	189	onehalf
+34	831,747,0,45,-75,45	2	190	threequarters
 r?	591,548,205,0,-14	1	191	questiondown
 `A	740,949,0,39,38,39	2	192	Agrave
 'A	740,949,0,39,38,39	2	193	Aacute
@@ -449,62 +618,62 @@ r?	591,548,205,0,-14	1	191	questiondown
 ~A	740,917,0,39,38,39	2	195	Atilde
 :A	740,928,0,39,38,39	2	196	Adieresis
 oA	740,955,0,39,38,39	2	197	Aring
-AE	992,740,0,102,70,81	2	198	AE
-,C	813,752,222,107,-55,81	3	199	Ccedilla
-`E	536,949,0,126,-20,81	2	200	Egrave
-'E	536,949,0,126,-20,81	2	201	Eacute
-^E	536,927,0,126,-20,81	2	202	Ecircumflex
-:E	536,928,0,126,-20,81	2	203	Edieresis
+AE	992,740,0,103,70,81	2	198	AE
+,C	813,752,222,107,-54,81	3	199	Ccedilla
+`E	536,949,0,127,-20,81	2	200	Egrave
+'E	536,949,0,127,-20,81	2	201	Eacute
+^E	536,927,0,127,-20,81	2	202	Ecircumflex
+:E	536,928,0,127,-20,81	2	203	Edieresis
 `I	226,949,0,164,-26,81	2	204	Igrave
-'I	226,949,0,264,-26,81	2	205	Iacute
+'I	226,949,0,263,-26,81	2	205	Iacute
 ^I	226,927,0,263,-26,81	2	206	Icircumflex
 :I	226,928,0,220,-26,81	2	207	Idieresis
 -D	790,740,0,73,-54,73	2	208	Eth
-~N	740,917,0,111,-25,81	2	209	Ntilde
-`O	869,949,13,82,-55,81	2	210	Ograve
-'O	869,949,13,82,-55,81	2	211	Oacute
-^O	869,927,13,82,-55,81	2	212	Ocircumflex
-~O	869,917,13,82,-55,81	2	213	Otilde
-:O	869,928,13,82,-55,81	2	214	Odieresis
-tmu	606,482,0,56,-37,56	0	215	multiply
-/O	868,819,83,111,-26,81	2	216	Oslash
-`U	655,949,13,111,-68,81	2	217	Ugrave
-'U	655,949,13,111,-68,81	2	218	Uacute
-^U	655,927,13,111,-68,81	2	219	Ucircumflex
-:U	655,928,13,111,-68,81	2	220	Udieresis
-'Y	592,949,0,187,-88,81	2	221	Yacute
-TP	592,740,0,79,-10,79	2	222	Thorn
-ss	554,753,13,74,-11,74	2	223	germandbls
-`a	683,786,13,89,-38,81	2	224	agrave
-'a	683,786,13,89,-38,81	2	225	aacute
-^a	683,764,13,89,-38,81	2	226	acircumflex
-~a	683,754,13,89,-38,81	2	227	atilde
-:a	683,765,13,89,-38,81	2	228	adieresis
-oa	683,807,13,89,-38,81	2	229	aring
-ae	1157,561,13,62,-30,62	0	230	ae
-,c	647,561,222,81,-37,81	1	231	ccedilla
-`e	650,786,13,64,-34,64	2	232	egrave
-'e	650,786,13,64,-34,64	2	233	eacute
-^e	650,764,13,64,-34,64	2	234	ecircumflex
-:e	650,765,13,64,-34,64	2	235	edieresis
-`i	200,786,0,146,-15,81	2	236	igrave
-'i	200,786,0,247,-15,81	2	237	iacute
-^i	200,764,0,245,9,81	2	238	icircumflex
+~N	740,917,0,112,-25,81	2	209	Ntilde
+`O	869,949,13,82,-54,81	2	210	Ograve
+'O	869,949,13,82,-54,81	2	211	Oacute
+^O	869,927,13,82,-54,81	2	212	Ocircumflex
+~O	869,917,13,82,-54,81	2	213	Otilde
+:O	869,928,13,82,-54,81	2	214	Odieresis
+tmu	606,482,0,57,-37,57	0	215	multiply
+/O	868,819,83,112,-26,81	2	216	Oslash
+`U	655,949,13,112,-68,81	2	217	Ugrave
+'U	655,949,13,112,-68,81	2	218	Uacute
+^U	655,927,13,112,-68,81	2	219	Ucircumflex
+:U	655,928,13,112,-68,81	2	220	Udieresis
+'Y	592,949,0,188,-88,81	2	221	Yacute
+TP	592,740,0,80,-10,80	2	222	Thorn
+ss	554,753,13,75,-11,75	2	223	germandbls
+`a	683,786,13,90,-37,81	2	224	agrave
+'a	683,786,13,90,-37,81	2	225	aacute
+^a	683,764,13,90,-37,81	2	226	acircumflex
+~a	683,754,13,90,-37,81	2	227	atilde
+:a	683,765,13,90,-37,81	2	228	adieresis
+oa	683,807,13,90,-37,81	2	229	aring
+ae	1157,561,13,63,-30,63	0	230	ae
+,c	647,561,222,81,-36,81	1	231	ccedilla
+`e	650,786,13,64,-33,64	2	232	egrave
+'e	650,786,13,64,-33,64	2	233	eacute
+^e	650,764,13,64,-33,64	2	234	ecircumflex
+:e	650,765,13,64,-33,64	2	235	edieresis
+`i	200,786,0,147,-15,81	2	236	igrave
+'i	200,786,0,246,-15,81	2	237	iacute
+^i	200,764,0,246,9,81	2	238	icircumflex
 :i	200,765,0,203,-15,81	2	239	idieresis
 Sd	655,753,12,70,-38,70	2	240	eth
 ~n	610,754,0,49,-15,49	2	241	ntilde
-`o	655,786,13,64,-38,64	2	242	ograve
-'o	655,786,13,64,-38,64	2	243	oacute
-^o	655,764,13,64,-38,64	2	244	ocircumflex
-~o	655,754,13,64,-38,64	2	245	otilde
-:o	655,765,13,64,-38,64	2	246	odieresis
-tdi	606,519,13,52,-42,52	0	247	divide
-/o	653,614,64,100,-1,81	0	248	oslash
-`u	608,786,13,84,-50,81	2	249	ugrave
-'u	608,786,13,84,-50,81	2	250	uacute
-^u	608,764,13,84,-50,81	2	251	ucircumflex
-:u	608,765,13,84,-50,81	2	252	udieresis
-'y	536,786,192,138,-47,81	3	253	yacute
+`o	655,786,13,65,-37,65	2	242	ograve
+'o	655,786,13,65,-37,65	2	243	oacute
+^o	655,764,13,65,-37,65	2	244	ocircumflex
+~o	655,754,13,65,-37,65	2	245	otilde
+:o	655,765,13,65,-37,65	2	246	odieresis
+tdi	606,519,13,53,-41,53	0	247	divide
+/o	653,614,64,101,-1,81	0	248	oslash
+`u	608,786,13,85,-49,81	2	249	ugrave
+'u	608,786,13,85,-49,81	2	250	uacute
+^u	608,764,13,85,-49,81	2	251	ucircumflex
+:u	608,765,13,85,-49,81	2	252	udieresis
+'y	536,786,192,139,-47,81	3	253	yacute
 Tp	682,740,192,67,22,67	3	254	thorn
-:y	536,765,192,138,-47,81	3	255	ydieresis
+:y	536,765,192,139,-47,81	3	255	ydieresis
 u2026	1000,126,0,0,-80	0	256	ellipsis
diff --git a/font/devps/AR b/font/devps/AR
index c5dc1bd2..81f31fc3 100644
--- a/font/devps/AR
+++ b/font/devps/AR
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Book
-#   Version 001.006
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:37:31 1991
-#   Comment UniqueID 34364
-#   Comment VMusage 24225 31117
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:39:30 1999
+#   Comment UniqueID 44724
+#   Comment VMusage 26533 33469
 
 name AR
 internalname AvantGarde-Book
@@ -19,247 +19,415 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
-A y -62
+A T -81
+A V -122
+A W -95
+A Y -122
+A 'Y -122
+A :Y -122
+A v -73
 A w -65
-A v -70
-A u -20
-A ' -100
-A cq -100
-A rq -100
-A Y -92
-A W -60
-A V -102
-A U -40
-A T -45
-A Q -40
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -30
-D W -10
-D V -50
-D A -50
-F . -160
-F e -20
-F , -180
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -20
-J . -15
-J a -20
-J A -30
-K o -15
-K e -20
-K O -20
-L y -23
-L ' -130
-L cq -130
-L rq -130
-L Y -91
-L W -67
-L V -113
+A y -72
+A 'y -72
+A :y -72
+'A T -81
+'A V -122
+'A W -95
+'A Y -122
+'A 'Y -122
+'A :Y -122
+'A v -73
+'A w -65
+'A y -72
+'A 'y -72
+'A :y -72
+^A T -81
+^A V -122
+^A W -95
+^A Y -122
+^A 'Y -122
+^A :Y -122
+^A v -73
+^A w -65
+^A y -72
+^A 'y -72
+^A :y -72
+:A T -81
+:A V -122
+:A W -95
+:A Y -122
+:A 'Y -122
+:A :Y -122
+:A v -73
+:A w -65
+:A y -72
+:A 'y -72
+:A :y -72
+`A T -81
+`A V -122
+`A W -95
+`A Y -122
+`A 'Y -122
+`A :Y -122
+`A v -73
+`A w -65
+`A y -72
+`A 'y -72
+`A :y -72
+oA T -81
+oA V -122
+oA W -95
+oA Y -122
+oA 'Y -122
+oA :Y -122
+oA v -73
+oA w -65
+oA y -72
+oA 'y -72
+oA :y -72
+~A T -81
+~A V -122
+~A W -95
+~A Y -122
+~A 'Y -122
+~A :Y -122
+~A v -73
+~A w -65
+~A y -72
+~A 'y -72
+~A :y -72
+F A -60
+F 'A -60
+F ^A -60
+F :A -60
+F `A -60
+F oA -60
+F ~A -60
+F , -122
+F . -79
 L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -60
-O T -30
-O A -60
-P . -300
-P o -60
-P e -20
-P , -280
-P a -20
-P A -114
-Q , 20
-R Y -10
-R W 10
-R V -10
+L V -113
+L W -67
+L Y -91
+L 'Y -91
+L :Y -91
+L y -23
+L 'y -23
+L :y -23
+/L T -46
+/L V -113
+/L W -67
+/L Y -91
+/L 'Y -91
+/L :Y -91
+/L y -23
+/L 'y -23
+/L :y -23
+P A -74
+P 'A -74
+P ^A -74
+P :A -74
+P `A -74
+P oA -74
+P ~A -74
+P , -123
+P . -91
 R T 6
-S , 20
-T y -50
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -70
-T i 10
-T - -75
-T hy -75
+R V -39
+R W 2
+R Y -20
+R 'Y -20
+R :Y -20
+R y 32
+R 'y 32
+R :y 32
+T A -81
+T 'A -81
+T ^A -81
+T :A -81
+T `A -81
+T oA -81
+T ~A -81
+T a -52
+T 'a -52
+T ^a -52
+T :a -52
+T `a -52
+T oa -52
+T ~a -52
+T c -51
+T ,c -51
+T : 3
+T , -102
 T e -49
-T , -82
-T : -15
-T a -90
-T O -30
-T A -45
-U . -20
-U , -20
-U A -40
-V u -40
-V ; -33
-V . -165
-V o -101
-V i -5
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
+T 'e -49
+T ^e -49
+T :e -49
+T `e -49
+T i 31
+T 'i 31
+T ^i 31
+T :i 31
+T `i 31
+T o -49
+T 'o -49
+T ^o -49
+T :o -49
+T `o -49
+T /o -49
+T ~o -49
+T . -71
+T r -30
+T s -23
+T ; -29
+T u -46
+T 'u -46
+T ^u -46
+T :u -46
+T `u -46
+T w 7
+T y 5
+T 'y 5
+T :y 5
+V A -122
+V 'A -122
+V ^A -122
+V :A -122
+V `A -122
+V oA -122
+V ~A -122
 V a -104
-V O -60
-V G -20
-V A -102
-W y -2
-W u -30
-W ; -33
-W . -106
-W o -46
-W i 6
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+V 'a -104
+V ^a -104
+V :a -104
+V `a -104
+V oa -104
+V ~a -104
+V : -1
+V , -106
+V e -101
+V 'e -101
+V ^e -101
+V :e -101
+V `e -101
+V i 5
+V 'i 5
+V o -101
+V 'o -101
+V ^o -101
+V :o -101
+V `o -101
+V /o -101
+V ~o -101
+V . -75
+V r -40
+V ; -33
+V u -40
+V 'u -40
+V ^u -40
+V :u -40
+V `u -40
+V y -25
+V 'y -25
+V :y -25
+W A -73
+W 'A -73
+W ^A -73
+W :A -73
+W `A -73
+W oA -73
+W ~A -73
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -175
-Y o -89
-Y - -85
-Y hy -85
-Y e -89
-Y , -145
-Y : -10
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -1
+W , -106
+W e -47
+W 'e -47
+W ^e -47
+W :e -47
+W `e -47
+W i 6
+W 'i 6
+W ^i 16
+W :i 16
+W `i 16
+W o -46
+W 'o -46
+W ^o -46
+W :o -46
+W `o -46
+W /o -46
+W ~o -46
+W . -74
+W r -29
+W ; -33
+W u -30
+W 'u -30
+W ^u -30
+W :u -30
+W `u -30
+W y -2
+W 'y -2
+W :y -2
+Y A -122
+Y 'A -122
+Y ^A -122
+Y :A -122
+Y `A -122
+Y oA -122
+Y ~A -122
 Y a -93
-Y O -30
-Y A -92
-a p 20
-a b 20
-b y -20
-b v -20
-c y -20
-c k -15
-, u0020 -110
-, ' -120
-, cq -120
-, rq -120
-e y -20
-e w -20
-e v -20
-f . -50
-f o -40
-f l -30
-f i -34
-f f -60
-f e -20
-f .i -34
-f , -50
-f a -40
-g a -15
-h y -30
-k y -5
-k e -15
-m y -20
-m u -20
-m a -20
-n y -15
-n v -20
-o y -20
-o x -15
-o w -20
-o v -30
-p y -20
-. u0020 -110
-. ' -120
-. cq -120
-. rq -120
-lq ` -35
-lq oq -35
-lq A -100
-rq u0020 -110
-` ` -203
-` oq -203
-oq ` -203
-oq oq -203
-` A -100
-oq A -100
-' v -30
-cq v -30
-' t 10
-cq t 10
-' u0020 -110
-cq u0020 -110
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -203
-' cq -203
-cq ' -203
-cq cq -203
-' rq -35
-cq rq -35
-' d -110
-cq d -110
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -20
-r n 21
-r m 28
-r l 20
-r k 20
-r i 20
-r - -60
-r hy -60
-r g -15
-r e -4
+Y 'a -93
+Y ^a -93
+Y :a -93
+Y `a -93
+Y oa -93
+Y ~a -93
+Y : 9
+Y , -97
+Y e -89
+Y 'e -89
+Y ^e -89
+Y :e -89
+Y `e -89
+Y i 13
+Y 'i 13
+Y ^i 23
+Y :i 23
+Y `i 23
+Y o -89
+Y 'o -89
+Y ^o -89
+Y :o -89
+Y `o -89
+Y /o -89
+Y ~o -89
+Y p -67
+Y . -65
+Y q -93
+Y ; -23
+Y u -69
+Y 'u -69
+Y ^u -69
+Y :u -69
+Y `u -69
+Y v -17
+'Y A -122
+'Y 'A -122
+'Y ^A -122
+'Y :A -122
+'Y `A -122
+'Y oA -122
+'Y ~A -122
+'Y a -93
+'Y 'a -93
+'Y ^a -93
+'Y :a -93
+'Y `a -93
+'Y oa -93
+'Y ~a -93
+'Y : 9
+'Y , -97
+'Y e -89
+'Y 'e -89
+'Y ^e -89
+'Y :e -89
+'Y `e -89
+'Y i 13
+'Y 'i 13
+'Y ^i 23
+'Y :i 23
+'Y `i 23
+'Y o -89
+'Y 'o -89
+'Y ^o -89
+'Y :o -89
+'Y `o -89
+'Y /o -89
+'Y ~o -89
+'Y p -67
+'Y . -65
+'Y q -93
+'Y ; -23
+'Y u -69
+'Y 'u -69
+'Y ^u -69
+'Y :u -69
+'Y `u -69
+'Y v -17
+:Y A -122
+:Y 'A -122
+:Y ^A -122
+:Y :A -122
+:Y `A -122
+:Y oA -122
+:Y ~A -122
+:Y a -93
+:Y 'a -93
+:Y ^a -93
+:Y :a -93
+:Y `a -93
+:Y oa -93
+:Y ~a -93
+:Y : 9
+:Y , -97
+:Y e -89
+:Y 'e -89
+:Y ^e -89
+:Y :e -89
+:Y `e -89
+:Y i 13
+:Y 'i 13
+:Y ^i 23
+:Y :i 23
+:Y `i 23
+:Y o -89
+:Y 'o -89
+:Y ^o -89
+:Y :o -89
+:Y `o -89
+:Y /o -89
+:Y ~o -89
+:Y p -67
+:Y . -65
+:Y q -93
+:Y ; -23
+:Y u -69
+:Y 'u -69
+:Y ^u -69
+:Y :u -69
+:Y `u -69
+:Y v -17
+f f 3
+r c -7
+r ,c -7
+r , -105
 r d -6
-r , -75
-r c -20
-r a -20
-s . 20
-s , 20
-u0020 ` -110
-u0020 oq -110
-u0020 lq -110
-u0020 Y -60
-u0020 W -25
-u0020 V -50
-u0020 T -25
-u0020 A -20
-v . -130
-v o -30
-v e -20
-v , -100
-v a -30
-w . -100
-w o -30
-w h 15
-w e -20
-w , -90
-w a -30
-y . -125
-y o -30
-y e -20
-y , -110
-y a -30
+r e -4
+r 'e -4
+r ^e -4
+r :e -4
+r `e -4
+r f 48
+r g 1
+r h 29
+r m 28
+r n 21
+r ~n 21
+r o -4
+r 'o -4
+r ^o -4
+r :o -4
+r `o -4
+r /o -4
+r ~o -4
+r . -73
+r q -8
 
 charset
 ha	606,740	2	0	asciicircum
@@ -271,6 +439,7 @@ vz	425,764	2	5	zcaron
 :Y	592,928	2	6	Ydieresis
 tm	1000,740	2	7	trademark
 aq	198,740	2	8	quotesingle
+Eu	554,753,13,4	2	9	Euro
 space	277	0	32	space
 !	295,740	2	33	exclam
 "	309,740	2	34	quotedbl
@@ -376,7 +545,7 @@ y	536,547,192	1	121	y
 z	425,547	0	122	z
 {	351,740,189	2	123	braceleft
 lC	"
-|	672,740,100	2	124	bar
+|	672,778,222	3	124	bar
 ba	"
 }	351,740,189	2	125	braceright
 rC	"
@@ -397,7 +566,7 @@ fi	487,753	2	140	fi
 fl	485,753	2	141	fl
 .i	200,547	0	144	dotlessi
 ga	378,786	2	146	grave
-a"	552,800	2	147	hungarumlaut
+a"	552,786	2	147	hungarumlaut
 a.	222,765	2	148	dotaccent
 ab	453,754	2	149	breve
 ah	502,764	2	150	caron
@@ -415,7 +584,7 @@ ct	554,707	0	162	cent
 Po	554,753	2	163	sterling
 Cs	554,580	0	164	currency
 Ye	554,740	2	165	yen
-bb	672,740,100	2	166	brokenbar
+bb	672,703,147	0	166	brokenbar
 sc	615,753,141	2	167	section
 ad	369,765	2	168	dieresis
 co	747,752,12,8,9	2	169	copyright
@@ -430,11 +599,11 @@ t+-	606,518,24	0	177	plusminus
 S2	332,747	2	178	twosuperior
 S3	332,747	2	179	threesuperior
 aa	375,786	2	180	acute
-*m	608,547,184	0	181	mu
+*m	608,547,192	1	181	mu
 mc	"
 ps	564,740,110	2	182	paragraph
 pc	277,316	0	183	periodcentered
-ac	324,0,222	1	184	cedilla
+ac	324,3,222	1	184	cedilla
 S1	332,740	2	185	onesuperior
 Om	369,753	2	186	ordmasculine
 fc	251,481	0	187	guilsinglright
@@ -455,7 +624,7 @@ AE	992,740,0,0,20	2	198	AE
 ^E	536,927	2	202	Ecircumflex
 :E	536,928	2	203	Edieresis
 `I	226,949,0,0,47	2	204	Igrave
-'I	226,949,0,49	2	205	Iacute
+'I	226,949,0,48	2	205	Iacute
 ^I	226,927,0,64,64	2	206	Icircumflex
 :I	226,928	2	207	Idieresis
 -D	790,740	2	208	Eth
@@ -487,7 +656,7 @@ ae	1157,561,13	0	230	ae
 ^e	650,764,13	2	234	ecircumflex
 :e	650,765,13	2	235	edieresis
 `i	200,786,0,0,60	2	236	igrave
-'i	200,786,0,62	2	237	iacute
+'i	200,786,0,61	2	237	iacute
 ^i	200,764,0,77,77	2	238	icircumflex
 :i	200,765,0,11,11	2	239	idieresis
 Sd	655,753,12	2	240	eth
diff --git a/font/devps/BMB b/font/devps/BMB
index 11f22c98..968f9b0a 100644
--- a/font/devps/BMB
+++ b/font/devps/BMB
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Demi
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:13:29 1992
-#   Comment UniqueID 37831
-#   Comment VMusage 31983 38875
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:32:33 1999
+#   Comment UniqueID 44721
+#   Comment VMusage 35828 42764
 
 name BMB
 internalname Bookman-Demi
@@ -19,101 +19,424 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
-A y -1
-A w -9
-A v -8
-A Y -52
-A W -20
-A V -68
 A T -40
-F . -132
-F , -130
+A V -68
+A W -20
+A Y -52
+A 'Y -52
+A :Y -52
+A v -8
+A w -9
+A y -1
+A 'y -1
+A :y -1
+'A T -40
+'A V -68
+'A W -20
+'A Y -52
+'A 'Y -52
+'A :Y -52
+'A v -8
+'A w -9
+'A y -1
+'A 'y -1
+'A :y -1
+^A T -40
+^A V -68
+^A W -20
+^A Y -52
+^A 'Y -52
+^A :Y -52
+^A v -8
+^A w -9
+^A y -1
+^A 'y -1
+^A :y -1
+:A T -40
+:A V -68
+:A W -20
+:A Y -52
+:A 'Y -52
+:A :Y -52
+:A v -8
+:A w -9
+:A y -1
+:A 'y -1
+:A :y -1
+`A T -40
+`A V -68
+`A W -20
+`A Y -52
+`A 'Y -52
+`A :Y -52
+`A v -8
+`A w -9
+`A y -1
+`A 'y -1
+`A :y -1
+oA T -40
+oA V -68
+oA W -20
+oA Y -52
+oA 'Y -52
+oA :Y -52
+oA v -8
+oA w -9
+oA y -1
+oA 'y -1
+oA :y -1
+~A T -40
+~A V -68
+~A W -20
+~A Y -52
+~A 'Y -52
+~A :Y -52
+~A v -8
+~A w -9
+~A y -1
+~A 'y -1
+~A :y -1
 F A -59
-L y 19
-L Y -35
-L W -41
-L V -50
+F 'A -59
+F ^A -59
+F :A -59
+F `A -59
+F oA -59
+F ~A -59
+F , -130
+F . -132
 L T -4
-P . -128
-P , -129
+L V -50
+L W -41
+L Y -35
+L 'Y -35
+L :Y -35
+L y 19
+L 'y 19
+L :y 19
+/L T -4
+/L V -50
+/L W -41
+/L Y -35
+/L 'Y -35
+/L :Y -35
+/L y 19
+/L 'y 19
+/L :y 19
 P A -46
-R y -8
-R Y -20
-R W -24
-R V -29
+P 'A -46
+P ^A -46
+P :A -46
+P `A -46
+P oA -46
+P ~A -46
+P , -129
+P . -128
 R T -4
-T ; 5
-T s -10
-T r 27
-T . -122
-T o -28
-T i 27
+R V -29
+R W -24
+R Y -20
+R 'Y -20
+R :Y -20
+R y -8
+R 'y -8
+R :y -8
+T A -42
+T 'A -42
+T ^A -42
+T :A -42
+T `A -42
+T oA -42
+T ~A -42
+T a -24
+T 'a -24
+T ^a -24
+T :a -24
+T `a -24
+T oa -24
+T ~a -24
+T c -29
+T ,c -29
+T : 7
+T , -122
+T e -29
+T 'e -29
+T ^e -29
+T :e -29
+T `e -29
 T - -10
 T hy -10
-T e -29
-T , -122
-T : 7
-T c -29
-T a -24
-T A -42
-V y 12
-V u -11
-V ; -38
-V r -15
-V . -105
-V o -79
-V i 15
+T i 27
+T 'i 27
+T ^i 27
+T :i 27
+T `i 27
+T o -28
+T 'o -28
+T ^o -28
+T :o -28
+T `o -28
+T /o -28
+T ~o -28
+T . -122
+T r 27
+T s -10
+T vs -10
+T ; 5
+V A -88
+V 'A -88
+V ^A -88
+V :A -88
+V `A -88
+V oA -88
+V ~A -88
+V a -74
+V 'a -74
+V ^a -74
+V :a -74
+V `a -74
+V oa -74
+V ~a -74
+V : -37
+V , -103
+V e -80
+V 'e -80
+V ^e -80
+V :e -80
+V `e -80
 V - -10
 V hy -10
-V e -80
-V , -103
-V : -37
-V a -74
-V A -88
-W y 12
-W u -11
-W ; -38
-W r -15
-W . -105
-W o -78
-W i 15
+V i 15
+V 'i 15
+V ^i 15
+V :i 15
+V `i 15
+V o -79
+V 'o -79
+V ^o -79
+V :o -79
+V `o -79
+V /o -79
+V ~o -79
+V . -105
+V r -15
+V ; -38
+V u -11
+V 'u -11
+V ^u -11
+V :u -11
+V `u -11
+V y 12
+V 'y 12
+V :y 12
+W A -60
+W 'A -60
+W ^A -60
+W :A -60
+W `A -60
+W oA -60
+W ~A -60
+W a -73
+W 'a -73
+W ^a -73
+W :a -73
+W `a -73
+W oa -73
+W ~a -73
+W : -37
+W , -103
+W e -79
+W 'e -79
+W ^e -79
+W :e -79
+W `e -79
 W - -10
 W hy -10
-W e -79
-W , -103
-W : -37
-W a -73
-W A -60
-Y v 24
-Y u -13
-Y ; -34
-Y q -66
-Y . -105
-Y p -23
-Y o -66
-Y i 2
+W i 15
+W 'i 15
+W ^i 15
+W :i 15
+W `i 15
+W o -78
+W 'o -78
+W ^o -78
+W :o -78
+W `o -78
+W /o -78
+W ~o -78
+W . -105
+W r -15
+W ; -38
+W u -11
+W 'u -11
+W ^u -11
+W :u -11
+W `u -11
+W y 12
+W 'y 12
+W :y 12
+Y A -56
+Y 'A -56
+Y ^A -56
+Y :A -56
+Y `A -56
+Y oA -56
+Y ~A -56
+Y a -60
+Y 'a -60
+Y ^a -60
+Y :a -60
+Y `a -60
+Y oa -60
+Y ~a -60
+Y : -32
+Y , -103
+Y e -67
+Y 'e -67
+Y ^e -67
+Y :e -67
+Y `e -67
 Y - -10
 Y hy -10
-Y e -67
-Y , -103
-Y : -32
-Y a -60
-Y A -56
+Y i 2
+Y 'i 2
+Y ^i 12
+Y :i 12
+Y `i 12
+Y o -66
+Y 'o -66
+Y ^o -66
+Y :o -66
+Y `o -66
+Y /o -66
+Y ~o -66
+Y p -23
+Y . -105
+Y q -66
+Y ; -34
+Y u -13
+Y 'u -13
+Y ^u -13
+Y :u -13
+Y `u -13
+Y v 24
+'Y A -56
+'Y 'A -56
+'Y ^A -56
+'Y :A -56
+'Y `A -56
+'Y oA -56
+'Y ~A -56
+'Y a -60
+'Y 'a -60
+'Y ^a -60
+'Y :a -60
+'Y `a -60
+'Y oa -60
+'Y ~a -60
+'Y : -32
+'Y , -103
+'Y e -67
+'Y 'e -67
+'Y ^e -67
+'Y :e -67
+'Y `e -67
+'Y - -10
+'Y hy -10
+'Y i 2
+'Y 'i 2
+'Y ^i 12
+'Y :i 12
+'Y `i 12
+'Y o -66
+'Y 'o -66
+'Y ^o -66
+'Y :o -66
+'Y `o -66
+'Y /o -66
+'Y ~o -66
+'Y p -23
+'Y . -105
+'Y q -66
+'Y ; -34
+'Y u -13
+'Y 'u -13
+'Y ^u -13
+'Y :u -13
+'Y `u -13
+'Y v 24
+:Y A -56
+:Y 'A -56
+:Y ^A -56
+:Y :A -56
+:Y `A -56
+:Y oA -56
+:Y ~A -56
+:Y a -60
+:Y 'a -60
+:Y ^a -60
+:Y :a -60
+:Y `a -60
+:Y oa -60
+:Y ~a -60
+:Y : -32
+:Y , -103
+:Y e -67
+:Y 'e -67
+:Y ^e -67
+:Y :e -67
+:Y `e -67
+:Y - -10
+:Y hy -10
+:Y i 2
+:Y 'i 2
+:Y ^i 12
+:Y :i 12
+:Y `i 12
+:Y o -66
+:Y 'o -66
+:Y ^o -66
+:Y :o -66
+:Y `o -66
+:Y /o -66
+:Y ~o -66
+:Y p -23
+:Y . -105
+:Y q -66
+:Y ; -34
+:Y u -13
+:Y 'u -13
+:Y ^u -13
+:Y :u -13
+:Y `u -13
+:Y v 24
 f f 21
-r q -9
-r . -102
-r o -9
-r n 20
-r m 20
+r c -9
+r ,c -9
+r , -101
+r d -10
+r e -10
+r 'e -10
+r ^e -10
+r :e -10
+r `e -10
+r f 20
+r g -9
+r h -23
 r - -10
 r hy -10
-r h -23
-r g -9
-r f 20
-r e -10
-r d -10
-r , -101
-r c -9
+r m 20
+r n 20
+r ~n 20
+r o -9
+r 'o -9
+r ^o -9
+r :o -9
+r `o -9
+r /o -9
+r ~o -9
+r . -102
+r q -9
 
 charset
 ha	600,681	2	0	asciicircum
@@ -125,6 +448,7 @@ vz	560,717	2	5	zcaron
 :Y	700,877,0,18,20	2	6	Ydieresis
 tm	980,681,0,2	2	7	trademark
 aq	240,698	2	8	quotesingle
+Eu	660,698,17	2	9	Euro
 space	340	0	32	space
 !	360,698,8	2	33	exclam
 "	420,698	2	34	quotedbl
@@ -137,9 +461,9 @@ Do	"
 &	800,698,17	2	38	ampersand
 '	320,698	2	39	quoteright
 cq	"
-(	320,749,150	2	40	parenleft
-)	320,749,150	2	41	parenright
-*	460,697	2	42	asterisk
+(	320,750,150	2	40	parenleft
+)	320,750,151	2	41	parenright
+*	460,698	2	42	asterisk
 +	600,514	0	43	plus
 ,	340,162,124	0	44	comma
 -	360,318	0	45	hyphen
@@ -252,11 +576,11 @@ fl	740,741	2	141	fl
 .i	360,502	0	144	dotlessi
 ga	400,730	2	146	grave
 a"	440,741	2	147	hungarumlaut
-a.	320,730	2	148	dotaccent
+a.	320,729	2	148	dotaccent
 ab	500,722	2	149	breve
 ah	500,717	2	150	caron
 ao	340,755	2	151	ring
-ho	320,0,163	0	152	ogonek
+ho	320,0,199	0	152	ogonek
 lq	540,698	2	153	quotedblleft
 rq	540,698	2	154	quotedblright
 oe	940,515,8	0	155	oe
@@ -271,7 +595,7 @@ Cs	660,593	0	164	currency
 Ye	660,681,0,36,28	2	165	yen
 bb	600,675,175	2	166	brokenbar
 sc	600,698,153	2	167	section
-ad	500,698	2	168	dieresis
+ad	500,673	2	168	dieresis
 co	740,698,17	2	169	copyright
 Of	400,698	2	170	ordfeminine
 fo	220,457	0	171	guilsinglleft
@@ -284,7 +608,7 @@ t+-	600,514	0	177	plusminus
 S2	396,698	2	178	twosuperior
 S3	396,698	2	179	threesuperior
 aa	400,731	2	180	acute
-*m	660,502,221	1	181	mu
+*m	679,502,205,3	0	181	mu
 mc	"
 ps	800,681	2	182	paragraph
 pc	340,355	0	183	periodcentered
diff --git a/font/devps/BMBI b/font/devps/BMBI
index 106058ac..83ceb175 100644
--- a/font/devps/BMBI
+++ b/font/devps/BMBI
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Demi Italic
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:12:43 1992
-#   Comment UniqueID 37832
-#   Comment VMusage 32139 39031
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:35:00 1999
+#   Comment UniqueID 44722
+#   Comment VMusage 35568 42504
 
 name BMBI
 internalname Bookman-DemiItalic
@@ -20,103 +20,424 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
-A y 20
-A w 20
-A v 20
-A Y -25
-A W -35
-A V -40
 A T -17
-F . -105
-F , -98
+A V -40
+A W -35
+A Y -25
+A 'Y -25
+A :Y -25
+A v 20
+A w 20
+A y 20
+A 'y 20
+A :y 20
+'A T -17
+'A V -40
+'A W -35
+'A Y -25
+'A 'Y -25
+'A :Y -25
+'A v 20
+'A w 20
+'A y 20
+'A 'y 20
+'A :y 20
+^A T -17
+^A V -40
+^A W -35
+^A Y -25
+^A 'Y -25
+^A :Y -25
+^A v 20
+^A w 20
+^A y 20
+^A 'y 20
+^A :y 20
+:A T -17
+:A V -40
+:A W -35
+:A Y -25
+:A 'Y -25
+:A :Y -25
+:A v 20
+:A w 20
+:A y 20
+:A 'y 20
+:A :y 20
+`A T -17
+`A V -40
+`A W -35
+`A Y -25
+`A 'Y -25
+`A :Y -25
+`A v 20
+`A w 20
+`A y 20
+`A 'y 20
+`A :y 20
+oA T -17
+oA V -40
+oA W -35
+oA Y -25
+oA 'Y -25
+oA :Y -25
+oA v 20
+oA w 20
+oA y 20
+oA 'y 20
+oA :y 20
+~A T -17
+~A V -40
+~A W -35
+~A Y -25
+~A 'Y -25
+~A :Y -25
+~A v 20
+~A w 20
+~A y 20
+~A 'y 20
+~A :y 20
 F A -35
-L y 62
-L Y -5
-L W -15
-L V -19
+F 'A -35
+F ^A -35
+F :A -35
+F `A -35
+F oA -35
+F ~A -35
+F , -98
+F . -105
 L T -26
-P . -105
-P , -98
+L V -19
+L W -15
+L Y -5
+L 'Y -5
+L :Y -5
+L y 62
+L 'y 62
+L :y 62
+/L T -26
+/L V -19
+/L W -15
+/L Y -5
+/L 'Y -5
+/L :Y -5
+/L y 62
+/L 'y 62
+/L :y 62
 P A -31
-R y 27
-R Y 4
-R W -4
-R V -8
+P 'A -31
+P ^A -31
+P :A -31
+P `A -31
+P oA -31
+P ~A -31
+P , -98
+P . -105
 R T -3
-T y 56
-T w 69
-T u 42
-T ; 31
-T s -1
-T r 41
-T . -107
-T o -5
-T i 42
+R V -8
+R W -4
+R Y 4
+R 'Y 4
+R :Y 4
+R y 27
+R 'y 27
+R :y 27
+T A -42
+T 'A -42
+T ^A -42
+T :A -42
+T `A -42
+T oA -42
+T ~A -42
+T a -8
+T 'a -8
+T ^a -8
+T :a -8
+T `a -8
+T oa -8
+T ~a -8
+T c -8
+T ,c -8
+T : 26
+T , -100
+T e -10
+T 'e -10
+T ^e -10
+T :e -10
+T `e -10
 T - -20
 T hy -20
-T e -10
-T , -100
-T : 26
-T c -8
-T a -8
-T A -42
-V y 17
-V u -1
-V ; -22
-V r 2
-V . -115
-V o -50
-V i 32
+T i 42
+T 'i 42
+T ^i 42
+T :i 42
+T `i 42
+T o -5
+T 'o -5
+T ^o -5
+T :o -5
+T `o -5
+T /o -5
+T ~o -5
+T . -107
+T r 41
+T s -1
+T vs -1
+T ; 31
+T u 42
+T 'u 42
+T ^u 42
+T :u 42
+T `u 42
+T w 69
+T y 56
+T 'y 56
+T :y 56
+V A -50
+V 'A -50
+V ^A -50
+V :A -50
+V `A -50
+V oA -50
+V ~A -50
+V a -50
+V 'a -50
+V ^a -50
+V :a -50
+V `a -50
+V oa -50
+V ~a -50
+V : -28
+V , -137
+V e -50
+V 'e -50
+V ^e -50
+V `e -50
 V - -20
 V hy -20
-V e -50
-V , -137
-V : -28
-V a -50
-V A -50
-W y -51
-W u -69
-W ; -81
-W r -66
-W . -183
-W o -100
-W i -36
+V i 32
+V 'i 32
+V ^i 48
+V :i 48
+V `i 32
+V o -50
+V 'o -50
+V ^o -50
+V :o -50
+V `o -50
+V /o -50
+V ~o -20
+V . -115
+V r 2
+V ; -22
+V u -1
+V 'u -1
+V ^u -1
+V :u -1
+V `u -1
+V y 17
+V 'y 17
+V :y 17
+W A -77
+W 'A -77
+W ^A -77
+W :A -77
+W `A -77
+W oA -77
+W ~A -77
+W a -100
+W 'a -100
+W ^a -100
+W :a -100
+W `a -100
+W oa -100
+W ~a -100
+W : -86
+W , -201
+W e -100
+W 'e -100
+W ^e -100
+W :e -100
+W `e -100
 W - -22
 W hy -22
-W e -100
-W , -201
-W : -86
-W a -100
-W A -77
-Y v 26
-Y u -1
-Y ; -4
-Y q -43
-Y . -113
-Y o -41
-Y i 20
+W i -36
+W 'i -36
+W `i -36
+W o -100
+W 'o -100
+W ^o -100
+W :o -100
+W `o -100
+W /o -100
+W ~o -100
+W . -183
+W r -66
+W ; -81
+W u -69
+W 'u -69
+W ^u -69
+W :u -69
+W `u -69
+W y -51
+W 'y -51
+W :y -51
+Y A -30
+Y 'A -30
+Y ^A -30
+Y :A -30
+Y `A -30
+Y oA -30
+Y ~A -30
+Y a -45
+Y 'a -45
+Y ^a -45
+Y :a -45
+Y `a -45
+Y oa -45
+Y ~a -45
+Y : -9
+Y , -106
+Y e -46
+Y 'e -46
+Y ^e -46
+Y `e -46
 Y - -20
 Y hy -20
-Y e -46
-Y , -106
-Y : -9
-Y a -45
-Y A -30
+Y i 20
+Y 'i 20
+Y ^i 40
+Y :i 40
+Y `i 40
+Y o -41
+Y 'o -41
+Y ^o -41
+Y :o -21
+Y `o -41
+Y /o -41
+Y ~o -41
+Y . -113
+Y q -43
+Y ; -4
+Y u -1
+Y 'u -1
+Y ^u -1
+Y :u -1
+Y `u -1
+Y v 26
+'Y A -30
+'Y 'A -30
+'Y ^A -30
+'Y :A -30
+'Y `A -30
+'Y oA -30
+'Y ~A -30
+'Y a -45
+'Y 'a -45
+'Y ^a -45
+'Y :a -45
+'Y `a -45
+'Y oa -45
+'Y ~a -45
+'Y : -9
+'Y , -106
+'Y e -46
+'Y 'e -46
+'Y ^e -46
+'Y `e -46
+'Y - -20
+'Y hy -20
+'Y i 20
+'Y 'i 20
+'Y ^i 40
+'Y :i 40
+'Y `i 40
+'Y o -41
+'Y 'o -41
+'Y ^o -41
+'Y :o -21
+'Y `o -41
+'Y /o -41
+'Y ~o -41
+'Y . -113
+'Y q -43
+'Y ; -4
+'Y u -1
+'Y 'u -1
+'Y ^u -1
+'Y :u -1
+'Y `u -1
+'Y v 26
+:Y A -30
+:Y 'A -30
+:Y ^A -30
+:Y :A -30
+:Y `A -30
+:Y oA -30
+:Y ~A -30
+:Y a -45
+:Y 'a -45
+:Y ^a -45
+:Y :a -45
+:Y `a -45
+:Y oa -45
+:Y ~a -45
+:Y : -9
+:Y , -106
+:Y e -46
+:Y 'e -46
+:Y ^e -46
+:Y `e -46
+:Y - -20
+:Y hy -20
+:Y i 20
+:Y 'i 20
+:Y ^i 40
+:Y :i 40
+:Y `i 40
+:Y o -41
+:Y 'o -41
+:Y ^o -41
+:Y :o -21
+:Y `o -41
+:Y /o -41
+:Y ~o -41
+:Y . -113
+:Y q -43
+:Y ; -4
+:Y u -1
+:Y 'u -1
+:Y ^u -1
+:Y :u -1
+:Y `u -1
+:Y v 26
 f f 10
-r q -3
-r . -120
-r o -1
-r n 39
-r m 39
+r c -5
+r ,c -5
+r , -113
+r d -3
+r e -6
+r 'e -6
+r ^e -6
+r :e -6
+r `e -6
+r f 42
+r g -23
+r h -35
 r - -20
 r hy -20
-r h -35
-r g -23
-r f 42
-r e -6
-r d -3
-r , -113
-r c -5
+r m 39
+r n 39
+r ~n 39
+r o -1
+r 'o -1
+r ^o -1
+r :o -1
+r `o -1
+r /o -1
+r ~o -1
+r . -120
+r q -3
 
 charset
 ha	620,681,0,24,-42,24	2	0	asciicircum
@@ -128,6 +449,7 @@ vz	560,749,8,76,14,73	2	5	zcaron
 :Y	660,900,0,207,-22,73	2	6	Ydieresis
 tm	940,681,0,92,8,73	2	7	trademark
 aq	180,696,0,165,-76,73	2	8	quotesingle
+Eu	680,698,17,105,-28,73	2	9	Euro
 space	340	0	32	space
 !	320,698,8,96,-36,73	2	33	exclam
 "	380,697,0,177,-90,73	2	34	quotedbl
@@ -140,8 +462,8 @@ Do	"
 &	980,698,17,86,2,73	2	38	ampersand
 '	320,698,0,79,-121,73	2	39	quoteright
 cq	"
-(	260,741,134,178,19,73	2	40	parenleft
-)	260,741,134,112,85,73	2	41	parenright
+(	260,741,135,178,19,73	2	40	parenleft
+)	260,742,134,112,85,73	2	41	parenright
 *	460,698,0,98,-76,73	2	42	asterisk
 +	600,514,0,45,-41,45	0	43	plus
 ,	340,185,124,8,-50,8	0	44	comma
@@ -255,15 +577,15 @@ fl	820,741,213,80,241,73	3	141	fl
 .i	380,507,8,90,-33,73	0	144	dotlessi
 ga	380,771,0,94,-143,73	2	146	grave
 a"	560,775,0,106,-131,73	2	147	hungarumlaut
-a.	380,734,0,15,-130,15	2	148	dotaccent
+a.	380,755,0,35,-117,35	2	148	dotaccent
 ab	460,707,0,106,-127,73	2	149	breve
 ah	480,749,0,93,-133,73	2	150	caron
 ao	360,775,0,96,-135,73	2	151	ring
-ho	320,0,182,0,-18	0	152	ogonek
+ho	320,0,199,23,-8,23	0	152	ogonek
 lq	520,698,0,75,-106,73	2	153	quotedblleft
 rq	520,698,0,90,-121,73	2	154	quotedblright
 oe	920,515,8,91,2,73	0	155	oe
-/l	380,732,8,82,-13,73	2	156	lslash
+/l	380,732,8,94,-25,73	2	156	lslash
 Bq	520,166,112,25,-56,25	0	157	quotedblbase
 OE	1180,698,17,115,-44,73	2	158	OE
 /L	640,681,0,134,36,73	2	159	Lslash
@@ -274,7 +596,7 @@ Cs	680,571,0,7,-98,7	0	164	currency
 Ye	680,681,0,152,-42,73	2	165	yen
 bb	620,675,175,0,-253	2	166	brokenbar
 sc	620,698,137,68,4,68	2	167	section
-ad	520,734,0,99,-130,73	2	168	dieresis
+ad	520,727,0,99,-130,73	2	168	dieresis
 co	780,698,17,53,-33,53	2	169	copyright
 Of	440,685,0,105,-68,73	2	170	ordfeminine
 fo	220,503,0,79,-12,73	0	171	guilsinglleft
@@ -287,7 +609,7 @@ t+-	600,514,0,45,-41,45	0	177	plusminus
 S2	408,698,0,127,-41,73	2	178	twosuperior
 S3	408,698,0,125,-36,73	2	179	threesuperior
 aa	340,771,0,117,-126,73	2	180	acute
-*m	680,507,213,90,-4,73	1	181	mu
+*m	679,507,205,98,-44,73	0	181	mu
 mc	"
 ps	680,681,0,85,-87,73	2	182	paragraph
 pc	340,358,0,26,-76,26	0	183	periodcentered
@@ -312,7 +634,7 @@ AE	1140,681,0,117,77,73	2	198	AE
 ^E	720,915,0,107,36,73	2	202	Ecircumflex
 :E	720,900,0,107,36,73	2	203	Edieresis
 `I	380,937,0,155,36,73	2	204	Igrave
-'I	380,937,0,155,36,73	2	205	Iacute
+'I	380,937,0,157,36,73	2	205	Iacute
 ^I	380,915,0,163,36,73	2	206	Icircumflex
 :I	380,900,0,169,36,73	2	207	Idieresis
 -D	760,681,0,95,36,73	2	208	Eth
@@ -343,7 +665,7 @@ ae	880,515,8,83,11,73	0	230	ae
 'e	560,771,8,86,-9,73	2	233	eacute
 ^e	560,749,8,86,-9,73	2	234	ecircumflex
 :e	560,734,8,86,-9,73	2	235	edieresis
-`i	380,771,8,94,-33,73	2	236	igrave
+`i	380,771,8,90,-33,73	2	236	igrave
 'i	380,771,8,90,-33,73	2	237	iacute
 ^i	380,749,8,103,-33,73	2	238	icircumflex
 :i	380,734,8,149,-33,73	2	239	idieresis
diff --git a/font/devps/BMI b/font/devps/BMI
index 104e8cf0..fd977c81 100644
--- a/font/devps/BMI
+++ b/font/devps/BMI
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Light Italic
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:12:06 1992
-#   Comment UniqueID 37830
-#   Comment VMusage 33139 40031
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:30:03 1999
+#   Comment UniqueID 44720
+#   Comment VMusage 36234 43170
 
 name BMI
 internalname Bookman-LightItalic
@@ -20,110 +20,390 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
-A Y -62
-A W -73
-A V -78
 A T -5
-F . -97
-F , -98
+A V -78
+A W -73
+A Y -62
+A 'Y -62
+A :Y -62
+'A T -5
+'A V -78
+'A W -73
+'A Y -62
+'A 'Y -62
+'A :Y -62
+^A T -5
+^A V -78
+^A W -73
+^A Y -62
+^A 'Y -62
+^A :Y -62
+:A T -5
+:A V -78
+:A W -73
+:A Y -62
+:A 'Y -62
+:A :Y -62
+`A T -5
+`A V -78
+`A W -73
+`A Y -62
+`A 'Y -62
+`A :Y -62
+oA T -5
+oA V -78
+oA W -73
+oA Y -62
+oA 'Y -62
+oA :Y -62
+~A T -5
+~A V -78
+~A W -73
+~A Y -62
+~A 'Y -62
+~A :Y -62
 F A -16
-L y 20
-L Y 7
-L W 9
+F 'A -16
+F ^A -16
+F :A -16
+F `A -16
+F oA -16
+F ~A -16
+F , -98
+F . -97
 L V 4
-P . -105
-P , -106
+L W 9
+L Y 7
+L 'Y 7
+L :Y 7
+L y 20
+L 'y 20
+L :y 20
+/L V 4
+/L W 9
+/L Y 7
+/L 'Y 7
+/L :Y 7
+/L y 20
+/L 'y 20
+/L :y 20
 P A -30
-R Y 11
-R W 2
-R V 2
+P 'A -30
+P ^A -30
+P :A -30
+P `A -30
+P oA -30
+P ~A -30
+P , -106
+P . -105
 R T 65
-T ; 48
-T s -7
-T r 67
-T . -78
-T o 14
-T i 71
+R V 2
+R W 2
+R Y 11
+R 'Y 11
+R :Y 11
+T A -14
+T 'A -14
+T ^A -14
+T :A -14
+T `A -14
+T oA -14
+T ~A -14
+T a 9
+T 'a 9
+T ^a 9
+T :a 9
+T `a 9
+T oa 9
+T ~a 9
+T c 16
+T ,c 16
+T : 48
+T , -79
+T e 10
+T 'e 10
+T ^e 10
+T :e 10
+T `e 10
 T - 20
 T hy 20
-T e 10
-T , -79
-T : 48
-T c 16
-T a 9
-T A -14
-V y -14
-V u -10
-V ; -44
-V r -20
-V . -100
-V o -70
-V i 3
+T i 71
+T 'i 71
+T ^i 71
+T :i 71
+T `i 71
+T o 14
+T 'o 14
+T ^o 14
+T :o 14
+T `o 14
+T /o 14
+T ~o 14
+T . -78
+T r 67
+T s -7
+T vs -7
+T ; 48
+V A -70
+V 'A -70
+V ^A -70
+V :A -70
+V `A -70
+V oA -70
+V ~A -70
+V a -70
+V 'a -70
+V ^a -70
+V :a -70
+V `a -70
+V oa -70
+V ~a -70
+V : -35
+V , -109
+V e -70
+V 'e -70
+V ^e -70
+V :e -70
+V `e -70
 V - 20
 V hy 20
-V e -70
-V , -109
-V : -35
-V a -70
-V A -70
-W y -14
-W u -20
-W ; -42
-W r -30
-W . -100
-W o -60
-W i 3
+V i 3
+V 'i 3
+V ^i 3
+V :i 13
+V `i 13
+V o -70
+V 'o -70
+V ^o -70
+V :o -70
+V `o -70
+V /o -70
+V ~o -70
+V . -100
+V r -20
+V ; -44
+V u -10
+V 'u -10
+V ^u -10
+V :u -10
+V `u -10
+V y -14
+V 'y -14
+V :y -14
+W A -60
+W 'A -60
+W ^A -60
+W :A -60
+W `A -60
+W oA -60
+W ~A -60
+W a -60
+W 'a -60
+W ^a -60
+W :a -60
+W `a -60
+W oa -60
+W ~a -60
+W : -35
+W , -109
+W e -60
+W 'e -60
+W ^e -60
+W :e -60
+W `e -60
 W - 20
 W hy 20
-W e -60
-W , -109
-W : -35
-W a -60
-W A -60
-Y v -19
-Y u -31
-Y ; -40
-Y q -72
-Y . -100
-Y p -37
-Y o -75
-Y i -11
+W i 3
+W 'i 3
+W ^i 13
+W :i 13
+W `i 13
+W o -60
+W 'o -60
+W ^o -60
+W :o -60
+W `o -60
+W /o -60
+W ~o -60
+W . -100
+W r -30
+W ; -42
+W u -20
+W 'u -20
+W ^u -20
+W :u -20
+W `u -20
+W y -14
+W 'y -14
+W :y -14
+Y A -82
+Y 'A -82
+Y ^A -82
+Y :A -82
+Y `A -82
+Y oA -82
+Y ~A -82
+Y a -79
+Y 'a -79
+Y ^a -79
+Y :a -79
+Y `a -79
+Y oa -79
+Y ~a -79
+Y : -35
+Y , -109
+Y e -78
+Y 'e -78
+Y ^e -78
+Y :e -78
+Y `e -78
 Y - 20
 Y hy 20
-Y e -78
-Y , -109
-Y : -35
-Y a -79
-Y A -82
+Y i -11
+Y 'i -11
+Y o -75
+Y 'o -75
+Y ^o -75
+Y :o -75
+Y `o -75
+Y /o -75
+Y ~o -75
+Y p -37
+Y . -100
+Y q -72
+Y ; -40
+Y u -31
+Y 'u -31
+Y ^u -31
+Y :u -31
+Y `u -31
+Y v -19
+'Y A -82
+'Y 'A -82
+'Y ^A -82
+'Y :A -82
+'Y `A -82
+'Y oA -82
+'Y ~A -82
+'Y a -79
+'Y 'a -79
+'Y ^a -79
+'Y :a -79
+'Y `a -79
+'Y oa -79
+'Y ~a -79
+'Y : -35
+'Y , -109
+'Y e -78
+'Y 'e -78
+'Y ^e -78
+'Y :e -78
+'Y `e -78
+'Y - 20
+'Y hy 20
+'Y i -11
+'Y 'i -11
+'Y o -75
+'Y 'o -75
+'Y ^o -75
+'Y :o -75
+'Y `o -75
+'Y /o -75
+'Y ~o -75
+'Y p -37
+'Y . -100
+'Y q -72
+'Y ; -40
+'Y u -31
+'Y 'u -31
+'Y ^u -31
+'Y :u -31
+'Y `u -31
+'Y v -19
+:Y A -82
+:Y 'A -82
+:Y ^A -82
+:Y :A -82
+:Y `A -82
+:Y oA -82
+:Y ~A -82
+:Y a -79
+:Y 'a -79
+:Y ^a -79
+:Y :a -79
+:Y `a -79
+:Y oa -79
+:Y ~a -79
+:Y : -35
+:Y , -109
+:Y e -78
+:Y 'e -78
+:Y ^e -78
+:Y :e -78
+:Y `e -78
+:Y - 20
+:Y hy 20
+:Y i -11
+:Y 'i -11
+:Y o -75
+:Y 'o -75
+:Y ^o -75
+:Y :o -75
+:Y `o -75
+:Y /o -75
+:Y ~o -75
+:Y p -37
+:Y . -100
+:Y q -72
+:Y ; -40
+:Y u -31
+:Y 'u -31
+:Y ^u -31
+:Y :u -31
+:Y `u -31
+:Y v -19
 f f -19
-r q -14
-r . -134
-r o -10
-r n 38
-r m 37
+r c -8
+r ,c -8
+r , -143
+r d -9
+r e -15
+r 'e -15
+r ^e -15
+r :e -15
+r `e -15
+r f -9
+r g -3
+r h -20
 r - 20
 r hy 20
-r h -20
-r g -3
-r f -9
-r e -15
-r d -9
-r , -143
-r c -8
+r m 37
+r n 38
+r ~n 38
+r o -10
+r 'o -10
+r ^o -10
+r :o -10
+r `o -10
+r /o -10
+r ~o -10
+r . -134
+r q -14
 
 charset
 ha	600,681,0,49,-47,49	2	0	asciicircum
 ti	600,386,0,45,-41,45	0	1	asciitilde
 vS	640,861,17,78,-11,70	2	2	Scaron
 vZ	580,861,0,165,42,70	2	3	Zcaron
-vs	540,684,8,57,-15,57	2	4	scaron
+vs	540,684,8,61,-15,61	2	4	scaron
 vz	520,684,8,91,12,70	2	5	zcaron
 :Y	660,865,0,199,-37,70	2	6	Ydieresis
 tm	980,681,0,35,-19,35	2	7	trademark
 aq	200,698,0,97,-49,70	2	8	quotesingle
+Eu	620,698,17,125,8,70	2	9	Euro
 space	300	0	32	space
 !	320,698,8,72,-53,70	2	33	exclam
-"	360,698,0,92,-57,70	2	34	quotedbl
+"	360,699,0,92,-57,70	2	34	quotedbl
 dq	"
 #	620,681,0,28,-57,28	2	35	numbersign
 sh	"
@@ -247,16 +527,16 @@ fi	640,725,222,119,209,70	3	140	fi
 fl	660,725,218,103,209,70	3	141	fl
 .i	280,484,8,121,-38,70	0	144	dotlessi
 ga	340,706,0,87,-132,70	2	146	grave
-a"	340,738,0,112,-117,70	2	147	hungarumlaut
-a.	260,664,0,80,-119,70	2	148	dotaccent
+a"	340,694,0,230,-138,70	2	147	hungarumlaut
+a.	260,693,0,100,-139,70	2	148	dotaccent
 ab	440,680,0,110,-141,70	2	149	breve
-ah	440,684,0,91,-128,70	2	150	caron
+ah	440,684,0,131,-168,70	2	150	caron
 ao	300,706,0,84,-128,70	2	151	ring
-ho	260,0,173,0,-1	0	152	ogonek
+ho	260,0,153,72,-21,70	0	152	ogonek
 lq	440,698,0,103,-141,70	2	153	quotedblleft
 rq	440,698,0,61,-98,61	2	154	quotedblright
 oe	900,494,8,98,-15,70	0	155	oe
-/l	340,717,8,108,0,70	2	156	lslash
+/l	340,717,8,83,17,70	2	156	lslash
 Bq	480,113,114,0,-37	0	157	quotedblbase
 OE	1180,698,17,107,-38,70	2	158	OE
 /L	580,681,0,126,29,70	2	159	Lslash
@@ -267,7 +547,7 @@ Cs	620,591,0,35,-50,35	0	164	currency
 Ye	620,681,0,165,-21,70	2	165	yen
 bb	600,675,175,0,-244	2	166	brokenbar
 sc	620,698,178,68,12,68	2	167	section
-ad	420,688,0,97,-135,70	2	168	dieresis
+ad	420,661,0,97,-135,70	0	168	dieresis
 co	740,698,17,94,-34,70	2	169	copyright
 Of	440,698,0,123,-80,70	2	170	ordfeminine
 fo	180,434,0,78,-25,70	0	171	guilsinglleft
@@ -279,8 +559,8 @@ de	400,698,0,70,-70,70	2	176	degree
 t+-	600,548,0,45,-41,45	0	177	plusminus
 S2	372,698,0,117,-18,70	2	178	twosuperior
 S3	372,698,0,117,-20,70	2	179	threesuperior
-aa	320,706,0,103,-128,70	2	180	acute
-*m	620,484,221,116,-3,70	1	181	mu
+aa	320,706,0,133,-158,70	2	180	acute
+*m	640,484,205,79,-48,70	0	181	mu
 mc	"
 ps	620,681,0,148,-62,70	2	182	paragraph
 pc	300,364,0,22,-87,22	0	183	periodcentered
@@ -305,7 +585,7 @@ AE	1220,681,0,99,95,70	2	198	AE
 ^E	680,862,0,106,29,70	2	202	Ecircumflex
 :E	680,865,0,106,29,70	2	203	Edieresis
 `I	320,883,0,142,29,70	2	204	Igrave
-'I	320,883,0,142,29,70	2	205	Iacute
+'I	320,883,0,163,29,70	2	205	Iacute
 ^I	320,862,0,179,29,70	2	206	Icircumflex
 :I	320,865,0,177,29,70	2	207	Idieresis
 -D	740,681,0,92,29,70	2	208	Eth
@@ -337,7 +617,7 @@ ae	880,494,8,88,-21,70	0	230	ae
 ^e	540,685,8,85,-15,70	2	234	ecircumflex
 :e	540,688,8,85,-15,70	2	235	edieresis
 `i	280,706,8,121,-38,70	2	236	igrave
-'i	280,706,8,121,-38,70	2	237	iacute
+'i	280,706,8,133,-38,70	2	237	iacute
 ^i	280,685,8,149,-26,70	2	238	icircumflex
 :i	280,688,8,147,-38,70	2	239	idieresis
 Sd	540,725,8,152,-15,70	2	240	eth
diff --git a/font/devps/BMR b/font/devps/BMR
index 367bffb3..1718637b 100644
--- a/font/devps/BMR
+++ b/font/devps/BMR
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Light
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:15:53 1992
-#   Comment UniqueID 37833
-#   Comment VMusage 32321 39213
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:27:36 1999
+#   Comment UniqueID 44719
+#   Comment VMusage 35588 42524
 
 name BMR
 internalname Bookman-Light
@@ -19,93 +19,398 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
-A y 32
-A w 4
-A v 7
-A Y -35
-A W -40
-A V -56
 A T 1
-F . -46
-F , -41
+A V -56
+A W -40
+A Y -35
+A 'Y -35
+A :Y -35
+A v 7
+A w 4
+A y 32
+A 'y 32
+A :y 32
+'A T 1
+'A V -56
+'A W -40
+'A Y -35
+'A 'Y -35
+'A :Y -35
+'A v 7
+'A w 4
+'A y 32
+'A 'y 32
+'A :y 32
+^A T 1
+^A V -56
+^A W -40
+^A Y -35
+^A 'Y -35
+^A :Y -35
+^A v 7
+^A w 4
+^A y 32
+^A 'y 32
+^A :y 32
+:A T 1
+:A V -56
+:A W -40
+:A Y -35
+:A 'Y -35
+:A :Y -35
+:A v 7
+:A w 4
+:A y 32
+:A 'y 32
+:A :y 32
+`A T 1
+`A V -56
+`A W -40
+`A Y -35
+`A 'Y -35
+`A :Y -35
+`A v 7
+`A w 4
+`A y 32
+`A 'y 32
+`A :y 32
+oA T 1
+oA V -56
+oA W -40
+oA Y -35
+oA 'Y -35
+oA :Y -35
+oA v 7
+oA w 4
+oA y 32
+oA 'y 32
+oA :y 32
+~A T 1
+~A V -56
+~A W -40
+~A Y -35
+~A 'Y -35
+~A :Y -35
+~A v 7
+~A w 4
+~A y 32
+~A 'y 32
+~A :y 32
 F A -21
-L y 79
-L Y 13
-L W 1
-L V -4
+F 'A -21
+F ^A -21
+F :A -21
+F `A -21
+F oA -21
+F ~A -21
+F , -41
+F . -46
 L T 28
-P . -60
-P , -55
+L V -4
+L W 1
+L Y 13
+L 'Y 13
+L :Y 13
+L y 79
+L 'y 79
+L :y 79
+/L T 28
+/L V -4
+/L W 1
+/L Y 13
+/L 'Y 13
+/L :Y 13
+/L y 79
+/L 'y 79
+/L :y 79
 P A -8
-R y 59
-R Y 26
-R W 13
-R V 8
+P 'A -8
+P ^A -8
+P :A -8
+P `A -8
+P oA -8
+P ~A -8
+P , -55
+P . -60
 R T 71
-T s 16
-T r 38
-T . -33
-T o 15
-T i 42
+R V 8
+R W 13
+R Y 26
+R 'Y 26
+R :Y 26
+R y 59
+R 'y 59
+R :y 59
+T A 1
+T 'A 1
+T ^A 1
+T :A 1
+T `A 1
+T oA 1
+T ~A 1
+T a 17
+T 'a 17
+T ^a 17
+T :a 17
+T `a 17
+T oa 17
+T ~a 17
+T c 14
+T ,c 14
+T , -28
+T e 13
+T 'e 13
+T ^e 13
+T :e 13
+T `e 13
 T - 90
 T hy 90
-T e 13
-T , -28
-T c 14
-T a 17
-T A 1
-V y 15
-V u -38
-V r -41
-V . -40
-V o -71
-V i -20
+T i 42
+T 'i 42
+T ^i 42
+T :i 42
+T `i 42
+T o 15
+T 'o 15
+T ^o 15
+T :o 15
+T `o 15
+T /o 15
+T ~o 15
+T . -33
+T r 38
+T s 16
+T vs 16
+V A -66
+V 'A -66
+V ^A -66
+V :A -66
+V `A -66
+V oA -66
+V ~A -66
+V a -69
+V 'a -69
+V ^a -69
+V :a -69
+V `a -69
+V oa -69
+V ~a -69
+V , -34
+V e -72
+V 'e -72
+V ^e -72
+V :e -72
+V `e -72
 V - 11
 V hy 11
-V e -72
-V , -34
-V a -69
-V A -66
-W y 15
-W u -38
-W r -41
-W . -40
-W o -68
-W i -20
+V i -20
+V 'i -20
+V o -71
+V 'o -71
+V ^o -71
+V :o -71
+V `o -71
+V /o -71
+V ~o -71
+V . -40
+V r -41
+V u -38
+V 'u -38
+V ^u -38
+V :u -38
+V `u -38
+V y 15
+V 'y 15
+V :y 15
+W A -64
+W 'A -64
+W ^A -64
+W :A -64
+W `A -64
+W oA -64
+W ~A -64
+W a -66
+W 'a -66
+W ^a -66
+W :a -66
+W `a -66
+W oa -66
+W ~a -66
+W , -34
+W e -69
+W 'e -69
+W ^e -69
+W :e -69
+W `e -69
 W - 11
 W hy 11
-W e -69
-W , -34
-W a -66
-W A -64
-Y v 15
-Y u -38
-Y q -55
-Y . -40
-Y p -31
-Y o -57
-Y i -37
+W i -20
+W 'i -20
+W o -68
+W 'o -68
+W ^o -68
+W :o -68
+W `o -68
+W /o -68
+W ~o -68
+W . -40
+W r -41
+W u -38
+W 'u -38
+W ^u -38
+W :u -38
+W `u -38
+W y 15
+W 'y 15
+W :y 15
+Y A -53
+Y 'A -53
+Y ^A -53
+Y :A -53
+Y `A -53
+Y oA -53
+Y ~A -53
+Y a -54
+Y 'a -54
+Y ^a -54
+Y :a -54
+Y `a -54
+Y oa -54
+Y ~a -54
+Y , -34
+Y e -58
+Y 'e -58
+Y ^e -58
+Y :e -58
+Y `e -58
 Y - 11
 Y hy 11
-Y e -58
-Y , -34
-Y a -54
-Y A -53
+Y i -37
+Y 'i -37
+Y ^i -37
+Y o -57
+Y 'o -57
+Y ^o -57
+Y :o -57
+Y `o -57
+Y /o -57
+Y ~o -57
+Y p -31
+Y . -40
+Y q -55
+Y u -38
+Y 'u -38
+Y ^u -38
+Y :u -38
+Y `u -38
+Y v 15
+'Y A -53
+'Y 'A -53
+'Y ^A -53
+'Y :A -53
+'Y `A -53
+'Y oA -53
+'Y ~A -53
+'Y a -54
+'Y 'a -54
+'Y ^a -54
+'Y :a -54
+'Y `a -54
+'Y oa -54
+'Y ~a -54
+'Y , -34
+'Y e -58
+'Y 'e -58
+'Y ^e -58
+'Y :e -58
+'Y `e -58
+'Y - 11
+'Y hy 11
+'Y i -37
+'Y 'i -37
+'Y o -57
+'Y 'o -57
+'Y ^o -57
+'Y :o -57
+'Y `o -57
+'Y /o -57
+'Y ~o -57
+'Y p -31
+'Y . -40
+'Y q -55
+'Y u -38
+'Y 'u -38
+'Y ^u -38
+'Y :u -38
+'Y `u -38
+'Y v 15
+:Y A -53
+:Y 'A -53
+:Y ^A -53
+:Y :A -53
+:Y `A -53
+:Y oA -53
+:Y ~A -53
+:Y a -54
+:Y 'a -54
+:Y ^a -54
+:Y :a -54
+:Y `a -54
+:Y oa -54
+:Y ~a -54
+:Y , -34
+:Y e -58
+:Y 'e -58
+:Y ^e -58
+:Y :e -58
+:Y `e -58
+:Y - 11
+:Y hy 11
+:Y i -37
+:Y 'i -37
+:Y o -57
+:Y 'o -57
+:Y ^o -57
+:Y :o -57
+:Y `o -57
+:Y /o -57
+:Y ~o -57
+:Y p -31
+:Y . -40
+:Y q -55
+:Y u -38
+:Y 'u -38
+:Y ^u -38
+:Y :u -38
+:Y `u -38
+:Y v 15
 f f 29
-r q 9
-r . -64
-r o 8
-r n 31
-r m 31
+r c 7
+r ,c 7
+r , -58
+r d 7
+r e 7
+r 'e 7
+r ^e 7
+r :e 7
+r `e 7
+r f 33
+r g -4
+r h -21
 r - 70
 r hy 70
-r h -21
-r g -4
-r f 33
-r e 7
-r d 7
-r , -58
-r c 7
+r m 31
+r n 31
+r ~n 31
+r o 8
+r 'o 8
+r ^o 8
+r :o 8
+r `o 8
+r /o 8
+r ~o 8
+r . -64
+r q 9
 
 charset
 ha	600,681	2	0	asciicircum
@@ -117,6 +422,7 @@ vz	480,672	2	5	zcaron
 :Y	640,851,0,26,30	2	6	Ydieresis
 tm	980,681	2	7	trademark
 aq	220,698	2	8	quotesingle
+Eu	620,698,17	2	9	Euro
 space	320	0	32	space
 !	300,698,8	2	33	exclam
 "	380,698	2	34	quotedbl
@@ -244,11 +550,11 @@ fl	620,734	2	141	fl
 .i	300,484	0	144	dotlessi
 ga	340,689	2	146	grave
 a"	380,698	2	147	hungarumlaut
-a.	260,672	2	148	dotaccent
+a.	260,684	2	148	dotaccent
 ab	460,687	2	149	breve
 ah	420,672	2	150	caron
 ao	320,731	2	151	ring
-ho	320,0,145	0	152	ogonek
+ho	320,0,153	0	152	ogonek
 lq	400,698	2	153	quotedblleft
 rq	400,698	2	154	quotedblright
 oe	900,494,8	0	155	oe
@@ -263,7 +569,7 @@ Cs	620,591	0	164	currency
 Ye	620,681,0,27,22	2	165	yen
 bb	600,675,175	2	166	brokenbar
 sc	520,698,178	2	167	section
-ad	420,674	2	168	dieresis
+ad	420,655	0	168	dieresis
 co	740,698,17	2	169	copyright
 Of	420,698	2	170	ordfeminine
 fo	240,437	0	171	guilsinglleft
@@ -276,7 +582,7 @@ t+-	600,513	0	177	plusminus
 S2	372,698	2	178	twosuperior
 S3	372,698	2	179	threesuperior
 aa	340,689	2	180	acute
-*m	680,484,251	1	181	mu
+*m	627,484,205	0	181	mu
 mc	"
 ps	600,681	2	182	paragraph
 pc	320,327	0	183	periodcentered
diff --git a/font/devps/ZCMI b/font/devps/ZCMI
index ce068db8..af537e60 100644
--- a/font/devps/ZCMI
+++ b/font/devps/ZCMI
@@ -1,16 +1,16 @@
 # This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Zapf Chancery Medium Italic
-#   Version 001.007
+#   Version 003.001
 #   FamilyName ITC Zapf Chancery
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All Rights Reserved.ITC Zapf Chancery is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Fri Dec 28 16:35:46 1990
-#   Comment UniqueID 33936
-#   Comment VMusage 34559 41451
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Zapf Chancery is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:37:27 1999
+#   Comment UniqueID 44723
+#   Comment VMusage 36306 43242
 
 name ZCMI
 internalname ZapfChancery-MediumItalic
@@ -20,168 +20,623 @@ encoding text.enc
 ligatures fi fl 0
 
 kernpairs
+A C 20
+A ,C 20
+A G -30
+A O 10
+A 'O 10
+A ^O 10
+A :O 10
+A `O 10
+A /O 10
+A ~O 10
+A Q 10
+A T 10
+A U -10
+A 'U -10
+A ^U -10
+A :U -10
+A `U -10
+A rq -40
 A ' -40
 A cq -40
-A rq -40
-A U -10
-A T 10
-A Q 10
-A O 10
-A G -30
-A C 20
-D . -30
-D , -20
-D Y 10
+'A C 20
+'A ,C 20
+'A G -30
+'A O 10
+'A 'O 10
+'A ^O 10
+'A :O 10
+'A `O 10
+'A /O 10
+'A ~O 10
+'A Q 10
+'A T 10
+'A U -10
+'A 'U -10
+'A ^U -10
+'A :U -10
+'A `U -10
+^A C 20
+^A ,C 20
+^A G -30
+^A O 10
+^A 'O 10
+^A ^O 10
+^A :O 10
+^A `O 10
+^A /O 10
+^A ~O 10
+^A Q 10
+^A T 10
+^A U -10
+^A 'U -10
+^A ^U -10
+^A :U -10
+^A `U -10
+:A C 20
+:A ,C 20
+:A G -30
+:A O 10
+:A 'O 10
+:A ^O 10
+:A :O 10
+:A `O 10
+:A /O 10
+:A ~O 10
+:A Q 10
+:A T 10
+:A U -10
+:A 'U -10
+:A ^U -10
+:A :U -10
+:A `U -10
+`A C 20
+`A ,C 20
+`A G -30
+`A O 10
+`A 'O 10
+`A ^O 10
+`A :O 10
+`A `O 10
+`A /O 10
+`A ~O 10
+`A Q 10
+`A T 10
+`A U -10
+`A 'U -10
+`A ^U -10
+`A :U -10
+`A `U -10
+oA C 20
+oA ,C 20
+oA G -30
+oA O 10
+oA 'O 10
+oA ^O 10
+oA :O 10
+oA `O 10
+oA /O 10
+oA ~O 10
+oA Q 10
+oA T 10
+oA U -10
+oA 'U -10
+oA ^U -10
+oA :U -10
+oA `U -10
+~A C 20
+~A ,C 20
+~A G -30
+~A O 10
+~A 'O 10
+~A ^O 10
+~A :O 10
+~A `O 10
+~A /O 10
+~A ~O 10
+~A Q 10
+~A T 10
+~A U -10
+~A 'U -10
+~A ^U -10
+~A :U -10
+~A `U -10
 D A -10
-F . -40
-F i 10
+D 'A -10
+D ^A -10
+D :A -10
+D `A -10
+D oA -10
+D ~A -10
+D Y 10
+D 'Y 10
+D :Y 10
+D , -20
+D . -30
 F , -30
-G . -20
+F i 10
+F . -40
 G , -10
-J . -20
+G . -20
 J , -10
-K u -20
-K o -20
+J . -20
 K e -20
-L y -10
+K 'e -20
+K ^e -20
+K :e -20
+K `e -20
+K o -20
+K 'o -20
+K ^o -20
+K :o -20
+K `o -20
+K ~o -20
+K u -20
+K 'u -20
+K ^u -20
+K :u -20
+K `u -20
+L V -20
+L W -10
+L rq -25
 L ' -25
 L cq -25
-L rq -25
-L W -10
-L V -20
-O . -20
-O , -10
-O Y 10
-O T 20
+L y -10
+L 'y -10
+L :y -10
 O A -20
-P . -50
-P o -10
-P e -10
-P , -40
-P a -20
+O 'A -20
+O ^A -20
+O :A -20
+O `A -20
+O oA -20
+O ~A -20
+O T 20
+O Y 10
+O 'Y 10
+O :Y 10
+O , -10
+O . -20
+'O A -20
+'O 'A -20
+'O ^A -20
+'O :A -20
+'O `A -20
+'O oA -20
+'O ~A -20
+'O T 20
+'O Y 10
+'O 'Y 10
+'O :Y 10
+'O , -10
+'O . -20
+^O A -20
+^O 'A -20
+^O ^A -20
+^O :A -20
+^O `A -20
+^O oA -20
+^O ~A -20
+^O T 20
+^O Y 10
+^O 'Y 10
+^O :Y 10
+^O , -10
+^O . -20
+:O A -20
+:O 'A -20
+:O ^A -20
+:O :A -20
+:O `A -20
+:O oA -20
+:O ~A -20
+:O T 20
+:O Y 10
+:O 'Y 10
+:O :Y 10
+:O , -10
+:O . -20
+`O A -20
+`O 'A -20
+`O ^A -20
+`O :A -20
+`O `A -20
+`O oA -20
+`O ~A -20
+`O T 20
+`O Y 10
+`O 'Y 10
+`O :Y 10
+`O , -10
+`O . -20
+/O A -20
+/O 'A -20
+/O ^A -20
+/O :A -20
+/O `A -20
+/O oA -20
+/O ~A -20
+/O T 20
+/O Y 10
+/O 'Y 10
+/O :Y 10
+/O , -10
+/O . -20
+~O A -20
+~O 'A -20
+~O ^A -20
+~O :A -20
+~O `A -20
+~O oA -20
+~O ~A -20
+~O T 20
+~O Y 10
+~O 'Y 10
+~O :Y 10
+~O , -10
+~O . -20
 P A -10
+P 'A -10
+P ^A -10
+P :A -10
+P `A -10
+P oA -10
+P ~A -10
+P a -20
+P 'a -20
+P ^a -20
+P :a -20
+P `a -20
+P oa -20
+P ~a -20
+P , -40
+P e -10
+P 'e -10
+P ^e -10
+P :e -10
+P `e -10
+P o -10
+P 'o -10
+P ^o -10
+P :o -10
+P `o -10
+P ~o -10
+P . -50
 Q U -10
-R Y 10
-R W 10
+Q 'U -10
+Q ^U -10
+Q :U -10
+Q `U -10
 R T 20
-T o -20
-T i 20
+R W 10
+R Y 10
+R 'Y 10
+R :Y 10
+T A 10
+T 'A 10
+T ^A 10
+T :A 10
+T `A 10
+T oA 10
+T ~A 10
+T O 30
+T 'O 30
+T ^O 30
+T :O 30
+T `O 30
+T /O 30
+T ~O 30
+T a -20
+T 'a -20
+T ^a -20
+T `a -20
+T oa -20
+T e -20
+T 'e -20
+T h 20
 T - -20
 T hy -20
-T h 20
-T e -20
-T a -20
-T O 30
-T A 10
-V . -100
-V o -20
-V e -20
-V , -90
-V a -20
-V O 10
+T i 20
+T o -20
+T 'o -20
+T ^o -20
 V G -20
-W . -50
-W o -20
-W i 10
-W h 10
-W e -20
-W , -40
-W a -20
+V O 10
+V 'O 10
+V ^O 10
+V :O 10
+V `O 10
+V /O 10
+V ~O 10
+V a -20
+V 'a -20
+V ^a -20
+V :a -20
+V `a -20
+V oa -20
+V ~a -20
+V , -90
+V e -20
+V 'e -20
+V ^e -20
+V :e -20
+V `e -20
+V o -20
+V 'o -20
+V ^o -20
+V :o -20
+V `o -20
+V ~o -20
+V . -100
 W O 10
-Y u -20
-Y . -50
-Y o -50
-Y i 10
-Y e -40
-Y , -40
+W 'O 10
+W ^O 10
+W :O 10
+W `O 10
+W /O 10
+W ~O 10
+W a -20
+W 'a -20
+W ^a -20
+W :a -20
+W `a -20
+W oa -20
+W ~a -20
+W , -40
+W e -20
+W 'e -20
+W ^e -20
+W :e -20
+W `e -20
+W h 10
+W i 10
+W o -20
+W 'o -20
+W ^o -20
+W :o -20
+W `o -20
+W ~o -20
+W . -50
 Y a -60
-b . -30
-b l -20
-b , -20
+Y 'a -60
+Y ^a -20
+Y :a -20
+Y `a -20
+Y oa -60
+Y ~a -20
+Y , -40
+Y e -40
+Y 'e -40
+Y i 10
+Y 'i 10
+Y ^i 30
+Y :i 30
+Y `i 30
+Y o -50
+Y 'o -20
+Y ^o -20
+Y :o -20
+Y `o -20
+Y ~o -20
+Y . -50
+Y u -20
+Y 'u -20
+Y ^u -20
+Y :u -20
+Y `u -20
+'Y a -60
+'Y 'a -60
+'Y ^a -60
+'Y :a -20
+'Y `a -20
+'Y oa -60
+'Y ~a -20
+'Y , -40
+'Y e -40
+'Y 'e -40
+'Y ^e -40
+'Y i 10
+'Y 'i 10
+'Y ^i 10
+'Y :i 30
+'Y `i 30
+'Y o -50
+'Y 'o -50
+'Y ^o -20
+'Y :o -20
+'Y `o -20
+'Y ~o -20
+'Y . -50
+'Y u -20
+'Y 'u -20
+'Y ^u -20
+'Y :u -20
+'Y `u -20
+:Y a -60
+:Y 'a -60
+:Y ^a -20
+:Y :a -20
+:Y `a -20
+:Y oa -60
+:Y ~a -20
+:Y , -40
+:Y e -40
+:Y 'e -40
+:Y ^e -40
+:Y i 10
+:Y 'i 10
+:Y ^i 30
+:Y :i 30
+:Y `i 30
+:Y o -50
+:Y 'o -50
+:Y ^o -50
+:Y :o -20
+:Y `o -20
+:Y ~o -20
+:Y . -50
+:Y u -20
+:Y 'u -20
+:Y ^u -20
+:Y :u -20
+:Y `u -20
 b b -20
+b , -20
+b l -20
+b . -30
 c k -10
+,c k -10
+, rq -70
 , ' -70
 , cq -70
-, rq -70
-d w -20
-d v -10
 d d -40
+d v -10
+d w -20
 e y 10
+e 'y 10
+e :y 10
+'e y 10
+'e 'y 10
+'e :y 10
+^e y 10
+^e 'y 10
+^e :y 10
+:e y 10
+:e 'y 10
+:e :y 10
+`e y 10
+`e 'y 10
+`e :y 10
+f a -20
+f 'a -20
+f ^a -20
+f :a -20
+f `a -20
+f oa -20
+f ~a -20
+f , -40
+f e -10
+f 'e -10
+f ^e -10
+f :e -10
+f `e -10
+f f -50
+f . -50
+f rq 30
 f ' 30
 f cq 30
-f rq 30
-f . -50
-f f -50
-f e -10
-f , -40
-f a -20
-g y 10
-g . -30
-g i 10
-g e 10
-g , -20
 g a 10
-k y 10
-k o -10
+g , -20
+g e 10
+g i 10
+g . -30
+g y 10
 k e -20
-m y 10
+k 'e -20
+k ^e -20
+k :e -20
+k `e -20
+k o -10
+k 'o -10
+k ^o -10
+k :o -10
+k `o -10
+k ~o -10
+k y 10
 m u 10
+m 'u 10
+m ^u 10
+m :u 10
+m `u 10
+m y 10
+m 'y 10
+m :y 10
 n y 20
-o . -30
+n 'y 20
+n :y 20
+~n y 20
+~n 'y 20
+~n :y 20
 o , -20
-p . -30
-p p -10
+o . -30
+'o , -20
+'o . -30
+^o , -20
+^o . -30
+:o , -20
+:o . -30
+`o , -20
+`o . -30
+~o , -20
+~o . -30
 p , -20
+p p -10
+p . -30
+. rq -80
 . ' -80
 . cq -80
-. rq -80
+lq A 10
 lq ` 20
 lq oq 20
-lq A 10
+` A 10
+oq A 10
 ` ` -115
 ` oq -115
 oq ` -115
 oq oq -115
-` A 10
-oq A 10
-' v 30
-cq v 30
-' t 20
-cq t 20
-' s -25
-cq s -25
-' r 30
-cq r 30
+' l 20
+cq l 20
+' rq 20
+cq rq 20
 ' ' -115
 ' cq -115
 cq ' -115
 cq cq -115
-' rq 20
-cq rq 20
-' l 20
-cq l 20
-r . -50
-r i 10
+' r 30
+cq r 30
+' s -25
+cq s -25
+' vs -25
+cq vs -25
+' t 20
+cq t 20
+' v 30
+cq v 30
 r , -40
-s . -20
+r i 10
+r 'i 10
+r ^i 10
+r :i 10
+r `i 10
+r . -50
 s , -10
-v . -30
+s . -20
+vs , -10
+vs . -20
 v , -20
-w . -30
-w o 10
-w h 20
+v . -30
 w , -20
+w h 20
+w o 10
+w 'o 10
+w ^o 10
+w :o 10
+w `o 10
+w ~o 10
+w . -30
 
 charset
 ha	520,594,0,62,-82,62	2	0	asciicircum
 ti	520,320,0,69,-73,69	0	1	asciitilde
-vS	460,831,81,184,5,87	2	2	Scaron
-vZ	620,831,19,99,8,87	2	3	Zcaron
+vS	460,821,81,184,5,87	2	2	Scaron
+vZ	620,821,19,99,8,87	2	3	Zcaron
 vs	320,659,14,194,4,87	2	4	scaron
 vz	440,659,14,124,24,87	2	5	zcaron
 :Y	560,762,168,264,9,87	2	6	Ydieresis
 tm	1000,594,0,96,-77,87	2	7	trademark
 aq	160,610,0,105,-95,87	2	8	quotesingle
+Eu	440,610,16,221,-21,87	2	9	Euro
 space	220	0	32	space
 !	280,610,14,123,-69,87	2	33	exclam
 "	220,610,0,163,-70,87	2	34	quotedbl
@@ -287,7 +742,7 @@ y	400,438,314,133,74,87	1	121	y
 z	440,445,14,118,24,87	0	122	z
 {	240,655,207,193,-5,87	2	123	braceleft
 lC	"
-|	520,714,16,0,-270	2	124	bar
+|	520,750,250,0,-270	2	124	bar
 ba	"
 }	240,655,207,128,60,87	2	125	braceright
 rC	"
@@ -309,15 +764,15 @@ fl	520,714,314,200,174,87	3	141	fl
 .i	240,438,14,116,-50,87	0	144	dotlessi
 ga	220,659,0,169,-143,87	2	146	grave
 a"	400,659,0,145,-158,87	2	147	hungarumlaut
-a.	220,610,0,158,-186,87	2	148	dotaccent
+a.	220,635,0,172,-186,87	2	148	dotaccent
 ab	440,631,0,111,-203,87	2	149	breve
 ah	340,659,0,184,-204,87	2	150	caron
 ao	300,659,0,166,-190,87	2	151	ring
-ho	280,6,191,3,12,3	0	152	ogonek
+ho	280,40,191,90,-64,87	0	152	ogonek
 lq	340,610,0,174,-119,87	2	153	quotedblleft
 rq	360,610,0,143,-108,87	2	154	quotedblright
 oe	560,438,14,118,-28,87	0	155	oe
-/l	300,714,14,265,-71,87	2	156	lslash
+/l	300,714,14,230,-24,87	2	156	lslash
 Bq	280,146,121,51,64,51	0	157	quotedblbase
 OE	820,610,16,139,-13,87	2	158	OE
 /L	580,610,16,127,1,87	2	159	Lslash
@@ -326,22 +781,22 @@ ct	440,543,134,86,-72,86	2	162	cent
 Po	440,610,52,116,66,87	2	163	sterling
 Cs	440,509,0,84,0,84	0	164	currency
 Ye	440,647,168,223,51,87	2	165	yen
-bb	520,714,16,0,-270	2	166	brokenbar
+bb	520,675,175,0,-270	2	166	brokenbar
 sc	420,610,215,144,-3,87	2	167	section
-ad	360,610,0,159,-193,87	2	168	dieresis
+ad	360,635,0,193,-183,87	2	168	dieresis
 co	740,610,16,73,-87,73	2	169	copyright
 Of	260,610,0,176,-61,87	2	170	ordfeminine
 fo	240,414,0,68,-48,68	0	171	guilsinglleft
 tno	520,340,0,73,-67,73	0	172	logicalnot
 \-	520,242,0,73,-67,73	0	173	minus
 rg	740,610,16,73,-87,73	2	174	registered
-a-	440,578,0,75,-172,75	2	175	macron
+a-	440,584,0,147,-242,87	2	175	macron
 de	400,610,0,107,-121,87	2	176	degree
 t+-	520,436,0,73,-67,73	0	177	plusminus
 S2	264,610,0,140,-22,87	2	178	twosuperior
 S3	264,610,0,134,-9,87	2	179	threesuperior
 aa	300,659,0,172,-215,87	2	180	acute
-*m	460,438,314,113,43,87	1	181	mu
+*m	458,438,314,113,8,87	1	181	mu
 mc	"
 ps	500,594,199,188,-55,87	2	182	paragraph
 pc	220,310,0,71,-89,71	0	183	periodcentered
@@ -356,8 +811,8 @@ r?	400,438,186,37,-32,37	0	191	questiondown
 `A	620,821,16,127,37,87	2	192	Agrave
 'A	620,821,16,132,37,87	2	193	Aacute
 ^A	620,821,16,127,37,87	2	194	Acircumflex
-~A	620,771,16,132,37,87	2	195	Atilde
-:A	620,762,16,139,37,87	2	196	Adieresis
+~A	620,781,16,132,37,87	2	195	Atilde
+:A	620,762,16,173,37,87	2	196	Adieresis
 oA	620,831,16,127,37,87	2	197	Aring
 AE	740,594,16,109,71,87	2	198	AE
 ,C	520,610,191,161,-43,87	2	199	Ccedilla
@@ -368,13 +823,13 @@ AE	740,594,16,109,71,87	2	198	AE
 `I	380,821,0,174,-49,87	2	204	Igrave
 'I	380,821,0,202,-49,87	2	205	Iacute
 ^I	380,821,0,174,-49,87	2	206	Icircumflex
-:I	380,762,0,189,-49,87	2	207	Idieresis
+:I	380,762,0,223,-49,87	2	207	Idieresis
 -D	700,640,6,118,-36,87	2	208	Eth
-~N	700,761,168,265,-35,87	2	209	Ntilde
+~N	700,781,168,265,-35,87	2	209	Ntilde
 `O	600,821,16,110,-44,87	2	210	Ograve
 'O	600,821,16,110,-44,87	2	211	Oacute
 ^O	600,821,16,110,-44,87	2	212	Ocircumflex
-~O	600,761,16,110,-44,87	2	213	Otilde
+~O	600,781,16,110,-44,87	2	213	Otilde
 :O	600,762,16,110,-44,87	2	214	Odieresis
 tmu	520,410,0,57,-83,57	0	215	multiply
 /O	660,672,78,141,-33,87	2	216	Oslash
@@ -389,25 +844,25 @@ ss	420,714,314,172,177,87	3	223	germandbls
 'a	420,659,15,122,-42,87	2	225	aacute
 ^a	420,649,15,115,-42,87	2	226	acircumflex
 ~a	420,619,15,152,-42,87	2	227	atilde
-:a	420,610,15,115,-42,87	2	228	adieresis
+:a	420,610,15,143,-42,87	2	228	adieresis
 oa	420,659,15,115,-42,87	2	229	aring
 ae	540,468,14,134,-17,87	0	230	ae
 ,c	340,438,191,116,-12,87	0	231	ccedilla
 `e	340,659,14,113,-37,87	2	232	egrave
 'e	340,659,14,172,-37,87	2	233	eacute
 ^e	340,649,14,143,-37,87	2	234	ecircumflex
-:e	340,610,14,159,-37,87	2	235	edieresis
+:e	340,610,14,193,-37,87	2	235	edieresis
 `i	240,659,14,116,-50,87	2	236	igrave
 'i	240,659,14,202,-50,87	2	237	iacute
 ^i	240,649,14,173,-50,87	2	238	icircumflex
-:i	240,610,14,179,-50,87	2	239	idieresis
+:i	240,610,14,213,-50,87	2	239	idieresis
 Sd	400,714,14,172,-37,87	2	240	eth
 ~n	460,619,14,134,-51,87	2	241	ntilde
 `o	400,659,14,99,-37,87	2	242	ograve
 'o	400,659,14,132,-37,87	2	243	oacute
 ^o	400,649,14,103,-37,87	2	244	ocircumflex
 ~o	400,619,14,152,-37,87	2	245	otilde
-:o	400,610,14,129,-37,87	2	246	odieresis
+:o	400,610,14,163,-37,87	2	246	odieresis
 tdi	520,440,14,73,-67,73	0	247	divide
 /o	440,488,64,150,4,87	0	248	oslash
 `u	460,659,14,118,-52,87	2	249	ugrave
@@ -416,5 +871,5 @@ tdi	520,440,14,73,-67,73	0	247	divide
 :u	460,610,14,118,-52,87	2	252	udieresis
 'y	400,659,314,133,74,87	3	253	yacute
 Tp	440,714,314,115,88,87	3	254	thorn
-:y	400,610,314,133,74,87	3	255	ydieresis
+:y	400,610,314,153,74,87	3	255	ydieresis
 u2026	1000,128,14,0,-74	0	256	ellipsis