1 files changed, 421 insertions, 333 deletions

diff --git a/contrib/groff/devps/NI b/contrib/groff/devps/NI
index eb250d7..af7c79f 100644
--- a/contrib/groff/devps/NI
+++ b/contrib/groff/devps/NI
@@ -5,443 +5,531 @@ spacewidth 278
 encoding text.enc
 ligatures fi fl 0
 kernpairs
-A y -54
-A w -20
-A v -20
-A ' -74
-A Y -74
-A W -92
-A V -111
-A T -74
-F . -129
-F f -18
-F , -129
-F A -74
-L y -55
-L ' -55
-L Y -55
-L W -55
-L V -74
-L T -55
-P . -129
-P , -129
-P A -92
-R y -54
-R Y -74
-R W -55
-R V -20
-R T -20
-T y -89
-T w -89
-T u -89
-T ; -92
-T s -89
-T r -89
-T . -111
-T o -89
-T i -71
-T - -129
-T hy -129
-T char173 -129
-T e -89
-T , -111
-T : -92
-T c -89
+A y -55
+A w -18
+A v -18
+A u -18
+A ' -125
+A cq -125
+A rq -125
+A Y -55
+A W -74
+A V -74
+A U -37
+A T -30
+A Q -18
+A O -18
+A G -18
+A C -18
+B . -50
+B , -50
+C . -50
+C , -50
+D . -50
+D , -50
+D Y -18
+D W -18
+D V -18
+F r -55
+F . -125
+F o -55
+F i -10
+F e -55
+F , -125
+F a -55
+F A -35
+G . -50
+G , -50
+J u -18
+J . -100
+J o -37
+J e -37
+J , -100
+J a -37
+J A -18
+L y -50
+L ' -125
+L cq -125
+L rq -125
+L Y -100
+L W -100
+L V -100
+L T -100
+N . -60
+N , -60
+O . -50
+O , -50
+O Y -18
+O X -18
+O V -18
+O T 18
+P . -125
+P o -55
+P e -55
+P , -125
+P a -55
+P A -50
+Q . -20
+Q , -20
+R Y -18
+R W -18
+R V -18
+R U -18
+S . -50
+S , -50
+T y -50
+T w -50
+T u -50
+T ; -50
+T r -50
+T . -100
+T o -74
+T i -18
+T - -100
+T hy -100
+T char173 -100
+T h -25
+T e -74
+T , -100
+T : -50
 T a -74
