1 files changed, 480 insertions, 333 deletions

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