-T A -18
-V y -109
-V u -109
-V ; -74
-V r -109
-V . -111
-V o -129
-V i -62
-V - -74
-V hy -74
-V char173 -74
-V e -129
-V , -140
-V : -74
-V a -129
-V A -111
-W y -74
-W u -74
-W ; -37
-W r -74
-W . -55
-W o -74
-W i -74
-W - -37
-W hy -37
-W char173 -37
-W e -74
-W , -55
-W : -37
-W a -74
-W A -74
-Y v -99
-Y u -99
-Y ; -111
-Y q -129
-Y . -129
-Y p -129
-Y o -129
-Y i -70
-Y - -129
-Y hy -129
-Y char173 -129
-Y e -129
-Y , -129
-Y : -111
-Y a -129
-Y A -74
-f ' 94
-1 1 -74
-` ` -18
-` oq -18
-oq ` -18
-oq oq -18
-' t -37
-' s -37
-' ' -18
-r ' 55
-r . -129
-r , -129
-v . -37
-v , -37
-w . -37
-w , -37
-y . -55
-y , -55
+T O 18
+U . -100
+U , -100
+U A -18
+V u -75
+V ; -75
+V . -100
+V o -75
+V i -50
+V - -100
+V hy -100
+V char173 -100
+V e -75
+V , -100
+V : -75
+V a -75
+V A -37
+W y -55
+W u -55
+W ; -75
+W . -100
+W o -55
+W i -20
+W - -75
+W hy -75
+W char173 -75
+W h -20
+W e -55
+W , -100
+W : -75
+W a -55
+W A -55
+Y u -100
+Y ; -75
+Y . -100
+Y o -100
+Y i -25
+Y - -100
+Y hy -100
+Y char173 -100
+Y e -100
+Y , -100
+Y : -75
+Y a -100
+Y A -55
+b . -50
+b , -50
+b b -10
+c . -50
+c k -18
+c h -18
+c , -50
+, ' -37
+, cq -37
+, rq -37
+e . -37
+e , -37
+f ' 75
+f cq 75
+f rq 75
+f . -75
+f o -10
+f , -75
+g . -50
+g , -50
+l y -10
+o . -50
+o , -50
+p . -50
+p , -50
+. ' -37
+. cq -37
+. rq -37
+lq A -75
+` ` -37
+` oq -37
+oq ` -37
+oq oq -37
+` A -75
+oq A -75
+' s -25
+cq s -25
+' ' -37
+' cq -37
+cq ' -37
+cq cq -37
+' d -37
+cq d -37
+r ; -25
+r s -10
+r . -125
+r k -18
+r - -75
+r hy -75
+r char173 -75
+r , -125
+r : -25
+s . -50
+s , -50
+v . -75
+v , -75
+w . -75
+w , -75
+y . -75
+y , -75
 charset
-ha	606,722,0,0,-2	2	0000	asciicircum
-ti	606,335,0,0,9	0	0001	asciitilde
-vS	667,944,15,15,50,15	2	0002	Scaron
-vZ	667,944,0,50,75,50	2	0003	Zcaron
-vs	444,688,15,40,51,40	2	0004	scaron
-vz	463,688,15,30,83,30	2	0005	zcaron
-:Y	685,900,0,123,18,107	2	0006	Ydieresis
-tm	950,722,0,71,2,71	2	0007	trademark
-aq	278,737,0,34,-64,34	2	0010	quotesingle
+ha	606,690,0,0,-39	2	0000	-- asciicircum
+ti	606,322,0,0,-22	0	0001	-- asciitilde
+vS	667,946,15,21,56,21	2	0002	-- Scaron
+vZ	667,946,0,50,75,50	2	0003	-- Zcaron
+vs	444,690,15,40,48,40	2	0004	-- scaron
+vz	463,690,15,30,83,30	2	0005	-- zcaron
+:Y	685,902,0,125,19,107	2	0006	-- Ydieresis
+tm	950,722,0,68,18,68	2	0007	-- trademark
+aq	278,737,0,9,-101,9	2	0010	-- quotesingle
 space	278	0	0040
-!	333,737,15,33,20,33	2	0041	exclam
-"	400,737,0,45,-50,45	2	0042	quotedbl
-#	556,705,0,18,17,18	2	0043	numbersign
+!	333,737,15,20,33,20	2	0041	-- exclam
+"	400,737,0,13,-77,13	2	0042	-- quotedbl
+dq	"
+#	556,690,0,22,22,22	2	0043	-- numbersign
 sh	"
-$	556,800,133,30,47,30	2	0044	dollar
+$	556,808,142,30,46,30	2	0044	-- dollar
 Do	"
-%	833,705,17,9,4,9	2	0045	percent
-&	852,737,15,0,26	2	0046	ampersand
-'	204,737,0,76,11,76	2	0047	quoteright
-(	333,737,124,116,10,107	2	0050	parenleft
-)	333,737,124,0,143	2	0051	parenright
-*	500,705,0,2,16,2	2	0052	asterisk
-+	606,504,0,0,13	0	0053	plus
-,	278,109,165,0,89	0	0054	comma
--	333,273,0,0,18	0	0055	hyphen
+%	833,705,15,7,7,7	2	0045	-- percent
+&	852,737,15,0,26	2	0046	-- ampersand
+'	204,737,0,75,11,75	2	0047	-- quoteright
+cq	"
+(	333,745,117,128,-3,107	2	0050	-- parenleft
+)	333,745,117,0,143	2	0051	-- parenright
+*	500,737,0,50,-30,50	2	0052	-- asterisk
++	606,506	0	0053	-- plus
+,	278,109,165,0,89	0	0054	-- comma
+-	333,274,0,0,18	0	0055	-- hyphen
 hy	"
 char173	"
-.	278,109,15,0,33	0	0056	period
-/	606,737,102,0,-90	2	0057	slash
+.	278,109,15,0,33	0	0056	-- period
+/	606,737,15,0,-82	2	0057	-- slash
 sl	"
-0	556,705,15,21,21,21	2	0060	zero
-1	556,705	2	0061	one
-2	556,705,0,2,85,2	2	0062	two
-3	556,705,15,0,52	2	0063	three
-4	556,705,0,6,58,6	2	0064	four
-5	556,705,15,34,46,34	2	0065	five
-6	556,705,15,41,14,41	2	0066	six
-7	556,705,15,55,-19,55	2	0067	seven
-8	556,705,15,21,42,21	2	0070	eight
-9	556,705,15,13,43,13	2	0071	nine
-:	278,466,15,26,8,26	0	0072	colon
-;	278,466,165,33,64,33	0	0073	semicolon
-<	606,518,10,0,16	0	0074	less
-=	606,381,0,0,14	0	0075	equal
->	606,518,10,6,-3,6	0	0076	greater
-?	444,737,15,23,-52,23	2	0077	question
-@	747,737,15,31,22,31	2	0100	at
+0	556,705,15,20,20,20	2	0060	-- zero
+1	556,705	2	0061	-- one
+2	556,705,0,0,87	2	0062	-- two
+3	556,705,15,0,52	2	0063	-- three
+4	556,705,0,6,58,6	2	0064	-- four
+5	556,705,15,34,46,34	2	0065	-- five
+6	556,705,15,42,14,42	2	0066	-- six
+7	556,705,15,55,-19,55	2	0067	-- seven
+8	556,705,15,20,44,20	2	0070	-- eight
+9	556,705,15,14,42,14	2	0071	-- nine
+:	278,466,15,1,33,1	0	0072	-- colon
+;	278,466,165,1,89,1	0	0073	-- semicolon
+<	606,514,8,0,14	0	0074	-- less
+=	606,389	0	0075	-- equal
+>	606,514,8,14,-14,14	0	0076	-- greater
+?	444,737,15,23,-52,23	2	0077	-- question
+@	747,737,15,53,52,53	2	0100	-- at
 at	"
-A	704,737,0,14,132,14	2	0101	A
-B	722,722,0,0,81	2	0102	B
-C	722,737,15,41,10,41	2	0103	C
-D	778,722,0,7,88,7	2	0104	D
-E	722,722,0,29,87,29	2	0105	E
-F	667,722,0,81,84,81	2	0106	F
-G	778,737,15,35,11,35	2	0107	G
-H	833,722,0,84,88,84	2	0110	H
-I	407,722,0,74,83,74	2	0111	I
-J	611,722,17,85,63,85	2	0112	J
-K	741,722,0,123,90,107	2	0113	K
-L	667,722,0,13,87,13	2	0114	L
-M	944,722,0,79,76,79	2	0115	M
-N	815,722,17,94,98,94	2	0116	N
-O	778,737,15,7,10,7	2	0117	O
-P	667,722,0,46,83,46	2	0120	P
-Q	778,737,190,7,10,7	2	0121	Q
-R	741,722,17,0,91	2	0122	R
-S	667,737,15,15,50,15	2	0123	S
-T	685,722,0,91,10,91	2	0124	T
-U	815,722,15,95,-43,95	2	0125	U
-V	704,722,15,118,14,107	2	0126	V
-W	926,722,15,97,-3,97	2	0127	W
-X	704,722,0,116,123,107	2	0130	X
-Y	685,722,0,123,18,107	2	0131	Y
-Z	667,722,0,50,75,50	2	0132	Z
-[	333,737,109,127,83,107	2	0133	bracketleft
+A	704,737,0,14,137,14	2	0101	-- A
+B	722,722,0,0,83	2	0102	-- B
+C	722,737,15,40,10,40	2	0103	-- C
+D	778,722,0,10,83,10	2	0104	-- D
+E	722,722,0,28,83,28	2	0105	-- E
+F	667,722,0,83,83,83	2	0106	-- F
+G	778,737,15,35,10,35	2	0107	-- G
+H	833,722,0,83,83,83	2	0110	-- H
+I	407,722,0,78,83,78	2	0111	-- I
+J	611,722,15,90,64,90	2	0112	-- J
+K	741,722,0,125,83,107	2	0113	-- K
+L	667,722,0,10,83,10	2	0114	-- L
+M	944,722,0,83,83,83	2	0115	-- M
+N	815,722,15,101,101,101	2	0116	-- N
+O	778,737,15,10,10,10	2	0117	-- O
+P	667,722,0,50,83,50	2	0120	-- P
+Q	778,737,190,10,10,10	2	0121	-- Q
+R	741,722,15,1,95,1	2	0122	-- R
+S	667,737,15,21,56,21	2	0123	-- S
+T	685,722,0,90,10,90	2	0124	-- T
+U	815,722,15,102,-43,102	2	0125	-- U
+V	704,722,10,125,14,107	2	0126	-- V
+W	926,722,10,102,-3,102	2	0127	-- W
+X	704,722,0,125,125,107	2	0130	-- X
+Y	685,722,0,125,19,107	2	0131	-- Y
+Z	667,722,0,50,75,50	2	0132	-- Z
+[	333,737,109,105,105,105	2	0133	-- bracketleft
 lB	"
-\	606,737,0,0,-39	2	0134	backslash
+\	606,737,15,0,-82	2	0134	-- backslash
 rs	"
-]	333,737,109,76,133,76	2	0135	bracketright
+]	333,737,109,83,127,83	2	0135	-- bracketright
 rB	"
-a^	333,688,0,48,13,48	2	0136	circumflex
+a^	333,690,0,48,13,48	2	0136	-- circumflex
 ^	"
-_	500,0,123,50,50,50	0	0137	underscore
-`	204,749,0,98,-11,98	2	0140	quoteleft
+_	500,0,125,50,50,50	0	0137	-- underscore
+`	204,737,0,75,11,75	2	0140	-- quoteleft
 oq	"
-a	574,466,15,0,49	0	0141	a
-b	556,737,15,0,18	2	0142	b
-c	444,466,15,7,45,7	0	0143	c
-d	611,737,15,25,47,25	2	0144	d
-e	444,466,15,0,56	0	0145	e
-f	333,737,205,187,118,107	3	0146	f
-g	537,499,205,36,129,36	1	0147	g
-h	611,737,15,0,50	2	0150	h
-i	333,715,15,0,23	2	0151	i
-j	315,715,205,52,216,52	3	0152	j
-k	556,737,15,0,55	2	0153	k
-l	333,737,15,11,34,11	2	0154	l
-m	889,466,15,0,35	0	0155	m
-n	611,466,15,1,36,1	0	0156	n
-o	500,466,15,0,45	0	0157	o
-p	574,466,205,0,151	1	0160	p
-q	556,466,205,0,50	1	0161	q
-r	444,466,0,39,41,39	0	0162	r
-s	444,466,15,0,51	0	0163	s
-t	352,619,15,27,25,27	2	0164	t
-u	611,466,15,0,9	0	0165	u
-v	519,466,15,0,16	0	0166	v
-w	778,466,15,0,18	0	0167	w
-x	500,466,15,21,83,21	0	0170	x
-y	500,466,205,4,129,4	1	0171	y
-z	463,466,15,4,83,4	0	0172	z
-lC	333,737,116,98,-2,98	2	0173	braceleft
+a	574,466,15,0,48	0	0141	-- a
+b	556,737,15,0,18	2	0142	-- b
+c	444,466,15,0,48	0	0143	-- c
+d	611,737,15,24,48,24	2	0144	-- d
+e	444,466,15,0,56	0	0145	-- e
+f	333,737,205,187,118,107	3	0146	-- f
+g	537,497,205,36,129,36	1	0147	-- g
+h	611,737,15,1,36,1	2	0150	-- h
+i	333,715,15,0,21	2	0151	-- i
+j	315,715,205,53,216,53	3	0152	-- j
+k	556,737,15,0,50	2	0153	-- k
+l	333,737,15,9,36,9	2	0154	-- l
+m	889,466,15,1,36,1	0	0155	-- m
+n	611,466,15,1,36,1	0	0156	-- n
+o	500,466,15,0,48	0	0157	-- o
+p	574,466,205,0,151	1	0160	-- p
+q	556,466,205,0,48	1	0161	-- q
+r	444,466,0,40,40,40	0	0162	-- r
+s	444,466,15,0,48	0	0163	-- s
+t	352,619,15,26,26,26	2	0164	-- t
+u	611,466,15,0,6	0	0165	-- u
+v	519,466,15,0,19	0	0166	-- v
+w	778,466,15,0,19	0	0167	-- w
+x	500,466,15,21,83,21	0	0170	-- x
+y	500,466,205,0,133	1	0171	-- y
+z	463,466,15,3,83,3	0	0172	-- z
+lC	333,737,109,111,12,107	2	0173	-- braceleft
 {	"
-ba	606,737,0,0,-219	2	0174	bar
+ba	606,750,250,0,-217	3	0174	-- bar
 |	"
-rC	333,737,116,0,148	2	0175	braceright
+rC	333,737,109,0,137	2	0175	-- braceright
 }	"
-a~	333,650,0,97,-2,97	2	0176	tilde
+a~	333,649,0,100,-2,100	2	0176	-- tilde
 ~	"
-bq	204,109,167,0,129	0	0200	quotesinglbase
-Fo	426,399,0,26,65,26	0	0201	guillemotleft
+bq	204,109,165,0,128	0	0200	-- quotesinglbase
+Fo	426,402,0,26,65,26	0	0201	-- guillemotleft
 char171	"
-Fc	426,394,0,24,67,24	0	0202	guillemotright
+Fc	426,402,0,26,65,26	0	0202	-- guillemotright
 char187	"
-bu	606,537,0,0,-64	0	0203	bullet
-Fn	556,737,205,57,107,57	3	0204	florin
-f/	167,705,17,216,154,107	2	0205	fraction
-%0	1000,705,15,53,56,53	2	0206	perthousand
-dg	500,737,147,68,-14,68	2	0207	dagger
-dd	500,737,148,78,80,78	2	0210	daggerdbl
-en	500,260,0,68,68,68	0	0211	endash
-em	1000,260,0,68,68,68	0	0212	emdash
-fi	611,737,205,3,110,3	3	0214	fi
-fl	611,737,205,33,110,33	3	0215	fl
-.i	333,466,15,0,23	0	0220	dotlessi
-ga	333,691,0,0,-23	2	0222	grave
-a"	333,689,0,237,-84,107	2	0223	hungarumlaut
-a.	333,644,0,0,-68	2	0224	dotaccent
-ab	333,677,0,87,-19,87	2	0225	breve
-ah	333,688,0,95,-23,95	2	0226	caron
-ao	333,712,0,146,-180,107	2	0227	ring
-ho	333,0,155,0,-18	0	0230	ogonek
-lq	389,749,0,93,-13,93	2	0231	quotedblleft
-rq	389,737,0,68,12,68	2	0232	quotedblright
-oe	778,466,17,0,50	0	0233	oe
-/l	333,737,15,59,34,59	2	0234	lslash
-Bq	389,109,167,0,129	0	0235	quotedblbase
-OE	981,722,0,32,14,32	2	0236	OE
-/L	667,722,0,13,87,13	2	0237	Lslash
-r!	333,542,205,0,57	1	0241	exclamdown
+bu	606,542,0,0,-72	0	0203	-- bullet
+Fn	556,737,205,63,108,63	3	0204	-- florin
+f/	167,705,15,184,184,107	2	0205	-- fraction
+%0	1000,705,15,44,44,44	2	0206	-- perthousand
+dg	500,737,147,56,-1,56	2	0207	-- dagger
+dd	500,737,147,56,104,56	2	0210	-- daggerdbl
+en	500,268,0,37,77,37	0	0211	-- endash
+em	1000,268,0,37,77,37	0	0212	-- emdash
+fi	611,737,205,0,118	3	0214	-- fi
+fl	611,737,205,26,118,26	3	0215	-- fl
+.i	333,466,15,0,21	0	0220	-- dotlessi
+ga	333,690,0,0,-21	2	0222	-- grave
+a"	333,690,0,172,18,107	2	0223	-- hungarumlaut
+a.	333,646,0,0,-96	2	0224	-- dotaccent
+ab	333,677,0,87,-19,87	2	0225	-- breve
+ah	333,690,0,95,-23,95	2	0226	-- caron
+ao	333,712,0,31,-64,31	2	0227	-- ring
+ho	333,0,215,0,-18	1	0230	-- ogonek
+lq	389,737,0,67,11,67	2	0231	-- quotedblleft
+rq	389,737,0,67,11,67	2	0232	-- quotedblright
+oe	778,466,15,0,48	0	0233	-- oe
+/l	333,737,15,57,75,57	2	0234	-- lslash
+Bq	389,109,165,0,128	0	0235	-- quotedblbase
+OE	981,722,0,44,10,44	2	0236	-- OE
+/L	667,722,0,10,83,10	2	0237	-- Lslash
+r!	333,547,205,0,72	1	0241	-- exclamdown
 char161	"
-ct	556,595,129,0,-11	0	0242	cent
+ct	556,580,144,0,-12	0	0242	-- cent
 char162	"
-Po	556,705,15,39,58,39	2	0243	sterling
+Po	556,705,15,38,63,38	2	0243	-- sterling
 char163	"
-Cs	556,603,0,24,25,24	0	0244	currency
+Cs	556,597,0,24,24,24	0	0244	-- currency
 char164	"
-Ye	556,705,0,117,10,107	2	0245	yen
+Ye	556,690,0,118,10,107	2	0245	-- yen
 char165	"
-bb	606,737,0,0,-219	2	0246	brokenbar
+bb	606,675,175,0,-217	2	0246	-- brokenbar
 char166	"
-sc	500,737,147,30,61,30	2	0247	section
+sc	500,737,147,30,60,30	2	0247	-- section
 char167	"
-ad	333,644,0,76,-9,76	2	0250	dieresis
+ad	333,646,0,76,-9,76	2	0250	-- dieresis
 char168	"
-co	747,737,15,27,26,27	2	0251	copyright
+co	747,737,15,53,52,53	2	0251	-- copyright
 char169	"
-Of	422,737,0,50,-33,50	2	0252	ordfeminine
+Of	422,705,0,48,-22,48	2	0252	-- ordfeminine
 char170	"
-fo	333,399,0,0,8	0	0253	guilsinglleft
-no	606,381,0,0,9	0	0254	logicalnot
+fo	333,402,0,0,10	0	0253	-- guilsinglleft
+no	606,389	0	0254	-- logicalnot
 char172	"
-\-	606,287,0,0,9	0	0255	minus
-rg	747,737,15,26,27,26	2	0256	registered
+\-	606,289	0	0255	-- minus
+rg	747,737,15,53,52,53	2	0256	-- registered
 char174	"
-a-	333,610,0,80,-1,80	0	0257	macron
+a-	333,610,0,80,-2,80	0	0257	-- macron
 char175	"
-de	400,705,0,20,-20,20	2	0260	degree
+de	400,705,0,22,-36,22	2	0260	-- degree
 char176	"
-char177	606,504,0,0,13	0	0261	plusminus
-S2	333,705,0,70,50,70	2	0262	twosuperior
+char177	606,506	0	0261	-- plusminus
+S2	333,705,0,76,50,76	2	0262	-- twosuperior
 char178	"
-S3	333,705,0,48,49,48	2	0263	threesuperior
+S3	333,705,0,76,28,76	2	0263	-- threesuperior
 char179	"
-aa	333,689,0,72,-82,72	2	0264	acute
+aa	333,690,0,72,-82,72	2	0264	-- acute
 char180	"
-char181	611,466,205,0,120	1	0265	mu
-ps	650,737,0,45,-38,45	2	0266	paragraph
+char181	611,466,205,0,110	1	0265	-- mu
+ps	650,722,132,65,2,65	2	0266	-- paragraph
 char182	"
-char183	278,316,0,0,-27	0	0267	periodcentered
-ac	333,0,227,0,47	1	0270	cedilla
+pc	278,374,0,0,-21	0	0267	-- periodcentered
+char183	"
+ac	333,0,215,0,47	1	0270	-- cedilla
 char184	"
-S1	333,705,0,26,7,26	2	0271	onesuperior
+S1	333,705,0,28,16,28	2	0271	-- onesuperior
 char185	"
-Om	372,738,0,50,-33,50	2	0272	ordmasculine
+Om	372,705,0,48,-16,48	2	0272	-- ordmasculine
 char186	"
-fc	333,394,0,0,10	0	0273	guilsinglright
-14	834,705,17,49,17,49	2	0274	onequarter
+fc	333,402,0,0,10	0	0273	-- guilsinglright
+14	834,705,15,0,16	2	0274	-- onequarter
 char188	"
-12	834,705,17,60,17,60	2	0275	onehalf
+12	834,705,15,0,16	2	0275	-- onehalf
 char189	"
-34	834,705,17,49,49,49	2	0276	threequarters
+34	834,705,15,0,28	2	0276	-- threequarters
 char190	"
-r?	444,542,205,0,43	1	0277	questiondown
+r?	444,547,205,0,53	1	0277	-- questiondown
 char191	"
-`A	704,947,0,14,132,14	2	0300	Agrave
+`A	704,946,0,14,137,14	2	0300	-- Agrave
 char192	"
-'A	704,945,0,14,132,14	2	0301	Aacute
+'A	704,946,0,14,137,14	2	0301	-- Aacute
 char193	"
-^A	704,944,0,14,132,14	2	0302	Acircumflex
+^A	704,946,0,14,137,14	2	0302	-- Acircumflex
 char194	"
-~A	704,906,0,14,132,14	2	0303	Atilde
+~A	704,905,0,14,137,14	2	0303	-- Atilde
 char195	"
-:A	704,900,0,14,132,14	2	0304	Adieresis
+:A	704,902,0,14,137,14	2	0304	-- Adieresis
 char196	"
-oA	704,968,0,14,132,14	2	0305	Aring
+oA	704,958,0,14,137,14	2	0305	-- Aring
 char197	"
-AE	870,722,0,50,142,50	2	0306	AE
+AE	870,722,0,68,137,68	2	0306	-- AE
 char198	"
-,C	722,737,227,41,10,41	3	0307	Ccedilla
+,C	722,737,215,40,10,40	3	0307	-- Ccedilla
 char199	"
-`E	722,947,0,29,87,29	2	0310	Egrave
+`E	722,946,0,28,83,28	2	0310	-- Egrave
 char200	"
-'E	722,945,0,29,87,29	2	0311	Eacute
+'E	722,946,0,28,83,28	2	0311	-- Eacute
 char201	"
-^E	722,944,0,29,87,29	2	0312	Ecircumflex
+^E	722,946,0,28,83,28	2	0312	-- Ecircumflex
 char202	"
-:E	722,900,0,29,87,29	2	0313	Edieresis
+:E	722,902,0,28,83,28	2	0313	-- Edieresis
 char203	"
-`I	407,947,0,74,83,74	2	0314	Igrave
+`I	407,946,0,78,83,78	2	0314	-- Igrave
 char204	"
-'I	407,945,0,74,83,74	2	0315	Iacute
+'I	407,946,0,95,83,95	2	0315	-- Iacute
 char205	"
-^I	407,944,0,74,83,74	2	0316	Icircumflex
+^I	407,946,0,78,83,78	2	0316	-- Icircumflex
 char206	"
-:I	407,900,0,89,83,89	2	0317	Idieresis
+:I	407,902,0,99,83,99	2	0317	-- Idieresis
 char207	"
--D	778,722,0,7,88,7	2	0320	Eth
+-D	778,722,0,10,83,10	2	0320	-- Eth
 char208	"
-~N	815,906,17,94,98,94	2	0321	Ntilde
+~N	815,905,15,101,101,101	2	0321	-- Ntilde
 char209	"
-`O	778,947,15,7,10,7	2	0322	Ograve
+`O	778,946,15,10,10,10	2	0322	-- Ograve
 char210	"
-'O	778,945,15,7,10,7	2	0323	Oacute
+'O	778,946,15,10,10,10	2	0323	-- Oacute
 char211	"
-^O	778,944,15,7,10,7	2	0324	Ocircumflex
+^O	778,946,15,10,10,10	2	0324	-- Ocircumflex
 char212	"
-~O	778,906,15,7,10,7	2	0325	Otilde
+~O	778,905,15,10,10,10	2	0325	-- Otilde
 char213	"
-:O	778,900,15,7,10,7	2	0326	Odieresis
+:O	778,902,15,10,10,10	2	0326	-- Odieresis
 char214	"
-char215	606,504,0,0,13	0	0327	multiply
-/O	778,755,87,7,49,7	2	0330	Oslash
+char215	606,482,0,0,-24	0	0327	-- multiply
+/O	778,780,68,20,34,20	2	0330	-- Oslash
 char216	"
-`U	815,947,15,95,-43,95	2	0331	Ugrave
+`U	815,946,15,102,-43,102	2	0331	-- Ugrave
 char217	"
-'U	815,945,15,95,-43,95	2	0332	Uacute
+'U	815,946,15,102,-43,102	2	0332	-- Uacute
 char218	"
-^U	815,944,15,95,-43,95	2	0333	Ucircumflex
+^U	815,946,15,102,-43,102	2	0333	-- Ucircumflex
 char219	"
-:U	815,900,15,95,-43,95	2	0334	Udieresis
+:U	815,902,15,102,-43,102	2	0334	-- Udieresis
 char220	"
-'Y	685,945,0,123,18,107	2	0335	Yacute
+'Y	685,946,0,125,19,107	2	0335	-- Yacute
 char221	"
-TP	667,722,0,7,83,7	2	0336	Thorn
+TP	667,722,0,10,83,10	2	0336	-- Thorn
 char222	"
-ss	556,737,205,19,126,19	3	0337	germandbls
+ss	556,737,205,19,126,19	3	0337	-- germandbls
 char223	"
-`a	574,691,15,0,49	2	0340	agrave
+`a	574,690,15,0,48	2	0340	-- agrave
 char224	"
-'a	574,689,15,0,49	2	0341	aacute
+'a	574,690,15,0,48	2	0341	-- aacute
 char225	"
-^a	574,688,15,0,49	2	0342	acircumflex
+^a	574,690,15,0,48	2	0342	-- acircumflex
 char226	"
-~a	574,650,15,0,49	2	0343	atilde
+~a	574,649,15,0,48	2	0343	-- atilde
 char227	"
-:a	574,644,15,0,49	2	0344	adieresis
+:a	574,646,15,0,48	2	0344	-- adieresis
 char228	"
-oa	574,712,15,0,49	2	0345	aring
+oa	574,712,15,0,48	2	0345	-- aring
 char229	"
-ae	722,466,15,0,68	0	0346	ae
+ae	722,466,15,0,68	0	0346	-- ae
 char230	"
-,c	444,466,227,7,45,7	1	0347	ccedilla
+,c	444,466,215,0,48	1	0347	-- ccedilla
 char231	"
-`e	444,691,15,0,56	2	0350	egrave
+`e	444,690,15,0,56	2	0350	-- egrave
 char232	"
-'e	444,689,15,17,56,17	2	0351	eacute
+'e	444,690,15,17,56,17	2	0351	-- eacute
 char233	"
-^e	444,688,15,0,56	2	0352	ecircumflex
+^e	444,690,15,0,56	2	0352	-- ecircumflex
 char234	"
-:e	444,644,15,11,56,11	2	0353	edieresis
+:e	444,646,15,21,56,21	2	0353	-- edieresis
 char235	"
-`i	333,691,15,0,23	2	0354	igrave
+`i	333,690,15,0,21	2	0354	-- igrave
 char236	"
-'i	333,689,15,72,23,72	2	0355	iacute
+'i	333,690,15,72,21,72	2	0355	-- iacute
 char237	"
-^i	333,688,15,8,53,8	2	0356	icircumflex
+^i	333,690,15,48,21,48	2	0356	-- icircumflex
 char238	"
-:i	333,644,15,66,23,66	2	0357	idieresis
+:i	333,646,15,76,21,76	2	0357	-- idieresis
 char239	"
-Sd	500,737,15,0,45	2	0360	eth
+Sd	500,737,15,0,48	2	0360	-- eth
 char240	"
-~n	611,650,15,1,36,1	2	0361	ntilde
+~n	611,649,15,1,36,1	2	0361	-- ntilde
 char241	"
-`o	500,691,15,0,45	2	0362	ograve
+`o	500,690,15,0,48	2	0362	-- ograve
 char242	"
-'o	500,689,15,0,45	2	0363	oacute
+'o	500,690,15,0,48	2	0363	-- oacute
 char243	"
-^o	500,688,15,0,45	2	0364	ocircumflex
+^o	500,690,15,0,48	2	0364	-- ocircumflex
 char244	"
-~o	500,650,15,4,45,4	2	0365	otilde
+~o	500,649,15,17,48,17	2	0365	-- otilde
 char245	"
-:o	500,644,15,0,45	2	0366	odieresis
+:o	500,646,15,0,48	2	0366	-- odieresis
 char246	"
-char247	606,504,0,0,13	0	0367	divide
-/o	500,549,121,0,55	0	0370	oslash
+char247	606,528,22	0	0367	-- divide
+/o	500,549,121,0,48	0	0370	-- oslash
 char248	"
-`u	611,691,15,0,9	2	0371	ugrave
+`u	611,690,15,0,6	2	0371	-- ugrave
 char249	"
-'u	611,689,15,0,9	2	0372	uacute
+'u	611,690,15,0,6	2	0372	-- uacute
 char250	"
-^u	611,688,15,0,9	2	0373	ucircumflex
+^u	611,690,15,0,6	2	0373	-- ucircumflex
 char251	"
-:u	611,644,15,0,9	2	0374	udieresis
+:u	611,646,15,0,6	2	0374	-- udieresis
 char252	"
-'y	500,689,205,4,129,4	3	0375	yacute
+'y	500,690,205,0,133	3	0375	-- yacute
 char253	"
-Tp	574,656,205,0,151	3	0376	thorn
+Tp	574,737,205,0,151	3	0376	-- thorn
 char254	"
-:y	500,644,205,4,129,4	3	0377	ydieresis
+:y	500,646,205,0,133	3	0377	-- ydieresis
 char255	"