Virgin import of FSF groff v1.19

49 files changed, 9492 insertions, 8276 deletions

diff --git a/contrib/groff/font/devps/AB b/contrib/groff/font/devps/AB
index 3a63212..8fd6fce 100644
--- a/contrib/groff/font/devps/AB
+++ b/contrib/groff/font/devps/AB
@@ -233,246 +233,247 @@ y , -100
 y c -35
 y a -30
 charset
-ha	600,740,0,0,-73	2	0000	-- asciicircum
-ti	600,347,0,0,-67	0	0001	-- asciitilde
-vS	520,944,15,0,-12	2	0002	-- Scaron
-vZ	500,944,0,0,-19	2	0003	-- Zcaron
-vs	440,774,18,0,-19	2	0004	-- scaron
-vz	460,774,0,0,-20	2	0005	-- zcaron
-:Y	620,939,0,2,2	2	0006	-- Ydieresis
-tm	1000,740,0,0,-9	2	0007	-- trademark
-aq	220,740,0,0,-44	2	0010	-- quotesingle
-space	280	0	0040
-!	280,740,0,0,-73	2	0041	-- exclam
-"	360,740,0,0,-19	2	0042	-- quotedbl
+ha	600,740	2	0	asciicircum
+ti	600,347	0	1	asciitilde
+vS	520,944,15	2	2	Scaron
+vZ	500,944	2	3	Zcaron
+vs	440,774,18	2	4	scaron
+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
+space	280	0	32	space
+!	280,740	2	33	exclam
+"	360,740	2	34	quotedbl
 dq	"
-#	560,700,0,0,-29	0	0043	-- numbersign
+#	560,700	0	35	numbersign
 sh	"
-$	560,857,86,0,-58	2	0044	-- dollar
+$	560,857,86	2	36	dollar
 Do	"
-%	860,755,15,0,-36	2	0045	-- percent
-&	680,755,15,0,-34	2	0046	-- ampersand
-'	280,740,0,0,-72	2	0047	-- quoteright
+%	860,755,15	2	37	percent
+&	680,755,15	2	38	ampersand
+'	280,740	2	39	quoteright
 cq	"
-(	380,754,157,0,-74	2	0050	-- parenleft
-)	380,754,157,0,-37	2	0051	-- parenright
-*	440,755,0,0,-67	2	0052	-- asterisk
-+	600,506,0,0,-48	0	0053	-- plus
-,	280,133,141,0,-73	0	0054	-- comma
--	420,348,0,0,-71	0	0055	-- hyphen
+(	380,754,157	2	40	parenleft
+)	380,754,157	2	41	parenright
+*	440,755	2	42	asterisk
++	600,506	0	43	plus
+,	280,133,141	0	44	comma
+-	420,348	0	45	hyphen
 hy	"
-.	280,133,0,0,-73	0	0056	-- period
-/	460,740,100,0,-6	2	0057	-- slash
+.	280,133	0	46	period
+/	460,740,100	2	47	slash
 sl	"
-0	560,755,15,0,-32	2	0060	-- zero
-1	560,740,0,0,-137	2	0061	-- one
-2	560,755,0,0,-36	2	0062	-- two
-3	560,755,15,0,-28	2	0063	-- three
-4	560,740,0,0,-15	2	0064	-- four
-5	560,740,15,0,-25	2	0065	-- five
-6	560,739,15,0,-23	2	0066	-- six
-7	560,740,0,0,-62	2	0067	-- seven
-8	560,755,15,0,-33	2	0070	-- eight
-9	560,754,0,0,-24	2	0071	-- nine
-:	280,555,0,0,-73	0	0072	-- colon
-;	280,555,141,0,-73	0	0073	-- semicolon
-<	600,514,8,0,-46	0	0074	-- less
-=	600,425,0,0,-48	0	0075	-- equal
->	600,514,8,0,-46	0	0076	-- greater
-?	560,755,0,0,-38	2	0077	-- question
-@	740,712,12,10,-50	0	0100	-- at
+0	560,755,15	2	48	zero
+1	560,740	2	49	one
+2	560,755	2	50	two
+3	560,755,15	2	51	three
+4	560,740	2	52	four
+5	560,740,15	2	53	five
+6	560,739,15	2	54	six
+7	560,740	2	55	seven
+8	560,755,15	2	56	eight
+9	560,754	2	57	nine
+:	280,555	0	58	colon
+;	280,555,141	0	59	semicolon
+<	600,514,8	0	60	less
+=	600,425	0	61	equal
+>	600,514,8	0	62	greater
+?	560,755	2	63	question
+@	740,712,12,10	0	64	at
 at	"
-A	740,740,0,0,-7	2	0101	-- A
-B	580,740,0,0,-70	2	0102	-- B
-C	780,755,15,0,-34	2	0103	-- C
-D	700,740,0,0,-63	2	0104	-- D
-E	520,740,0,0,-61	2	0105	-- E
-F	480,740,0,0,-61	2	0106	-- F
-G	840,755,15,0,-27	2	0107	-- G
-H	680,740,0,0,-71	2	0110	-- H
-I	280,740,0,0,-72	2	0111	-- I
-J	480,740,15,0,-2	2	0112	-- J
-K	620,740,0,0,-89	2	0113	-- K
-L	440,740,0,0,-72	2	0114	-- L
-M	900,740,0,0,-63	2	0115	-- M
-N	740,740,0,0,-70	2	0116	-- N
-O	840,755,15,0,-33	2	0117	-- O
-P	560,740,0,0,-72	2	0120	-- P
-Q	840,755,15,0,-32	2	0121	-- Q
-R	580,740,0,0,-64	2	0122	-- R
-S	520,755,15,0,-12	2	0123	-- S
-T	420,740,0,0,-6	2	0124	-- T
-U	640,740,15,0,-55	2	0125	-- U
-V	700,740,0,0,-8	2	0126	-- V
-W	900,740,0,0,-7	2	0127	-- W
-X	680,740,0,0,-4	2	0130	-- X
-Y	620,740,0,2,2	2	0131	-- Y
-Z	500,740,0,0,-19	2	0132	-- Z
-[	320,754,157,0,-66	2	0133	-- bracketleft
+A	740,740	2	65	A
+B	580,740	2	66	B
+C	780,755,15	2	67	C
+D	700,740	2	68	D
+E	520,740	2	69	E
+F	480,740	2	70	F
+G	840,755,15	2	71	G
+H	680,740	2	72	H
+I	280,740	2	73	I
+J	480,740,15	2	74	J
+K	620,740	2	75	K
+L	440,740	2	76	L
+M	900,740	2	77	M
+N	740,740	2	78	N
+O	840,755,15	2	79	O
+P	560,740	2	80	P
+Q	840,755,15	2	81	Q
+R	580,740	2	82	R
+S	520,755,15	2	83	S
+T	420,740	2	84	T
+U	640,740,15	2	85	U
+V	700,740	2	86	V
+W	900,740	2	87	W
+X	680,740	2	88	X
+Y	620,740,0,2,2	2	89	Y
+Z	500,740	2	90	Z
+[	320,754,157	2	91	bracketleft
 lB	"
-\	640,740,100,0,-96	2	0134	-- backslash
+\	640,740,100	2	92	backslash
 rs	"
-]	320,754,157,0,-36	2	0135	-- bracketright
+]	320,754,157	2	93	bracketright
 rB	"
-a^	540,774,0,0,-71	2	0136	-- circumflex
+a^	540,774	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	280,740,0,0,-72	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	280,740	2	96	quoteleft
 oq	"
-a	660,574,18,0,-27	0	0141	-- a
-b	660,740,18,0,-47	2	0142	-- b
-c	640,574,18,0,-37	0	0143	-- c
-d	660,740,18,0,-34	2	0144	-- d
-e	640,577,18,0,-31	0	0145	-- e
-f	280,755,0,0,-15	2	0146	-- f
-g	660,574,226,0,-32	1	0147	-- g
-h	600,740,0,0,-54	2	0150	-- h
-i	240,740,0,0,-53	2	0151	-- i
-j	260,740,185,0,-16	3	0152	-- j
-k	580,740,0,0,-80	2	0153	-- k
-l	240,740,0,0,-54	2	0154	-- l
-m	940,574,0,0,-54	0	0155	-- m
-n	600,574,0,0,-54	0	0156	-- n
-o	640,574,18,0,-25	0	0157	-- o
-p	660,574,185,0,-47	1	0160	-- p
-q	660,574,185,0,-31	1	0161	-- q
-r	320,574,0,0,-63	0	0162	-- r
-s	440,574,18,0,-19	0	0163	-- s
-t	300,740,0,0,-21	2	0164	-- t
-u	600,555,18,0,-50	0	0165	-- u
-v	560,555,0,0,-3	0	0166	-- v
-w	800,555,0,0,-11	0	0167	-- w
-x	560,555,0,0,-3	0	0170	-- x
-y	580,555,185,0,-8	1	0171	-- y
-z	460,555,0,0,-20	0	0172	-- z
-lC	340,747,191,0,3	3	0173	-- braceleft
+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
+f	280,755	2	102	f
+g	660,574,226	1	103	g
+h	600,740	2	104	h
+i	240,740	2	105	i
+j	260,740,185	3	106	j
+k	580,740	2	107	k
+l	240,740	2	108	l
+m	940,574	0	109	m
+n	600,574	0	110	n
+o	640,574,18	0	111	o
+p	660,574,185	1	112	p
+q	660,574,185	1	113	q
+r	320,574	0	114	r
+s	440,574,18	0	115	s
+t	300,740	2	116	t
+u	600,555,18	0	117	u
+v	560,555	0	118	v
+w	800,555	0	119	w
+x	560,555	0	120	x
+y	580,555,185	1	121	y
+z	460,555	0	122	z
+lC	340,747,191,0,3	3	123	braceleft
 {	"
-ba	600,740,100,0,-233	2	0174	-- bar
+ba	600,740,100	2	124	bar
 |	"
-rC	340,747,191,3,-23	3	0175	-- braceright
+rC	340,747,191,3	3	125	braceright
 }	"
-a~	480,767,0,0,-44	2	0176	-- tilde
+a~	480,767	2	126	tilde
 ~	"
-bq	280,133,141,0,-72	0	0200	-- quotesinglbase
-Fo	460,469,0,0,-61	0	0201	-- guillemotleft
-Fc	460,469,0,0,-61	0	0202	-- guillemotright
-bu	600,532,0,0,-148	0	0203	-- bullet
-Fn	560,824,151	2	0204	-- florin
-f/	160,740,0,122,123	2	0205	-- fraction
-%0	1280,755,15,0,-36	2	0206	-- perthousand
-dg	560,740,142,0,-51	2	0207	-- dagger
-dd	560,740,142,0,-51	2	0210	-- daggerdbl
-en	500,348,0,0,-35	0	0211	-- endash
-em	1000,348,0,0,-35	0	0212	-- emdash
-fi	520,755,0,0,-25	2	0214	-- fi
-fl	520,755,0,0,-25	2	0215	-- fl
-.i	240,555,0,0,-53	0	0220	-- dotlessi
-ga	420,851,0,0,-50	2	0222	-- grave
-a"	700,862,0,0,-132	2	0223	-- hungarumlaut
-a.	280,769,0,0,-74	2	0224	-- dotaccent
-ab	480,770,0,0,-42	2	0225	-- breve
-ah	540,774,0,0,-71	2	0226	-- caron
-ao	360,834,0,0,-73	2	0227	-- ring
-ho	340,9,195,0,-79	1	0230	-- ogonek
-lq	480,740,0,0,-70	2	0231	-- quotedblleft
-rq	480,740,0,0,-70	2	0232	-- quotedblright
-oe	1080,574,18,0,-30	0	0233	-- oe
-/l	320,740,0,0,-34	2	0234	-- lslash
-Bq	480,133,141,0,-70	0	0235	-- quotedblbase
-OE	1060,755,15,0,-37	2	0236	-- OE
-/L	480,740,0,0,-26	2	0237	-- Lslash
-r!	280,555,185,0,-74	1	0241	-- exclamdown
-ct	560,715,0,0,-43	0	0242	-- cent
-Po	560,755,0,2,2	2	0243	-- sterling
-Cs	560,577,0,0,-27	0	0244	-- currency
-Ye	560,740,0,10,10	2	0245	-- yen
-bb	600,740,100,0,-233	2	0246	-- brokenbar
-sc	560,755,158,0,-28	2	0247	-- section
-ad	500,769,0,0,-78	2	0250	-- dieresis
-co	740,752,12,12,12	2	0251	-- copyright
-Of	360,755,0,0,-19	2	0252	-- ordfeminine
-fo	240,469,0,0,-50	0	0253	-- guilsinglleft
-no	600,425,0,0,-48	0	0254	-- logicalnot
-\-	600,313,0,0,-48	0	0255	-- minus
-rg	740,752,12,12,12	2	0256	-- registered
-a-	420,759,0,0,-72	2	0257	-- macron
-de	400,712,0,0,-57	0	0260	-- degree
-t+-	600,556,62,0,-48	0	0261	-- plusminus
-S2	336,749,0,0,-13	2	0262	-- twosuperior
-S3	336,749,0,0,-8	2	0263	-- threesuperior
-aa	420,849,0,0,-91	2	0264	-- acute
-mc	576,555,187,0,-38	1	0265	-- mu
-ps	600,740,103,7,7	2	0266	-- paragraph
-pc	280,320,0,0,-73	0	0267	-- periodcentered
-ac	340,6,251,0,-98	1	0270	-- cedilla
-S1	336,740,0,0,-72	2	0271	-- onesuperior
-Om	360,755,0,0,-23	2	0272	-- ordmasculine
-fc	240,469,0,0,-50	0	0273	-- guilsinglright
-14	840,740,0,0,-92	2	0274	-- onequarter
-12	840,740,0,0,-62	2	0275	-- onehalf
-34	840,749,0,0,-18	2	0276	-- threequarters
-r?	560,555,200,0,-68	1	0277	-- questiondown
-`A	740,1021,0,0,-7	2	0300	-- Agrave
-'A	740,1019,0,0,-7	2	0301	-- Aacute
-^A	740,944,0,0,-7	2	0302	-- Acircumflex
-~A	740,937,0,0,-7	2	0303	-- Atilde
-:A	740,939,0,0,-7	2	0304	-- Adieresis
-oA	740,969,0,0,-7	2	0305	-- Aring
-AE	900,740,0,0,5	2	0306	-- AE
-,C	780,755,251,0,-34	3	0307	-- Ccedilla
-`E	520,1021,0,0,-61	2	0310	-- Egrave
-'E	520,1019,0,0,-61	2	0311	-- Eacute
-^E	520,944,0,0,-61	2	0312	-- Ecircumflex
-:E	520,939,0,0,-61	2	0313	-- Edieresis
-`I	280,1021,0,0,45	2	0314	-- Igrave
-'I	280,1019,0,45,-46	2	0315	-- Iacute
-^I	280,944,0,60,59	2	0316	-- Icircumflex
-:I	280,939,0,32,32	2	0317	-- Idieresis
--D	742,740,0,0,-25	2	0320	-- Eth
-~N	740,937,0,0,-70	2	0321	-- Ntilde
-`O	840,1021,15,0,-33	2	0322	-- Ograve
-'O	840,1019,15,0,-33	2	0323	-- Oacute
-^O	840,944,15,0,-33	2	0324	-- Ocircumflex
-~O	840,937,15,0,-33	2	0325	-- Otilde
-:O	840,939,15,0,-33	2	0326	-- Odieresis
-tmu	600,494,0,0,-59	0	0327	-- multiply
-/O	840,814,71,0,-33	2	0330	-- Oslash
-`U	640,1021,15,0,-55	2	0331	-- Ugrave
-'U	640,1019,15,0,-55	2	0332	-- Uacute
-^U	640,944,15,0,-55	2	0333	-- Ucircumflex
-:U	640,939,15,0,-55	2	0334	-- Udieresis
-'Y	620,1019,0,2,2	2	0335	-- Yacute
-TP	560,740,0,0,-72	2	0336	-- Thorn
-ss	600,755,18,0,-51	2	0337	-- germandbls
-`a	660,851,18,0,-27	2	0340	-- agrave
-'a	660,849,18,0,-27	2	0341	-- aacute
-^a	660,774,18,0,-27	2	0342	-- acircumflex
-~a	660,767,18,0,-27	2	0343	-- atilde
-:a	660,769,18,0,-27	2	0344	-- adieresis
-oa	660,834,18,0,-27	2	0345	-- aring
-ae	1080,574,18,0,-29	0	0346	-- ae
-,c	640,574,251,0,-37	1	0347	-- ccedilla
-`e	640,851,18,0,-31	2	0350	-- egrave
-'e	640,849,18,0,-31	2	0351	-- eacute
-^e	640,774,18,0,-31	2	0352	-- ecircumflex
-:e	640,769,18,0,-31	2	0353	-- edieresis
-`i	240,851,0,0,65	2	0354	-- igrave
-'i	240,849,0,65,-26	2	0355	-- iacute
-^i	240,774,0,80,79	2	0356	-- icircumflex
-:i	240,769,0,52,52	2	0357	-- idieresis
-Sd	640,754,18,0,-27	2	0360	-- eth
-~n	600,767,0,0,-54	2	0361	-- ntilde
-`o	640,851,18,0,-25	2	0362	-- ograve
-'o	640,849,18,0,-25	2	0363	-- oacute
-^o	640,774,18,0,-25	2	0364	-- ocircumflex
-~o	640,767,18,0,-25	2	0365	-- otilde
-:o	640,769,18,0,-25	2	0366	-- odieresis
-tdi	600,526,20,0,-48	0	0367	-- divide
-/o	660,608,50,0,-35	0	0370	-- oslash
-`u	600,851,18,0,-50	2	0371	-- ugrave
-'u	600,849,18,0,-50	2	0372	-- uacute
-^u	600,774,18,0,-50	2	0373	-- ucircumflex
-:u	600,769,18,0,-50	2	0374	-- udieresis
-'y	580,849,185,0,-8	3	0375	-- yacute
-Tp	660,740,185,0,-47	3	0376	-- thorn
-:y	580,769,185,0,-8	3	0377	-- ydieresis
+bq	280,133,141	0	128	quotesinglbase
+Fo	460,469	0	129	guillemotleft
+Fc	460,469	0	130	guillemotright
+bu	600,532	0	131	bullet
+Fn	560,824,151	2	132	florin
+f/	160,740,0,122,123	2	133	fraction
+%0	1280,755,15	2	134	perthousand
+dg	560,740,142	2	135	dagger
+dd	560,740,142	2	136	daggerdbl
+en	500,348	0	137	endash
+em	1000,348	0	138	emdash
+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.	280,769	2	148	dotaccent
+ab	480,770	2	149	breve
+ah	540,774	2	150	caron
+ao	360,834	2	151	ring
+ho	340,9,195	1	152	ogonek
+lq	480,740	2	153	quotedblleft
+rq	480,740	2	154	quotedblright
+oe	1080,574,18	0	155	oe
+/l	320,740	2	156	lslash
+Bq	480,133,141	0	157	quotedblbase
+OE	1060,755,15	2	158	OE
+/L	480,740	2	159	Lslash
+r!	280,555,185	1	161	exclamdown
+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
+sc	560,755,158	2	167	section
+ad	500,769	2	168	dieresis
+co	740,752,12,12,12	2	169	copyright
+Of	360,755	2	170	ordfeminine
+fo	240,469	0	171	guilsinglleft
+tno	600,425	0	172	logicalnot
+\-	600,313	0	173	minus
+rg	740,752,12,12,12	2	174	registered
+a-	420,759	2	175	macron
+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
+mc	576,555,187	1	181	mu
+ps	600,740,103,7,7	2	182	paragraph
+pc	280,320	0	183	periodcentered
+ac	340,6,251	1	184	cedilla
+S1	336,740	2	185	onesuperior
+Om	360,755	2	186	ordmasculine
+fc	240,469	0	187	guilsinglright
+14	840,740	2	188	onequarter
+12	840,740	2	189	onehalf
+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,944	2	194	Acircumflex
+~A	740,937	2	195	Atilde
+:A	740,939	2	196	Adieresis
+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,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,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,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,944,15	2	219	Ucircumflex
+:U	640,939,15	2	220	Udieresis
+'Y	620,1019,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,774,18	2	226	acircumflex
+~a	660,767,18	2	227	atilde
+:a	660,769,18	2	228	adieresis
+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,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,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,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,774,18	2	251	ucircumflex
+:u	600,769,18	2	252	udieresis
+'y	580,849,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/contrib/groff/font/devps/ABI b/contrib/groff/font/devps/ABI
index 57f8487..f3a38b2 100644
--- a/contrib/groff/font/devps/ABI
+++ b/contrib/groff/font/devps/ABI
@@ -234,246 +234,247 @@ y , -100
 y c -35
 y a -30
 charset
-ha	600,740,0,46,-92,46	2	0000	-- asciicircum
-ti	600,347,0,29,-64,29	0	0001	-- asciitilde
-vS	520,944,15,165,1,82	2	0002	-- Scaron
-vZ	500,944,0,200,31,82	2	0003	-- Zcaron
-vs	440,774,18,173,1,82	2	0004	-- scaron
-vz	460,774,0,188,30,82	2	0005	-- zcaron
-:Y	620,939,0,189,-85,82	2	0006	-- Ydieresis
-tm	1000,740,0,8,-81,8	2	0007	-- trademark
-aq	220,740,0,144,-102,82	2	0010	-- quotesingle
-space	280	0	0040
-!	280,740,0,113,-23,82	2	0041	-- exclam
-"	360,740,0,168,-77,82	2	0042	-- quotedbl
+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
+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
+space	280	0	32	space
+!	280,740,0,113,-23,82	2	33	exclam
+"	360,740,0,168,-77,82	2	34	quotedbl
 dq	"
-#	560,700,0,108,-16,82	0	0043	-- numbersign
+#	560,700,0,108,-16,82	0	35	numbersign
 sh	"
-$	560,857,86,72,-49,72	2	0044	-- dollar
+$	560,857,86,72,-49,72	2	36	dollar
 Do	"
-%	860,755,15,46,-89,46	2	0045	-- percent
-&	680,755,15,112,-21,82	2	0046	-- ampersand
-'	280,740,0,112,-109,82	2	0047	-- quoteright
+%	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
 cq	"
-(	380,754,157,160,-70,82	2	0050	-- parenleft
-)	380,754,157,48,42,48	2	0051	-- parenright
-*	440,755,0,102,-124,82	2	0052	-- asterisk
-+	600,506,0,60,-34,60	0	0053	-- plus
-,	280,133,141,1,2,1	0	0054	-- comma
--	420,348,0,43,-64,43	0	0055	-- hyphen
+(	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
 hy	"
-.	280,133,0,1,-23,1	0	0056	-- period
-/	460,740,100,181,63,82	2	0057	-- slash
+.	280,133,0,1,-23,1	0	46	period
+/	460,740,100,181,63,82	2	47	slash
 sl	"
-0	560,755,15,118,-20,82	2	0060	-- zero
-1	560,740,0,0,-180	2	0061	-- one
-2	560,755,0,112,6,82	2	0062	-- two
-3	560,755,15,75,-17,75	2	0063	-- three
-4	560,740,0,94,14,82	2	0064	-- four
-5	560,740,15,90,-14,82	2	0065	-- five
-6	560,739,15,77,-14,77	2	0066	-- six
-7	560,740,0,125,-33,82	2	0067	-- seven
-8	560,755,15,80,-21,80	2	0070	-- eight
-9	560,754,0,123,-60,82	2	0071	-- nine
-:	280,555,0,79,-23,79	0	0072	-- colon
-;	280,555,141,79,2,79	0	0073	-- semicolon
-<	600,514,8,99,-34,82	0	0074	-- less
-=	600,425,0,81,-13,81	0	0075	-- equal
->	600,514,8,60,5,60	0	0076	-- greater
-?	560,755,0,83,-85,82	2	0077	-- question
-@	740,712,12,142,-59,82	0	0100	-- at
+0	560,755,15,118,-20,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
+:	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
+=	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
 at	"
-A	740,740,0,42,43,42	2	0101	-- A
-B	580,740,0,80,-20,80	2	0102	-- B
-C	780,755,15,134,-47,82	2	0103	-- C
-D	700,740,0,82,-13,82	2	0104	-- D
-E	520,740,0,126,-11,82	2	0105	-- E
-F	480,740,0,145,-11,82	2	0106	-- F
-G	840,755,15,97,-39,82	2	0107	-- G
-H	680,740,0,117,-21,82	2	0110	-- H
-I	280,740,0,116,-22,82	2	0111	-- I
-J	480,740,15,116,16,82	2	0112	-- J
-K	620,740,0,187,-39,82	2	0113	-- K
-L	440,740,0,69,-22,69	2	0114	-- L
-M	900,740,0,124,-13,82	2	0115	-- M
-N	740,740,0,118,-20,82	2	0116	-- N
-O	840,755,15,92,-45,82	2	0117	-- O
-P	560,740,0,135,-22,82	2	0120	-- P
-Q	840,755,15,92,-44,82	2	0121	-- Q
-R	580,740,0,126,-14,82	2	0122	-- R
-S	520,755,15,108,1,82	2	0123	-- S
-T	420,740,0,185,-69,82	2	0124	-- T
-U	640,740,15,132,-47,82	2	0125	-- U
-V	700,740,0,182,-95,82	2	0126	-- V
-W	900,740,0,186,-94,82	2	0127	-- W
-X	680,740,0,183,46,82	2	0130	-- X
-Y	620,740,0,189,-85,82	2	0131	-- Y
-Z	500,740,0,149,31,82	2	0132	-- Z
-[	320,754,157,154,-39,82	2	0133	-- bracketleft
+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
+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
+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
+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
+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
 lB	"
-\	640,740,100,0,-183	2	0134	-- backslash
+\	640,740,100,0,-183	2	92	backslash
 rs	"
-]	320,754,157,72,43,72	2	0135	-- bracketright
+]	320,754,157,72,43,72	2	93	bracketright
 rB	"
-a^	540,774,0,98,-139,82	2	0136	-- circumflex
+a^	540,774,0,98,-139,82	2	94	circumflex
 ^	"
-_	500,0,125,36,73,36	0	0137	-- underscore
-`	280,740,0,111,-108,82	2	0140	-- quoteleft
+_	500,0,125,36,73,36	0	95	underscore
+`	280,740,0,111,-108,82	2	96	quoteleft
 oq	"
-a	660,574,18,106,-23,82	0	0141	-- a
-b	660,740,18,79,3,79	2	0142	-- b
-c	640,574,18,89,-34,82	0	0143	-- c
-d	660,740,18,145,-30,82	2	0144	-- d
-e	640,577,18,77,-27,77	0	0145	-- e
-f	280,755,0,190,-12,82	2	0146	-- f
-g	660,574,226,116,17,82	1	0147	-- g
-h	600,740,0,64,-4,64	2	0150	-- h
-i	240,740,0,133,-3,82	2	0151	-- i
-j	260,740,185,132,68,82	3	0152	-- j
-k	580,740,0,118,-30,82	2	0153	-- k
-l	240,740,0,134,-4,82	2	0154	-- l
-m	940,574,0,64,-4,64	0	0155	-- m
-n	600,574,0,63,-4,63	0	0156	-- n
-o	640,574,18,82,-21,82	0	0157	-- o
-p	660,574,185,76,37,76	1	0160	-- p
-q	660,574,185,106,-28,82	1	0161	-- q
-r	320,574,0,153,-13,82	0	0162	-- r
-s	440,574,18,93,1,82	0	0163	-- s
-t	300,740,0,152,-36,82	2	0164	-- t
-u	600,555,18,97,-37,82	0	0165	-- u
-v	560,555,0,149,-56,82	0	0166	-- v
-w	800,555,0,142,-64,82	0	0167	-- w
-x	560,555,0,122,47,82	0	0170	-- x
-y	580,555,185,144,-25,82	1	0171	-- y
-z	460,555,0,118,30,82	0	0172	-- z
-lC	340,747,191,165,10,82	3	0173	-- braceleft
+a	660,574,18,106,-23,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
+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
+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
+o	640,574,18,82,-21,82	0	111	o
+p	660,574,185,76,37,76	1	112	p
+q	660,574,185,106,-28,82	1	113	q
+r	320,574,0,153,-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
+x	560,555,0,122,47,82	0	120	x
+y	580,555,185,144,-25,82	1	121	y
+z	460,555,0,118,30,82	0	122	z
+lC	340,747,191,165,10,82	3	123	braceleft
 {	"
-ba	600,740,100,0,-164	2	0174	-- bar
+ba	600,740,100,0,-164	2	124	bar
 |	"
-rC	340,747,191,115,62,82	3	0175	-- braceright
+rC	340,747,191,115,62,82	3	125	braceright
 }	"
-a~	480,767,0,134,-128,82	2	0176	-- tilde
+a~	480,767,0,134,-128,82	2	126	tilde
 ~	"
-bq	280,133,141,0,3	0	0200	-- quotesinglbase
-Fo	460,469,0,77,-55,77	0	0201	-- guillemotleft
-Fc	460,469,0,53,-31,53	0	0202	-- guillemotright
-bu	600,532,0,0,-165	0	0203	-- bullet
-Fn	560,824,151,154,77,82	2	0204	-- florin
-f/	160,740,0,309,173,82	2	0205	-- fraction
-%0	1280,755,15,26,-89,26	2	0206	-- perthousand
-dg	560,740,142,102,-83,82	2	0207	-- dagger
-dd	560,740,142,108,-13,82	2	0210	-- daggerdbl
-en	500,348,0,79,-28,79	0	0211	-- endash
-em	1000,348,0,79,-28,79	0	0212	-- emdash
-fi	520,755,0,128,-22,82	2	0214	-- fi
-fl	520,755,0,128,-22,82	2	0215	-- fl
-.i	240,555,0,99,-3,82	0	0220	-- dotlessi
-ga	420,851,0,92,-139,82	2	0222	-- grave
-a"	700,862,0,104,-208,82	2	0223	-- hungarumlaut
-a.	280,769,0,120,-142,82	2	0224	-- dotaccent
-ab	480,770,0,152,-135,82	2	0225	-- breve
-ah	540,774,0,123,-164,82	2	0226	-- caron
-ao	360,834,0,114,-156,82	2	0227	-- ring
-ho	340,9,195,0,-9	1	0230	-- ogonek
-lq	480,740,0,116,-106,82	2	0231	-- quotedblleft
-rq	480,740,0,117,-107,82	2	0232	-- quotedblright
-oe	1080,574,18,78,-26,78	0	0233	-- oe
-/l	320,740,0,134,-24,82	2	0234	-- lslash
-Bq	480,133,141,5,5,5	0	0235	-- quotedblbase
-OE	1060,755,15,134,-48,82	2	0236	-- OE
-/L	480,740,0,54,-18,54	2	0237	-- Lslash
-r!	280,555,185,80,10,80	1	0241	-- exclamdown
-ct	560,715,0,89,-60,82	0	0242	-- cent
-Po	560,755,0,105,12,82	2	0243	-- sterling
-Cs	560,577,0,118,-3,82	0	0244	-- currency
-Ye	560,740,0,197,-33,82	2	0245	-- yen
-bb	600,740,100,0,-164	2	0246	-- brokenbar
-sc	560,755,158,92,-15,82	2	0247	-- section
-ad	500,769,0,115,-146,82	2	0250	-- dieresis
-co	740,752,12,137,0,82	2	0251	-- copyright
-Of	360,755,0,162,-77,82	2	0252	-- ordfeminine
-fo	240,469,0,87,-44,82	0	0253	-- guilsinglleft
-no	600,425,0,81,-55,81	0	0254	-- logicalnot
-\-	600,313,0,60,-34,60	0	0255	-- minus
-rg	740,752,12,137,0,82	2	0256	-- registered
-a-	420,759,0,120,-142,82	2	0257	-- macron
-de	400,712,0,101,-110,82	0	0260	-- degree
-t+-	600,556,62,76,13,76	0	0261	-- plusminus
-S2	336,749,0,150,-23,82	2	0262	-- twosuperior
-S3	336,749,0,127,-37,82	2	0263	-- threesuperior
-aa	420,849,0,138,-174,82	2	0264	-- acute
-mc	576,555,187,116,47,82	1	0265	-- mu
-ps	600,740,103,194,-40,82	2	0266	-- paragraph
-pc	280,320,0,35,-58,35	0	0267	-- periodcentered
-ac	340,6,251,0,-17	1	0270	-- cedilla
-S1	336,740,0,74,-132,74	2	0271	-- onesuperior
-Om	360,755,0,141,-81,82	2	0272	-- ordmasculine
-fc	240,469,0,63,-20,63	0	0273	-- guilsinglright
-14	840,740,0,0,-137	2	0274	-- onequarter
-12	840,740,0,40,-107,40	2	0275	-- onehalf
-34	840,749,0,46,-47,46	2	0276	-- threequarters
-r?	560,555,200,17,-19,17	1	0277	-- questiondown
-`A	740,1021,0,42,43,42	2	0300	-- Agrave
-'A	740,1019,0,42,43,42	2	0301	-- Aacute
-^A	740,944,0,42,43,42	2	0302	-- Acircumflex
-~A	740,937,0,42,43,42	2	0303	-- Atilde
-:A	740,939,0,42,43,42	2	0304	-- Adieresis
-oA	740,969,0,42,43,42	2	0305	-- Aring
-AE	900,740,0,111,55,82	2	0306	-- AE
-,C	780,755,251,134,-47,82	3	0307	-- Ccedilla
-`E	520,1021,0,126,-11,82	2	0310	-- Egrave
-'E	520,1019,0,126,-11,82	2	0311	-- Eacute
-^E	520,944,0,139,-11,82	2	0312	-- Ecircumflex
-:E	520,939,0,136,-11,82	2	0313	-- Edieresis
-`I	280,1021,0,168,-22,82	2	0314	-- Igrave
-'I	280,1019,0,264,-22,82	2	0315	-- Iacute
-^I	280,944,0,259,-22,82	2	0316	-- Icircumflex
-:I	280,939,0,256,-22,82	2	0317	-- Idieresis
--D	742,740,0,74,-33,74	2	0320	-- Eth
-~N	740,937,0,118,-20,82	2	0321	-- Ntilde
-`O	840,1021,15,92,-45,82	2	0322	-- Ograve
-'O	840,1019,15,92,-45,82	2	0323	-- Oacute
-^O	840,944,15,92,-45,82	2	0324	-- Ocircumflex
-~O	840,937,15,92,-45,82	2	0325	-- Otilde
-:O	840,939,15,92,-45,82	2	0326	-- Odieresis
-tmu	600,494,0,67,-26,67	0	0327	-- multiply
-/O	840,814,71,101,-44,82	2	0330	-- Oslash
-`U	640,1021,15,132,-47,82	2	0331	-- Ugrave
-'U	640,1019,15,132,-47,82	2	0332	-- Uacute
-^U	640,944,15,132,-47,82	2	0333	-- Ucircumflex
-:U	640,939,15,132,-47,82	2	0334	-- Udieresis
-'Y	620,1019,0,189,-85,82	2	0335	-- Yacute
-TP	560,740,0,109,-22,82	2	0336	-- Thorn
-ss	600,755,18,79,-1,79	2	0337	-- germandbls
-`a	660,851,18,106,-23,82	2	0340	-- agrave
-'a	660,849,18,106,-23,82	2	0341	-- aacute
-^a	660,774,18,106,-23,82	2	0342	-- acircumflex
-~a	660,767,18,106,-23,82	2	0343	-- atilde
-:a	660,769,18,106,-23,82	2	0344	-- adieresis
-oa	660,834,18,106,-23,82	2	0345	-- aring
-ae	1080,574,18,75,-25,75	0	0346	-- ae
-,c	640,574,251,89,-33,82	1	0347	-- ccedilla
-`e	640,851,18,77,-27,77	2	0350	-- egrave
-'e	640,849,18,77,-27,77	2	0351	-- eacute
-^e	640,774,18,77,-27,77	2	0352	-- ecircumflex
-:e	640,769,18,77,-27,77	2	0353	-- edieresis
-`i	240,851,0,157,-3,82	2	0354	-- igrave
-'i	240,849,0,253,-3,82	2	0355	-- iacute
-^i	240,774,0,248,11,82	2	0356	-- icircumflex
-:i	240,769,0,245,-3,82	2	0357	-- idieresis
-Sd	640,754,18,109,-23,82	2	0360	-- eth
-~n	600,767,0,74,-4,74	2	0361	-- ntilde
-`o	640,851,18,82,-21,82	2	0362	-- ograve
-'o	640,849,18,82,-21,82	2	0363	-- oacute
-^o	640,774,18,82,-21,82	2	0364	-- ocircumflex
-~o	640,767,18,82,-21,82	2	0365	-- otilde
-:o	640,769,18,82,-21,82	2	0366	-- odieresis
-tdi	600,526,20,60,-34,60	0	0367	-- divide
-/o	660,608,50,75,-31,75	0	0370	-- oslash
-`u	600,851,18,97,-37,82	2	0371	-- ugrave
-'u	600,849,18,97,-37,82	2	0372	-- uacute
-^u	600,774,18,97,-37,82	2	0373	-- ucircumflex
-:u	600,769,18,97,-37,82	2	0374	-- udieresis
-'y	580,849,185,144,-25,82	3	0375	-- yacute
-Tp	660,740,185,76,37,76	3	0376	-- thorn
-:y	580,769,185,144,-25,82	3	0377	-- ydieresis
+bq	280,133,141,0,3	0	128	quotesinglbase
+Fo	460,469,0,77,-55,77	0	129	guillemotleft
+Fc	460,469,0,53,-31,53	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
+%0	1280,755,15,26,-89,26	2	134	perthousand
+dg	560,740,142,102,-83,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
+.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
+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
+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
+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
+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
+mc	576,555,187,116,47,82	1	181	mu
+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
+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
+`A	740,1021,0,42,43,42	2	192	Agrave
+'A	740,1019,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
+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
+,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
+`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,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,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
+/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
+u2026	1000,133,0,0,-50	0	256	ellipsis
diff --git a/contrib/groff/font/devps/AI b/contrib/groff/font/devps/AI
index eb5c689..611434b 100644
--- a/contrib/groff/font/devps/AI
+++ b/contrib/groff/font/devps/AI
@@ -234,246 +234,247 @@ y e -20
 y , -110
 y a -30
 charset
-ha	606,740,0,54,-60,54	2	0000	-- asciicircum
-ti	606,319,0,28,-64,28	0	0001	-- asciitilde
-vS	498,927,13,145,-7,81	2	0002	-- Scaron
-vZ	480,927,0,166,38,81	2	0003	-- Zcaron
-vs	388,764,13,170,1,81	2	0004	-- scaron
-vz	425,764,0,152,40,81	2	0005	-- zcaron
-:Y	592,928,0,187,-88,81	2	0006	-- Ydieresis
-tm	1000,740,0,3,-87,3	2	0007	-- trademark
-aq	198,740,0,129,-103,81	2	0010	-- quotesingle
-space	277	0	0040
-!	295,740,0,77,-61,77	2	0041	-- exclam
-"	309,740,0,151,-80,81	2	0042	-- quotedbl
+ha	606,740,0,54,-60,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	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
+space	277	0	32	space
+!	295,740,0,77,-61,77	2	33	exclam
+"	309,740,0,151,-80,81	2	34	quotedbl
 dq	"
-#	554,740,0,116,-21,81	2	0043	-- numbersign
+#	554,740,0,116,-21,81	2	35	numbersign
 sh	"
-$	554,811,70,77,-57,77	2	0044	-- dollar
+$	554,811,70,77,-57,77	2	36	dollar
 Do	"
-%	775,751,13,62,-74,62	2	0045	-- percent
-&	757,753,12,68,-42,68	2	0046	-- ampersand
-'	351,740,0,92,-145,81	2	0047	-- quoteright
+%	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
 cq	"
-(	369,757,205,176,-39,81	3	0050	-- parenleft
-)	369,757,205,63,74,63	3	0051	-- parenright
-*	425,740,0,104,-120,81	2	0052	-- asterisk
-+	606,506,0,52,-42,52	0	0053	-- plus
-,	277,126,67,0,48	0	0054	-- comma
--	332,315,0,78,-26,78	0	0055	-- hyphen
+(	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
 hy	"
-.	277,126,0,0,-52	0	0056	-- period
-/	437,740,100,153,25,81	2	0057	-- slash
+.	277,126,0,0,-52	0	46	period
+/	437,740,100,153,25,81	2	47	slash
 sl	"
-0	554,753,13,118,-21,81	2	0060	-- zero
-1	554,740,0,0,-210	2	0061	-- one
-2	554,753,0,111,10,81	2	0062	-- two
-3	554,753,13,61,-23,61	2	0063	-- three
-4	554,740,0,94,11,81	2	0064	-- four
-5	554,740,13,101,-19,81	2	0065	-- five
-6	554,739,13,76,-15,76	2	0066	-- six
-7	554,740,0,124,-60,81	2	0067	-- seven
-8	554,753,13,76,-27,76	2	0070	-- eight
-9	554,752,0,122,-61,81	2	0071	-- nine
-:	277,548,0,51,-52,51	0	0072	-- colon
-;	277,548,67,51,48,51	0	0073	-- semicolon
-<	606,514,8,93,-37,81	0	0074	-- less
-=	606,388,0,71,-23,71	0	0075	-- equal
->	606,514,8,57,-1,57	0	0076	-- greater
-?	591,752,0,87,-108,81	2	0077	-- question
-@	867,753,13,71,-76,71	2	0100	-- at
+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
+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
+8	554,753,13,76,-27,76	2	56	eight
+9	554,752,0,122,-61,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
 at	"
-A	740,740,0,39,38,39	2	0101	-- A
-B	574,740,0,82,-24,81	2	0102	-- B
-C	813,752,13,107,-55,81	2	0103	-- C
-D	744,740,0,79,-24,79	2	0104	-- D
-E	536,740,0,126,-20,81	2	0105	-- E
-F	485,740,0,146,-20,81	2	0106	-- F
-G	872,753,13,69,-53,69	2	0107	-- G
-H	683,740,0,111,-26,81	2	0110	-- H
-I	226,740,0,111,-26,81	2	0111	-- I
-J	482,740,13,107,13,81	2	0112	-- J
-K	591,740,0,187,-31,81	2	0113	-- K
-L	462,740,0,62,-32,62	2	0114	-- L
-M	919,740,0,111,-26,81	2	0115	-- M
-N	740,740,0,111,-25,81	2	0116	-- N
-O	869,753,13,82,-55,81	2	0117	-- O
-P	592,740,0,122,-25,81	2	0120	-- P
-Q	871,753,13,91,-52,81	2	0121	-- Q
-R	607,740,0,112,-20,81	2	0122	-- R
-S	498,753,13,113,-7,81	2	0123	-- S
-T	426,740,0,180,-81,81	2	0124	-- T
-U	655,740,13,111,-68,81	2	0125	-- U
-V	702,740,0,178,-95,81	2	0126	-- V
-W	960,740,0,177,-98,81	2	0127	-- W
-X	609,740,0,165,42,81	2	0130	-- X
-Y	592,740,0,187,-88,81	2	0131	-- Y
-Z	480,740,0,166,38,81	2	0132	-- Z
-[	351,753,179,176,-95,81	2	0133	-- bracketleft
+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
 lB	"
-\	605,740,100,0,-205	2	0134	-- backslash
+\	605,740,100,0,-205	2	92	backslash
 rs	"
-]	351,753,179,11,69,11	2	0135	-- bracketright
+]	351,753,179,11,69,11	2	93	bracketright
 rB	"
-a^	502,764,0,94,-142,81	2	0136	-- circumflex
+a^	502,764,0,94,-142,81	2	94	circumflex
 ^	"
-_	500,0,125,36,73,36	0	0137	-- underscore
-`	351,740,0,57,-182,57	2	0140	-- quoteleft
+_	500,0,125,36,73,36	0	95	underscore
+`	351,740,0,57,-182,57	2	96	quoteleft
 oq	"
-a	683,561,13,89,-38,81	0	0141	-- a
-b	682,740,13,71,-18,71	2	0142	-- b
-c	647,561,13,81,-37,81	0	0143	-- c
-d	685,740,13,120,-35,81	2	0144	-- d
-e	650,561,13,64,-34,64	0	0145	-- e
-f	314,753,0,190,-54,81	2	0146	-- f
-g	673,561,215,84,-6,81	1	0147	-- g
-h	610,740,0,46,-12,46	2	0150	-- h
-i	200,740,0,122,-15,81	2	0151	-- i
-j	203,740,192,121,130,81	3	0152	-- j
-k	502,740,0,136,-20,81	2	0153	-- k
-l	200,740,0,122,-15,81	2	0154	-- l
-m	938,561,0,50,-16,50	0	0155	-- m
-n	610,561,0,49,-15,49	0	0156	-- n
-o	655,561,13,64,-38,64	0	0157	-- o
-p	682,561,192,67,22,67	1	0160	-- p
-q	682,561,192,85,-33,81	1	0161	-- q
-r	301,561,0,144,-15,81	0	0162	-- r
-s	388,561,13,86,1,81	0	0163	-- s
-t	339,740,0,142,-54,81	2	0164	-- t
-u	608,547,13,84,-50,81	0	0165	-- u
-v	554,547,0,143,-58,81	0	0166	-- v
-w	831,547,0,140,-64,81	0	0167	-- w
-x	480,547,0,139,38,81	0	0170	-- x
-y	536,547,192,138,-47,81	1	0171	-- y
-z	425,547,0,123,40,81	0	0172	-- z
-lC	351,740,189,167,-65,81	2	0173	-- braceleft
+a	683,561,13,89,-38,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
+f	314,753,0,190,-54,81	2	102	f
+g	673,561,215,84,-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
+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
+p	682,561,192,67,22,67	1	112	p
+q	682,561,192,85,-33,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
+lC	351,740,189,167,-65,81	2	123	braceleft
 {	"
-ba	672,740,100,0,-230	2	0174	-- bar
+ba	672,740,100,0,-230	2	124	bar
 |	"
-rC	351,740,189,37,65,37	2	0175	-- braceright
+rC	351,740,189,37,65,37	2	125	braceright
 }	"
-a~	439,754,0,131,-129,81	2	0176	-- tilde
+a~	439,754,0,131,-129,81	2	126	tilde
 ~	"
-bq	354,126,68,0,-26	0	0200	-- quotesinglbase
-Fo	425,481,0,94,-42,81	0	0201	-- guillemotleft
-Fc	425,481,0,62,-10,62	0	0202	-- guillemotright
-bu	606,532,0,0,-167	0	0203	-- bullet
-Fn	554,818,153,165,89,81	2	0204	-- florin
-f/	166,740,0,301,163,81	2	0205	-- fraction
-%0	1174,751,13,58,-78,58	2	0206	-- perthousand
-dg	553,740,133,90,-96,81	2	0207	-- dagger
-dd	553,740,133,90,-22,81	2	0210	-- daggerdbl
-en	500,315,0,73,-31,73	0	0211	-- endash
-em	1000,315,0,73,-31,73	0	0212	-- emdash
-fi	487,753,0,122,-54,81	2	0214	-- fi
-fl	485,753,0,122,-54,81	2	0215	-- fl
-.i	200,547,0,86,-15,81	0	0220	-- dotlessi
-ga	378,786,0,97,-154,81	2	0222	-- grave
-a"	552,800,0,92,-189,81	2	0223	-- hungarumlaut
-a.	222,765,0,118,-142,81	2	0224	-- dotaccent
-ab	453,754,0,138,-142,81	2	0225	-- breve
-ah	502,764,0,113,-160,81	2	0226	-- caron
-ao	332,807,0,119,-141,81	2	0227	-- ring
-ho	302,0,191,0,-3	1	0230	-- ogonek
-lq	502,740,0,55,-184,55	2	0231	-- quotedblleft
-rq	484,740,0,108,-147,81	2	0232	-- quotedblright
-oe	1137,561,13,73,-30,73	0	0233	-- oe
-/l	300,740,0,104,-45,81	2	0234	-- lslash
-Bq	502,126,68,0,-26	0	0235	-- quotedblbase
-OE	1194,753,13,135,-57,81	2	0236	-- OE
-/L	517,740,0,62,-57,62	2	0237	-- Lslash
-r!	295,548,192,41,-24,41	1	0241	-- exclamdown
-ct	554,707,0,92,-65,81	0	0242	-- cent
-Po	554,753,0,110,21,81	2	0243	-- sterling
-Cs	554,580,0,141,26,81	0	0244	-- currency
-Ye	554,740,0,183,-25,81	2	0245	-- yen
-bb	672,740,100,0,-230	2	0246	-- brokenbar
-sc	615,753,141,32,-68,32	2	0247	-- section
-ad	369,765,0,118,-141,81	2	0250	-- dieresis
-co	747,752,12,133,-3,81	2	0251	-- copyright
-Of	369,753,0,175,-52,81	2	0252	-- ordfeminine
-fo	251,481,0,94,-42,81	0	0253	-- guilsinglleft
-no	606,388,0,71,-60,71	0	0254	-- logicalnot
-\-	606,287,0,52,-42,52	0	0255	-- minus
-rg	747,752,12,133,-3,81	2	0256	-- registered
-a-	485,736,0,112,-147,81	0	0257	-- macron
-de	400,709,0,101,-108,81	0	0260	-- degree
-t+-	606,518,24,62,3,62	0	0261	-- plusminus
-S2	332,747,0,151,-24,81	2	0262	-- twosuperior
-S3	332,747,0,126,-48,81	2	0263	-- threesuperior
-aa	375,786,0,119,-153,81	2	0264	-- acute
-mc	608,547,184,70,4,70	0	0265	-- mu
-ps	564,740,110,174,-69,81	2	0266	-- paragraph
-pc	277,316,0,8,-87,8	0	0267	-- periodcentered
-ac	324,0,222,0,-2	1	0270	-- cedilla
-S1	332,740,0,53,-140,53	2	0271	-- onesuperior
-Om	369,753,0,147,-66,81	2	0272	-- ordmasculine
-fc	251,481,0,62,-10,62	0	0273	-- guilsinglright
-14	831,740,0,0,-133	2	0274	-- onequarter
-12	831,740,0,29,-114,29	2	0275	-- onehalf
-34	831,747,0,44,-76,44	2	0276	-- threequarters
-r?	591,548,205,0,-14	1	0277	-- questiondown
-`A	740,949,0,39,38,39	2	0300	-- Agrave
-'A	740,949,0,39,38,39	2	0301	-- Aacute
-^A	740,927,0,39,38,39	2	0302	-- Acircumflex
-~A	740,917,0,39,38,39	2	0303	-- Atilde
-:A	740,928,0,39,38,39	2	0304	-- Adieresis
-oA	740,955,0,39,38,39	2	0305	-- Aring
-AE	992,740,0,102,70,81	2	0306	-- AE
-,C	813,752,222,107,-55,81	3	0307	-- Ccedilla
-`E	536,949,0,126,-20,81	2	0310	-- Egrave
-'E	536,949,0,126,-20,81	2	0311	-- Eacute
-^E	536,927,0,126,-20,81	2	0312	-- Ecircumflex
-:E	536,928,0,126,-20,81	2	0313	-- Edieresis
-`I	226,949,0,164,-26,81	2	0314	-- Igrave
-'I	226,949,0,264,-26,81	2	0315	-- Iacute
-^I	226,927,0,263,-26,81	2	0316	-- Icircumflex
-:I	226,928,0,220,-26,81	2	0317	-- Idieresis
--D	790,740,0,73,-54,73	2	0320	-- Eth
-~N	740,917,0,111,-25,81	2	0321	-- Ntilde
-`O	869,949,13,82,-55,81	2	0322	-- Ograve
-'O	869,949,13,82,-55,81	2	0323	-- Oacute
-^O	869,927,13,82,-55,81	2	0324	-- Ocircumflex
-~O	869,917,13,82,-55,81	2	0325	-- Otilde
-:O	869,928,13,82,-55,81	2	0326	-- Odieresis
-tmu	606,482,0,56,-37,56	0	0327	-- multiply
-/O	868,819,83,111,-26,81	2	0330	-- Oslash
-`U	655,949,13,111,-68,81	2	0331	-- Ugrave
-'U	655,949,13,111,-68,81	2	0332	-- Uacute
-^U	655,927,13,111,-68,81	2	0333	-- Ucircumflex
-:U	655,928,13,111,-68,81	2	0334	-- Udieresis
-'Y	592,949,0,187,-88,81	2	0335	-- Yacute
-TP	592,740,0,79,-10,79	2	0336	-- Thorn
-ss	554,753,13,74,-11,74	2	0337	-- germandbls
-`a	683,786,13,89,-38,81	2	0340	-- agrave
-'a	683,786,13,89,-38,81	2	0341	-- aacute
-^a	683,764,13,89,-38,81	2	0342	-- acircumflex
-~a	683,754,13,89,-38,81	2	0343	-- atilde
-:a	683,765,13,89,-38,81	2	0344	-- adieresis
-oa	683,807,13,89,-38,81	2	0345	-- aring
-ae	1157,561,13,62,-30,62	0	0346	-- ae
-,c	647,561,222,81,-37,81	1	0347	-- ccedilla
-`e	650,786,13,64,-34,64	2	0350	-- egrave
-'e	650,786,13,64,-34,64	2	0351	-- eacute
-^e	650,764,13,64,-34,64	2	0352	-- ecircumflex
-:e	650,765,13,64,-34,64	2	0353	-- edieresis
-`i	200,786,0,146,-15,81	2	0354	-- igrave
-'i	200,786,0,247,-15,81	2	0355	-- iacute
-^i	200,764,0,245,9,81	2	0356	-- icircumflex
-:i	200,765,0,203,-15,81	2	0357	-- idieresis
-Sd	655,753,12,70,-38,70	2	0360	-- eth
-~n	610,754,0,49,-15,49	2	0361	-- ntilde
-`o	655,786,13,64,-38,64	2	0362	-- ograve
-'o	655,786,13,64,-38,64	2	0363	-- oacute
-^o	655,764,13,64,-38,64	2	0364	-- ocircumflex
-~o	655,754,13,64,-38,64	2	0365	-- otilde
-:o	655,765,13,64,-38,64	2	0366	-- odieresis
-tdi	606,519,13,52,-42,52	0	0367	-- divide
-/o	653,614,64,100,-1,81	0	0370	-- oslash
-`u	608,786,13,84,-50,81	2	0371	-- ugrave
-'u	608,786,13,84,-50,81	2	0372	-- uacute
-^u	608,764,13,84,-50,81	2	0373	-- ucircumflex
-:u	608,765,13,84,-50,81	2	0374	-- udieresis
-'y	536,786,192,138,-47,81	3	0375	-- yacute
-Tp	682,740,192,67,22,67	3	0376	-- thorn
-:y	536,765,192,138,-47,81	3	0377	-- ydieresis
+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
+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
+%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
+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
+/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
+r!	295,548,192,41,-24,41	1	161	exclamdown
+ct	554,707,0,92,-65,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
+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
+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
+aa	375,786,0,119,-153,81	2	180	acute
+mc	608,547,184,70,4,70	0	181	mu
+ps	564,740,110,174,-69,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
+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
+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
+^A	740,927,0,39,38,39	2	194	Acircumflex
+~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
+`I	226,949,0,164,-26,81	2	204	Igrave
+'I	226,949,0,264,-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
+: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
+Tp	682,740,192,67,22,67	3	254	thorn
+:y	536,765,192,138,-47,81	3	255	ydieresis
+u2026	1000,126,0,0,-80	0	256	ellipsis
diff --git a/contrib/groff/font/devps/AR b/contrib/groff/font/devps/AR
index 8d3129a..6490cdc 100644
--- a/contrib/groff/font/devps/AR
+++ b/contrib/groff/font/devps/AR
@@ -233,246 +233,247 @@ y e -20
 y , -110
 y a -30
 charset
-ha	606,740,0,0,-53	2	0000	-- asciicircum
-ti	606,319,0,0,-72	0	0001	-- asciitilde
-vS	498,927,13,0,-22	2	0002	-- Scaron
-vZ	480,927,0,0,-12	2	0003	-- Zcaron
-vs	388,764,13,0,-11	2	0004	-- scaron
-vz	425,764,0,0,-10	2	0005	-- zcaron
-:Y	592,928,0,0,-1	2	0006	-- Ydieresis
-tm	1000,740,0,0,-9	2	0007	-- trademark
-aq	198,740,0,0,-59	2	0010	-- quotesingle
-space	277	0	0040
-!	295,740,0,0,-111	2	0041	-- exclam
-"	309,740,0,0,-36	2	0042	-- quotedbl
+ha	606,740	2	0	asciicircum
+ti	606,319	0	1	asciitilde
+vS	498,927,13	2	2	Scaron
+vZ	480,927	2	3	Zcaron
+vs	388,764,13	2	4	scaron
+vz	425,764	2	5	zcaron
+:Y	592,928	2	6	Ydieresis
+tm	1000,740	2	7	trademark
+aq	198,740	2	8	quotesingle
+space	277	0	32	space
+!	295,740	2	33	exclam
+"	309,740	2	34	quotedbl
 dq	"
-#	554,740,0,0,-33	2	0043	-- numbersign
+#	554,740	2	35	numbersign
 sh	"
-$	554,811,70,0,-70	2	0044	-- dollar
+$	554,811,70	2	36	dollar
 Do	"
-%	775,751,13,0,-21	2	0045	-- percent
-&	757,753,12,0,-56	2	0046	-- ampersand
-'	351,740,0,0,-94	2	0047	-- quoteright
+%	775,751,13	2	37	percent
+&	757,753,12	2	38	ampersand
+'	351,740	2	39	quoteright
 cq	"
-(	369,757,205,0,-47	3	0050	-- parenleft
-)	369,757,205,0,-14	3	0051	-- parenright
-*	425,740,0,0,-58	2	0052	-- asterisk
-+	606,506,0,0,-51	0	0053	-- plus
-,	277,126,67,0,-14	0	0054	-- comma
--	332,315,0,0,-30	0	0055	-- hyphen
+(	369,757,205	3	40	parenleft
+)	369,757,205	3	41	parenright
+*	425,740	2	42	asterisk
++	606,506	0	43	plus
+,	277,126,67	0	44	comma
+-	332,315	0	45	hyphen
 hy	"
-.	277,126,0,0,-102	0	0056	-- period
-/	437,740,100,0,-44	2	0057	-- slash
+.	277,126	0	46	period
+/	437,740,100	2	47	slash
 sl	"
-0	554,753,13,0,-29	2	0060	-- zero
-1	554,740,0,0,-135	2	0061	-- one
-2	554,753,0,0,-40	2	0062	-- two
-3	554,753,13,0,-34	2	0063	-- three
-4	554,740,0,0,-14	2	0064	-- four
-5	554,740,13,0,-26	2	0065	-- five
-6	554,739,13,0,-24	2	0066	-- six
-7	554,740,0,0,-63	2	0067	-- seven
-8	554,753,13,0,-41	2	0070	-- eight
-9	554,752,0,0,-24	2	0071	-- nine
-:	277,548,0,0,-102	0	0072	-- colon
-;	277,548,67,0,-14	0	0073	-- semicolon
-<	606,514,8,0,-46	0	0074	-- less
-=	606,388,0,0,-51	0	0075	-- equal
->	606,514,8,0,-52	0	0076	-- greater
-?	591,752,0,0,-64	2	0077	-- question
-@	867,753,13,0,-65	2	0100	-- at
+0	554,753,13	2	48	zero
+1	554,740	2	49	one
+2	554,753	2	50	two
+3	554,753,13	2	51	three
+4	554,740	2	52	four
+5	554,740,13	2	53	five
+6	554,739,13	2	54	six
+7	554,740	2	55	seven
+8	554,753,13	2	56	eight
+9	554,752	2	57	nine
+:	277,548	0	58	colon
+;	277,548,67	0	59	semicolon
+<	606,514,8	0	60	less
+=	606,388	0	61	equal
+>	606,514,8	0	62	greater
+?	591,752	2	63	question
+@	867,753,13	2	64	at
 at	"
-A	740,740,0,0,-12	2	0101	-- A
-B	574,740,0,0,-74	2	0102	-- B
-C	813,752,13,0,-43	2	0103	-- C
-D	744,740,0,0,-74	2	0104	-- D
-E	536,740,0,0,-70	2	0105	-- E
-F	485,740,0,0,-70	2	0106	-- F
-G	872,753,13,0,-40	2	0107	-- G
-H	683,740,0,0,-76	2	0110	-- H
-I	226,740,0,0,-76	2	0111	-- I
-J	482,740,13,0,-6	2	0112	-- J
-K	591,740,0,0,-81	2	0113	-- K
-L	462,740,0,0,-82	2	0114	-- L
-M	919,740,0,0,-76	2	0115	-- M
-N	740,740,0,0,-75	2	0116	-- N
-O	869,753,13,0,-43	2	0117	-- O
-P	592,740,0,0,-75	2	0120	-- P
-Q	871,753,13,0,-40	2	0121	-- Q
-R	607,740,0,0,-70	2	0122	-- R
-S	498,753,13,0,-22	2	0123	-- S
-T	426,740,0,0,-6	2	0124	-- T
-U	655,740,13,0,-75	2	0125	-- U
-V	702,740,0,0,-8	2	0126	-- V
-W	960,740,0,0,-11	2	0127	-- W
-X	609,740,0,0,-8	2	0130	-- X
-Y	592,740,0,0,-1	2	0131	-- Y
-Z	480,740,0,0,-12	2	0132	-- Z
-[	351,753,179,0,-133	2	0133	-- bracketleft
+A	740,740	2	65	A
+B	574,740	2	66	B
+C	813,752,13	2	67	C
+D	744,740	2	68	D
+E	536,740	2	69	E
+F	485,740	2	70	F
+G	872,753,13	2	71	G
+H	683,740	2	72	H
+I	226,740	2	73	I
+J	482,740,13	2	74	J
+K	591,740	2	75	K
+L	462,740	2	76	L
+M	919,740	2	77	M
+N	740,740	2	78	N
+O	869,753,13	2	79	O
+P	592,740	2	80	P
+Q	871,753,13	2	81	Q
+R	607,740	2	82	R
+S	498,753,13	2	83	S
+T	426,740	2	84	T
+U	655,740,13	2	85	U
+V	702,740	2	86	V
+W	960,740	2	87	W
+X	609,740	2	88	X
+Y	592,740	2	89	Y
+Z	480,740	2	90	Z
+[	351,753,179	2	91	bracketleft
 lB	"
-\	605,740,100,0,-118	2	0134	-- backslash
+\	605,740,100	2	92	backslash
 rs	"
-]	351,753,179,0,-14	2	0135	-- bracketright
+]	351,753,179	2	93	bracketright
 rB	"
-a^	502,764,0,0,-74	2	0136	-- circumflex
+a^	502,764	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	351,740,0,0,-95	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	351,740	2	96	quoteleft
 oq	"
-a	683,561,13,0,-42	0	0141	-- a
-b	682,740,13,0,-68	2	0142	-- b
-c	647,561,13,0,-41	0	0143	-- c
-d	685,740,13,0,-39	2	0144	-- d
-e	650,561,13,0,-38	0	0145	-- e
-f	314,753,0,0,-19	2	0146	-- f
-g	673,561,215,0,-37	1	0147	-- g
-h	610,740,0,0,-62	2	0150	-- h
-i	200,740,0,0,-65	2	0151	-- i
-j	203,740,192,0,44	3	0152	-- j
-k	502,740,0,0,-70	2	0153	-- k
-l	200,740,0,0,-65	2	0154	-- l
-m	938,561,0,0,-66	0	0155	-- m
-n	610,561,0,0,-65	0	0156	-- n
-o	655,561,13,0,-42	0	0157	-- o
-p	682,561,192,0,-64	1	0160	-- p
-q	682,561,192,0,-37	1	0161	-- q
-r	301,561,0,0,-65	0	0162	-- r
-s	388,561,13,0,-24	0	0163	-- s
-t	339,740,0,0,-14	2	0164	-- t
-u	608,547,13,0,-62	0	0165	-- u
-v	554,547,0,0,-7	0	0166	-- v
-w	831,547,0,0,-13	0	0167	-- w
-x	480,547,0,0,-12	0	0170	-- x
-y	536,547,192,0,-15	1	0171	-- y
-z	425,547,0,0,-10	0	0172	-- z
-lC	351,740,189,0,-70	2	0173	-- braceleft
+a	683,561,13	0	97	a
+b	682,740,13	2	98	b
+c	647,561,13	0	99	c
+d	685,740,13	2	100	d
+e	650,561,13	0	101	e
+f	314,753	2	102	f
+g	673,561,215	1	103	g
+h	610,740	2	104	h
+i	200,740	2	105	i
+j	203,740,192,0,44	3	106	j
+k	502,740	2	107	k
+l	200,740	2	108	l
+m	938,561	0	109	m
+n	610,561	0	110	n
+o	655,561,13	0	111	o
+p	682,561,192	1	112	p
+q	682,561,192	1	113	q
+r	301,561	0	114	r
+s	388,561,13	0	115	s
+t	339,740	2	116	t
+u	608,547,13	0	117	u
+v	554,547	0	118	v
+w	831,547	0	119	w
+x	480,547	0	120	x
+y	536,547,192	1	121	y
+z	425,547	0	122	z
+lC	351,740,189	2	123	braceleft
 {	"
-ba	672,740,100,0,-299	2	0174	-- bar
+ba	672,740,100	2	124	bar
 |	"
-rC	351,740,189,0,-20	2	0175	-- braceright
+rC	351,740,189	2	125	braceright
 }	"
-a~	439,754,0,0,-47	2	0176	-- tilde
+a~	439,754	2	126	tilde
 ~	"
-bq	354,126,68,0,-89	0	0200	-- quotesinglbase
-Fo	425,481,0,0,-40	0	0201	-- guillemotleft
-Fc	425,481,0,0,-39	0	0202	-- guillemotright
-bu	606,532,0,0,-150	0	0203	-- bullet
-Fn	554,818,153,0,12	2	0204	-- florin
-f/	166,740,0,114,113	2	0205	-- fraction
-%0	1174,751,13,0,-25	2	0206	-- perthousand
-dg	553,740,133,0,-59	2	0207	-- dagger
-dd	553,740,133,0,-59	2	0210	-- daggerdbl
-en	500,315,0,0,-35	0	0211	-- endash
-em	1000,315,0,0,-35	0	0212	-- emdash
-fi	487,753,0,0,-19	2	0214	-- fi
-fl	485,753,0,0,-19	2	0215	-- fl
-.i	200,547,0,0,-65	0	0220	-- dotlessi
-ga	378,786,0,0,-69	2	0222	-- grave
-a"	552,800,0,0,-119	2	0223	-- hungarumlaut
-a.	222,765,0,0,-74	2	0224	-- dotaccent
-ab	453,754,0,0,-52	2	0225	-- breve
-ah	502,764,0,0,-68	2	0226	-- caron
-ao	332,807,0,0,-62	2	0227	-- ring
-ho	302,0,191,0,-73	1	0230	-- ogonek
-lq	502,740,0,0,-97	2	0231	-- quotedblleft
-rq	484,740,0,0,-96	2	0232	-- quotedblright
-oe	1137,561,13,0,-34	0	0233	-- oe
-/l	300,740,0,0,-43	2	0234	-- lslash
-Bq	502,126,68,0,-89	0	0235	-- quotedblbase
-OE	1194,753,13,0,-45	2	0236	-- OE
-/L	517,740,0,0,-59	2	0237	-- Lslash
-r!	295,548,192,0,-110	1	0241	-- exclamdown
-ct	554,707,0,0,-48	0	0242	-- cent
-Po	554,753,0,0,-4	2	0243	-- sterling
-Cs	554,580,0,0,-8	0	0244	-- currency
-Ye	554,740,0,0,-4	2	0245	-- yen
-bb	672,740,100,0,-299	2	0246	-- brokenbar
-sc	615,753,141,0,-85	2	0247	-- section
-ad	369,765,0,0,-73	2	0250	-- dieresis
-co	747,752,12,8,9	2	0251	-- copyright
-Of	369,753,0,0,3	2	0252	-- ordfeminine
-fo	251,481,0,0,-40	0	0253	-- guilsinglleft
-no	606,388,0,0,-51	0	0254	-- logicalnot
-\-	606,287,0,0,-51	0	0255	-- minus
-rg	747,752,12,8,9	2	0256	-- registered
-a-	485,736,0,0,-73	0	0257	-- macron
-de	400,709,0,0,-56	0	0260	-- degree
-t+-	606,518,24,0,-51	0	0261	-- plusminus
-S2	332,747,0,0,-19	2	0262	-- twosuperior
-S3	332,747,0,0,-18	2	0263	-- threesuperior
-aa	375,786,0,0,-78	2	0264	-- acute
-mc	608,547,184,0,-80	0	0265	-- mu
-ps	564,740,110,0,-22	2	0266	-- paragraph
-pc	277,316,0,0,-102	0	0267	-- periodcentered
-ac	324,0,222,0,-80	1	0270	-- cedilla
-S1	332,740,0,0,-63	2	0271	-- onesuperior
-Om	369,753,0,0,-12	2	0272	-- ordmasculine
-fc	251,481,0,0,-39	0	0273	-- guilsinglright
-14	831,740,0,0,-100	2	0274	-- onequarter
-12	831,740,0,0,-81	2	0275	-- onehalf
-34	831,747,0,0,-46	2	0276	-- threequarters
-r?	591,548,205,0,-65	1	0277	-- questiondown
-`A	740,949,0,0,-12	2	0300	-- Agrave
-'A	740,949,0,0,-12	2	0301	-- Aacute
-^A	740,927,0,0,-12	2	0302	-- Acircumflex
-~A	740,917,0,0,-12	2	0303	-- Atilde
-:A	740,928,0,0,-12	2	0304	-- Adieresis
-oA	740,955,0,0,-12	2	0305	-- Aring
-AE	992,740,0,0,20	2	0306	-- AE
-,C	813,752,222,0,-43	3	0307	-- Ccedilla
-`E	536,949,0,0,-70	2	0310	-- Egrave
-'E	536,949,0,0,-70	2	0311	-- Eacute
-^E	536,927,0,0,-70	2	0312	-- Ecircumflex
-:E	536,928,0,0,-70	2	0313	-- Edieresis
-`I	226,949,0,0,47	2	0314	-- Igrave
-'I	226,949,0,49,-44	2	0315	-- Iacute
-^I	226,927,0,64,64	2	0316	-- Icircumflex
-:I	226,928,0,0,-2	2	0317	-- Idieresis
--D	790,740,0,0,-40	2	0320	-- Eth
-~N	740,917,0,0,-75	2	0321	-- Ntilde
-`O	869,949,13,0,-43	2	0322	-- Ograve
-'O	869,949,13,0,-43	2	0323	-- Oacute
-^O	869,927,13,0,-43	2	0324	-- Ocircumflex
-~O	869,917,13,0,-43	2	0325	-- Otilde
-:O	869,928,13,0,-43	2	0326	-- Odieresis
-tmu	606,482,0,0,-74	0	0327	-- multiply
-/O	868,819,83,0,-43	2	0330	-- Oslash
-`U	655,949,13,0,-75	2	0331	-- Ugrave
-'U	655,949,13,0,-75	2	0332	-- Uacute
-^U	655,927,13,0,-75	2	0333	-- Ucircumflex
-:U	655,928,13,0,-75	2	0334	-- Udieresis
-'Y	592,949,0,0,-1	2	0335	-- Yacute
-TP	592,740,0,0,-60	2	0336	-- Thorn
-ss	554,753,13,0,-61	2	0337	-- germandbls
-`a	683,786,13,0,-42	2	0340	-- agrave
-'a	683,786,13,0,-42	2	0341	-- aacute
-^a	683,764,13,0,-42	2	0342	-- acircumflex
-~a	683,754,13,0,-42	2	0343	-- atilde
-:a	683,765,13,0,-42	2	0344	-- adieresis
-oa	683,807,13,0,-42	2	0345	-- aring
-ae	1157,561,13,0,-34	0	0346	-- ae
-,c	647,561,222,0,-41	1	0347	-- ccedilla
-`e	650,786,13,0,-38	2	0350	-- egrave
-'e	650,786,13,0,-38	2	0351	-- eacute
-^e	650,764,13,0,-38	2	0352	-- ecircumflex
-:e	650,765,13,0,-38	2	0353	-- edieresis
-`i	200,786,0,0,60	2	0354	-- igrave
-'i	200,786,0,62,-31	2	0355	-- iacute
-^i	200,764,0,77,77	2	0356	-- icircumflex
-:i	200,765,0,11,11	2	0357	-- idieresis
-Sd	655,753,12,0,-42	2	0360	-- eth
-~n	610,754,0,0,-65	2	0361	-- ntilde
-`o	655,786,13,0,-42	2	0362	-- ograve
-'o	655,786,13,0,-42	2	0363	-- oacute
-^o	655,764,13,0,-42	2	0364	-- ocircumflex
-~o	655,754,13,0,-42	2	0365	-- otilde
-:o	655,765,13,0,-42	2	0366	-- odieresis
-tdi	606,519,13,0,-51	0	0367	-- divide
-/o	653,614,64,0,-41	0	0370	-- oslash
-`u	608,786,13,0,-62	2	0371	-- ugrave
-'u	608,786,13,0,-62	2	0372	-- uacute
-^u	608,764,13,0,-62	2	0373	-- ucircumflex
-:u	608,765,13,0,-62	2	0374	-- udieresis
-'y	536,786,192,0,-15	3	0375	-- yacute
-Tp	682,740,192,0,-64	3	0376	-- thorn
-:y	536,765,192,0,-15	3	0377	-- ydieresis
+bq	354,126,68	0	128	quotesinglbase
+Fo	425,481	0	129	guillemotleft
+Fc	425,481	0	130	guillemotright
+bu	606,532	0	131	bullet
+Fn	554,818,153,0,12	2	132	florin
+f/	166,740,0,114,113	2	133	fraction
+%0	1174,751,13	2	134	perthousand
+dg	553,740,133	2	135	dagger
+dd	553,740,133	2	136	daggerdbl
+en	500,315	0	137	endash
+em	1000,315	0	138	emdash
+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.	222,765	2	148	dotaccent
+ab	453,754	2	149	breve
+ah	502,764	2	150	caron
+ao	332,807	2	151	ring
+ho	302,0,191	1	152	ogonek
+lq	502,740	2	153	quotedblleft
+rq	484,740	2	154	quotedblright
+oe	1137,561,13	0	155	oe
+/l	300,740	2	156	lslash
+Bq	502,126,68	0	157	quotedblbase
+OE	1194,753,13	2	158	OE
+/L	517,740	2	159	Lslash
+r!	295,548,192	1	161	exclamdown
+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
+sc	615,753,141	2	167	section
+ad	369,765	2	168	dieresis
+co	747,752,12,8,9	2	169	copyright
+Of	369,753,0,0,3	2	170	ordfeminine
+fo	251,481	0	171	guilsinglleft
+tno	606,388	0	172	logicalnot
+\-	606,287	0	173	minus
+rg	747,752,12,8,9	2	174	registered
+a-	485,736	0	175	macron
+de	400,709	0	176	degree
+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
+mc	608,547,184	0	181	mu
+ps	564,740,110	2	182	paragraph
+pc	277,316	0	183	periodcentered
+ac	324,0,222	1	184	cedilla
+S1	332,740	2	185	onesuperior
+Om	369,753	2	186	ordmasculine
+fc	251,481	0	187	guilsinglright
+14	831,740	2	188	onequarter
+12	831,740	2	189	onehalf
+34	831,747	2	190	threequarters
+r?	591,548,205	1	191	questiondown
+`A	740,949	2	192	Agrave
+'A	740,949	2	193	Aacute
+^A	740,927	2	194	Acircumflex
+~A	740,917	2	195	Atilde
+:A	740,928	2	196	Adieresis
+oA	740,955	2	197	Aring
+AE	992,740,0,0,20	2	198	AE
+,C	813,752,222	3	199	Ccedilla
+`E	536,949	2	200	Egrave
+'E	536,949	2	201	Eacute
+^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,927,0,64,64	2	206	Icircumflex
+:I	226,928	2	207	Idieresis
+-D	790,740	2	208	Eth
+~N	740,917	2	209	Ntilde
+`O	869,949,13	2	210	Ograve
+'O	869,949,13	2	211	Oacute
+^O	869,927,13	2	212	Ocircumflex
+~O	869,917,13	2	213	Otilde
+:O	869,928,13	2	214	Odieresis
+tmu	606,482	0	215	multiply
+/O	868,819,83	2	216	Oslash
+`U	655,949,13	2	217	Ugrave
+'U	655,949,13	2	218	Uacute
+^U	655,927,13	2	219	Ucircumflex
+:U	655,928,13	2	220	Udieresis
+'Y	592,949	2	221	Yacute
+TP	592,740	2	222	Thorn
+ss	554,753,13	2	223	germandbls
+`a	683,786,13	2	224	agrave
+'a	683,786,13	2	225	aacute
+^a	683,764,13	2	226	acircumflex
+~a	683,754,13	2	227	atilde
+:a	683,765,13	2	228	adieresis
+oa	683,807,13	2	229	aring
+ae	1157,561,13	0	230	ae
+,c	647,561,222	1	231	ccedilla
+`e	650,786,13	2	232	egrave
+'e	650,786,13	2	233	eacute
+^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,764,0,77,77	2	238	icircumflex
+:i	200,765,0,11,11	2	239	idieresis
+Sd	655,753,12	2	240	eth
+~n	610,754	2	241	ntilde
+`o	655,786,13	2	242	ograve
+'o	655,786,13	2	243	oacute
+^o	655,764,13	2	244	ocircumflex
+~o	655,754,13	2	245	otilde
+:o	655,765,13	2	246	odieresis
+tdi	606,519,13	0	247	divide
+/o	653,614,64	0	248	oslash
+`u	608,786,13	2	249	ugrave
+'u	608,786,13	2	250	uacute
+^u	608,764,13	2	251	ucircumflex
+:u	608,765,13	2	252	udieresis
+'y	536,786,192	3	253	yacute
+Tp	682,740,192	3	254	thorn
+:y	536,765,192	3	255	ydieresis
+u2026	1000,126	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMB b/contrib/groff/font/devps/BMB
index 96a7258..edb18a8 100644
--- a/contrib/groff/font/devps/BMB
+++ b/contrib/groff/font/devps/BMB
@@ -100,246 +100,247 @@ r d -10
 r , -101
 r c -9
 charset
-ha	600,681,0,0,-52	2	0000	-- asciicircum
-ti	600,368,0,0,-51	0	0001	-- asciitilde
-vS	660,896,17,0,-21	2	0002	-- Scaron
-vZ	640,896,0,0,-6	2	0003	-- Zcaron
-vs	520,717,8,0,-22	2	0004	-- scaron
-vz	560,717,0,0,-22	2	0005	-- zcaron
-:Y	700,877,0,18,20	2	0006	-- Ydieresis
-tm	980,681,0,2,-42	2	0007	-- trademark
-aq	240,698,0,0,-42	2	0010	-- quotesingle
-space	340	0	0040
-!	360,698,8,0,-82	2	0041	-- exclam
-"	420,698,0,0,-11	2	0042	-- quotedbl
+ha	600,681	2	0	asciicircum
+ti	600,368	0	1	asciitilde
+vS	660,896,17	2	2	Scaron
+vZ	640,896	2	3	Zcaron
+vs	520,717,8	2	4	scaron
+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
+space	340	0	32	space
+!	360,698,8	2	33	exclam
+"	420,698	2	34	quotedbl
 dq	"
-#	660,681,0,0,-84	2	0043	-- numbersign
+#	660,681	2	35	numbersign
 sh	"
-$	660,805,119,0,-48	2	0044	-- dollar
+$	660,805,119	2	36	dollar
 Do	"
-%	940,698,8,0,-12	2	0045	-- percent
-&	800,698,17,0,-21	2	0046	-- ampersand
-'	320,698,0,0,-82	2	0047	-- quoteright
+%	940,698,8	2	37	percent
+&	800,698,17	2	38	ampersand
+'	320,698	2	39	quoteright
 cq	"
-(	320,749,150,0,-48	2	0050	-- parenleft
-)	320,749,150,0,-20	2	0051	-- parenright
-*	460,697,0,0,-62	2	0052	-- asterisk
-+	600,514,0,0,-51	0	0053	-- plus
-,	340,162,124,0,-78	0	0054	-- comma
--	360,318,0,0,-20	0	0055	-- hyphen
+(	320,749,150	2	40	parenleft
+)	320,749,150	2	41	parenright
+*	460,697	2	42	asterisk
++	600,514	0	43	plus
+,	340,162,124	0	44	comma
+-	360,318	0	45	hyphen
 hy	"
-.	340,172,8,0,-76	0	0056	-- period
-/	600,725,149,0,-50	2	0057	-- slash
+.	340,172,8	0	46	period
+/	600,725,149	2	47	slash
 sl	"
-0	660,698,17,0,-30	2	0060	-- zero
-1	660,681,0,0,-137	2	0061	-- one
-2	660,698,0,0,-41	2	0062	-- two
-3	660,698,17,0,-37	2	0063	-- three
-4	660,681,0,0,-19	2	0064	-- four
-5	660,723,17,0,-44	2	0065	-- five
-6	660,698,17,0,-34	2	0066	-- six
-7	660,681,0,0,-36	2	0067	-- seven
-8	660,698,17,0,-36	2	0070	-- eight
-9	660,698,17,0,-33	2	0071	-- nine
-:	340,515,8,0,-76	0	0072	-- colon
-;	340,515,124,0,-75	0	0073	-- semicolon
-<	600,542,9,0,-49	0	0074	-- less
-=	600,421,0,0,-51	0	0075	-- equal
->	600,542,9,0,-48	0	0076	-- greater
-?	660,698,8,0,-61	2	0077	-- question
-@	820,698,17,0,-60	2	0100	-- at
+0	660,698,17	2	48	zero
+1	660,681	2	49	one
+2	660,698	2	50	two
+3	660,698,17	2	51	three
+4	660,681	2	52	four
+5	660,723,17	2	53	five
+6	660,698,17	2	54	six
+7	660,681	2	55	seven
+8	660,698,17	2	56	eight
+9	660,698,17	2	57	nine
+:	340,515,8	0	58	colon
+;	340,515,124	0	59	semicolon
+<	600,542,9	0	60	less
+=	600,421	0	61	equal
+>	600,542,9	0	62	greater
+?	660,698,8	2	63	question
+@	820,698,17	2	64	at
 at	"
-A	720,681,0,43,34	2	0101	-- A
-B	720,681,0,0,-20	2	0102	-- B
-C	740,698,17,0,-35	2	0103	-- C
-D	780,681,0,0,-20	2	0104	-- D
-E	720,681,0,4,-20	2	0105	-- E
-F	680,681,0,6,-20	2	0106	-- F
-G	780,698,17,0,-35	2	0107	-- G
-H	820,681,0,0,-20	2	0110	-- H
-I	400,681,0,0,-20	2	0111	-- I
-J	640,681,17,0,12	2	0112	-- J
-K	800,681,0,0,-20	2	0113	-- K
-L	640,681,0,28,-20	2	0114	-- L
-M	940,681,0,0,-20	2	0115	-- M
-N	740,681,0,0,-20	2	0116	-- N
-O	800,698,17,0,-35	2	0117	-- O
-P	660,681,0,0,-20	2	0120	-- P
-Q	800,698,226,0,-35	3	0121	-- Q
-R	780,681,0,3,-20	2	0122	-- R
-S	660,698,17,0,-21	2	0123	-- S
-T	700,681,0,3,4	2	0124	-- T
-U	740,681,17,0,-15	2	0125	-- U
-V	720,681,0,10,20	2	0126	-- V
-W	940,681,0,23,20	2	0127	-- W
-X	780,681,0,0,-1	2	0130	-- X
-Y	700,681,0,18,20	2	0131	-- Y
-Z	640,681,0,0,-6	2	0132	-- Z
-[	300,725,138,0,-75	2	0133	-- bracketleft
+A	720,681,0,43,34	2	65	A
+B	720,681	2	66	B
+C	740,698,17	2	67	C
+D	780,681	2	68	D
+E	720,681,0,4	2	69	E
+F	680,681,0,6	2	70	F
+G	780,698,17	2	71	G
+H	820,681	2	72	H
+I	400,681	2	73	I
+J	640,681,17,0,12	2	74	J
+K	800,681	2	75	K
+L	640,681,0,28	2	76	L
+M	940,681	2	77	M
+N	740,681	2	78	N
+O	800,698,17	2	79	O
+P	660,681	2	80	P
+Q	800,698,226	3	81	Q
+R	780,681,0,3	2	82	R
+S	660,698,17	2	83	S
+T	700,681,0,3,4	2	84	T
+U	740,681,17	2	85	U
+V	720,681,0,10,20	2	86	V
+W	940,681,0,23,20	2	87	W
+X	780,681	2	88	X
+Y	700,681,0,18,20	2	89	Y
+Z	640,681	2	90	Z
+[	300,725,138	2	91	bracketleft
 lB	"
-\	600,725,0,0,-50	2	0134	-- backslash
+\	600,725	2	92	backslash
 rs	"
-]	300,725,138,0,-21	2	0135	-- bracketright
+]	300,725,138	2	93	bracketright
 rB	"
-a^	500,731,0,0,-68	2	0136	-- circumflex
+a^	500,731	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	320,698,0,0,-82	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	320,698	2	96	quoteleft
 oq	"
-a	580,515,8,8,-28	0	0141	-- a
-b	600,725,8,0,20	2	0142	-- b
-c	580,515,8,0,-31	0	0143	-- c
-d	640,725,8,0,-31	2	0144	-- d
-e	580,515,8,0,-31	0	0145	-- e
-f	380,741,0,81,-22	2	0146	-- f
-g	580,595,243,3,-9	1	0147	-- g
-h	680,725,0,0,-22	2	0150	-- h
-i	360,729,0,0,-22	2	0151	-- i
-j	340,729,221,0,94	3	0152	-- j
-k	660,725,0,0,-22	2	0153	-- k
-l	340,725,0,0,-9	2	0154	-- l
-m	1000,515,0,0,-22	0	0155	-- m
-n	680,515,0,0,-22	0	0156	-- n
-o	620,515,8,0,-31	0	0157	-- o
-p	640,515,212,0,-22	1	0160	-- p
-q	620,515,212,13,-31	1	0161	-- q
-r	460,502,0,2,-22	0	0162	-- r
-s	520,515,8,0,-22	0	0163	-- s
-t	460,660,8,0,-22	2	0164	-- t
-u	660,502,8,0,-22	0	0165	-- u
-v	600,502,0,0,6	0	0166	-- v
-w	800,502,0,10,6	0	0167	-- w
-x	600,502,0,0,-8	0	0170	-- x
-y	620,502,221,0,-6	1	0171	-- y
-z	560,502,0,0,-22	0	0172	-- z
-lC	320,726,139,0,-14	2	0173	-- braceleft
+a	580,515,8,8	0	97	a
+b	600,725,8,0,20	2	98	b
+c	580,515,8	0	99	c
+d	640,725,8	2	100	d
+e	580,515,8	0	101	e
+f	380,741,0,81	2	102	f
+g	580,595,243,3	1	103	g
+h	680,725	2	104	h
+i	360,729	2	105	i
+j	340,729,221,0,94	3	106	j
+k	660,725	2	107	k
+l	340,725	2	108	l
+m	1000,515	0	109	m
+n	680,515	0	110	n
+o	620,515,8	0	111	o
+p	640,515,212	1	112	p
+q	620,515,212,13	1	113	q
+r	460,502,0,2	0	114	r
+s	520,515,8	0	115	s
+t	460,660,8	2	116	t
+u	660,502,8	0	117	u
+v	600,502,0,0,6	0	118	v
+w	800,502,0,10,6	0	119	w
+x	600,502	0	120	x
+y	620,502,221	1	121	y
+z	560,502	0	122	z
+lC	320,726,139	2	123	braceleft
 {	"
-ba	600,750,250,0,-243	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	320,725,140,0,-15	2	0175	-- braceright
+rC	320,725,140	2	125	braceright
 }	"
-a~	480,691,0,0,-69	2	0176	-- tilde
+a~	480,691	2	126	tilde
 ~	"
-bq	320,144,114,0,-82	0	0200	-- quotesinglbase
-Fo	400,457,0,0,-34	0	0201	-- guillemotleft
-Fc	400,457,0,0,-34	0	0202	-- guillemotright
-bu	460,511,0,0,-60	0	0203	-- bullet
-Fn	660,749,209,14,46	2	0204	-- florin
-f/	120,681,0,192,194	2	0205	-- fraction
-%0	1360,698,8,0,-12	2	0206	-- perthousand
-dg	440,698,156,0,-33	2	0207	-- dagger
-dd	380,698,156,0,-8	2	0210	-- daggerdbl
-en	500,318,0,25,25	0	0211	-- endash
-em	1000,318,0,25,25	0	0212	-- emdash
-fi	740,741,0,0,-22	2	0214	-- fi
-fl	740,741,0,0,-22	2	0215	-- fl
-.i	360,502,0,0,-22	0	0220	-- dotlessi
-ga	400,730,0,0,-68	2	0222	-- grave
-a"	440,741,0,0,-68	2	0223	-- hungarumlaut
-a.	320,730,0,0,-68	2	0224	-- dotaccent
-ab	500,722,0,0,-68	2	0225	-- breve
-ah	500,717,0,0,-68	2	0226	-- caron
-ao	340,755,0,0,-68	2	0227	-- ring
-ho	320,0,163,0,-68	0	0230	-- ogonek
-lq	540,698,0,0,-82	2	0231	-- quotedblleft
-rq	540,698,0,0,-82	2	0232	-- quotedblright
-oe	940,515,8,0,-31	0	0233	-- oe
-/l	340,725,0,0,-9	2	0234	-- lslash
-Bq	540,144,114,0,-82	0	0235	-- quotedblbase
-OE	1220,698,17,0,-35	2	0236	-- OE
-/L	640,681,0,28,-20	2	0237	-- Lslash
-r!	360,515,191,0,-84	0	0241	-- exclamdown
-ct	660,674,0,0,-133	2	0242	-- cent
-Po	660,698,17,0,-10	2	0243	-- sterling
-Cs	660,593,0,0,-77	0	0244	-- currency
-Ye	660,681,0,36,28	2	0245	-- yen
-bb	600,675,175,0,-243	2	0246	-- brokenbar
-sc	600,698,153,0,-36	2	0247	-- section
-ad	500,698,0,0,-68	2	0250	-- dieresis
-co	740,698,17,0,-23	2	0251	-- copyright
-Of	400,698,0,0,-27	2	0252	-- ordfeminine
-fo	220,457,0,0,-34	0	0253	-- guilsinglleft
-no	600,421,0,0,-51	0	0254	-- logicalnot
-\-	600,323,0,0,-51	0	0255	-- minus
-rg	740,698,17,0,-23	2	0256	-- registered
-a-	460,663,0,0,-68	2	0257	-- macron
-de	400,698,0,0,-50	2	0260	-- degree
-t+-	600,514,0,0,-51	0	0261	-- plusminus
-S2	396,698,0,0,-14	2	0262	-- twosuperior
-S3	396,698,0,0,-5	2	0263	-- threesuperior
-aa	400,731,0,0,-68	2	0264	-- acute
-mc	660,502,221,0,-22	1	0265	-- mu
-ps	800,681,0,0,-51	2	0266	-- paragraph
-pc	340,355,0,0,-76	0	0267	-- periodcentered
-ac	360,0,213,0,-68	1	0270	-- cedilla
-S1	396,687,0,0,-65	2	0271	-- onesuperior
-Om	400,698,0,0,-17	2	0272	-- ordmasculine
-fc	220,457,0,0,-34	0	0273	-- guilsinglright
-14	990,681,0,0,-65	2	0274	-- onequarter
-12	990,681,0,0,-65	2	0275	-- onehalf
-34	990,692,0,0,-15	2	0276	-- threequarters
-r?	660,515,191,0,-62	0	0277	-- questiondown
-`A	720,909,0,43,34	2	0300	-- Agrave
-'A	720,910,0,43,34	2	0301	-- Aacute
-^A	720,910,0,43,34	2	0302	-- Acircumflex
-~A	720,870,0,43,34	2	0303	-- Atilde
-:A	720,877,0,43,34	2	0304	-- Adieresis
-oA	720,934,0,43,34	2	0305	-- Aring
-AE	1140,681,0,9,34	2	0306	-- AE
-,C	740,698,213,0,-35	3	0307	-- Ccedilla
-`E	720,909,0,4,-20	2	0310	-- Egrave
-'E	720,910,0,4,-20	2	0311	-- Eacute
-^E	720,910,0,4,-20	2	0312	-- Ecircumflex
-:E	720,877,0,4,-20	2	0313	-- Edieresis
-`I	400,909,0,0,-20	2	0314	-- Igrave
-'I	400,910,0,0,-20	2	0315	-- Iacute
-^I	400,910,0,0,-18	2	0316	-- Icircumflex
-:I	400,877,0,0,-18	2	0317	-- Idieresis
--D	780,681,0,0,-20	2	0320	-- Eth
-~N	740,870,0,0,-20	2	0321	-- Ntilde
-`O	800,909,17,0,-35	2	0322	-- Ograve
-'O	800,910,17,0,-35	2	0323	-- Oacute
-^O	800,910,17,0,-35	2	0324	-- Ocircumflex
-~O	800,870,17,0,-35	2	0325	-- Otilde
-:O	800,877,17,0,-35	2	0326	-- Odieresis
-tmu	600,514,0,0,-48	0	0327	-- multiply
-/O	800,781,110,0,-35	2	0330	-- Oslash
-`U	740,909,17,0,-15	2	0331	-- Ugrave
-'U	740,910,17,0,-15	2	0332	-- Uacute
-^U	740,910,17,0,-15	2	0333	-- Ucircumflex
-:U	740,877,17,0,-15	2	0334	-- Udieresis
-'Y	700,910,0,18,20	2	0335	-- Yacute
-TP	660,681,0,0,-20	2	0336	-- Thorn
-ss	660,699,91,0,61	2	0337	-- germandbls
-`a	580,730,8,8,-28	2	0340	-- agrave
-'a	580,731,8,8,-28	2	0341	-- aacute
-^a	580,731,8,8,-28	2	0342	-- acircumflex
-~a	580,691,8,8,-28	2	0343	-- atilde
-:a	580,698,8,8,-28	2	0344	-- adieresis
-oa	580,755,8,8,-28	2	0345	-- aring
-ae	880,515,8,0,-28	0	0346	-- ae
-,c	580,515,213,0,-31	1	0347	-- ccedilla
-`e	580,730,8,0,-31	2	0350	-- egrave
-'e	580,731,8,0,-31	2	0351	-- eacute
-^e	580,731,8,0,-31	2	0352	-- ecircumflex
-:e	580,698,8,0,-31	2	0353	-- edieresis
-`i	360,730,0,0,-22	2	0354	-- igrave
-'i	360,731,0,0,-22	2	0355	-- iacute
-^i	360,731,0,0,2	2	0356	-- icircumflex
-:i	360,698,0,11,2	2	0357	-- idieresis
-Sd	620,741,8,0,-31	2	0360	-- eth
-~n	680,691,0,0,-22	2	0361	-- ntilde
-`o	620,730,8,0,-31	2	0362	-- ograve
-'o	620,731,8,0,-31	2	0363	-- oacute
-^o	620,731,8,0,-31	2	0364	-- ocircumflex
-~o	620,691,8,0,-31	2	0365	-- otilde
-:o	620,698,8,0,-31	2	0366	-- odieresis
-tdi	600,521,0,0,-51	0	0367	-- divide
-/o	620,551,40,0,-31	0	0370	-- oslash
-`u	660,730,8,0,-22	2	0371	-- ugrave
-'u	660,731,8,0,-22	2	0372	-- uacute
-^u	660,731,8,0,-22	2	0373	-- ucircumflex
-:u	660,698,8,0,-22	2	0374	-- udieresis
-'y	620,731,221,0,-6	3	0375	-- yacute
-Tp	640,725,212,0,-22	3	0376	-- thorn
-:y	620,698,221,0,-6	3	0377	-- ydieresis
+bq	320,144,114	0	128	quotesinglbase
+Fo	400,457	0	129	guillemotleft
+Fc	400,457	0	130	guillemotright
+bu	460,511	0	131	bullet
+Fn	660,749,209,14,46	2	132	florin
+f/	120,681,0,192,194	2	133	fraction
+%0	1360,698,8	2	134	perthousand
+dg	440,698,156	2	135	dagger
+dd	380,698,156	2	136	daggerdbl
+en	500,318,0,25,25	0	137	endash
+em	1000,318,0,25,25	0	138	emdash
+fi	740,741	2	140	fi
+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
+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
+lq	540,698	2	153	quotedblleft
+rq	540,698	2	154	quotedblright
+oe	940,515,8	0	155	oe
+/l	340,725	2	156	lslash
+Bq	540,144,114	0	157	quotedblbase
+OE	1220,698,17	2	158	OE
+/L	640,681,0,28	2	159	Lslash
+r!	360,515,191	0	161	exclamdown
+ct	660,674	2	162	cent
+Po	660,698,17	2	163	sterling
+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
+co	740,698,17	2	169	copyright
+Of	400,698	2	170	ordfeminine
+fo	220,457	0	171	guilsinglleft
+tno	600,421	0	172	logicalnot
+\-	600,323	0	173	minus
+rg	740,698,17	2	174	registered
+a-	460,663	2	175	macron
+de	400,698	2	176	degree
+t+-	600,514	0	177	plusminus
+S2	396,698	2	178	twosuperior
+S3	396,698	2	179	threesuperior
+aa	400,731	2	180	acute
+mc	660,502,221	1	181	mu
+ps	800,681	2	182	paragraph
+pc	340,355	0	183	periodcentered
+ac	360,0,213	1	184	cedilla
+S1	396,687	2	185	onesuperior
+Om	400,698	2	186	ordmasculine
+fc	220,457	0	187	guilsinglright
+14	990,681	2	188	onequarter
+12	990,681	2	189	onehalf
+34	990,692	2	190	threequarters
+r?	660,515,191	0	191	questiondown
+`A	720,909,0,43,34	2	192	Agrave
+'A	720,910,0,43,34	2	193	Aacute
+^A	720,910,0,43,34	2	194	Acircumflex
+~A	720,870,0,43,34	2	195	Atilde
+:A	720,877,0,43,34	2	196	Adieresis
+oA	720,934,0,43,34	2	197	Aring
+AE	1140,681,0,9,34	2	198	AE
+,C	740,698,213	3	199	Ccedilla
+`E	720,909,0,4	2	200	Egrave
+'E	720,910,0,4	2	201	Eacute
+^E	720,910,0,4	2	202	Ecircumflex
+:E	720,877,0,4	2	203	Edieresis
+`I	400,909	2	204	Igrave
+'I	400,910	2	205	Iacute
+^I	400,910	2	206	Icircumflex
+:I	400,877	2	207	Idieresis
+-D	780,681	2	208	Eth
+~N	740,870	2	209	Ntilde
+`O	800,909,17	2	210	Ograve
+'O	800,910,17	2	211	Oacute
+^O	800,910,17	2	212	Ocircumflex
+~O	800,870,17	2	213	Otilde
+:O	800,877,17	2	214	Odieresis
+tmu	600,514	0	215	multiply
+/O	800,781,110	2	216	Oslash
+`U	740,909,17	2	217	Ugrave
+'U	740,910,17	2	218	Uacute
+^U	740,910,17	2	219	Ucircumflex
+:U	740,877,17	2	220	Udieresis
+'Y	700,910,0,18,20	2	221	Yacute
+TP	660,681	2	222	Thorn
+ss	660,699,91,0,61	2	223	germandbls
+`a	580,730,8,8	2	224	agrave
+'a	580,731,8,8	2	225	aacute
+^a	580,731,8,8	2	226	acircumflex
+~a	580,691,8,8	2	227	atilde
+:a	580,698,8,8	2	228	adieresis
+oa	580,755,8,8	2	229	aring
+ae	880,515,8	0	230	ae
+,c	580,515,213	1	231	ccedilla
+`e	580,730,8	2	232	egrave
+'e	580,731,8	2	233	eacute
+^e	580,731,8	2	234	ecircumflex
+:e	580,698,8	2	235	edieresis
+`i	360,730	2	236	igrave
+'i	360,731	2	237	iacute
+^i	360,731,0,0,2	2	238	icircumflex
+:i	360,698,0,11,2	2	239	idieresis
+Sd	620,741,8	2	240	eth
+~n	680,691	2	241	ntilde
+`o	620,730,8	2	242	ograve
+'o	620,731,8	2	243	oacute
+^o	620,731,8	2	244	ocircumflex
+~o	620,691,8	2	245	otilde
+:o	620,698,8	2	246	odieresis
+tdi	600,521	0	247	divide
+/o	620,551,40	0	248	oslash
+`u	660,730,8	2	249	ugrave
+'u	660,731,8	2	250	uacute
+^u	660,731,8	2	251	ucircumflex
+:u	660,698,8	2	252	udieresis
+'y	620,731,221	3	253	yacute
+Tp	640,725,212	3	254	thorn
+:y	620,698,221	3	255	ydieresis
+u2026	1000,172,8	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMBI b/contrib/groff/font/devps/BMBI
index 32b1422..b794a71 100644
--- a/contrib/groff/font/devps/BMBI
+++ b/contrib/groff/font/devps/BMBI
@@ -103,246 +103,247 @@ r d -3
 r , -113
 r c -5
 charset
-ha	620,681,0,24,-42,24	2	0000	-- asciicircum
-ti	620,368,0,35,-51,35	0	0001	-- asciitilde
-vS	700,915,17,81,-9,73	2	0002	-- Scaron
-vZ	680,915,0,110,27,73	2	0003	-- Zcaron
-vs	540,749,8,83,18,73	2	0004	-- scaron
-vz	560,749,8,76,14,73	2	0005	-- zcaron
-:Y	660,900,0,207,-22,73	2	0006	-- Ydieresis
-tm	940,681,0,92,8,73	2	0007	-- trademark
-aq	180,696,0,165,-76,73	2	0010	-- quotesingle
-space	340	0	0040
-!	320,698,8,96,-36,73	2	0041	-- exclam
-"	380,697,0,177,-90,73	2	0042	-- quotedbl
+ha	620,681,0,24,-42,24	2	0	asciicircum
+ti	620,368,0,35,-51,35	0	1	asciitilde
+vS	700,915,17,81,-9,73	2	2	Scaron
+vZ	680,915,0,110,27,73	2	3	Zcaron
+vs	540,749,8,83,18,73	2	4	scaron
+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
+space	340	0	32	space
+!	320,698,8,96,-36,73	2	33	exclam
+"	380,697,0,177,-90,73	2	34	quotedbl
 dq	"
-#	680,681,0,19,-107,19	2	0043	-- numbersign
+#	680,681,0,19,-107,19	2	35	numbersign
 sh	"
-$	680,790,164,67,5,67	2	0044	-- dollar
+$	680,790,164,67,5,67	2	36	dollar
 Do	"
-%	880,698,17,69,-56,69	2	0045	-- percent
-&	980,698,17,86,2,73	2	0046	-- ampersand
-'	320,698,0,79,-121,73	2	0047	-- quoteright
+%	880,698,17,69,-56,69	2	37	percent
+&	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	0050	-- parenleft
-)	260,741,134,112,85,73	2	0051	-- parenright
-*	460,698,0,98,-76,73	2	0052	-- asterisk
-+	600,514,0,45,-41,45	0	0053	-- plus
-,	340,185,124,8,-50,8	0	0054	-- comma
--	280,313,0,89,-9,73	0	0055	-- hyphen
+(	260,741,134,178,19,73	2	40	parenleft
+)	260,741,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
+-	280,313,0,89,-9,73	0	45	hyphen
 hy	"
-.	340,177,8,6,-56,6	0	0056	-- period
-/	360,742,106,192,41,73	2	0057	-- slash
+.	340,177,8,6,-56,6	0	46	period
+/	360,742,106,192,41,73	2	47	slash
 sl	"
-0	680,698,17,73,-37,73	2	0060	-- zero
-1	680,681,0,0,-73	2	0061	-- one
-2	680,698,0,44,-17,44	2	0062	-- two
-3	680,698,17,53,-22,53	2	0063	-- three
-4	680,681,0,78,-13,73	2	0064	-- four
-5	680,681,17,39,-28,39	2	0065	-- five
-6	680,698,17,74,-38,73	2	0066	-- six
-7	680,681,0,109,-73,73	2	0067	-- seven
-8	680,698,17,56,-18,56	2	0070	-- eight
-9	680,698,17,82,-21,73	2	0071	-- nine
-:	340,515,8,66,-56,66	0	0072	-- colon
-;	340,515,124,62,-50,62	0	0073	-- semicolon
-<	620,540,9,18,-29,18	0	0074	-- less
-=	600,421,0,45,-41,45	0	0075	-- equal
->	620,540,9,28,-39,28	0	0076	-- greater
-?	620,698,8,98,-95,73	2	0077	-- question
-@	780,698,17,60,-30,60	2	0100	-- at
+0	680,698,17,73,-37,73	2	48	zero
+1	680,681,0,0,-73	2	49	one
+2	680,698,0,44,-17,44	2	50	two
+3	680,698,17,53,-22,53	2	51	three
+4	680,681,0,78,-13,73	2	52	four
+5	680,681,17,39,-28,39	2	53	five
+6	680,698,17,74,-38,73	2	54	six
+7	680,681,0,109,-73,73	2	55	seven
+8	680,698,17,56,-18,56	2	56	eight
+9	680,698,17,82,-21,73	2	57	nine
+:	340,515,8,66,-56,66	0	58	colon
+;	340,515,124,62,-50,62	0	59	semicolon
+<	620,540,9,18,-29,18	0	60	less
+=	600,421,0,45,-41,45	0	61	equal
+>	620,540,9,28,-39,28	0	62	greater
+?	620,698,8,98,-95,73	2	63	question
+@	780,698,17,60,-30,60	2	64	at
 at	"
-A	720,681,0,99,77,73	2	0101	-- A
-B	720,681,0,92,36,73	2	0102	-- B
-C	700,698,17,104,-28,73	2	0103	-- C
-D	760,681,0,95,36,73	2	0104	-- D
-E	720,681,0,107,36,73	2	0105	-- E
-F	660,681,0,153,36,73	2	0106	-- F
-G	760,698,17,118,-27,73	2	0107	-- G
-H	800,681,0,160,36,73	2	0110	-- H
-I	380,681,0,155,36,73	2	0111	-- I
-J	620,681,17,151,42,73	2	0112	-- J
-K	780,681,0,149,36,73	2	0113	-- K
-L	640,681,0,135,36,73	2	0114	-- L
-M	860,681,0,160,36,73	2	0115	-- M
-N	740,681,0,155,36,73	2	0116	-- N
-O	760,698,17,96,-28,73	2	0117	-- O
-P	640,681,0,134,56,73	2	0120	-- P
-Q	760,698,213,95,13,73	3	0121	-- Q
-R	740,681,0,75,36,73	2	0122	-- R
-S	700,698,17,81,-9,73	2	0123	-- S
-T	700,681,0,152,-20,73	2	0124	-- T
-U	740,681,17,165,-62,73	2	0125	-- U
-V	660,681,0,209,-22,73	2	0126	-- V
-W	1000,681,0,140,-22,73	2	0127	-- W
-X	740,681,0,145,57,73	2	0130	-- X
-Y	660,681,0,207,-22,73	2	0131	-- Y
-Z	680,681,0,110,27,73	2	0132	-- Z
-[	260,741,118,164,41,73	2	0133	-- bracketleft
+A	720,681,0,99,77,73	2	65	A
+B	720,681,0,92,36,73	2	66	B
+C	700,698,17,104,-28,73	2	67	C
+D	760,681,0,95,36,73	2	68	D
+E	720,681,0,107,36,73	2	69	E
+F	660,681,0,153,36,73	2	70	F
+G	760,698,17,118,-27,73	2	71	G
+H	800,681,0,160,36,73	2	72	H
+I	380,681,0,155,36,73	2	73	I
+J	620,681,17,151,42,73	2	74	J
+K	780,681,0,149,36,73	2	75	K
+L	640,681,0,135,36,73	2	76	L
+M	860,681,0,160,36,73	2	77	M
+N	740,681,0,155,36,73	2	78	N
+O	760,698,17,96,-28,73	2	79	O
+P	640,681,0,134,56,73	2	80	P
+Q	760,698,213,95,13,73	3	81	Q
+R	740,681,0,75,36,73	2	82	R
+S	700,698,17,81,-9,73	2	83	S
+T	700,681,0,152,-20,73	2	84	T
+U	740,681,17,165,-62,73	2	85	U
+V	660,681,0,209,-22,73	2	86	V
+W	1000,681,0,140,-22,73	2	87	W
+X	740,681,0,145,57,73	2	88	X
+Y	660,681,0,207,-22,73	2	89	Y
+Z	680,681,0,110,27,73	2	90	Z
+[	260,741,118,164,41,73	2	91	bracketleft
 lB	"
-\	580,741,0,45,-23,45	2	0134	-- backslash
+\	580,741,0,45,-23,45	2	92	backslash
 rs	"
-]	260,741,118,137,68,73	2	0135	-- bracketright
+]	260,741,118,137,68,73	2	93	bracketright
 rB	"
-a^	480,749,0,93,-133,73	2	0136	-- circumflex
+a^	480,749,0,93,-133,73	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	320,698,0,63,-105,63	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	320,698,0,63,-105,63	2	96	quoteleft
 oq	"
-a	680,515,8,105,-34,73	0	0141	-- a
-b	600,732,8,83,-7,73	2	0142	-- b
-c	560,515,8,87,-8,73	0	0143	-- c
-d	680,732,8,84,-10,73	2	0144	-- d
-e	560,515,8,86,-9,73	0	0145	-- e
-f	420,741,213,271,242,73	3	0146	-- f
-g	620,515,213,99,29,73	1	0147	-- g
-h	700,732,8,86,-43,73	2	0150	-- h
-i	380,755,8,90,-33,73	2	0151	-- i
-j	320,755,213,122,210,73	3	0152	-- j
-k	700,732,8,82,-47,73	2	0153	-- k
-l	380,732,8,80,-59,73	2	0154	-- l
-m	960,515,8,86,-33,73	0	0155	-- m
-n	680,515,8,85,-33,73	0	0156	-- n
-o	600,515,8,77,-9,73	0	0157	-- o
-p	660,515,213,72,74,72	1	0160	-- p
-q	620,515,213,70,-10,70	1	0161	-- q
-r	500,515,0,132,-34,73	0	0162	-- r
-s	540,515,8,83,18,73	0	0163	-- s
-t	440,658,8,98,-56,73	2	0164	-- t
-u	680,507,8,90,-33,73	0	0165	-- u
-v	540,515,8,82,-6,73	0	0166	-- v
-w	860,515,8,81,-6,73	0	0167	-- w
-x	620,515,8,84,40,73	0	0170	-- x
-y	600,507,213,92,25,73	1	0171	-- y
-z	560,515,8,76,14,73	0	0172	-- z
-lC	300,742,123,163,1,73	2	0173	-- braceleft
+a	680,515,8,105,-34,73	0	97	a
+b	600,732,8,83,-7,73	2	98	b
+c	560,515,8,87,-8,73	0	99	c
+d	680,732,8,84,-10,73	2	100	d
+e	560,515,8,86,-9,73	0	101	e
+f	420,741,213,271,242,73	3	102	f
+g	620,515,213,99,29,73	1	103	g
+h	700,732,8,86,-43,73	2	104	h
+i	380,755,8,90,-33,73	2	105	i
+j	320,755,213,122,210,73	3	106	j
+k	700,732,8,82,-47,73	2	107	k
+l	380,732,8,80,-59,73	2	108	l
+m	960,515,8,86,-33,73	0	109	m
+n	680,515,8,85,-33,73	0	110	n
+o	600,515,8,77,-9,73	0	111	o
+p	660,515,213,72,74,72	1	112	p
+q	620,515,213,70,-10,70	1	113	q
+r	500,515,0,132,-34,73	0	114	r
+s	540,515,8,83,18,73	0	115	s
+t	440,658,8,98,-56,73	2	116	t
+u	680,507,8,90,-33,73	0	117	u
+v	540,515,8,82,-6,73	0	118	v
+w	860,515,8,81,-6,73	0	119	w
+x	620,515,8,84,40,73	0	120	x
+y	600,507,213,92,25,73	1	121	y
+z	560,515,8,76,14,73	0	122	z
+lC	300,742,123,163,1,73	2	123	braceleft
 {	"
-ba	620,750,250,0,-253	3	0174	-- bar
+ba	620,750,250,0,-253	3	124	bar
 |	"
-rC	300,751,114,106,58,73	2	0175	-- braceright
+rC	300,751,114,106,58,73	2	125	braceright
 }	"
-a~	480,709,0,103,-128,73	2	0176	-- tilde
+a~	480,709,0,103,-128,73	2	126	tilde
 ~	"
-bq	300,166,112,34,-56,34	0	0200	-- quotesinglbase
-Fo	380,503,0,76,-12,73	0	0201	-- guillemotleft
-Fc	380,503,0,76,-12,73	0	0202	-- guillemotright
-bu	360,511,0,94,-10,73	0	0203	-- bullet
-Fn	680,741,199,113,78,73	2	0204	-- florin
-f/	120,681,0,312,194,73	2	0205	-- fraction
-%0	1360,698,17,23,-56,23	2	0206	-- perthousand
-dg	420,698,137,96,-39,73	2	0207	-- dagger
-dd	420,698,137,116,-29,73	2	0210	-- daggerdbl
-en	500,311,0,123,10,73	0	0211	-- endash
-em	1000,311,0,123,10,73	0	0212	-- emdash
-fi	820,741,213,80,241,73	3	0214	-- fi
-fl	820,741,213,80,241,73	3	0215	-- fl
-.i	380,507,8,90,-33,73	0	0220	-- dotlessi
-ga	380,771,0,94,-143,73	2	0222	-- grave
-a"	560,775,0,106,-131,73	2	0223	-- hungarumlaut
-a.	380,734,0,15,-130,15	2	0224	-- dotaccent
-ab	460,707,0,106,-127,73	2	0225	-- breve
-ah	480,749,0,93,-133,73	2	0226	-- caron
-ao	360,775,0,96,-135,73	2	0227	-- ring
-ho	320,0,182,0,-18	0	0230	-- ogonek
-lq	520,698,0,75,-106,73	2	0231	-- quotedblleft
-rq	520,698,0,90,-121,73	2	0232	-- quotedblright
-oe	920,515,8,91,2,73	0	0233	-- oe
-/l	380,732,8,82,-13,73	2	0234	-- lslash
-Bq	520,166,112,25,-56,25	0	0235	-- quotedblbase
-OE	1180,698,17,115,-44,73	2	0236	-- OE
-/L	640,681,0,134,36,73	2	0237	-- Lslash
-r!	320,515,191,74,-14,73	0	0241	-- exclamdown
-ct	680,718,0,0,-111	2	0242	-- cent
-Po	680,698,17,157,50,73	2	0243	-- sterling
-Cs	680,571,0,7,-98,7	0	0244	-- currency
-Ye	680,681,0,152,-42,73	2	0245	-- yen
-bb	620,675,175,0,-253	2	0246	-- brokenbar
-sc	620,698,137,68,4,68	2	0247	-- section
-ad	520,734,0,99,-130,73	2	0250	-- dieresis
-co	780,698,17,53,-33,53	2	0251	-- copyright
-Of	440,685,0,105,-68,73	2	0252	-- ordfeminine
-fo	220,503,0,79,-12,73	0	0253	-- guilsinglleft
-no	620,421,0,15,-31,15	0	0254	-- logicalnot
-\-	600,323,0,45,-41,45	0	0255	-- minus
-rg	780,698,17,53,-33,53	2	0256	-- registered
-a-	480,691,0,101,-127,73	2	0257	-- macron
-de	400,698,0,80,-80,73	2	0260	-- degree
-t+-	600,514,0,45,-41,45	0	0261	-- plusminus
-S2	408,698,0,127,-41,73	2	0262	-- twosuperior
-S3	408,698,0,125,-36,73	2	0263	-- threesuperior
-aa	340,771,0,117,-126,73	2	0264	-- acute
-mc	680,507,213,90,-4,73	1	0265	-- mu
-ps	680,681,0,85,-87,73	2	0266	-- paragraph
-pc	340,358,0,26,-76,26	0	0267	-- periodcentered
-ac	360,0,220,0,-18	1	0270	-- cedilla
-S1	408,688,0,48,-68,48	2	0271	-- onesuperior
-Om	440,685,0,65,-77,65	2	0272	-- ordmasculine
-fc	220,503,0,79,-12,73	0	0273	-- guilsinglright
-14	1020,681,0,84,-68,73	2	0274	-- onequarter
-12	1020,681,0,66,-68,66	2	0275	-- onehalf
-34	1020,691,0,84,-36,73	2	0276	-- threequarters
-r?	620,515,189,36,-33,36	0	0277	-- questiondown
-`A	720,937,0,99,77,73	2	0300	-- Agrave
-'A	720,937,0,99,77,73	2	0301	-- Aacute
-^A	720,915,0,99,77,73	2	0302	-- Acircumflex
-~A	720,875,0,99,77,73	2	0303	-- Atilde
-:A	720,900,0,99,77,73	2	0304	-- Adieresis
-oA	720,941,0,99,77,73	2	0305	-- Aring
-AE	1140,681,0,117,77,73	2	0306	-- AE
-,C	700,698,220,104,-28,73	3	0307	-- Ccedilla
-`E	720,937,0,107,36,73	2	0310	-- Egrave
-'E	720,937,0,107,36,73	2	0311	-- Eacute
-^E	720,915,0,107,36,73	2	0312	-- Ecircumflex
-:E	720,900,0,107,36,73	2	0313	-- Edieresis
-`I	380,937,0,155,36,73	2	0314	-- Igrave
-'I	380,937,0,155,36,73	2	0315	-- Iacute
-^I	380,915,0,163,36,73	2	0316	-- Icircumflex
-:I	380,900,0,169,36,73	2	0317	-- Idieresis
--D	760,681,0,95,36,73	2	0320	-- Eth
-~N	740,875,0,155,36,73	2	0321	-- Ntilde
-`O	760,937,17,96,-28,73	2	0322	-- Ograve
-'O	760,937,17,96,-28,73	2	0323	-- Oacute
-^O	760,915,17,96,-28,73	2	0324	-- Ocircumflex
-~O	760,875,17,96,-28,73	2	0325	-- Otilde
-:O	760,900,17,96,-28,73	2	0326	-- Odieresis
-tmu	600,514,0,45,-41,45	0	0327	-- multiply
-/O	760,725,29,137,29,73	2	0330	-- Oslash
-`U	740,937,17,165,-62,73	2	0331	-- Ugrave
-'U	740,937,17,165,-62,73	2	0332	-- Uacute
-^U	740,915,17,165,-62,73	2	0333	-- Ucircumflex
-:U	740,900,17,165,-62,73	2	0334	-- Udieresis
-'Y	660,937,0,207,-22,73	2	0335	-- Yacute
-TP	640,681,0,111,56,73	2	0336	-- Thorn
-ss	660,741,213,92,281,73	3	0337	-- germandbls
-`a	680,771,8,105,-34,73	2	0340	-- agrave
-'a	680,771,8,105,-34,73	2	0341	-- aacute
-^a	680,749,8,105,-34,73	2	0342	-- acircumflex
-~a	680,709,8,105,-34,73	2	0343	-- atilde
-:a	680,734,8,105,-34,73	2	0344	-- adieresis
-oa	680,775,8,105,-34,73	2	0345	-- aring
-ae	880,515,8,83,11,73	0	0346	-- ae
-,c	560,515,220,87,-8,73	1	0347	-- ccedilla
-`e	560,771,8,86,-9,73	2	0350	-- egrave
-'e	560,771,8,86,-9,73	2	0351	-- eacute
-^e	560,749,8,86,-9,73	2	0352	-- ecircumflex
-:e	560,734,8,86,-9,73	2	0353	-- edieresis
-`i	380,771,8,94,-33,73	2	0354	-- igrave
-'i	380,771,8,90,-33,73	2	0355	-- iacute
-^i	380,749,8,103,-33,73	2	0356	-- icircumflex
-:i	380,734,8,149,-33,73	2	0357	-- idieresis
-Sd	600,741,8,112,-9,73	2	0360	-- eth
-~n	680,709,8,85,-33,73	2	0361	-- ntilde
-`o	600,771,8,77,-9,73	2	0362	-- ograve
-'o	600,771,8,77,-9,73	2	0363	-- oacute
-^o	600,749,8,77,-9,73	2	0364	-- ocircumflex
-~o	600,709,8,77,-9,73	2	0365	-- otilde
-:o	600,734,8,77,-9,73	2	0366	-- odieresis
-tdi	600,521,0,45,-41,45	0	0367	-- divide
-/o	600,571,54,111,33,73	0	0370	-- oslash
-`u	680,771,8,90,-33,73	2	0371	-- ugrave
-'u	680,771,8,90,-33,73	2	0372	-- uacute
-^u	680,749,8,90,-33,73	2	0373	-- ucircumflex
-:u	680,734,8,90,-33,73	2	0374	-- udieresis
-'y	600,771,213,92,25,73	3	0375	-- yacute
-Tp	660,732,213,72,74,72	3	0376	-- thorn
-:y	600,734,213,92,25,73	3	0377	-- ydieresis
+bq	300,166,112,34,-56,34	0	128	quotesinglbase
+Fo	380,503,0,76,-12,73	0	129	guillemotleft
+Fc	380,503,0,76,-12,73	0	130	guillemotright
+bu	360,511,0,94,-10,73	0	131	bullet
+Fn	680,741,199,113,78,73	2	132	florin
+f/	120,681,0,312,194,73	2	133	fraction
+%0	1360,698,17,23,-56,23	2	134	perthousand
+dg	420,698,137,96,-39,73	2	135	dagger
+dd	420,698,137,116,-29,73	2	136	daggerdbl
+en	500,311,0,123,10,73	0	137	endash
+em	1000,311,0,123,10,73	0	138	emdash
+fi	820,741,213,80,241,73	3	140	fi
+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
+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
+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
+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
+r!	320,515,191,74,-14,73	0	161	exclamdown
+ct	680,718,0,0,-111	2	162	cent
+Po	680,698,17,157,50,73	2	163	sterling
+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
+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
+tno	620,421,0,15,-31,15	0	172	logicalnot
+\-	600,323,0,45,-41,45	0	173	minus
+rg	780,698,17,53,-33,53	2	174	registered
+a-	480,691,0,101,-127,73	2	175	macron
+de	400,698,0,80,-80,73	2	176	degree
+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
+mc	680,507,213,90,-4,73	1	181	mu
+ps	680,681,0,85,-87,73	2	182	paragraph
+pc	340,358,0,26,-76,26	0	183	periodcentered
+ac	360,0,220,0,-18	1	184	cedilla
+S1	408,688,0,48,-68,48	2	185	onesuperior
+Om	440,685,0,65,-77,65	2	186	ordmasculine
+fc	220,503,0,79,-12,73	0	187	guilsinglright
+14	1020,681,0,84,-68,73	2	188	onequarter
+12	1020,681,0,66,-68,66	2	189	onehalf
+34	1020,691,0,84,-36,73	2	190	threequarters
+r?	620,515,189,36,-33,36	0	191	questiondown
+`A	720,937,0,99,77,73	2	192	Agrave
+'A	720,937,0,99,77,73	2	193	Aacute
+^A	720,915,0,99,77,73	2	194	Acircumflex
+~A	720,875,0,99,77,73	2	195	Atilde
+:A	720,900,0,99,77,73	2	196	Adieresis
+oA	720,941,0,99,77,73	2	197	Aring
+AE	1140,681,0,117,77,73	2	198	AE
+,C	700,698,220,104,-28,73	3	199	Ccedilla
+`E	720,937,0,107,36,73	2	200	Egrave
+'E	720,937,0,107,36,73	2	201	Eacute
+^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,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
+~N	740,875,0,155,36,73	2	209	Ntilde
+`O	760,937,17,96,-28,73	2	210	Ograve
+'O	760,937,17,96,-28,73	2	211	Oacute
+^O	760,915,17,96,-28,73	2	212	Ocircumflex
+~O	760,875,17,96,-28,73	2	213	Otilde
+:O	760,900,17,96,-28,73	2	214	Odieresis
+tmu	600,514,0,45,-41,45	0	215	multiply
+/O	760,725,29,137,29,73	2	216	Oslash
+`U	740,937,17,165,-62,73	2	217	Ugrave
+'U	740,937,17,165,-62,73	2	218	Uacute
+^U	740,915,17,165,-62,73	2	219	Ucircumflex
+:U	740,900,17,165,-62,73	2	220	Udieresis
+'Y	660,937,0,207,-22,73	2	221	Yacute
+TP	640,681,0,111,56,73	2	222	Thorn
+ss	660,741,213,92,281,73	3	223	germandbls
+`a	680,771,8,105,-34,73	2	224	agrave
+'a	680,771,8,105,-34,73	2	225	aacute
+^a	680,749,8,105,-34,73	2	226	acircumflex
+~a	680,709,8,105,-34,73	2	227	atilde
+:a	680,734,8,105,-34,73	2	228	adieresis
+oa	680,775,8,105,-34,73	2	229	aring
+ae	880,515,8,83,11,73	0	230	ae
+,c	560,515,220,87,-8,73	1	231	ccedilla
+`e	560,771,8,86,-9,73	2	232	egrave
+'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	237	iacute
+^i	380,749,8,103,-33,73	2	238	icircumflex
+:i	380,734,8,149,-33,73	2	239	idieresis
+Sd	600,741,8,112,-9,73	2	240	eth
+~n	680,709,8,85,-33,73	2	241	ntilde
+`o	600,771,8,77,-9,73	2	242	ograve
+'o	600,771,8,77,-9,73	2	243	oacute
+^o	600,749,8,77,-9,73	2	244	ocircumflex
+~o	600,709,8,77,-9,73	2	245	otilde
+:o	600,734,8,77,-9,73	2	246	odieresis
+tdi	600,521,0,45,-41,45	0	247	divide
+/o	600,571,54,111,33,73	0	248	oslash
+`u	680,771,8,90,-33,73	2	249	ugrave
+'u	680,771,8,90,-33,73	2	250	uacute
+^u	680,749,8,90,-33,73	2	251	ucircumflex
+:u	680,734,8,90,-33,73	2	252	udieresis
+'y	600,771,213,92,25,73	3	253	yacute
+Tp	660,732,213,72,74,72	3	254	thorn
+:y	600,734,213,92,25,73	3	255	ydieresis
+u2026	1000,177,8,0,-36	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMI b/contrib/groff/font/devps/BMI
index b75e1b4..7ed66f4 100644
--- a/contrib/groff/font/devps/BMI
+++ b/contrib/groff/font/devps/BMI
@@ -96,246 +96,247 @@ r d -9
 r , -143
 r c -8
 charset
-ha	600,681,0,49,-47,49	2	0000	-- asciicircum
-ti	600,386,0,45,-41,45	0	0001	-- asciitilde
-vS	640,861,17,78,-11,70	2	0002	-- Scaron
-vZ	580,861,0,165,42,70	2	0003	-- Zcaron
-vs	540,684,8,57,-15,57	2	0004	-- scaron
-vz	520,684,8,91,12,70	2	0005	-- zcaron
-:Y	660,865,0,199,-37,70	2	0006	-- Ydieresis
-tm	980,681,0,35,-19,35	2	0007	-- trademark
-aq	200,698,0,97,-49,70	2	0010	-- quotesingle
-space	300	0	0040
-!	320,698,8,72,-53,70	2	0041	-- exclam
-"	360,698,0,92,-57,70	2	0042	-- quotedbl
+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
+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
+space	300	0	32	space
+!	320,698,8,72,-53,70	2	33	exclam
+"	360,698,0,92,-57,70	2	34	quotedbl
 dq	"
-#	620,681,0,28,-57,28	2	0043	-- numbersign
+#	620,681,0,28,-57,28	2	35	numbersign
 sh	"
-$	620,762,85,49,-28,49	2	0044	-- dollar
+$	620,762,85,49,-28,49	2	36	dollar
 Do	"
-%	800,691,8,61,-6,61	2	0045	-- percent
-&	820,698,18,78,-15,70	2	0046	-- ampersand
-'	280,698,0,58,-98,58	2	0047	-- quoteright
+%	800,691,8,61,-6,61	2	37	percent
+&	820,698,18,78,-15,70	2	38	ampersand
+'	280,698,0,58,-98,58	2	39	quoteright
 cq	"
-(	280,727,146,153,-46,70	2	0050	-- parenleft
-)	280,727,146,49,58,49	2	0051	-- parenright
-*	440,698,0,115,-89,70	2	0052	-- asterisk
-+	600,548,0,45,-41,45	0	0053	-- plus
-,	300,112,115,0,-38	0	0054	-- comma
--	320,325,0,66,-28,66	0	0055	-- hyphen
+(	280,727,146,153,-46,70	2	40	parenleft
+)	280,727,146,49,58,49	2	41	parenright
+*	440,698,0,115,-89,70	2	42	asterisk
++	600,548,0,45,-41,45	0	43	plus
+,	300,112,115,0,-38	0	44	comma
+-	320,325,0,66,-28,66	0	45	hyphen
 hy	"
-.	300,127,8,0,-46	0	0056	-- period
-/	600,717,149,12,-54,12	2	0057	-- slash
+.	300,127,8,0,-46	0	46	period
+/	600,717,149,12,-54,12	2	47	slash
 sl	"
-0	620,698,17,76,-36,70	2	0060	-- zero
-1	620,681,0,0,-104	2	0061	-- one
-2	620,698,0,66,-16,66	2	0062	-- two
-3	620,698,17,52,-5,52	2	0063	-- three
-4	620,681,0,64,-19,64	2	0064	-- four
-5	620,681,17,44,-20,44	2	0065	-- five
-6	620,698,17,87,-39,70	2	0066	-- six
-7	620,681,0,102,-93,70	2	0067	-- seven
-8	620,698,17,85,-11,70	2	0070	-- eight
-9	620,698,17,79,-27,70	2	0071	-- nine
-:	300,494,8,42,-46,42	0	0072	-- colon
-;	300,494,114,42,-38,42	0	0073	-- semicolon
-<	600,561,0,38,-29,38	0	0074	-- less
-=	600,433,0,45,-41,45	0	0075	-- equal
->	600,561,0,52,-43,52	0	0076	-- greater
-?	540,698,8,114,-64,70	2	0077	-- question
-@	780,698,17,72,-52,70	2	0100	-- at
+0	620,698,17,76,-36,70	2	48	zero
+1	620,681,0,0,-104	2	49	one
+2	620,698,0,66,-16,66	2	50	two
+3	620,698,17,52,-5,52	2	51	three
+4	620,681,0,64,-19,64	2	52	four
+5	620,681,17,44,-20,44	2	53	five
+6	620,698,17,87,-39,70	2	54	six
+7	620,681,0,102,-93,70	2	55	seven
+8	620,698,17,85,-11,70	2	56	eight
+9	620,698,17,79,-27,70	2	57	nine
+:	300,494,8,42,-46,42	0	58	colon
+;	300,494,114,42,-38,42	0	59	semicolon
+<	600,561,0,38,-29,38	0	60	less
+=	600,433,0,45,-41,45	0	61	equal
+>	600,561,0,52,-43,52	0	62	greater
+?	540,698,8,114,-64,70	2	63	question
+@	780,698,17,72,-52,70	2	64	at
 at	"
-A	700,681,0,70,75,70	2	0101	-- A
-B	720,681,0,76,29,70	2	0102	-- B
-C	720,698,17,76,-38,70	2	0103	-- C
-D	740,681,0,92,29,70	2	0104	-- D
-E	680,681,0,106,29,70	2	0105	-- E
-F	620,681,0,173,29,70	2	0106	-- F
-G	760,698,17,103,-38,70	2	0107	-- G
-H	800,681,0,138,29,70	2	0110	-- H
-I	320,681,0,142,29,70	2	0111	-- I
-J	560,681,17,156,52,70	2	0112	-- J
-K	720,681,0,134,29,70	2	0113	-- K
-L	580,681,0,126,29,70	2	0114	-- L
-M	860,681,0,146,32,70	2	0115	-- M
-N	720,681,0,153,32,70	2	0116	-- N
-O	760,698,17,89,-38,70	2	0117	-- O
-P	600,681,0,131,29,70	2	0120	-- P
-Q	780,698,191,82,-11,70	2	0121	-- Q
-R	700,681,0,86,29,70	2	0122	-- R
-S	640,698,17,78,-11,70	2	0123	-- S
-T	600,681,0,175,0,70	2	0124	-- T
-U	720,681,17,172,-68,70	2	0125	-- U
-V	680,681,0,185,-37,70	2	0126	-- V
-W	960,681,0,185,-37,70	2	0127	-- W
-X	700,681,0,165,75,70	2	0130	-- X
-Y	660,681,0,199,-37,70	2	0131	-- Y
-Z	580,681,0,165,42,70	2	0132	-- Z
-[	260,717,136,141,-6,70	2	0133	-- bracketleft
+A	700,681,0,70,75,70	2	65	A
+B	720,681,0,76,29,70	2	66	B
+C	720,698,17,76,-38,70	2	67	C
+D	740,681,0,92,29,70	2	68	D
+E	680,681,0,106,29,70	2	69	E
+F	620,681,0,173,29,70	2	70	F
+G	760,698,17,103,-38,70	2	71	G
+H	800,681,0,138,29,70	2	72	H
+I	320,681,0,142,29,70	2	73	I
+J	560,681,17,156,52,70	2	74	J
+K	720,681,0,134,29,70	2	75	K
+L	580,681,0,126,29,70	2	76	L
+M	860,681,0,146,32,70	2	77	M
+N	720,681,0,153,32,70	2	78	N
+O	760,698,17,89,-38,70	2	79	O
+P	600,681,0,131,29,70	2	80	P
+Q	780,698,191,82,-11,70	2	81	Q
+R	700,681,0,86,29,70	2	82	R
+S	640,698,17,78,-11,70	2	83	S
+T	600,681,0,175,0,70	2	84	T
+U	720,681,17,172,-68,70	2	85	U
+V	680,681,0,185,-37,70	2	86	V
+W	960,681,0,185,-37,70	2	87	W
+X	700,681,0,165,75,70	2	88	X
+Y	660,681,0,199,-37,70	2	89	Y
+Z	580,681,0,165,42,70	2	90	Z
+[	260,717,136,141,-6,70	2	91	bracketleft
 lB	"
-\	600,717,0,0,-34	2	0134	-- backslash
+\	600,717,0,0,-34	2	92	backslash
 rs	"
-]	260,717,136,99,35,70	2	0135	-- bracketright
+]	260,717,136,99,35,70	2	93	bracketright
 rB	"
-a^	440,685,0,89,-126,70	2	0136	-- circumflex
+a^	440,685,0,89,-126,70	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	280,698,0,100,-141,70	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	280,698,0,100,-141,70	2	96	quoteleft
 oq	"
-a	620,494,8,116,-21,70	0	0141	-- a
-b	600,717,8,71,-38,70	2	0142	-- b
-c	480,494,8,92,-15,70	0	0143	-- c
-d	640,717,8,105,-15,70	2	0144	-- d
-e	540,494,8,85,-15,70	0	0145	-- e
-f	340,725,218,267,210,70	3	0146	-- f
-g	560,494,221,71,46,70	1	0147	-- g
-h	620,717,8,119,-38,70	2	0150	-- h
-i	280,663,8,121,-38,70	2	0151	-- i
-j	280,663,221,78,250,70	3	0152	-- j
-k	600,717,8,107,-38,70	2	0153	-- k
-l	280,717,8,112,-50,70	2	0154	-- l
-m	880,494,8,122,-38,70	0	0155	-- m
-n	620,494,8,103,-38,70	0	0156	-- n
-o	540,494,8,82,-15,70	0	0157	-- o
-p	600,494,212,70,74,70	1	0160	-- p
-q	560,494,212,74,-15,70	1	0161	-- q
-r	400,494,0,131,-38,70	0	0162	-- r
-s	540,494,8,57,-15,57	0	0163	-- s
-t	340,664,8,121,-38,70	2	0164	-- t
-u	620,484,8,116,-38,70	0	0165	-- u
-v	540,494,8,72,-38,70	0	0166	-- v
-w	880,494,8,63,-38,63	0	0167	-- w
-x	540,494,8,136,41,70	0	0170	-- x
-y	600,484,221,59,-10,59	1	0171	-- y
-z	520,494,8,91,12,70	0	0172	-- z
-lC	360,717,191,132,-72,70	2	0173	-- braceleft
+a	620,494,8,116,-21,70	0	97	a
+b	600,717,8,71,-38,70	2	98	b
+c	480,494,8,92,-15,70	0	99	c
+d	640,717,8,105,-15,70	2	100	d
+e	540,494,8,85,-15,70	0	101	e
+f	340,725,218,267,210,70	3	102	f
+g	560,494,221,71,46,70	1	103	g
+h	620,717,8,119,-38,70	2	104	h
+i	280,663,8,121,-38,70	2	105	i
+j	280,663,221,78,250,70	3	106	j
+k	600,717,8,107,-38,70	2	107	k
+l	280,717,8,112,-50,70	2	108	l
+m	880,494,8,122,-38,70	0	109	m
+n	620,494,8,103,-38,70	0	110	n
+o	540,494,8,82,-15,70	0	111	o
+p	600,494,212,70,74,70	1	112	p
+q	560,494,212,74,-15,70	1	113	q
+r	400,494,0,131,-38,70	0	114	r
+s	540,494,8,57,-15,57	0	115	s
+t	340,664,8,121,-38,70	2	116	t
+u	620,484,8,116,-38,70	0	117	u
+v	540,494,8,72,-38,70	0	118	v
+w	880,494,8,63,-38,63	0	119	w
+x	540,494,8,136,41,70	0	120	x
+y	600,484,221,59,-10,59	1	121	y
+z	520,494,8,91,12,70	0	122	z
+lC	360,717,191,132,-72,70	2	123	braceleft
 {	"
-ba	600,750,250,0,-244	3	0174	-- bar
+ba	600,750,250,0,-244	3	124	bar
 |	"
-rC	380,717,191,3,37,3	2	0175	-- braceright
+rC	380,717,191,3,37,3	2	125	braceright
 }	"
-a~	440,671,0,98,-130,70	2	0176	-- tilde
+a~	440,671,0,98,-130,70	2	126	tilde
 ~	"
-bq	320,113,114,0,-37	0	0200	-- quotesinglbase
-Fo	300,434,0,63,-20,63	0	0201	-- guillemotleft
-Fc	300,434,0,53,-10,53	0	0202	-- guillemotright
-bu	460,511,0,34,-50,34	0	0203	-- bullet
-Fn	620,725,218,122,76,70	3	0204	-- florin
-f/	20,681,0,353,278,70	2	0205	-- fraction
-%0	1180,691,8,69,-6,69	2	0206	-- perthousand
-dg	620,698,130,0,-142	2	0207	-- dagger
-dd	620,698,122,0,-94	2	0210	-- daggerdbl
-en	500,325,0,111,17,70	0	0211	-- endash
-em	1000,325,0,111,17,70	0	0212	-- emdash
-fi	640,725,222,119,209,70	3	0214	-- fi
-fl	660,725,218,103,209,70	3	0215	-- fl
-.i	280,484,8,121,-38,70	0	0220	-- dotlessi
-ga	340,706,0,87,-132,70	2	0222	-- grave
-a"	340,738,0,112,-117,70	2	0223	-- hungarumlaut
-a.	260,664,0,80,-119,70	2	0224	-- dotaccent
-ab	440,680,0,110,-141,70	2	0225	-- breve
-ah	440,684,0,91,-128,70	2	0226	-- caron
-ao	300,706,0,84,-128,70	2	0227	-- ring
-ho	260,0,173,0,-1	0	0230	-- ogonek
-lq	440,698,0,103,-141,70	2	0231	-- quotedblleft
-rq	440,698,0,61,-98,61	2	0232	-- quotedblright
-oe	900,494,8,98,-15,70	0	0233	-- oe
-/l	340,717,8,108,0,70	2	0234	-- lslash
-Bq	480,113,114,0,-37	0	0235	-- quotedblbase
-OE	1180,698,17,107,-38,70	2	0236	-- OE
-/L	580,681,0,126,29,70	2	0237	-- Lslash
-r!	320,494,213,31,-23,31	1	0241	-- exclamdown
-ct	620,715,29,26,-98,26	2	0242	-- cent
-Po	620,698,17,132,46,70	2	0243	-- sterling
-Cs	620,591,0,35,-50,35	0	0244	-- currency
-Ye	620,681,0,165,-21,70	2	0245	-- yen
-bb	600,675,175,0,-244	2	0246	-- brokenbar
-sc	620,698,178,68,12,68	2	0247	-- section
-ad	420,688,0,97,-135,70	2	0250	-- dieresis
-co	740,698,17,94,-34,70	2	0251	-- copyright
-Of	440,698,0,123,-80,70	2	0252	-- ordfeminine
-fo	180,434,0,78,-25,70	0	0253	-- guilsinglleft
-no	600,433,0,45,-41,45	0	0254	-- logicalnot
-\-	600,335,0,45,-41,45	0	0255	-- minus
-rg	740,698,17,94,-34,70	2	0256	-- registered
-a-	440,658,0,94,-128,70	0	0257	-- macron
-de	400,698,0,70,-70,70	2	0260	-- degree
-t+-	600,548,0,45,-41,45	0	0261	-- plusminus
-S2	372,698,0,117,-18,70	2	0262	-- twosuperior
-S3	372,698,0,117,-20,70	2	0263	-- threesuperior
-aa	320,706,0,103,-128,70	2	0264	-- acute
-mc	620,484,221,116,-3,70	1	0265	-- mu
-ps	620,681,0,148,-62,70	2	0266	-- paragraph
-pc	300,364,0,22,-87,22	0	0267	-- periodcentered
-ac	320,0,178,0,5	0	0270	-- cedilla
-S1	372,688,0,17,-64,17	2	0271	-- onesuperior
-Om	400,698,0,105,-89,70	2	0272	-- ordmasculine
-fc	180,434,0,73,-20,70	0	0273	-- guilsinglright
-14	930,681,0,33,-41,33	2	0274	-- onequarter
-12	930,681,0,45,-41,45	2	0275	-- onehalf
-34	930,691,0,33,-49,33	2	0276	-- threequarters
-r?	540,494,212,18,32,18	1	0277	-- questiondown
-`A	700,883,0,70,75,70	2	0300	-- Agrave
-'A	700,883,0,70,75,70	2	0301	-- Aacute
-^A	700,862,0,70,75,70	2	0302	-- Acircumflex
-~A	700,848,0,70,75,70	2	0303	-- Atilde
-:A	700,865,0,70,75,70	2	0304	-- Adieresis
-oA	700,883,0,70,75,70	2	0305	-- Aring
-AE	1220,681,0,99,95,70	2	0306	-- AE
-,C	720,698,178,76,-38,70	2	0307	-- Ccedilla
-`E	680,883,0,106,29,70	2	0310	-- Egrave
-'E	680,883,0,106,29,70	2	0311	-- Eacute
-^E	680,862,0,106,29,70	2	0312	-- Ecircumflex
-:E	680,865,0,106,29,70	2	0313	-- Edieresis
-`I	320,883,0,142,29,70	2	0314	-- Igrave
-'I	320,883,0,142,29,70	2	0315	-- Iacute
-^I	320,862,0,179,29,70	2	0316	-- Icircumflex
-:I	320,865,0,177,29,70	2	0317	-- Idieresis
--D	740,681,0,92,29,70	2	0320	-- Eth
-~N	720,848,0,153,32,70	2	0321	-- Ntilde
-`O	760,883,17,89,-38,70	2	0322	-- Ograve
-'O	760,883,17,89,-38,70	2	0323	-- Oacute
-^O	760,862,17,89,-38,70	2	0324	-- Ocircumflex
-~O	760,848,17,89,-38,70	2	0325	-- Otilde
-:O	760,865,17,89,-38,70	2	0326	-- Odieresis
-tmu	600,548,0,45,-41,45	0	0327	-- multiply
-/O	760,777,95,89,-38,70	2	0330	-- Oslash
-`U	720,883,17,172,-68,70	2	0331	-- Ugrave
-'U	720,883,17,172,-68,70	2	0332	-- Uacute
-^U	720,862,17,172,-68,70	2	0333	-- Ucircumflex
-:U	720,865,17,172,-68,70	2	0334	-- Udieresis
-'Y	660,883,0,199,-37,70	2	0335	-- Yacute
-TP	600,681,0,106,29,70	2	0336	-- Thorn
-ss	620,698,111,83,171,70	2	0337	-- germandbls
-`a	620,706,8,116,-21,70	2	0340	-- agrave
-'a	620,706,8,116,-21,70	2	0341	-- aacute
-^a	620,685,8,116,-21,70	2	0342	-- acircumflex
-~a	620,671,8,116,-21,70	2	0343	-- atilde
-:a	620,688,8,116,-21,70	2	0344	-- adieresis
-oa	620,706,8,116,-21,70	2	0345	-- aring
-ae	880,494,8,88,-21,70	0	0346	-- ae
-,c	480,494,178,92,-15,70	0	0347	-- ccedilla
-`e	540,706,8,85,-15,70	2	0350	-- egrave
-'e	540,706,8,85,-15,70	2	0351	-- eacute
-^e	540,685,8,85,-15,70	2	0352	-- ecircumflex
-:e	540,688,8,85,-15,70	2	0353	-- edieresis
-`i	280,706,8,121,-38,70	2	0354	-- igrave
-'i	280,706,8,121,-38,70	2	0355	-- iacute
-^i	280,685,8,149,-26,70	2	0356	-- icircumflex
-:i	280,688,8,147,-38,70	2	0357	-- idieresis
-Sd	540,725,8,152,-15,70	2	0360	-- eth
-~n	620,671,8,103,-38,70	2	0361	-- ntilde
-`o	540,706,8,82,-15,70	2	0362	-- ograve
-'o	540,706,8,82,-15,70	2	0363	-- oacute
-^o	540,685,8,82,-15,70	2	0364	-- ocircumflex
-~o	540,671,8,82,-15,70	2	0365	-- otilde
-:o	540,688,8,82,-15,70	2	0366	-- odieresis
-tdi	600,548,0,45,-41,45	0	0367	-- divide
-/o	540,532,49,81,-15,70	0	0370	-- oslash
-`u	620,706,8,116,-38,70	2	0371	-- ugrave
-'u	620,706,8,116,-38,70	2	0372	-- uacute
-^u	620,685,8,116,-38,70	2	0373	-- ucircumflex
-:u	620,688,8,116,-38,70	2	0374	-- udieresis
-'y	600,706,221,59,-10,59	3	0375	-- yacute
-Tp	600,717,212,70,74,70	3	0376	-- thorn
-:y	600,688,221,59,-10,59	3	0377	-- ydieresis
+bq	320,113,114,0,-37	0	128	quotesinglbase
+Fo	300,434,0,63,-20,63	0	129	guillemotleft
+Fc	300,434,0,53,-10,53	0	130	guillemotright
+bu	460,511,0,34,-50,34	0	131	bullet
+Fn	620,725,218,122,76,70	3	132	florin
+f/	20,681,0,353,278,70	2	133	fraction
+%0	1180,691,8,69,-6,69	2	134	perthousand
+dg	620,698,130,0,-142	2	135	dagger
+dd	620,698,122,0,-94	2	136	daggerdbl
+en	500,325,0,111,17,70	0	137	endash
+em	1000,325,0,111,17,70	0	138	emdash
+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
+ab	440,680,0,110,-141,70	2	149	breve
+ah	440,684,0,91,-128,70	2	150	caron
+ao	300,706,0,84,-128,70	2	151	ring
+ho	260,0,173,0,-1	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
+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
+r!	320,494,213,31,-23,31	1	161	exclamdown
+ct	620,715,29,26,-98,26	2	162	cent
+Po	620,698,17,132,46,70	2	163	sterling
+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
+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
+tno	600,433,0,45,-41,45	0	172	logicalnot
+\-	600,335,0,45,-41,45	0	173	minus
+rg	740,698,17,94,-34,70	2	174	registered
+a-	440,658,0,94,-128,70	0	175	macron
+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
+mc	620,484,221,116,-3,70	1	181	mu
+ps	620,681,0,148,-62,70	2	182	paragraph
+pc	300,364,0,22,-87,22	0	183	periodcentered
+ac	320,0,178,0,5	0	184	cedilla
+S1	372,688,0,17,-64,17	2	185	onesuperior
+Om	400,698,0,105,-89,70	2	186	ordmasculine
+fc	180,434,0,73,-20,70	0	187	guilsinglright
+14	930,681,0,33,-41,33	2	188	onequarter
+12	930,681,0,45,-41,45	2	189	onehalf
+34	930,691,0,33,-49,33	2	190	threequarters
+r?	540,494,212,18,32,18	1	191	questiondown
+`A	700,883,0,70,75,70	2	192	Agrave
+'A	700,883,0,70,75,70	2	193	Aacute
+^A	700,862,0,70,75,70	2	194	Acircumflex
+~A	700,848,0,70,75,70	2	195	Atilde
+:A	700,865,0,70,75,70	2	196	Adieresis
+oA	700,883,0,70,75,70	2	197	Aring
+AE	1220,681,0,99,95,70	2	198	AE
+,C	720,698,178,76,-38,70	2	199	Ccedilla
+`E	680,883,0,106,29,70	2	200	Egrave
+'E	680,883,0,106,29,70	2	201	Eacute
+^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,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
+~N	720,848,0,153,32,70	2	209	Ntilde
+`O	760,883,17,89,-38,70	2	210	Ograve
+'O	760,883,17,89,-38,70	2	211	Oacute
+^O	760,862,17,89,-38,70	2	212	Ocircumflex
+~O	760,848,17,89,-38,70	2	213	Otilde
+:O	760,865,17,89,-38,70	2	214	Odieresis
+tmu	600,548,0,45,-41,45	0	215	multiply
+/O	760,777,95,89,-38,70	2	216	Oslash
+`U	720,883,17,172,-68,70	2	217	Ugrave
+'U	720,883,17,172,-68,70	2	218	Uacute
+^U	720,862,17,172,-68,70	2	219	Ucircumflex
+:U	720,865,17,172,-68,70	2	220	Udieresis
+'Y	660,883,0,199,-37,70	2	221	Yacute
+TP	600,681,0,106,29,70	2	222	Thorn
+ss	620,698,111,83,171,70	2	223	germandbls
+`a	620,706,8,116,-21,70	2	224	agrave
+'a	620,706,8,116,-21,70	2	225	aacute
+^a	620,685,8,116,-21,70	2	226	acircumflex
+~a	620,671,8,116,-21,70	2	227	atilde
+:a	620,688,8,116,-21,70	2	228	adieresis
+oa	620,706,8,116,-21,70	2	229	aring
+ae	880,494,8,88,-21,70	0	230	ae
+,c	480,494,178,92,-15,70	0	231	ccedilla
+`e	540,706,8,85,-15,70	2	232	egrave
+'e	540,706,8,85,-15,70	2	233	eacute
+^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,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
+~n	620,671,8,103,-38,70	2	241	ntilde
+`o	540,706,8,82,-15,70	2	242	ograve
+'o	540,706,8,82,-15,70	2	243	oacute
+^o	540,685,8,82,-15,70	2	244	ocircumflex
+~o	540,671,8,82,-15,70	2	245	otilde
+:o	540,688,8,82,-15,70	2	246	odieresis
+tdi	600,548,0,45,-41,45	0	247	divide
+/o	540,532,49,81,-15,70	0	248	oslash
+`u	620,706,8,116,-38,70	2	249	ugrave
+'u	620,706,8,116,-38,70	2	250	uacute
+^u	620,685,8,116,-38,70	2	251	ucircumflex
+:u	620,688,8,116,-38,70	2	252	udieresis
+'y	600,706,221,59,-10,59	3	253	yacute
+Tp	600,717,212,70,74,70	3	254	thorn
+:y	600,688,221,59,-10,59	3	255	ydieresis
+u2026	1000,127,8,0,-49	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMR b/contrib/groff/font/devps/BMR
index 1ce51e0..bef802a 100644
--- a/contrib/groff/font/devps/BMR
+++ b/contrib/groff/font/devps/BMR
@@ -92,246 +92,247 @@ r d 7
 r , -58
 r c 7
 charset
-ha	600,681,0,0,-52	2	0000	-- asciicircum
-ti	600,352,0,0,-52	0	0001	-- asciitilde
-vS	660,849,17,0,-28	2	0002	-- Scaron
-vZ	640,849,0,16,-10	2	0003	-- Zcaron
-vs	520,672,8,0,-40	2	0004	-- scaron
-vz	480,672,0,0,-7	2	0005	-- zcaron
-:Y	640,851,0,26,30	2	0006	-- Ydieresis
-tm	980,681,0,0,-34	2	0007	-- trademark
-aq	220,698,0,0,-67	2	0010	-- quotesingle
-space	320	0	0040
-!	300,698,8,0,-75	2	0041	-- exclam
-"	380,698,0,0,-56	2	0042	-- quotedbl
+ha	600,681	2	0	asciicircum
+ti	600,352	0	1	asciitilde
+vS	660,849,17	2	2	Scaron
+vZ	640,849,0,16	2	3	Zcaron
+vs	520,672,8	2	4	scaron
+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
+space	320	0	32	space
+!	300,698,8	2	33	exclam
+"	380,698	2	34	quotedbl
 dq	"
-#	620,681,0,0,-65	2	0043	-- numbersign
+#	620,681	2	35	numbersign
 sh	"
-$	620,791,109,0,-34	2	0044	-- dollar
+$	620,791,109	2	36	dollar
 Do	"
-%	900,698,8,0,-22	2	0045	-- percent
-&	800,698,17,0,-45	2	0046	-- ampersand
-'	220,698,0,0,-46	2	0047	-- quoteright
+%	900,698,8	2	37	percent
+&	800,698,17	2	38	ampersand
+'	220,698	2	39	quoteright
 cq	"
-(	300,727,145,0,-76	2	0050	-- parenleft
-)	300,727,146,0,-17	2	0051	-- parenright
-*	440,698,0,0,-54	2	0052	-- asterisk
-+	600,513,0,0,-51	0	0053	-- plus
-,	320,114,114,0,-90	0	0054	-- comma
--	400,292,0,0,-50	0	0055	-- hyphen
+(	300,727,145	2	40	parenleft
+)	300,727,146	2	41	parenright
+*	440,698	2	42	asterisk
++	600,513	0	43	plus
+,	320,114,114	0	44	comma
+-	400,292	0	45	hyphen
 hy	"
-.	320,123,8,0,-92	0	0056	-- period
-/	600,717,149,0,-74	2	0057	-- slash
+.	320,123,8	0	46	period
+/	600,717,149	2	47	slash
 sl	"
-0	620,698,17,0,-40	2	0060	-- zero
-1	620,681,0,0,-160	2	0061	-- one
-2	620,698,0,0,-42	2	0062	-- two
-3	620,698,17,0,-40	2	0063	-- three
-4	620,681,0,0,-25	2	0064	-- four
-5	620,717,17,0,-60	2	0065	-- five
-6	620,698,17,0,-45	2	0066	-- six
-7	620,681,0,0,-60	2	0067	-- seven
-8	620,698,17,0,-44	2	0070	-- eight
-9	620,698,17,0,-37	2	0071	-- nine
-:	320,494,8,0,-92	0	0072	-- colon
-;	320,494,114,0,-90	0	0073	-- semicolon
-<	600,526,2,0,-49	0	0074	-- less
-=	600,398,0,0,-51	0	0075	-- equal
->	600,526,2,0,-48	0	0076	-- greater
-?	540,698,8,0,-27	2	0077	-- question
-@	820,698,17,0,-55	2	0100	-- at
+0	620,698,17	2	48	zero
+1	620,681	2	49	one
+2	620,698	2	50	two
+3	620,698,17	2	51	three
+4	620,681	2	52	four
+5	620,717,17	2	53	five
+6	620,698,17	2	54	six
+7	620,681	2	55	seven
+8	620,698,17	2	56	eight
+9	620,698,17	2	57	nine
+:	320,494,8	0	58	colon
+;	320,494,114	0	59	semicolon
+<	600,526,2	0	60	less
+=	600,398	0	61	equal
+>	600,526,2	0	62	greater
+?	540,698,8	2	63	question
+@	820,698,17	2	64	at
 at	"
-A	680,681,0,34,37	2	0101	-- A
-B	740,681,0,0,-31	2	0102	-- B
-C	740,698,17,0,-44	2	0103	-- C
-D	800,681,0,0,-31	2	0104	-- D
-E	720,681,0,0,-31	2	0105	-- E
-F	640,681,0,14,-31	2	0106	-- F
-G	800,698,17,0,-44	2	0107	-- G
-H	800,681,0,0,-31	2	0110	-- H
-I	340,681,0,0,-31	2	0111	-- I
-J	600,681,17,0,23	2	0112	-- J
-K	720,681,0,30,-31	2	0113	-- K
-L	600,681,0,29,-31	2	0114	-- L
-M	920,681,0,0,-26	2	0115	-- M
-N	740,681,0,0,-26	2	0116	-- N
-O	800,698,17,0,-44	2	0117	-- O
-P	620,681,0,0,-31	2	0120	-- P
-Q	820,698,189,0,-44	2	0121	-- Q
-R	720,681,0,37,-31	2	0122	-- R
-S	660,698,17,0,-28	2	0123	-- S
-T	620,681,0,36,37	2	0124	-- T
-U	780,681,17,0,-25	2	0125	-- U
-V	700,681,0,25,30	2	0126	-- V
-W	960,681,0,24,30	2	0127	-- W
-X	720,681,0,35,30	2	0130	-- X
-Y	640,681,0,26,30	2	0131	-- Y
-Z	640,681,0,16,-10	2	0132	-- Z
-[	300,717,136,0,-92	2	0133	-- bracketleft
+A	680,681,0,34,37	2	65	A
+B	740,681	2	66	B
+C	740,698,17	2	67	C
+D	800,681	2	68	D
+E	720,681	2	69	E
+F	640,681,0,14	2	70	F
+G	800,698,17	2	71	G
+H	800,681	2	72	H
+I	340,681	2	73	I
+J	600,681,17,0,23	2	74	J
+K	720,681,0,30	2	75	K
+L	600,681,0,29	2	76	L
+M	920,681	2	77	M
+N	740,681	2	78	N
+O	800,698,17	2	79	O
+P	620,681	2	80	P
+Q	820,698,189	2	81	Q
+R	720,681,0,37	2	82	R
+S	660,698,17	2	83	S
+T	620,681,0,36,37	2	84	T
+U	780,681,17	2	85	U
+V	700,681,0,25,30	2	86	V
+W	960,681,0,24,30	2	87	W
+X	720,681,0,35,30	2	88	X
+Y	640,681,0,26,30	2	89	Y
+Z	640,681,0,16	2	90	Z
+[	300,717,136	2	91	bracketleft
 lB	"
-\	600,717,0,0,-74	2	0134	-- backslash
+\	600,717	2	92	backslash
 rs	"
-]	300,717,136,0,-41	2	0135	-- bracketright
+]	300,717,136	2	93	bracketright
 rB	"
-a^	420,685,0,0,-68	2	0136	-- circumflex
+a^	420,685	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	220,698,0,0,-46	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	220,698	2	96	quoteleft
 oq	"
-a	580,494,8,7,-35	0	0141	-- a
-b	620,717,8,0,2	2	0142	-- b
-c	520,494,8,0,-37	0	0143	-- c
-d	620,717,8,0,-37	2	0144	-- d
-e	520,494,8,0,-37	0	0145	-- e
-f	320,734,0,94,-20	2	0146	-- f
-g	540,567,243,2,-17	1	0147	-- g
-h	660,717,0,0,-20	2	0150	-- h
-i	300,654,0,0,-20	0	0151	-- i
-j	300,654,251,0,109	1	0152	-- j
-k	620,717,0,8,-20	2	0153	-- k
-l	300,717,0,0,-20	2	0154	-- l
-m	940,494,0,0,-17	0	0155	-- m
-n	660,494,0,0,-20	0	0156	-- n
-o	560,494,8,0,-37	0	0157	-- o
-p	620,494,228,0,-20	1	0160	-- p
-q	580,494,228,9,-37	1	0161	-- q
-r	440,494,0,7,-20	0	0162	-- r
-s	520,494,8,0,-40	0	0163	-- s
-t	380,667,8,8,-20	2	0164	-- t
-u	680,484,8,0,-20	0	0165	-- u
-v	520,484,0,14,23	0	0166	-- v
-w	780,484,0,24,19	0	0167	-- w
-x	560,484,0,16,16	0	0170	-- x
-y	540,484,236,9,23	1	0171	-- y
-z	480,484,0,0,-7	0	0172	-- z
-lC	280,717,136,0,-21	2	0173	-- braceleft
+a	580,494,8,7	0	97	a
+b	620,717,8,0,2	2	98	b
+c	520,494,8	0	99	c
+d	620,717,8	2	100	d
+e	520,494,8	0	101	e
+f	320,734,0,94	2	102	f
+g	540,567,243,2	1	103	g
+h	660,717	2	104	h
+i	300,654	0	105	i
+j	300,654,251,0,109	1	106	j
+k	620,717,0,8	2	107	k
+l	300,717	2	108	l
+m	940,494	0	109	m
+n	660,494	0	110	n
+o	560,494,8	0	111	o
+p	620,494,228	1	112	p
+q	580,494,228,9	1	113	q
+r	440,494,0,7	0	114	r
+s	520,494,8	0	115	s
+t	380,667,8,8	2	116	t
+u	680,484,8	0	117	u
+v	520,484,0,14,23	0	118	v
+w	780,484,0,24,19	0	119	w
+x	560,484,0,16,16	0	120	x
+y	540,484,236,9,23	1	121	y
+z	480,484	0	122	z
+lC	280,717,136	2	123	braceleft
 {	"
-ba	600,750,250,0,-264	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	280,717,136,0,-21	2	0175	-- braceright
+rC	280,717,136	2	125	braceright
 }	"
-a~	440,661,0,0,-68	0	0176	-- tilde
+a~	440,661	0	126	tilde
 ~	"
-bq	220,110,108,0,-46	0	0200	-- quotesinglbase
-Fo	360,437,0,0,-51	0	0201	-- guillemotleft
-Fc	360,437,0,0,-51	0	0202	-- guillemotright
-bu	460,511,0,0,-60	0	0203	-- bullet
-Fn	620,749,155,13,29	2	0204	-- florin
-f/	140,681,0,195,188	2	0205	-- fraction
-%0	1280,698,8,0,-22	2	0206	-- perthousand
-dg	540,698,156,0,-79	2	0207	-- dagger
-dd	540,698,156,0,-79	2	0210	-- daggerdbl
-en	500,292,0,15,15	0	0211	-- endash
-em	1000,292,0,15,15	0	0212	-- emdash
-fi	620,734,0,0,-20	2	0214	-- fi
-fl	620,734,0,0,-20	2	0215	-- fl
-.i	300,484,0,0,-20	0	0220	-- dotlessi
-ga	340,689,0,0,-68	2	0222	-- grave
-a"	380,698,0,0,-68	2	0223	-- hungarumlaut
-a.	260,672,0,0,-68	2	0224	-- dotaccent
-ab	460,687,0,0,-68	2	0225	-- breve
-ah	420,672,0,0,-68	2	0226	-- caron
-ao	320,731,0,0,-68	2	0227	-- ring
-ho	320,0,145,0,-68	0	0230	-- ogonek
-lq	400,698,0,0,-46	2	0231	-- quotedblleft
-rq	400,698,0,0,-46	2	0232	-- quotedblright
-oe	900,494,8,0,-37	0	0233	-- oe
-/l	320,717,0,0,-20	2	0234	-- lslash
-Bq	400,110,108,0,-46	0	0235	-- quotedblbase
-OE	1240,698,17,0,-44	2	0236	-- OE
-/L	600,681,0,29,-31	2	0237	-- Lslash
-r!	300,494,214,0,-75	0	0241	-- exclamdown
-ct	620,651,0,0,-116	0	0242	-- cent
-Po	620,698,17,11,-8	2	0243	-- sterling
-Cs	620,591,0,0,-58	0	0244	-- currency
-Ye	620,681,0,27,22	2	0245	-- yen
-bb	600,675,175,0,-264	2	0246	-- brokenbar
-sc	520,698,178,0,-33	2	0247	-- section
-ad	420,674,0,0,-68	2	0250	-- dieresis
-co	740,698,17,0,-24	2	0251	-- copyright
-Of	420,698,0,0,-49	2	0252	-- ordfeminine
-fo	240,437,0,0,-51	0	0253	-- guilsinglleft
-no	600,398,0,0,-51	0	0254	-- logicalnot
-\-	600,300,0,0,-51	0	0255	-- minus
-rg	740,698,17,0,-23	2	0256	-- registered
-a-	440,635,0,0,-68	0	0257	-- macron
-de	400,698,0,0,-50	2	0260	-- degree
-t+-	600,513,0,0,-51	0	0261	-- plusminus
-S2	372,698,0,0,-20	2	0262	-- twosuperior
-S3	372,698,0,0,-12	2	0263	-- threesuperior
-aa	340,689,0,0,-68	2	0264	-- acute
-mc	680,484,251,0,-20	1	0265	-- mu
-ps	600,681,0,0,-14	2	0266	-- paragraph
-pc	320,327,0,0,-92	0	0267	-- periodcentered
-ac	320,0,200,0,-68	0	0270	-- cedilla
-S1	372,688,0,0,-80	2	0271	-- onesuperior
-Om	420,698,0,0,-56	2	0272	-- ordmasculine
-fc	240,437,0,0,-51	0	0273	-- guilsinglright
-14	930,681,0,0,-80	2	0274	-- onequarter
-12	930,681,0,0,-80	2	0275	-- onehalf
-34	930,691,0,0,-52	2	0276	-- threequarters
-r?	540,494,217,0,-23	0	0277	-- questiondown
-`A	680,866,0,34,37	2	0300	-- Agrave
-'A	680,866,0,34,37	2	0301	-- Aacute
-^A	680,862,0,34,37	2	0302	-- Acircumflex
-~A	680,838,0,34,37	2	0303	-- Atilde
-:A	680,851,0,34,37	2	0304	-- Adieresis
-oA	680,908,0,34,37	2	0305	-- Aring
-AE	1260,681,0,0,36	2	0306	-- AE
-,C	740,698,200,0,-44	2	0307	-- Ccedilla
-`E	720,866,0,0,-31	2	0310	-- Egrave
-'E	720,866,0,0,-31	2	0311	-- Eacute
-^E	720,862,0,0,-31	2	0312	-- Ecircumflex
-:E	720,851,0,0,-31	2	0313	-- Edieresis
-`I	340,866,0,0,-31	2	0314	-- Igrave
-'I	340,866,0,0,-31	2	0315	-- Iacute
-^I	340,862,0,0,-28	2	0316	-- Icircumflex
-:I	340,851,0,0,-28	2	0317	-- Idieresis
--D	800,681,0,0,-31	2	0320	-- Eth
-~N	740,838,0,0,-26	2	0321	-- Ntilde
-`O	800,866,17,0,-44	2	0322	-- Ograve
-'O	800,866,17,0,-44	2	0323	-- Oacute
-^O	800,862,17,0,-44	2	0324	-- Ocircumflex
-~O	800,838,17,0,-44	2	0325	-- Otilde
-:O	800,851,17,0,-44	2	0326	-- Odieresis
-tmu	600,513,0,0,-51	0	0327	-- multiply
-/O	800,733,53,0,-44	2	0330	-- Oslash
-`U	780,866,17,0,-25	2	0331	-- Ugrave
-'U	780,866,17,0,-25	2	0332	-- Uacute
-^U	780,862,17,0,-25	2	0333	-- Ucircumflex
-:U	780,851,17,0,-25	2	0334	-- Udieresis
-'Y	640,866,0,26,30	2	0335	-- Yacute
-TP	620,681,0,0,-31	2	0336	-- Thorn
-ss	660,698,110,0,109	2	0337	-- germandbls
-`a	580,689,8,7,-35	2	0340	-- agrave
-'a	580,689,8,7,-35	2	0341	-- aacute
-^a	580,685,8,7,-35	2	0342	-- acircumflex
-~a	580,661,8,7,-35	0	0343	-- atilde
-:a	580,674,8,7,-35	2	0344	-- adieresis
-oa	580,731,8,7,-35	2	0345	-- aring
-ae	860,494,8,0,-35	0	0346	-- ae
-,c	520,494,200,0,-37	0	0347	-- ccedilla
-`e	520,689,8,0,-37	2	0350	-- egrave
-'e	520,689,8,0,-37	2	0351	-- eacute
-^e	520,685,8,0,-37	2	0352	-- ecircumflex
-:e	520,674,8,0,-37	2	0353	-- edieresis
-`i	300,689,0,0,-20	2	0354	-- igrave
-'i	300,689,0,0,-20	2	0355	-- iacute
-^i	300,685,0,0,-8	2	0356	-- icircumflex
-:i	300,674,0,0,-8	2	0357	-- idieresis
-Sd	560,734,8,0,-37	2	0360	-- eth
-~n	660,661,0,0,-20	0	0361	-- ntilde
-`o	560,689,8,0,-37	2	0362	-- ograve
-'o	560,689,8,0,-37	2	0363	-- oacute
-^o	560,685,8,0,-37	2	0364	-- ocircumflex
-~o	560,661,8,0,-37	0	0365	-- otilde
-:o	560,674,8,0,-37	2	0366	-- odieresis
-tdi	600,514,0,0,-51	0	0367	-- divide
-/o	560,534,40,0,-37	0	0370	-- oslash
-`u	680,689,8,0,-20	2	0371	-- ugrave
-'u	680,689,8,0,-20	2	0372	-- uacute
-^u	680,685,8,0,-20	2	0373	-- ucircumflex
-:u	680,674,8,0,-20	2	0374	-- udieresis
-'y	540,689,236,9,23	3	0375	-- yacute
-Tp	620,717,228,0,-20	3	0376	-- thorn
-:y	540,674,236,9,23	3	0377	-- ydieresis
+bq	220,110,108	0	128	quotesinglbase
+Fo	360,437	0	129	guillemotleft
+Fc	360,437	0	130	guillemotright
+bu	460,511	0	131	bullet
+Fn	620,749,155,13,29	2	132	florin
+f/	140,681,0,195,188	2	133	fraction
+%0	1280,698,8	2	134	perthousand
+dg	540,698,156	2	135	dagger
+dd	540,698,156	2	136	daggerdbl
+en	500,292,0,15,15	0	137	endash
+em	1000,292,0,15,15	0	138	emdash
+fi	620,734	2	140	fi
+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
+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
+lq	400,698	2	153	quotedblleft
+rq	400,698	2	154	quotedblright
+oe	900,494,8	0	155	oe
+/l	320,717	2	156	lslash
+Bq	400,110,108	0	157	quotedblbase
+OE	1240,698,17	2	158	OE
+/L	600,681,0,29	2	159	Lslash
+r!	300,494,214	0	161	exclamdown
+ct	620,651	0	162	cent
+Po	620,698,17,11	2	163	sterling
+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
+co	740,698,17	2	169	copyright
+Of	420,698	2	170	ordfeminine
+fo	240,437	0	171	guilsinglleft
+tno	600,398	0	172	logicalnot
+\-	600,300	0	173	minus
+rg	740,698,17	2	174	registered
+a-	440,635	0	175	macron
+de	400,698	2	176	degree
+t+-	600,513	0	177	plusminus
+S2	372,698	2	178	twosuperior
+S3	372,698	2	179	threesuperior
+aa	340,689	2	180	acute
+mc	680,484,251	1	181	mu
+ps	600,681	2	182	paragraph
+pc	320,327	0	183	periodcentered
+ac	320,0,200	0	184	cedilla
+S1	372,688	2	185	onesuperior
+Om	420,698	2	186	ordmasculine
+fc	240,437	0	187	guilsinglright
+14	930,681	2	188	onequarter
+12	930,681	2	189	onehalf
+34	930,691	2	190	threequarters
+r?	540,494,217	0	191	questiondown
+`A	680,866,0,34,37	2	192	Agrave
+'A	680,866,0,34,37	2	193	Aacute
+^A	680,862,0,34,37	2	194	Acircumflex
+~A	680,838,0,34,37	2	195	Atilde
+:A	680,851,0,34,37	2	196	Adieresis
+oA	680,908,0,34,37	2	197	Aring
+AE	1260,681,0,0,36	2	198	AE
+,C	740,698,200	2	199	Ccedilla
+`E	720,866	2	200	Egrave
+'E	720,866	2	201	Eacute
+^E	720,862	2	202	Ecircumflex
+:E	720,851	2	203	Edieresis
+`I	340,866	2	204	Igrave
+'I	340,866	2	205	Iacute
+^I	340,862	2	206	Icircumflex
+:I	340,851	2	207	Idieresis
+-D	800,681	2	208	Eth
+~N	740,838	2	209	Ntilde
+`O	800,866,17	2	210	Ograve
+'O	800,866,17	2	211	Oacute
+^O	800,862,17	2	212	Ocircumflex
+~O	800,838,17	2	213	Otilde
+:O	800,851,17	2	214	Odieresis
+tmu	600,513	0	215	multiply
+/O	800,733,53	2	216	Oslash
+`U	780,866,17	2	217	Ugrave
+'U	780,866,17	2	218	Uacute
+^U	780,862,17	2	219	Ucircumflex
+:U	780,851,17	2	220	Udieresis
+'Y	640,866,0,26,30	2	221	Yacute
+TP	620,681	2	222	Thorn
+ss	660,698,110,0,109	2	223	germandbls
+`a	580,689,8,7	2	224	agrave
+'a	580,689,8,7	2	225	aacute
+^a	580,685,8,7	2	226	acircumflex
+~a	580,661,8,7	0	227	atilde
+:a	580,674,8,7	2	228	adieresis
+oa	580,731,8,7	2	229	aring
+ae	860,494,8	0	230	ae
+,c	520,494,200	0	231	ccedilla
+`e	520,689,8	2	232	egrave
+'e	520,689,8	2	233	eacute
+^e	520,685,8	2	234	ecircumflex
+:e	520,674,8	2	235	edieresis
+`i	300,689	2	236	igrave
+'i	300,689	2	237	iacute
+^i	300,685	2	238	icircumflex
+:i	300,674	2	239	idieresis
+Sd	560,734,8	2	240	eth
+~n	660,661	0	241	ntilde
+`o	560,689,8	2	242	ograve
+'o	560,689,8	2	243	oacute
+^o	560,685,8	2	244	ocircumflex
+~o	560,661,8	0	245	otilde
+:o	560,674,8	2	246	odieresis
+tdi	600,514	0	247	divide
+/o	560,534,40	0	248	oslash
+`u	680,689,8	2	249	ugrave
+'u	680,689,8	2	250	uacute
+^u	680,685,8	2	251	ucircumflex
+:u	680,674,8	2	252	udieresis
+'y	540,689,236,9,23	3	253	yacute
+Tp	620,717,228	3	254	thorn
+:y	540,674,236,9,23	3	255	ydieresis
+u2026	1000,123,8	0	256	ellipsis
diff --git a/contrib/groff/font/devps/CB b/contrib/groff/font/devps/CB
index 4bdd9c7..31f19b7 100644
--- a/contrib/groff/font/devps/CB
+++ b/contrib/groff/font/devps/CB
@@ -3,246 +3,279 @@ internalname Courier-Bold
 spacewidth 600
 encoding text.enc
 charset
-ha	600,616,0,0,-108	2	0000	-- asciicircum
-ti	600,356,0,0,-71	0	0001	-- asciitilde
-vS	600,790,22,0,-47	2	0002	-- Scaron
-vZ	600,790,0,0,-62	2	0003	-- Zcaron
-vs	600,667,17,0,-68	2	0004	-- scaron
-vz	600,667,0,0,-81	2	0005	-- zcaron
-:Y	600,748,0,0,-12	2	0006	-- Ydieresis
-tm	600,562,0,149,9	2	0007	-- trademark
-aq	600,562,0,0,-227	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-202	2	0041	-- exclam
-"	600,562,0,0,-135	2	0042	-- quotedbl
+ha	600,616	2	0	asciicircum
+ti	600,356	0	1	asciitilde
+vS	600,790,22	2	2	Scaron
+vZ	600,790	2	3	Zcaron
+vs	600,667,17	2	4	scaron
+vz	600,667	2	5	zcaron
+:Y	600,748	2	6	Ydieresis
+tm	600,562,0,149,9	2	7	trademark
+aq	600,562	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15	2	33	exclam
+"	600,562	2	34	quotedbl
 dq	"
-#	600,651,45,0,-56	2	0043	-- numbersign
+#	600,651,45	2	35	numbersign
 sh	"
-$	600,666,126,0,-82	2	0044	-- dollar
+$	600,666,126	2	36	dollar
 Do	"
-%	600,616,15,0,-5	2	0045	-- percent
-&	600,543,15,0,-36	0	0046	-- ampersand
-'	600,562,0,0,-171	2	0047	-- quoteright
+%	600,616,15	2	37	percent
+&	600,543,15	0	38	ampersand
+'	600,562	2	39	quoteright
 cq	"
-(	600,616,102,0,-219	2	0050	-- parenleft
-)	600,616,102,0,-139	2	0051	-- parenright
-*	600,601,0,0,-91	2	0052	-- asterisk
-+	600,478,0,0,-71	0	0053	-- plus
-,	600,174,111,0,-123	0	0054	-- comma
--	600,313,0,0,-100	0	0055	-- hyphen
+(	600,616,102	2	40	parenleft
+)	600,616,102	2	41	parenright
+*	600,601	2	42	asterisk
++	600,478	0	43	plus
+,	600,174,111	0	44	comma
+-	600,313	0	45	hyphen
 hy	"
-.	600,171,15,0,-192	0	0056	-- period
-/	600,626,77,0,-98	2	0057	-- slash
+.	600,171,15	0	46	period
+/	600,626,77	2	47	slash
 sl	"
-0	600,616,15,0,-87	2	0060	-- zero
-1	600,616,0,0,-81	2	0061	-- one
-2	600,616,0,0,-61	2	0062	-- two
-3	600,616,15,0,-63	2	0063	-- three
-4	600,616,0,0,-53	2	0064	-- four
-5	600,601,15,0,-70	2	0065	-- five
-6	600,616,15,0,-90	2	0066	-- six
-7	600,601,0,0,-55	2	0067	-- seven
-8	600,616,15,0,-83	2	0070	-- eight
-9	600,616,15,0,-79	2	0071	-- nine
-:	600,425,15,0,-191	0	0072	-- colon
-;	600,425,111,0,-123	0	0073	-- semicolon
-<	600,501,0,0,-66	0	0074	-- less
-=	600,398,0,0,-71	0	0075	-- equal
->	600,501,0,0,-77	0	0076	-- greater
-?	600,580,14,0,-98	2	0077	-- question
-@	600,616,15,0,-16	2	0100	-- at
+0	600,616,15	2	48	zero
+1	600,616	2	49	one
+2	600,616	2	50	two
+3	600,616,15	2	51	three
+4	600,616	2	52	four
+5	600,601,15	2	53	five
+6	600,616,15	2	54	six
+7	600,601	2	55	seven
+8	600,616,15	2	56	eight
+9	600,616,15	2	57	nine
+:	600,425,15	0	58	colon
+;	600,425,111	0	59	semicolon
+<	600,501	0	60	less
+=	600,398	0	61	equal
+>	600,501	0	62	greater
+?	600,580,14	2	63	question
+@	600,616,15	2	64	at
 at	"
-A	600,562,0,9,9	2	0101	-- A
-B	600,562,0,0,-30	2	0102	-- B
-C	600,580,18,0,-22	2	0103	-- C
-D	600,562,0,0,-30	2	0104	-- D
-E	600,562,0,0,-25	2	0105	-- E
-F	600,562,0,0,-39	2	0106	-- F
-G	600,580,18,0,-22	2	0107	-- G
-H	600,562,0,0,-20	2	0110	-- H
-I	600,562,0,0,-77	2	0111	-- I
-J	600,562,18,1,-37	2	0112	-- J
-K	600,562,0,0,-21	2	0113	-- K
-L	600,562,0,0,-39	2	0114	-- L
-M	600,562,0,2,2	2	0115	-- M
-N	600,562,12,10,-8	2	0116	-- N
-O	600,580,18,0,-22	2	0117	-- O
-P	600,562,0,0,-48	2	0120	-- P
-Q	600,580,138,0,-32	2	0121	-- Q
-R	600,562,0,0,-24	2	0122	-- R
-S	600,582,22,0,-47	2	0123	-- S
-T	600,562,0,0,-21	2	0124	-- T
-U	600,562,18,0,-4	2	0125	-- U
-V	600,562,0,13,13	2	0126	-- V
-W	600,562,0,18,18	2	0127	-- W
-X	600,562,0,0,-12	2	0130	-- X
-Y	600,562,0,0,-12	2	0131	-- Y
-Z	600,562,0,0,-62	2	0132	-- Z
-[	600,616,102,0,-245	2	0133	-- bracketleft
+A	600,562,0,9,9	2	65	A
+B	600,562	2	66	B
+C	600,580,18	2	67	C
+D	600,562	2	68	D
+E	600,562	2	69	E
+F	600,562	2	70	F
+G	600,580,18	2	71	G
+H	600,562	2	72	H
+I	600,562	2	73	I
+J	600,562,18,1	2	74	J
+K	600,562	2	75	K
+L	600,562	2	76	L
+M	600,562,0,2,2	2	77	M
+N	600,562,12,10	2	78	N
+O	600,580,18	2	79	O
+P	600,562	2	80	P
+Q	600,580,138	2	81	Q
+R	600,562	2	82	R
+S	600,582,22	2	83	S
+T	600,562	2	84	T
+U	600,562,18	2	85	U
+V	600,562,0,13,13	2	86	V
+W	600,562,0,18,18	2	87	W
+X	600,562	2	88	X
+Y	600,562	2	89	Y
+Z	600,562	2	90	Z
+[	600,616,102	2	91	bracketleft
 lB	"
-\	600,626,77,0,-99	2	0134	-- backslash
+\	600,626,77	2	92	backslash
 rs	"
-]	600,616,102,0,-125	2	0135	-- bracketright
+]	600,616,102	2	93	bracketright
 rB	"
-a^	600,657,0,0,-103	2	0136	-- circumflex
+a^	600,657	2	94	circumflex
 ^	"
-_	600,0,125	0	0137	-- underscore
-`	600,562,0,0,-178	2	0140	-- quoteleft
+_	600,0,125	0	95	underscore
+`	600,562	2	96	quoteleft
 oq	"
-a	600,454,15,0,-35	0	0141	-- a
-b	600,626,15	2	0142	-- b
-c	600,459,15,0,-40	0	0143	-- c
-d	600,626,15,0,-20	2	0144	-- d
-e	600,454,15,0,-40	0	0145	-- e
-f	600,626,0,0,-83	2	0146	-- f
-g	600,454,146,0,-30	1	0147	-- g
-h	600,626,0,0,-5	2	0150	-- h
-i	600,658,0,0,-77	2	0151	-- i
-j	600,658,146,0,-63	3	0152	-- j
-k	600,626,0,0,-20	2	0153	-- k
-l	600,626,0,0,-77	2	0154	-- l
-m	600,454,0,26,22	0	0155	-- m
-n	600,454,0,0,-18	0	0156	-- n
-o	600,454,15,0,-30	0	0157	-- o
-p	600,454,142,0,1	1	0160	-- p
-q	600,454,142,0,-20	1	0161	-- q
-r	600,454,0,0,-47	0	0162	-- r
-s	600,459,17,0,-68	0	0163	-- s
-t	600,562,15,0,-47	2	0164	-- t
-u	600,439,15,0,1	0	0165	-- u
-v	600,439,0,1,1	0	0166	-- v
-w	600,439,0,18,18	0	0167	-- w
-x	600,439,0,0,-6	0	0170	-- x
-y	600,439,142,1,4	1	0171	-- y
-z	600,439,0,0,-81	0	0172	-- z
-lC	600,616,102,0,-160	2	0173	-- braceleft
+a	600,454,15	0	97	a
+b	600,626,15	2	98	b
+c	600,459,15	0	99	c
+d	600,626,15	2	100	d
+e	600,454,15	0	101	e
+f	600,626	2	102	f
+g	600,454,146	1	103	g
+h	600,626	2	104	h
+i	600,658	2	105	i
+j	600,658,146	3	106	j
+k	600,626	2	107	k
+l	600,626	2	108	l
+m	600,454,0,26,22	0	109	m
+n	600,454	0	110	n
+o	600,454,15	0	111	o
+p	600,454,142,0,1	1	112	p
+q	600,454,142	1	113	q
+r	600,454	0	114	r
+s	600,459,17	0	115	s
+t	600,562,15	2	116	t
+u	600,439,15,0,1	0	117	u
+v	600,439,0,1,1	0	118	v
+w	600,439,0,18,18	0	119	w
+x	600,439	0	120	x
+y	600,439,142,1,4	1	121	y
+z	600,439	0	122	z
+lC	600,616,102	2	123	braceleft
 {	"
-ba	600,750,250,0,-255	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	600,616,102,0,-136	2	0175	-- braceright
+rC	600,616,102	2	125	braceright
 }	"
-a~	600,636,0,0,-89	2	0176	-- tilde
+a~	600,636	2	126	tilde
 ~	"
-bq	600,143,142,0,-175	1	0200	-- quotesinglbase
-Fo	600,446,0,0,-8	0	0201	-- guillemotleft
-Fc	600,446,0,0,-47	0	0202	-- guillemotright
-bu	600,430,0,0,-140	0	0203	-- bullet
-Fn	600,616,131,0,30	2	0204	-- florin
-f/	600,661,60,0,-25	2	0205	-- fraction
-%0	600,616,15,113,113	2	0206	-- perthousand
-dg	600,580,70,0,-106	2	0207	-- dagger
-dd	600,580,70,0,-106	2	0210	-- daggerdbl
-en	600,313,0,0,-65	0	0211	-- endash
-em	600,313,0,10,10	0	0212	-- emdash
-fi	600,626,0,0,-12	2	0214	-- fi
-fl	600,626,0,0,-12	2	0215	-- fl
-.i	600,439,0,0,-77	0	0220	-- dotlessi
-ga	600,661,0,0,-132	2	0222	-- grave
-a"	600,661,0,0,-68	2	0223	-- hungarumlaut
-a.	600,625,0,0,-230	2	0224	-- dotaccent
-ab	600,631,0,0,-83	2	0225	-- breve
-ah	600,667,0,0,-103	2	0226	-- caron
-ao	600,678,0,0,-198	2	0227	-- ring
-ho	600,0,199,0,-169	1	0230	-- ogonek
-lq	600,562,0,0,-71	2	0231	-- quotedblleft
-rq	600,562,0,0,-61	2	0232	-- quotedblright
-oe	600,454,15,11,18	0	0233	-- oe
-/l	600,626,0,0,-77	2	0234	-- lslash
-Bq	600,143,142,0,-65	1	0235	-- quotedblbase
-OE	600,562,0,0,25	2	0236	-- OE
-/L	600,562,0,0,-39	2	0237	-- Lslash
-r!	600,449,146,0,-202	1	0241	-- exclamdown
-ct	600,614,49,0,-66	2	0242	-- cent
-Po	600,611,28,0,-72	2	0243	-- sterling
-Cs	600,517,0,0,-54	0	0244	-- currency
-Ye	600,562,0,0,-10	2	0245	-- yen
-bb	600,675,175,0,-255	3	0246	-- brokenbar
-sc	600,580,70,0,-83	2	0247	-- section
-ad	600,625,0,0,-128	2	0250	-- dieresis
-co	600,580,18	2	0251	-- copyright
-Of	600,580,0,0,-147	2	0252	-- ordfeminine
-fo	600,446,0,0,-141	0	0253	-- guilsinglleft
-no	600,413,0,0,-71	0	0254	-- logicalnot
-\-	600,313,0,0,-71	0	0255	-- minus
-rg	600,580,18	2	0256	-- registered
-a-	600,585,0,0,-88	2	0257	-- macron
-de	600,616,0,0,-86	2	0260	-- degree
-t+-	600,515,0,0,-71	0	0261	-- plusminus
-S2	600,616,0,0,-143	2	0262	-- twosuperior
-S3	600,616,0,0,-138	2	0263	-- threesuperior
-aa	600,661,0,0,-205	2	0264	-- acute
-mc	600,439,142,0,1	1	0265	-- mu
-ps	600,580,70,0,-6	2	0266	-- paragraph
-pc	600,351,0,0,-196	0	0267	-- periodcentered
-ac	600,0,206,0,-205	1	0270	-- cedilla
-S1	600,616,0,0,-153	2	0271	-- onesuperior
-Om	600,580,0,0,-147	2	0272	-- ordmasculine
-fc	600,446,0,0,-141	0	0273	-- guilsinglright
-14	600,661,60,56,56	2	0274	-- onequarter
-12	600,661,60,48,47	2	0275	-- onehalf
-34	600,661,60,48,47	2	0276	-- threequarters
-r?	600,449,146,0,-99	1	0277	-- questiondown
-`A	600,784,0,9,9	2	0300	-- Agrave
-'A	600,784,0,9,9	2	0301	-- Aacute
-^A	600,780,0,9,9	2	0302	-- Acircumflex
-~A	600,759,0,9,9	2	0303	-- Atilde
-:A	600,748,0,9,9	2	0304	-- Adieresis
-oA	600,801,0,9,9	2	0305	-- Aring
-AE	600,562,0,2,29	2	0306	-- AE
-,C	600,580,206,0,-22	3	0307	-- Ccedilla
-`E	600,784,0,0,-25	2	0310	-- Egrave
-'E	600,784,0,0,-25	2	0311	-- Eacute
-^E	600,780,0,0,-25	2	0312	-- Ecircumflex
-:E	600,748,0,0,-25	2	0313	-- Edieresis
-`I	600,784,0,0,-77	2	0314	-- Igrave
-'I	600,784,0,0,-77	2	0315	-- Iacute
-^I	600,780,0,0,-77	2	0316	-- Icircumflex
-:I	600,748,0,0,-77	2	0317	-- Idieresis
--D	600,562,0,0,-30	2	0320	-- Eth
-~N	600,759,12,10,-8	2	0321	-- Ntilde
-`O	600,784,18,0,-22	2	0322	-- Ograve
-'O	600,784,18,0,-22	2	0323	-- Oacute
-^O	600,780,18,0,-22	2	0324	-- Ocircumflex
-~O	600,759,18,0,-22	2	0325	-- Otilde
-:O	600,748,18,0,-22	2	0326	-- Odieresis
-tmu	600,478,0,0,-81	0	0327	-- multiply
-/O	600,584,22,0,-22	2	0330	-- Oslash
-`U	600,784,18,0,-4	2	0331	-- Ugrave
-'U	600,784,18,0,-4	2	0332	-- Uacute
-^U	600,780,18,0,-4	2	0333	-- Ucircumflex
-:U	600,748,18,0,-4	2	0334	-- Udieresis
-'Y	600,784,0,0,-12	2	0335	-- Yacute
-TP	600,562,0,0,-48	2	0336	-- Thorn
-ss	600,626,15,0,-22	2	0337	-- germandbls
-`a	600,661,15,0,-35	2	0340	-- agrave
-'a	600,661,15,0,-35	2	0341	-- aacute
-^a	600,657,15,0,-35	2	0342	-- acircumflex
-~a	600,636,15,0,-35	2	0343	-- atilde
-:a	600,625,15,0,-35	2	0344	-- adieresis
-oa	600,678,15,0,-35	2	0345	-- aring
-ae	600,454,15,1,4	0	0346	-- ae
-,c	600,459,206,0,-40	1	0347	-- ccedilla
-`e	600,661,15,0,-40	2	0350	-- egrave
-'e	600,661,15,0,-40	2	0351	-- eacute
-^e	600,657,15,0,-40	2	0352	-- ecircumflex
-:e	600,625,15,0,-40	2	0353	-- edieresis
-`i	600,661,0,0,-77	2	0354	-- igrave
-'i	600,661,0,0,-77	2	0355	-- iacute
-^i	600,657,0,0,-63	2	0356	-- icircumflex
-:i	600,625,0,0,-77	2	0357	-- idieresis
-Sd	600,626,27,0,-58	2	0360	-- eth
-~n	600,636,0,0,-18	2	0361	-- ntilde
-`o	600,661,15,0,-30	2	0362	-- ograve
-'o	600,661,15,0,-30	2	0363	-- oacute
-^o	600,657,15,0,-30	2	0364	-- ocircumflex
-~o	600,636,15,0,-30	2	0365	-- otilde
-:o	600,625,15,0,-30	2	0366	-- odieresis
-tdi	600,500,0,0,-71	0	0367	-- divide
-/o	600,463,24,0,-30	0	0370	-- oslash
-`u	600,661,15,0,1	2	0371	-- ugrave
-'u	600,661,15,0,1	2	0372	-- uacute
-^u	600,657,15,0,1	2	0373	-- ucircumflex
-:u	600,625,15,0,1	2	0374	-- udieresis
-'y	600,661,142,1,4	3	0375	-- yacute
-Tp	600,626,142,0,14	3	0376	-- thorn
-:y	600,625,142,1,4	3	0377	-- ydieresis
+bq	600,143,142	1	128	quotesinglbase
+Fo	600,446	0	129	guillemotleft
+Fc	600,446	0	130	guillemotright
+bu	600,430	0	131	bullet
+Fn	600,616,131,0,30	2	132	florin
+f/	600,661,60	2	133	fraction
+%0	600,616,15,113,113	2	134	perthousand
+dg	600,580,70	2	135	dagger
+dd	600,580,70	2	136	daggerdbl
+en	600,313	0	137	endash
+em	600,313,0,10,10	0	138	emdash
+fi	600,626	2	140	fi
+fl	600,626	2	141	fl
+.i	600,439	0	144	dotlessi
+ga	600,661	2	146	grave
+a"	600,661	2	147	hungarumlaut
+a.	600,625	2	148	dotaccent
+ab	600,631	2	149	breve
+ah	600,667	2	150	caron
+ao	600,678	2	151	ring
+ho	600,0,199	1	152	ogonek
+lq	600,562	2	153	quotedblleft
+rq	600,562	2	154	quotedblright
+oe	600,454,15,11,18	0	155	oe
+/l	600,626	2	156	lslash
+Bq	600,143,142	1	157	quotedblbase
+OE	600,562,0,0,25	2	158	OE
+/L	600,562	2	159	Lslash
+r!	600,449,146	1	161	exclamdown
+ct	600,614,49	2	162	cent
+Po	600,611,28	2	163	sterling
+Cs	600,517	0	164	currency
+Ye	600,562	2	165	yen
+bb	600,675,175	3	166	brokenbar
+sc	600,580,70	2	167	section
+ad	600,625	2	168	dieresis
+co	600,580,18	2	169	copyright
+Of	600,580	2	170	ordfeminine
+fo	600,446	0	171	guilsinglleft
+tno	600,413	0	172	logicalnot
+\-	600,313	0	173	minus
+rg	600,580,18	2	174	registered
+a-	600,585	2	175	macron
+de	600,616	2	176	degree
+t+-	600,515	0	177	plusminus
+S2	600,616	2	178	twosuperior
+S3	600,616	2	179	threesuperior
+aa	600,661	2	180	acute
+mc	600,439,142,0,1	1	181	mu
+ps	600,580,70	2	182	paragraph
+pc	600,351	0	183	periodcentered
+ac	600,0,206	1	184	cedilla
+S1	600,616	2	185	onesuperior
+Om	600,580	2	186	ordmasculine
+fc	600,446	0	187	guilsinglright
+14	600,661,60,56,56	2	188	onequarter
+12	600,661,60,48,47	2	189	onehalf
+34	600,661,60,48,47	2	190	threequarters
+r?	600,449,146	1	191	questiondown
+`A	600,784,0,9,9	2	192	Agrave
+'A	600,784,0,9,9	2	193	Aacute
+^A	600,780,0,9,9	2	194	Acircumflex
+~A	600,759,0,9,9	2	195	Atilde
+:A	600,748,0,9,9	2	196	Adieresis
+oA	600,801,0,9,9	2	197	Aring
+AE	600,562,0,2,29	2	198	AE
+,C	600,580,206	3	199	Ccedilla
+`E	600,784	2	200	Egrave
+'E	600,784	2	201	Eacute
+^E	600,780	2	202	Ecircumflex
+:E	600,748	2	203	Edieresis
+`I	600,784	2	204	Igrave
+'I	600,784	2	205	Iacute
+^I	600,780	2	206	Icircumflex
+:I	600,748	2	207	Idieresis
+-D	600,562	2	208	Eth
+~N	600,759,12,10	2	209	Ntilde
+`O	600,784,18	2	210	Ograve
+'O	600,784,18	2	211	Oacute
+^O	600,780,18	2	212	Ocircumflex
+~O	600,759,18	2	213	Otilde
+:O	600,748,18	2	214	Odieresis
+tmu	600,478	0	215	multiply
+/O	600,584,22	2	216	Oslash
+`U	600,784,18	2	217	Ugrave
+'U	600,784,18	2	218	Uacute
+^U	600,780,18	2	219	Ucircumflex
+:U	600,748,18	2	220	Udieresis
+'Y	600,784	2	221	Yacute
+TP	600,562	2	222	Thorn
+ss	600,626,15	2	223	germandbls
+`a	600,661,15	2	224	agrave
+'a	600,661,15	2	225	aacute
+^a	600,657,15	2	226	acircumflex
+~a	600,636,15	2	227	atilde
+:a	600,625,15	2	228	adieresis
+oa	600,678,15	2	229	aring
+ae	600,454,15,1,4	0	230	ae
+,c	600,459,206	1	231	ccedilla
+`e	600,661,15	2	232	egrave
+'e	600,661,15	2	233	eacute
+^e	600,657,15	2	234	ecircumflex
+:e	600,625,15	2	235	edieresis
+`i	600,661	2	236	igrave
+'i	600,661	2	237	iacute
+^i	600,657	2	238	icircumflex
+:i	600,625	2	239	idieresis
+Sd	600,626,27	2	240	eth
+~n	600,636	2	241	ntilde
+`o	600,661,15	2	242	ograve
+'o	600,661,15	2	243	oacute
+^o	600,657,15	2	244	ocircumflex
+~o	600,636,15	2	245	otilde
+:o	600,625,15	2	246	odieresis
+tdi	600,500	0	247	divide
+/o	600,463,24	0	248	oslash
+`u	600,661,15,0,1	2	249	ugrave
+'u	600,661,15,0,1	2	250	uacute
+^u	600,657,15,0,1	2	251	ucircumflex
+:u	600,625,15,0,1	2	252	udieresis
+'y	600,661,142,1,4	3	253	yacute
+Tp	600,626,142,0,14	3	254	thorn
+:y	600,625,142,1,4	3	255	ydieresis
+IJ	600,562,18,22,8	2	256	IJ
+---	600,447	0	257	up
+---	600,320	0	258	dectab
+u0047_030C	600,790,18	2	259	Gcaron
+---	600,562	2	260	stop
+---	600,562	2	261	tab
+u2026	600,116,15	0	262	ellipsis
+---	600,333	0	263	largebullet
+u0073_0327	600,459,206	1	264	scedilla
+---	600,562	2	265	return
+ij	600,658,146	3	266	ij
+---	600,562,0,45,45	2	267	LL
+---	600,562	2	268	square
+da	600,608,15	2	269	arrowdown
+<-	600,455,0,34,24	0	270	arrowleft
+<>	600,455,0,24,24	0	271	arrowboth
+---	600,599	2	272	graybox
+->	600,455,0,24,34	0	273	arrowright
+u00AF	600,629	2	274	overscore
+---	600,626,0,0,12	2	275	ll
+u0067_030C	600,667,146	3	276	gcaron
+u20A4	600,611,28	2	277	lira
+---	600,580	2	278	center
+u0053_0327	600,582,206	3	279	Scedilla
+---	600,601,146	3	280	format
+ua	600,626	2	281	arrowup
+---	600,572,15	2	282	notegraphic
+u211E	600,562,15	2	283	prescription
+---	600,372	0	284	indent
+---	600,439,15	0	285	down
+---	600,371	0	286	left
+u0049_0307	600,748	2	287	Idot
+---	600,487,15	0	288	merge
diff --git a/contrib/groff/font/devps/CBI b/contrib/groff/font/devps/CBI
index b927db2..27976db 100644
--- a/contrib/groff/font/devps/CBI
+++ b/contrib/groff/font/devps/CBI
@@ -4,246 +4,279 @@ slant 12
 spacewidth 600
 encoding text.enc
 charset
-ha	600,616,0,5,-121,5	2	0000	-- asciicircum
-ti	600,356,0,39,-70,39	0	0001	-- asciitilde
-vS	600,790,22,122,-4,75	2	0002	-- Scaron
-vZ	600,790,0,109,-12,75	2	0003	-- Zcaron
-vs	600,667,17,82,-17,75	2	0004	-- scaron
-vz	600,667,0,82,-31,75	2	0005	-- zcaron
-:Y	600,748,0,158,-59,75	2	0006	-- Ydieresis
-tm	600,562,0,318,-36,75	2	0007	-- trademark
-aq	600,562,0,0,-254	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-166	2	0041	-- exclam
-"	600,562,0,34,-162,34	2	0042	-- quotedbl
+ha	600,616,0,5,-121,5	2	0	asciicircum
+ti	600,356,0,39,-70,39	0	1	asciitilde
+vS	600,790,22,122,-4,75	2	2	Scaron
+vZ	600,790,0,109,-12,75	2	3	Zcaron
+vs	600,667,17,82,-17,75	2	4	scaron
+vz	600,667,0,82,-31,75	2	5	zcaron
+:Y	600,748,0,158,-59,75	2	6	Ydieresis
+tm	600,562,0,318,-36,75	2	7	trademark
+aq	600,562,0,0,-254	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15,0,-166	2	33	exclam
+"	600,562,0,34,-162,34	2	34	quotedbl
 dq	"
-#	600,651,45,90,-38,75	2	0043	-- numbersign
+#	600,651,45,90,-38,75	2	35	numbersign
 sh	"
-$	600,666,126,79,-37,75	2	0044	-- dollar
+$	600,666,126,79,-37,75	2	36	dollar
 Do	"
-%	600,616,15,74,-52,74	2	0045	-- percent
-&	600,543,15,44,-12,44	0	0046	-- ampersand
-'	600,562,0,0,-180	2	0047	-- quoteright
+%	600,616,15,74,-52,74	2	37	percent
+&	600,543,15,44,-12,44	0	38	ampersand
+'	600,562,0,0,-180	2	39	quoteright
 cq	"
-(	600,616,102,42,-216,42	2	0050	-- parenleft
-)	600,616,102,0,-67	2	0051	-- parenright
-*	600,601,0,47,-129,47	2	0052	-- asterisk
-+	600,478,0,46,-64,46	0	0053	-- plus
-,	600,174,111,0,-49	0	0054	-- comma
--	600,313,0,17,-93,17	0	0055	-- hyphen
+(	600,616,102,42,-216,42	2	40	parenleft
+)	600,616,102,0,-67	2	41	parenright
+*	600,601,0,47,-129,47	2	42	asterisk
++	600,478,0,46,-64,46	0	43	plus
+,	600,174,111,0,-49	0	44	comma
+-	600,313,0,17,-93,17	0	45	hyphen
 hy	"
-.	600,171,15,0,-157	0	0056	-- period
-/	600,626,77,76,-41,75	2	0057	-- slash
+.	600,171,15,0,-157	0	46	period
+/	600,626,77,76,-41,75	2	47	slash
 sl	"
-0	600,616,15,42,-86,42	2	0060	-- zero
-1	600,616,0,11,-43,11	2	0061	-- one
-2	600,616,0,43,-11,43	2	0062	-- two
-3	600,616,15,21,-22,21	2	0063	-- three
-4	600,616,0,8,-32,8	2	0064	-- four
-5	600,601,15,71,-27,71	2	0065	-- five
-6	600,616,15,102,-86,75	2	0066	-- six
-7	600,601,0,72,-97,72	2	0067	-- seven
-8	600,616,15,54,-65,54	2	0070	-- eight
-9	600,616,15,42,-26,42	2	0071	-- nine
-:	600,425,15,0,-156	0	0072	-- colon
-;	600,425,111,0,-49	0	0073	-- semicolon
-<	600,501,0,62,-71,62	0	0074	-- less
-=	600,398,0,64,-46,64	0	0075	-- equal
->	600,501,0,39,-47,39	0	0076	-- greater
-?	600,580,14,41,-133,41	2	0077	-- question
-@	600,616,15,91,-16,75	2	0100	-- at
+0	600,616,15,42,-86,42	2	48	zero
+1	600,616,0,11,-43,11	2	49	one
+2	600,616,0,43,-11,43	2	50	two
+3	600,616,15,21,-22,21	2	51	three
+4	600,616,0,8,-32,8	2	52	four
+5	600,601,15,71,-27,71	2	53	five
+6	600,616,15,102,-86,75	2	54	six
+7	600,601,0,72,-97,72	2	55	seven
+8	600,616,15,54,-65,54	2	56	eight
+9	600,616,15,42,-26,42	2	57	nine
+:	600,425,15,0,-156	0	58	colon
+;	600,425,111,0,-49	0	59	semicolon
+<	600,501,0,62,-71,62	0	60	less
+=	600,398,0,64,-46,64	0	61	equal
+>	600,501,0,39,-47,39	0	62	greater
+?	600,580,14,41,-133,41	2	63	question
+@	600,616,15,91,-16,75	2	64	at
 at	"
-A	600,562,0,81,59,75	2	0101	-- A
-B	600,562,0,79,20,75	2	0102	-- B
-C	600,580,18,124,-25,75	2	0103	-- C
-D	600,562,0,114,20,75	2	0104	-- D
-E	600,562,0,119,25,75	2	0105	-- E
-F	600,562,0,133,11,75	2	0106	-- F
-G	600,580,18,124,-25,75	2	0107	-- G
-H	600,562,0,149,30,75	2	0110	-- H
-I	600,562,0,92,-27,75	2	0111	-- I
-J	600,562,18,170,-9,75	2	0112	-- J
-K	600,562,0,141,29,75	2	0113	-- K
-L	600,562,0,85,11,75	2	0114	-- L
-M	600,562,0,171,52,75	2	0115	-- M
-N	600,562,12,179,42,75	2	0116	-- N
-O	600,580,18,95,-24,75	2	0117	-- O
-P	600,562,0,92,2,75	2	0120	-- P
-Q	600,580,138,86,-34,75	2	0121	-- Q
-R	600,562,0,67,26,67	2	0122	-- R
-S	600,582,22,122,-4,75	2	0123	-- S
-T	600,562,0,128,-36,75	2	0124	-- T
-U	600,562,18,165,-51,75	2	0125	-- U
-V	600,562,0,182,-34,75	2	0126	-- V
-W	600,562,0,187,-34,75	2	0127	-- W
-X	600,562,0,139,38,75	2	0130	-- X
-Y	600,562,0,158,-59,75	2	0131	-- Y
-Z	600,562,0,86,-12,75	2	0132	-- Z
-[	600,616,102,56,-173,56	2	0133	-- bracketleft
+A	600,562,0,81,59,75	2	65	A
+B	600,562,0,79,20,75	2	66	B
+C	600,580,18,124,-25,75	2	67	C
+D	600,562,0,114,20,75	2	68	D
+E	600,562,0,119,25,75	2	69	E
+F	600,562,0,133,11,75	2	70	F
+G	600,580,18,124,-25,75	2	71	G
+H	600,562,0,149,30,75	2	72	H
+I	600,562,0,92,-27,75	2	73	I
+J	600,562,18,170,-9,75	2	74	J
+K	600,562,0,141,29,75	2	75	K
+L	600,562,0,85,11,75	2	76	L
+M	600,562,0,171,52,75	2	77	M
+N	600,562,12,179,42,75	2	78	N
+O	600,580,18,95,-24,75	2	79	O
+P	600,562,0,92,2,75	2	80	P
+Q	600,580,138,86,-34,75	2	81	Q
+R	600,562,0,67,26,67	2	82	R
+S	600,582,22,122,-4,75	2	83	S
+T	600,562,0,128,-36,75	2	84	T
+U	600,562,18,165,-51,75	2	85	U
+V	600,562,0,182,-34,75	2	86	V
+W	600,562,0,187,-34,75	2	87	W
+X	600,562,0,139,38,75	2	88	X
+Y	600,562,0,158,-59,75	2	89	Y
+Z	600,562,0,86,-12,75	2	90	Z
+[	600,616,102,56,-173,56	2	91	bracketleft
 lB	"
-\	600,626,77,0,-173	2	0134	-- backslash
+\	600,626,77,0,-173	2	92	backslash
 rs	"
-]	600,616,102,0,-53	2	0135	-- bracketright
+]	600,616,102,0,-53	2	93	bracketright
 rB	"
-a^	600,657,0,56,-162,56	2	0136	-- circumflex
+a^	600,657,0,56,-162,56	2	94	circumflex
 ^	"
-_	600,0,125,34,77,34	0	0137	-- underscore
-`	600,562,0,0,-247	2	0140	-- quoteleft
+_	600,0,125,34,77,34	0	95	underscore
+`	600,562,0,0,-247	2	96	quoteleft
 oq	"
-a	600,454,15,42,-12,42	0	0141	-- a
-b	600,626,15,86,37,75	2	0142	-- b
-c	600,459,15,81,-31,75	0	0143	-- c
-d	600,626,15,94,-11,75	2	0144	-- d
-e	600,454,15,54,-31,54	0	0145	-- e
-f	600,626,0,127,-33,75	2	0146	-- f
-g	600,454,146,123,9,75	1	0147	-- g
-h	600,626,0,64,32,64	2	0150	-- h
-i	600,658,0,0,-27	2	0151	-- i
-j	600,658,146,30,13,30	3	0152	-- j
-k	600,626,0,92,17,75	2	0153	-- k
-l	600,626,0,0,-27	2	0154	-- l
-m	600,454,0,98,72,75	0	0155	-- m
-n	600,454,0,64,32,64	0	0156	-- n
-o	600,454,15,72,-21,72	0	0157	-- o
-p	600,454,142,72,81,72	1	0160	-- p
-q	600,454,142,134,-11,75	1	0161	-- q
-r	600,454,0,104,3,75	0	0162	-- r
-s	600,459,17,57,-17,57	0	0163	-- s
-t	600,562,15,16,-68,16	2	0164	-- t
-u	600,439,15,41,-20,41	0	0165	-- u
-v	600,439,0,144,-20,75	0	0166	-- v
-w	600,439,0,161,-3,75	0	0167	-- w
-x	600,439,0,120,44,75	0	0170	-- x
-y	600,439,142,144,70,75	1	0171	-- y
-z	600,439,0,63,-31,63	0	0172	-- z
-lC	600,616,102,45,-154,45	2	0173	-- braceleft
+a	600,454,15,42,-12,42	0	97	a
+b	600,626,15,86,37,75	2	98	b
+c	600,459,15,81,-31,75	0	99	c
+d	600,626,15,94,-11,75	2	100	d
+e	600,454,15,54,-31,54	0	101	e
+f	600,626,0,127,-33,75	2	102	f
+g	600,454,146,123,9,75	1	103	g
+h	600,626,0,64,32,64	2	104	h
+i	600,658,0,0,-27	2	105	i
+j	600,658,146,30,13,30	3	106	j
+k	600,626,0,92,17,75	2	107	k
+l	600,626,0,0,-27	2	108	l
+m	600,454,0,98,72,75	0	109	m
+n	600,454,0,64,32,64	0	110	n
+o	600,454,15,72,-21,72	0	111	o
+p	600,454,142,72,81,72	1	112	p
+q	600,454,142,134,-11,75	1	113	q
+r	600,454,0,104,3,75	0	114	r
+s	600,459,17,57,-17,57	0	115	s
+t	600,562,15,16,-68,16	2	116	t
+u	600,439,15,41,-20,41	0	117	u
+v	600,439,0,144,-20,75	0	118	v
+w	600,439,0,161,-3,75	0	119	w
+x	600,439,0,120,44,75	0	120	x
+y	600,439,142,144,70,75	1	121	y
+z	600,439,0,63,-31,63	0	122	z
+lC	600,616,102,45,-154,45	2	123	braceleft
 {	"
-ba	600,750,250,0,-152	3	0174	-- bar
+ba	600,750,250,0,-152	3	124	bar
 |	"
-rC	600,616,102,0,-64	2	0175	-- braceright
+rC	600,616,102,0,-64	2	125	braceright
 }	"
-a~	600,636,0,92,-150,75	2	0176	-- tilde
+a~	600,636,0,92,-150,75	2	126	tilde
 ~	"
-bq	600,143,142,0,-95	1	0200	-- quotesinglbase
-Fo	600,446,0,88,-13,75	0	0201	-- guillemotleft
-Fc	600,446,0,97,-22,75	0	0202	-- guillemotright
-bu	600,430,0,0,-147	0	0203	-- bullet
-Fn	600,616,131,151,106,75	2	0204	-- florin
-f/	600,661,60,157,28,75	2	0205	-- fraction
-%0	600,616,15,192,94,75	2	0206	-- perthousand
-dg	600,580,70,36,-126,36	2	0207	-- dagger
-dd	600,580,70,36,-72,36	2	0210	-- daggerdbl
-en	600,313,0,52,-58,52	0	0211	-- endash
-em	600,313,0,127,17,75	0	0212	-- emdash
-fi	600,626,0,93,38,75	2	0214	-- fi
-fl	600,626,0,93,38,75	2	0215	-- fl
-.i	600,439,0,0,-27	0	0220	-- dotlessi
-ga	600,661,0,0,-222	2	0222	-- grave
-a"	600,661,0,178,-122,75	2	0223	-- hungarumlaut
-a.	600,625,0,0,-296	2	0224	-- dotaccent
-ab	600,631,0,101,-167,75	2	0225	-- breve
-ah	600,667,0,82,-188,75	2	0226	-- caron
-ao	600,678,0,0,-269	2	0227	-- ring
-ho	600,0,199,0,-94	1	0230	-- ogonek
-lq	600,562,0,44,-140,44	2	0231	-- quotedblleft
-rq	600,562,0,94,-70,75	2	0232	-- quotedblright
-oe	600,454,15,111,31,75	0	0233	-- oe
-/l	600,626,0,28,-27,28	2	0234	-- lslash
-Bq	600,143,142,9,15,9	1	0235	-- quotedblbase
-OE	600,562,0,150,24,75	2	0236	-- OE
-/L	600,562,0,85,11,75	2	0237	-- Lslash
-r!	600,449,146,0,-147	1	0241	-- exclamdown
-ct	600,614,49,54,-71,54	2	0242	-- cent
-Po	600,611,28,100,-57,75	2	0243	-- sterling
-Cs	600,517,0,93,-27,75	0	0244	-- currency
-Ye	600,562,0,159,-48,75	2	0245	-- yen
-bb	600,675,175,0,-168	3	0246	-- brokenbar
-sc	600,580,70,69,-24,69	2	0247	-- section
-ad	600,625,0,42,-194,42	2	0250	-- dieresis
-co	600,580,18,117,-3,75	2	0251	-- copyright
-Of	600,580,0,0,-139	2	0252	-- ordfeminine
-fo	600,446,0,0,-146	0	0253	-- guilsinglleft
-no	600,413,0,67,-85,67	0	0254	-- logicalnot
-\-	600,313,0,46,-64,46	0	0255	-- minus
-rg	600,580,18,117,-3,75	2	0256	-- registered
-a-	600,585,0,86,-145,75	2	0257	-- macron
-de	600,616,0,19,-123,19	2	0260	-- degree
-t+-	600,515,0,64,-26,64	0	0261	-- plusminus
-S2	600,616,0,0,-142	2	0262	-- twosuperior
-S3	600,616,0,0,-143	2	0263	-- threesuperior
-aa	600,661,0,58,-263,58	2	0264	-- acute
-mc	600,439,142,41,0,41	1	0265	-- mu
-ps	600,580,70,149,-11,75	2	0266	-- paragraph
-pc	600,351,0,0,-199	0	0267	-- periodcentered
-ac	600,0,206,0,-119	1	0270	-- cedilla
-S1	600,616,0,0,-163	2	0271	-- onesuperior
-Om	600,580,0,0,-139	2	0272	-- ordmasculine
-fc	600,446,0,0,-116	0	0273	-- guilsinglright
-14	600,661,60,156,36,75	2	0274	-- onequarter
-12	600,661,60,165,27,75	2	0275	-- onehalf
-34	600,661,60,148,42,75	2	0276	-- threequarters
-r?	600,449,146,0,-51	1	0277	-- questiondown
-`A	600,784,0,81,59,75	2	0300	-- Agrave
-'A	600,784,0,115,59,75	2	0301	-- Aacute
-^A	600,780,0,81,59,75	2	0302	-- Acircumflex
-~A	600,759,0,88,59,75	2	0303	-- Atilde
-:A	600,748,0,81,59,75	2	0304	-- Adieresis
-oA	600,801,0,81,59,75	2	0305	-- Aring
-AE	600,562,0,157,79,75	2	0306	-- AE
-,C	600,580,206,124,-24,75	3	0307	-- Ccedilla
-`E	600,784,0,119,25,75	2	0310	-- Egrave
-'E	600,784,0,119,25,75	2	0311	-- Eacute
-^E	600,780,0,119,25,75	2	0312	-- Ecircumflex
-:E	600,748,0,119,25,75	2	0313	-- Edieresis
-`I	600,784,0,92,-27,75	2	0314	-- Igrave
-'I	600,784,0,92,-27,75	2	0315	-- Iacute
-^I	600,780,0,92,-27,75	2	0316	-- Icircumflex
-:I	600,748,0,92,-27,75	2	0317	-- Idieresis
--D	600,562,0,114,20,75	2	0320	-- Eth
-~N	600,759,12,179,42,75	2	0321	-- Ntilde
-`O	600,784,18,95,-24,75	2	0322	-- Ograve
-'O	600,784,18,95,-24,75	2	0323	-- Oacute
-^O	600,780,18,95,-24,75	2	0324	-- Ocircumflex
-~O	600,759,18,118,-24,75	2	0325	-- Otilde
-:O	600,748,18,95,-24,75	2	0326	-- Odieresis
-tmu	600,478,0,56,-55,56	0	0327	-- multiply
-/O	600,584,22,122,2,75	2	0330	-- Oslash
-`U	600,784,18,165,-51,75	2	0331	-- Ugrave
-'U	600,784,18,165,-51,75	2	0332	-- Uacute
-^U	600,780,18,165,-51,75	2	0333	-- Ucircumflex
-:U	600,748,18,165,-51,75	2	0334	-- Udieresis
-'Y	600,784,0,158,-59,75	2	0335	-- Yacute
-TP	600,562,0,69,2,69	2	0336	-- Thorn
-ss	600,626,15,78,28,75	2	0337	-- germandbls
-`a	600,661,15,42,-12,42	2	0340	-- agrave
-'a	600,661,15,58,-12,58	2	0341	-- aacute
-^a	600,657,15,42,-12,42	2	0342	-- acircumflex
-~a	600,636,15,92,-12,75	2	0343	-- atilde
-:a	600,625,15,42,-12,42	2	0344	-- adieresis
-oa	600,678,15,42,-12,42	2	0345	-- aring
-ae	600,454,15,101,29,75	0	0346	-- ae
-,c	600,459,206,81,-31,75	1	0347	-- ccedilla
-`e	600,661,15,54,-31,54	2	0350	-- egrave
-'e	600,661,15,58,-31,58	2	0351	-- eacute
-^e	600,657,15,56,-31,56	2	0352	-- ecircumflex
-:e	600,625,15,54,-31,54	2	0353	-- edieresis
-`i	600,661,0,0,-27	2	0354	-- igrave
-'i	600,661,0,58,-27,58	2	0355	-- iacute
-^i	600,657,0,16,-27,16	2	0356	-- icircumflex
-:i	600,625,0,2,-27,2	2	0357	-- idieresis
-Sd	600,626,27,111,-43,75	2	0360	-- eth
-~n	600,636,0,92,32,75	2	0361	-- ntilde
-`o	600,661,15,72,-21,72	2	0362	-- ograve
-'o	600,661,15,72,-21,72	2	0363	-- oacute
-^o	600,657,15,72,-21,72	2	0364	-- ocircumflex
-~o	600,636,15,92,-21,75	2	0365	-- otilde
-:o	600,625,15,72,-21,72	2	0366	-- odieresis
-tdi	600,500,0,46,-64,46	0	0367	-- divide
-/o	600,463,24,87,-5,75	0	0370	-- oslash
-`u	600,661,15,41,-20,41	2	0371	-- ugrave
-'u	600,661,15,58,-20,58	2	0372	-- uacute
-^u	600,657,15,41,-20,41	2	0373	-- ucircumflex
-:u	600,625,15,41,-20,41	2	0374	-- udieresis
-'y	600,661,142,144,70,75	3	0375	-- yacute
-Tp	600,626,142,72,81,72	3	0376	-- thorn
-:y	600,625,142,144,70,75	3	0377	-- ydieresis
+bq	600,143,142,0,-95	1	128	quotesinglbase
+Fo	600,446,0,88,-13,75	0	129	guillemotleft
+Fc	600,446,0,97,-22,75	0	130	guillemotright
+bu	600,430,0,0,-147	0	131	bullet
+Fn	600,616,131,151,106,75	2	132	florin
+f/	600,661,60,157,28,75	2	133	fraction
+%0	600,616,15,192,94,75	2	134	perthousand
+dg	600,580,70,36,-126,36	2	135	dagger
+dd	600,580,70,36,-72,36	2	136	daggerdbl
+en	600,313,0,52,-58,52	0	137	endash
+em	600,313,0,127,17,75	0	138	emdash
+fi	600,626,0,93,38,75	2	140	fi
+fl	600,626,0,93,38,75	2	141	fl
+.i	600,439,0,0,-27	0	144	dotlessi
+ga	600,661,0,0,-222	2	146	grave
+a"	600,661,0,178,-122,75	2	147	hungarumlaut
+a.	600,625,0,0,-296	2	148	dotaccent
+ab	600,631,0,101,-167,75	2	149	breve
+ah	600,667,0,82,-188,75	2	150	caron
+ao	600,678,0,0,-269	2	151	ring
+ho	600,0,199,0,-94	1	152	ogonek
+lq	600,562,0,44,-140,44	2	153	quotedblleft
+rq	600,562,0,94,-70,75	2	154	quotedblright
+oe	600,454,15,111,31,75	0	155	oe
+/l	600,626,0,28,-27,28	2	156	lslash
+Bq	600,143,142,9,15,9	1	157	quotedblbase
+OE	600,562,0,150,24,75	2	158	OE
+/L	600,562,0,85,11,75	2	159	Lslash
+r!	600,449,146,0,-147	1	161	exclamdown
+ct	600,614,49,54,-71,54	2	162	cent
+Po	600,611,28,100,-57,75	2	163	sterling
+Cs	600,517,0,93,-27,75	0	164	currency
+Ye	600,562,0,159,-48,75	2	165	yen
+bb	600,675,175,0,-168	3	166	brokenbar
+sc	600,580,70,69,-24,69	2	167	section
+ad	600,625,0,42,-194,42	2	168	dieresis
+co	600,580,18,117,-3,75	2	169	copyright
+Of	600,580,0,0,-139	2	170	ordfeminine
+fo	600,446,0,0,-146	0	171	guilsinglleft
+tno	600,413,0,67,-85,67	0	172	logicalnot
+\-	600,313,0,46,-64,46	0	173	minus
+rg	600,580,18,117,-3,75	2	174	registered
+a-	600,585,0,86,-145,75	2	175	macron
+de	600,616,0,19,-123,19	2	176	degree
+t+-	600,515,0,64,-26,64	0	177	plusminus
+S2	600,616,0,0,-142	2	178	twosuperior
+S3	600,616,0,0,-143	2	179	threesuperior
+aa	600,661,0,58,-263,58	2	180	acute
+mc	600,439,142,41,0,41	1	181	mu
+ps	600,580,70,149,-11,75	2	182	paragraph
+pc	600,351,0,0,-199	0	183	periodcentered
+ac	600,0,206,0,-119	1	184	cedilla
+S1	600,616,0,0,-163	2	185	onesuperior
+Om	600,580,0,0,-139	2	186	ordmasculine
+fc	600,446,0,0,-116	0	187	guilsinglright
+14	600,661,60,156,36,75	2	188	onequarter
+12	600,661,60,165,27,75	2	189	onehalf
+34	600,661,60,148,42,75	2	190	threequarters
+r?	600,449,146,0,-51	1	191	questiondown
+`A	600,784,0,81,59,75	2	192	Agrave
+'A	600,784,0,115,59,75	2	193	Aacute
+^A	600,780,0,81,59,75	2	194	Acircumflex
+~A	600,759,0,88,59,75	2	195	Atilde
+:A	600,748,0,81,59,75	2	196	Adieresis
+oA	600,801,0,81,59,75	2	197	Aring
+AE	600,562,0,157,79,75	2	198	AE
+,C	600,580,206,124,-24,75	3	199	Ccedilla
+`E	600,784,0,119,25,75	2	200	Egrave
+'E	600,784,0,119,25,75	2	201	Eacute
+^E	600,780,0,119,25,75	2	202	Ecircumflex
+:E	600,748,0,119,25,75	2	203	Edieresis
+`I	600,784,0,92,-27,75	2	204	Igrave
+'I	600,784,0,92,-27,75	2	205	Iacute
+^I	600,780,0,92,-27,75	2	206	Icircumflex
+:I	600,748,0,92,-27,75	2	207	Idieresis
+-D	600,562,0,114,20,75	2	208	Eth
+~N	600,759,12,179,42,75	2	209	Ntilde
+`O	600,784,18,95,-24,75	2	210	Ograve
+'O	600,784,18,95,-24,75	2	211	Oacute
+^O	600,780,18,95,-24,75	2	212	Ocircumflex
+~O	600,759,18,118,-24,75	2	213	Otilde
+:O	600,748,18,95,-24,75	2	214	Odieresis
+tmu	600,478,0,56,-55,56	0	215	multiply
+/O	600,584,22,122,2,75	2	216	Oslash
+`U	600,784,18,165,-51,75	2	217	Ugrave
+'U	600,784,18,165,-51,75	2	218	Uacute
+^U	600,780,18,165,-51,75	2	219	Ucircumflex
+:U	600,748,18,165,-51,75	2	220	Udieresis
+'Y	600,784,0,158,-59,75	2	221	Yacute
+TP	600,562,0,69,2,69	2	222	Thorn
+ss	600,626,15,78,28,75	2	223	germandbls
+`a	600,661,15,42,-12,42	2	224	agrave
+'a	600,661,15,58,-12,58	2	225	aacute
+^a	600,657,15,42,-12,42	2	226	acircumflex
+~a	600,636,15,92,-12,75	2	227	atilde
+:a	600,625,15,42,-12,42	2	228	adieresis
+oa	600,678,15,42,-12,42	2	229	aring
+ae	600,454,15,101,29,75	0	230	ae
+,c	600,459,206,81,-31,75	1	231	ccedilla
+`e	600,661,15,54,-31,54	2	232	egrave
+'e	600,661,15,58,-31,58	2	233	eacute
+^e	600,657,15,56,-31,56	2	234	ecircumflex
+:e	600,625,15,54,-31,54	2	235	edieresis
+`i	600,661,0,0,-27	2	236	igrave
+'i	600,661,0,58,-27,58	2	237	iacute
+^i	600,657,0,16,-27,16	2	238	icircumflex
+:i	600,625,0,2,-27,2	2	239	idieresis
+Sd	600,626,27,111,-43,75	2	240	eth
+~n	600,636,0,92,32,75	2	241	ntilde
+`o	600,661,15,72,-21,72	2	242	ograve
+'o	600,661,15,72,-21,72	2	243	oacute
+^o	600,657,15,72,-21,72	2	244	ocircumflex
+~o	600,636,15,92,-21,75	2	245	otilde
+:o	600,625,15,72,-21,72	2	246	odieresis
+tdi	600,500,0,46,-64,46	0	247	divide
+/o	600,463,24,87,-5,75	0	248	oslash
+`u	600,661,15,41,-20,41	2	249	ugrave
+'u	600,661,15,58,-20,58	2	250	uacute
+^u	600,657,15,41,-20,41	2	251	ucircumflex
+:u	600,625,15,41,-20,41	2	252	udieresis
+'y	600,661,142,144,70,75	3	253	yacute
+Tp	600,626,142,72,81,72	3	254	thorn
+:y	600,625,142,144,70,75	3	255	ydieresis
+IJ	600,562,18,191,58,75	2	256	IJ
+---	600,447,0,0,-146	0	257	up
+---	600,320,0,65,42,65	0	258	dectab
+u0047_030C	600,790,18,124,-25,75	2	259	Gcaron
+---	600,562,0,150,31,75	2	260	stop
+---	600,562,0,91,31,75	2	261	tab
+u2026	600,116,15,36,15,36	0	262	ellipsis
+---	600,333,0,0,-257	0	263	largebullet
+u0073_0327	600,459,206,57,-17,57	1	264	scedilla
+---	600,562,0,150,-29,75	2	265	return
+ij	600,658,146,164,44,75	3	266	ij
+---	600,562,0,144,95,75	2	267	LL
+---	600,562,0,150,31,75	2	268	square
+da	600,608,15,0,-124	2	269	arrowdown
+<-	600,455,0,158,10,75	0	270	arrowleft
+<>	600,455,0,138,10,75	0	271	arrowboth
+---	600,599,0,102,-26,75	2	272	graybox
+->	600,455,0,138,30,75	0	273	arrowright
+u00AF	600,629,0,184,-73,75	2	274	overscore
+---	600,626,0,103,49,75	2	275	ll
+u0067_030C	600,667,146,123,9,75	3	276	gcaron
+u20A4	600,611,28,100,-57,75	2	277	lira
+---	600,580,0,73,-53,73	2	278	center
+u0053_0327	600,582,206,122,-4,75	3	279	Scedilla
+---	600,601,146,0,76	3	280	format
+ua	600,626,0,6,-194,6	2	281	arrowup
+---	600,572,15,69,-41,69	2	282	notegraphic
+u211E	600,562,15,82,26,75	2	283	prescription
+---	600,372,0,29,-49,29	0	284	indent
+---	600,439,15,0,-118	0	285	down
+---	600,371,0,39,-59,39	0	286	left
+u0049_0307	600,748,0,92,-27,75	2	287	Idot
+---	600,487,15,0,-118	0	288	merge
diff --git a/contrib/groff/font/devps/CI b/contrib/groff/font/devps/CI
index 32d7bef..7d7582d 100644
--- a/contrib/groff/font/devps/CI
+++ b/contrib/groff/font/devps/CI
@@ -4,246 +4,279 @@ slant 12
 spacewidth 600
 encoding text.enc
 charset
-ha	600,622,0,37,-125,37	2	0000	-- asciicircum
-ti	600,320,0,50,-66,50	0	0001	-- asciitilde
-vS	600,805,20,123,-26,72	2	0002	-- Scaron
-vZ	600,805,0,93,-36,72	2	0003	-- Zcaron
-vs	600,669,15,64,-28,64	2	0004	-- scaron
-vz	600,669,0,74,-49,72	2	0005	-- zcaron
-:Y	600,731,0,145,-83,72	2	0006	-- Ydieresis
-tm	600,562,0,192,-25,72	2	0007	-- trademark
-aq	600,562,0,0,-295	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-193	2	0041	-- exclam
-"	600,562,0,0,-223	2	0042	-- quotedbl
+ha	600,622,0,37,-125,37	2	0	asciicircum
+ti	600,320,0,50,-66,50	0	1	asciitilde
+vS	600,805,20,123,-26,72	2	2	Scaron
+vZ	600,805,0,93,-36,72	2	3	Zcaron
+vs	600,669,15,64,-28,64	2	4	scaron
+vz	600,669,0,74,-49,72	2	5	zcaron
+:Y	600,731,0,145,-83,72	2	6	Ydieresis
+tm	600,562,0,192,-25,72	2	7	trademark
+aq	600,562,0,0,-295	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15,0,-193	2	33	exclam
+"	600,562,0,0,-223	2	34	quotedbl
 dq	"
-#	600,639,32,46,-83,46	2	0043	-- numbersign
+#	600,639,32,46,-83,46	2	35	numbersign
 sh	"
-$	600,662,126,46,-58,46	2	0044	-- dollar
+$	600,662,126,46,-58,46	2	36	dollar
 Do	"
-%	600,622,15,49,-84,49	2	0045	-- percent
-&	600,543,15,30,-37,30	0	0046	-- ampersand
-'	600,562,0,0,-233	2	0047	-- quoteright
+%	600,622,15,49,-84,49	2	37	percent
+&	600,543,15,30,-37,30	0	38	ampersand
+'	600,562,0,0,-233	2	39	quoteright
 cq	"
-(	600,622,108,22,-263,22	2	0050	-- parenleft
-)	600,622,108,0,-87	2	0051	-- parenright
-*	600,607,0,30,-162,30	2	0052	-- asterisk
-+	600,470,0,30,-79,30	0	0053	-- plus
-,	600,122,112,0,-107	0	0054	-- comma
--	600,285,0,8,-102,8	0	0055	-- hyphen
+(	600,622,108,22,-263,22	2	40	parenleft
+)	600,622,108,0,-87	2	41	parenright
+*	600,607,0,30,-162,30	2	42	asterisk
++	600,470,0,30,-79,30	0	43	plus
+,	600,122,112,0,-107	0	44	comma
+-	600,285,0,8,-102,8	0	45	hyphen
 hy	"
-.	600,109,15,0,-188	0	0056	-- period
-/	600,629,80,54,-62,54	2	0057	-- slash
+.	600,109,15,0,-188	0	46	period
+/	600,629,80,54,-62,54	2	47	slash
 sl	"
-0	600,622,15,25,-104,25	2	0060	-- zero
-1	600,622,0,0,-48	2	0061	-- one
-2	600,622,0,18,-20,18	2	0062	-- two
-3	600,622,15,0,-32	2	0063	-- three
-4	600,622,0,0,-58	2	0064	-- four
-5	600,607,15,39,-49,39	2	0065	-- five
-6	600,622,15,79,-105,72	2	0066	-- six
-7	600,607,0,62,-132,62	2	0067	-- seven
-8	600,622,15,38,-82,38	2	0070	-- eight
-9	600,622,15,24,-43,24	2	0071	-- nine
-:	600,385,15,0,-188	0	0072	-- colon
-;	600,385,112,0,-107	0	0073	-- semicolon
-<	600,472,0,60,-46,60	0	0074	-- less
-=	600,376,0,50,-59,50	0	0075	-- equal
->	600,472,0,49,-35,49	0	0076	-- greater
-?	600,572,15,33,-172,33	2	0077	-- question
-@	600,622,15,32,-77,32	2	0100	-- at
+0	600,622,15,25,-104,25	2	48	zero
+1	600,622,0,0,-48	2	49	one
+2	600,622,0,18,-20,18	2	50	two
+3	600,622,15,0,-32	2	51	three
+4	600,622,0,0,-58	2	52	four
+5	600,607,15,39,-49,39	2	53	five
+6	600,622,15,79,-105,72	2	54	six
+7	600,607,0,62,-132,62	2	55	seven
+8	600,622,15,38,-82,38	2	56	eight
+9	600,622,15,24,-43,24	2	57	nine
+:	600,385,15,0,-188	0	58	colon
+;	600,385,112,0,-107	0	59	semicolon
+<	600,472,0,60,-46,60	0	60	less
+=	600,376,0,50,-59,50	0	61	equal
+>	600,472,0,49,-35,49	0	62	greater
+?	600,572,15,33,-172,33	2	63	question
+@	600,622,15,32,-77,32	2	64	at
 at	"
-A	600,562,0,57,47,57	2	0101	-- A
-B	600,562,0,66,7,66	2	0102	-- B
-C	600,580,18,105,-43,72	2	0103	-- C
-D	600,562,0,95,7,72	2	0104	-- D
-E	600,562,0,110,-3,72	2	0105	-- E
-F	600,562,0,110,-3,72	2	0106	-- F
-G	600,580,18,95,-33,72	2	0107	-- G
-H	600,562,0,137,18,72	2	0110	-- H
-I	600,562,0,73,-46,72	2	0111	-- I
-J	600,562,18,135,-2,72	2	0112	-- J
-K	600,562,0,121,12,72	2	0113	-- K
-L	600,562,0,57,3,57	2	0114	-- L
-M	600,562,0,165,46,72	2	0115	-- M
-N	600,562,13,162,43,72	2	0116	-- N
-O	600,580,18,75,-44,72	2	0117	-- O
-P	600,562,0,94,-29,72	2	0120	-- P
-Q	600,580,138,75,-45,72	2	0121	-- Q
-R	600,562,0,48,12,48	2	0122	-- R
-S	600,580,20,100,-26,72	2	0123	-- S
-T	600,562,0,115,-58,72	2	0124	-- T
-U	600,562,18,152,-75,72	2	0125	-- U
-V	600,562,13,173,-55,72	2	0126	-- V
-W	600,562,13,172,-56,72	2	0127	-- W
-X	600,562,0,125,27,72	2	0130	-- X
-Y	600,562,0,145,-83,72	2	0131	-- Y
-Z	600,562,0,60,-36,60	2	0132	-- Z
-[	600,622,108,24,-196,24	2	0133	-- bracketleft
+A	600,562,0,57,47,57	2	65	A
+B	600,562,0,66,7,66	2	66	B
+C	600,580,18,105,-43,72	2	67	C
+D	600,562,0,95,7,72	2	68	D
+E	600,562,0,110,-3,72	2	69	E
+F	600,562,0,110,-3,72	2	70	F
+G	600,580,18,95,-33,72	2	71	G
+H	600,562,0,137,18,72	2	72	H
+I	600,562,0,73,-46,72	2	73	I
+J	600,562,18,135,-2,72	2	74	J
+K	600,562,0,121,12,72	2	75	K
+L	600,562,0,57,3,57	2	76	L
+M	600,562,0,165,46,72	2	77	M
+N	600,562,13,162,43,72	2	78	N
+O	600,580,18,75,-44,72	2	79	O
+P	600,562,0,94,-29,72	2	80	P
+Q	600,580,138,75,-45,72	2	81	Q
+R	600,562,0,48,12,48	2	82	R
+S	600,580,20,100,-26,72	2	83	S
+T	600,562,0,115,-58,72	2	84	T
+U	600,562,18,152,-75,72	2	85	U
+V	600,562,13,173,-55,72	2	86	V
+W	600,562,13,172,-56,72	2	87	W
+X	600,562,0,125,27,72	2	88	X
+Y	600,562,0,145,-83,72	2	89	Y
+Z	600,562,0,60,-36,60	2	90	Z
+[	600,622,108,24,-196,24	2	91	bracketleft
 lB	"
-\	600,629,80,0,-199	2	0134	-- backslash
+\	600,629,80,0,-199	2	92	backslash
 rs	"
-]	600,622,108,0,-85	2	0135	-- bracketright
+]	600,622,108,0,-85	2	93	bracketright
 rB	"
-a^	600,654,0,31,-179,31	2	0136	-- circumflex
+a^	600,654,0,31,-179,31	2	94	circumflex
 ^	"
-_	600,0,125,34,77,34	0	0137	-- underscore
-`	600,562,0,0,-293	2	0140	-- quoteleft
+_	600,0,125,34,77,34	0	95	underscore
+`	600,562,0,0,-293	2	96	quoteleft
 oq	"
-a	600,441,15,19,-26,19	0	0141	-- a
-b	600,629,15,75,21,72	2	0142	-- b
-c	600,441,15,58,-56,58	0	0143	-- c
-d	600,629,15,90,-35,72	2	0144	-- d
-e	600,441,15,48,-56,48	0	0145	-- e
-f	600,629,0,112,-64,72	2	0146	-- f
-g	600,441,157,107,-11,72	1	0147	-- g
-h	600,629,0,42,17,42	2	0150	-- h
-i	600,657,0,0,-45	2	0151	-- i
-j	600,657,157,0,-2	3	0152	-- j
-k	600,629,0,83,-8,72	2	0153	-- k
-l	600,629,0,0,-45	2	0154	-- l
-m	600,441,0,65,55,65	0	0155	-- m
-n	600,441,0,35,24,35	0	0156	-- n
-o	600,441,15,38,-52,38	0	0157	-- o
-p	600,441,157,55,74,55	1	0160	-- p
-q	600,441,157,132,-35,72	1	0161	-- q
-r	600,441,0,86,-10,72	0	0162	-- r
-s	600,441,15,34,-28,34	0	0163	-- s
-t	600,561,15,11,-117,11	2	0164	-- t
-u	600,426,15,22,-51,22	0	0165	-- u
-v	600,426,10,131,-40,72	0	0166	-- v
-w	600,426,10,145,-26,72	0	0167	-- w
-x	600,426,0,105,30,72	0	0170	-- x
-y	600,426,157,133,54,72	1	0171	-- y
-z	600,426,0,43,-49,43	0	0172	-- z
-lC	600,622,108,19,-183,19	2	0173	-- braceleft
+a	600,441,15,19,-26,19	0	97	a
+b	600,629,15,75,21,72	2	98	b
+c	600,441,15,58,-56,58	0	99	c
+d	600,629,15,90,-35,72	2	100	d
+e	600,441,15,48,-56,48	0	101	e
+f	600,629,0,112,-64,72	2	102	f
+g	600,441,157,107,-11,72	1	103	g
+h	600,629,0,42,17,42	2	104	h
+i	600,657,0,0,-45	2	105	i
+j	600,657,157,0,-2	3	106	j
+k	600,629,0,83,-8,72	2	107	k
+l	600,629,0,0,-45	2	108	l
+m	600,441,0,65,55,65	0	109	m
+n	600,441,0,35,24,35	0	110	n
+o	600,441,15,38,-52,38	0	111	o
+p	600,441,157,55,74,55	1	112	p
+q	600,441,157,132,-35,72	1	113	q
+r	600,441,0,86,-10,72	0	114	r
+s	600,441,15,34,-28,34	0	115	s
+t	600,561,15,11,-117,11	2	116	t
+u	600,426,15,22,-51,22	0	117	u
+v	600,426,10,131,-40,72	0	118	v
+w	600,426,10,145,-26,72	0	119	w
+x	600,426,0,105,30,72	0	120	x
+y	600,426,157,133,54,72	1	121	y
+z	600,426,0,43,-49,43	0	122	z
+lC	600,622,108,19,-183,19	2	123	braceleft
 {	"
-ba	600,750,250,0,-172	3	0174	-- bar
+ba	600,750,250,0,-172	3	124	bar
 |	"
-rC	600,622,108,0,-90	2	0175	-- braceright
+rC	600,622,108,0,-90	2	125	braceright
 }	"
-a~	600,606,0,79,-162,72	2	0176	-- tilde
+a~	600,606,0,79,-162,72	2	126	tilde
 ~	"
-bq	600,100,134,0,-135	0	0200	-- quotesinglbase
-Fo	600,446,0,102,-42,72	0	0201	-- guillemotleft
-Fc	600,446,0,68,-8,68	0	0202	-- guillemotright
-bu	600,383,0,0,-174	0	0203	-- bullet
-Fn	600,622,143,121,76,72	2	0204	-- florin
-f/	600,665,57,96,-34,72	2	0205	-- fraction
-%0	600,622,15,77,-9,72	2	0206	-- perthousand
-dg	600,580,78,0,-167	2	0207	-- dagger
-dd	600,580,78,0,-113	2	0210	-- daggerdbl
-en	600,285,0,36,-74,36	0	0211	-- endash
-em	600,285,0,111,1,72	0	0212	-- emdash
-fi	600,629,0,69,47,69	2	0214	-- fi
-fl	600,629,0,69,47,69	2	0215	-- fl
-.i	600,426,0,0,-45	0	0220	-- dotlessi
-ga	600,672,0,0,-244	2	0222	-- grave
-a"	600,672,0,133,-189,72	2	0223	-- hungarumlaut
-a.	600,580,0,0,-310	2	0224	-- dotaccent
-ab	600,609,0,26,-229,26	2	0225	-- breve
-ah	600,669,0,64,-212,64	2	0226	-- caron
-ao	600,627,0,0,-282	2	0227	-- ring
-ho	600,0,151,0,-157	0	0230	-- ogonek
-lq	600,562,0,0,-212	2	0231	-- quotedblleft
-rq	600,562,0,26,-163,26	2	0232	-- quotedblright
-oe	600,441,15,65,-4,65	0	0233	-- oe
-/l	600,629,0,33,-45,33	2	0234	-- lslash
-Bq	600,100,134,0,-65	0	0235	-- quotedblbase
-OE	600,562,0,122,-9,72	2	0236	-- OE
-/L	600,562,0,57,3,57	2	0237	-- Lslash
-r!	600,430,157,0,-175	1	0241	-- exclamdown
-ct	600,614,49,38,-101,38	2	0242	-- cent
-Po	600,611,21,71,-74,71	2	0243	-- sterling
-Cs	600,506,0,78,-44,72	0	0244	-- currency
-Ye	600,562,0,143,-70,72	2	0245	-- yen
-bb	600,675,175,0,-188	3	0246	-- brokenbar
-sc	600,580,78,40,-54,40	2	0247	-- section
-ad	600,595,0,20,-212,20	2	0250	-- dieresis
-co	600,580,18,117,-3,72	2	0251	-- copyright
-Of	600,580,0,0,-159	2	0252	-- ordfeminine
-fo	600,446,0,0,-154	0	0253	-- guilsinglleft
-no	600,369,0,41,-105,41	0	0254	-- logicalnot
-\-	600,283,0,30,-79,30	0	0255	-- minus
-rg	600,580,18,117,-3,72	2	0256	-- registered
-a-	600,565,0,50,-182,50	2	0257	-- macron
-de	600,622,0,26,-164,26	2	0260	-- degree
-t+-	600,558,0,44,-46,44	0	0261	-- plusminus
-S2	600,622,0,0,-180	2	0262	-- twosuperior
-S3	600,622,0,0,-163	2	0263	-- threesuperior
-aa	600,672,0,62,-298,62	2	0264	-- acute
-mc	600,426,157,22,-22,22	1	0265	-- mu
-ps	600,562,78,80,-50,72	2	0266	-- paragraph
-pc	600,327,0,0,-225	0	0267	-- periodcentered
-ac	600,10,151,0,-147	0	0270	-- cedilla
-S1	600,622,0,0,-181	2	0271	-- onesuperior
-Om	600,580,0,0,-160	2	0272	-- ordmasculine
-fc	600,446,0,0,-120	0	0273	-- guilsinglright
-14	600,665,57,124,-15,72	2	0274	-- onequarter
-12	600,665,57,119,-15,72	2	0275	-- onehalf
-34	600,666,56,109,-23,72	2	0276	-- threequarters
-r?	600,430,157,0,-55	1	0277	-- questiondown
-`A	600,793,0,57,47,57	2	0300	-- Agrave
-'A	600,793,0,108,47,72	2	0301	-- Aacute
-^A	600,775,0,57,47,57	2	0302	-- Acircumflex
-~A	600,732,0,106,47,72	2	0303	-- Atilde
-:A	600,731,0,57,47,57	2	0304	-- Adieresis
-oA	600,753,0,57,47,57	2	0305	-- Aring
-AE	600,562,0,105,47,72	2	0306	-- AE
-,C	600,580,151,108,-43,72	2	0307	-- Ccedilla
-`E	600,793,0,110,-3,72	2	0310	-- Egrave
-'E	600,793,0,118,-3,72	2	0311	-- Eacute
-^E	600,775,0,110,-3,72	2	0312	-- Ecircumflex
-:E	600,731,0,110,-3,72	2	0313	-- Edieresis
-`I	600,793,0,73,-46,72	2	0314	-- Igrave
-'I	600,793,0,88,-46,72	2	0315	-- Iacute
-^I	600,775,0,73,-46,72	2	0316	-- Icircumflex
-:I	600,731,0,73,-46,72	2	0317	-- Idieresis
--D	600,562,0,95,7,72	2	0320	-- Eth
-~N	600,732,13,162,43,72	2	0321	-- Ntilde
-`O	600,793,18,75,-44,72	2	0322	-- Ograve
-'O	600,793,18,88,-44,72	2	0323	-- Oacute
-^O	600,775,18,75,-44,72	2	0324	-- Ocircumflex
-~O	600,732,18,106,-44,72	2	0325	-- Otilde
-:O	600,731,18,75,-44,72	2	0326	-- Odieresis
-tmu	600,470,0,57,-53,57	0	0327	-- multiply
-/O	600,629,80,75,-44,72	2	0330	-- Oslash
-`U	600,793,18,152,-75,72	2	0331	-- Ugrave
-'U	600,793,18,152,-75,72	2	0332	-- Uacute
-^U	600,775,18,152,-75,72	2	0333	-- Ucircumflex
-:U	600,731,18,152,-75,72	2	0334	-- Udieresis
-'Y	600,793,0,145,-83,72	2	0335	-- Yacute
-TP	600,562,0,56,-29,56	2	0336	-- Thorn
-ss	600,629,15,67,2,67	2	0337	-- germandbls
-`a	600,672,15,19,-26,19	2	0340	-- agrave
-'a	600,672,15,62,-26,62	2	0341	-- aacute
-^a	600,654,15,31,-26,31	2	0342	-- acircumflex
-~a	600,606,15,79,-26,72	2	0343	-- atilde
-:a	600,595,15,20,-26,20	2	0344	-- adieresis
-oa	600,627,15,19,-26,19	2	0345	-- aring
-ae	600,441,15,76,9,72	0	0346	-- ae
-,c	600,441,151,64,-56,64	0	0347	-- ccedilla
-`e	600,672,15,48,-56,48	2	0350	-- egrave
-'e	600,672,15,62,-56,62	2	0351	-- eacute
-^e	600,654,15,48,-56,48	2	0352	-- ecircumflex
-:e	600,595,15,48,-56,48	2	0353	-- edieresis
-`i	600,672,0,0,-45	2	0354	-- igrave
-'i	600,672,0,62,-45,62	2	0355	-- iacute
-^i	600,654,0,1,-45,1	2	0356	-- icircumflex
-:i	600,595,0,0,-45	2	0357	-- idieresis
-Sd	600,629,15,89,-52,72	2	0360	-- eth
-~n	600,606,0,79,24,72	2	0361	-- ntilde
-`o	600,672,15,38,-52,38	2	0362	-- ograve
-'o	600,672,15,62,-52,62	2	0363	-- oacute
-^o	600,654,15,38,-52,38	2	0364	-- ocircumflex
-~o	600,606,15,79,-52,72	2	0365	-- otilde
-:o	600,595,15,38,-52,38	2	0366	-- odieresis
-tdi	600,467,0,23,-86,23	0	0367	-- divide
-/o	600,506,80,38,-52,38	0	0370	-- oslash
-`u	600,672,15,22,-51,22	2	0371	-- ugrave
-'u	600,672,15,52,-51,52	2	0372	-- uacute
-^u	600,654,15,22,-51,22	2	0373	-- ucircumflex
-:u	600,595,15,22,-51,22	2	0374	-- udieresis
-'y	600,672,157,133,54,72	3	0375	-- yacute
-Tp	600,629,157,55,74,55	3	0376	-- thorn
-:y	600,595,157,133,54,72	3	0377	-- ydieresis
+bq	600,100,134,0,-135	0	128	quotesinglbase
+Fo	600,446,0,102,-42,72	0	129	guillemotleft
+Fc	600,446,0,68,-8,68	0	130	guillemotright
+bu	600,383,0,0,-174	0	131	bullet
+Fn	600,622,143,121,76,72	2	132	florin
+f/	600,665,57,96,-34,72	2	133	fraction
+%0	600,622,15,77,-9,72	2	134	perthousand
+dg	600,580,78,0,-167	2	135	dagger
+dd	600,580,78,0,-113	2	136	daggerdbl
+en	600,285,0,36,-74,36	0	137	endash
+em	600,285,0,111,1,72	0	138	emdash
+fi	600,629,0,69,47,69	2	140	fi
+fl	600,629,0,69,47,69	2	141	fl
+.i	600,426,0,0,-45	0	144	dotlessi
+ga	600,672,0,0,-244	2	146	grave
+a"	600,672,0,133,-189,72	2	147	hungarumlaut
+a.	600,580,0,0,-310	2	148	dotaccent
+ab	600,609,0,26,-229,26	2	149	breve
+ah	600,669,0,64,-212,64	2	150	caron
+ao	600,627,0,0,-282	2	151	ring
+ho	600,0,151,0,-157	0	152	ogonek
+lq	600,562,0,0,-212	2	153	quotedblleft
+rq	600,562,0,26,-163,26	2	154	quotedblright
+oe	600,441,15,65,-4,65	0	155	oe
+/l	600,629,0,33,-45,33	2	156	lslash
+Bq	600,100,134,0,-65	0	157	quotedblbase
+OE	600,562,0,122,-9,72	2	158	OE
+/L	600,562,0,57,3,57	2	159	Lslash
+r!	600,430,157,0,-175	1	161	exclamdown
+ct	600,614,49,38,-101,38	2	162	cent
+Po	600,611,21,71,-74,71	2	163	sterling
+Cs	600,506,0,78,-44,72	0	164	currency
+Ye	600,562,0,143,-70,72	2	165	yen
+bb	600,675,175,0,-188	3	166	brokenbar
+sc	600,580,78,40,-54,40	2	167	section
+ad	600,595,0,20,-212,20	2	168	dieresis
+co	600,580,18,117,-3,72	2	169	copyright
+Of	600,580,0,0,-159	2	170	ordfeminine
+fo	600,446,0,0,-154	0	171	guilsinglleft
+tno	600,369,0,41,-105,41	0	172	logicalnot
+\-	600,283,0,30,-79,30	0	173	minus
+rg	600,580,18,117,-3,72	2	174	registered
+a-	600,565,0,50,-182,50	2	175	macron
+de	600,622,0,26,-164,26	2	176	degree
+t+-	600,558,0,44,-46,44	0	177	plusminus
+S2	600,622,0,0,-180	2	178	twosuperior
+S3	600,622,0,0,-163	2	179	threesuperior
+aa	600,672,0,62,-298,62	2	180	acute
+mc	600,426,157,22,-22,22	1	181	mu
+ps	600,562,78,80,-50,72	2	182	paragraph
+pc	600,327,0,0,-225	0	183	periodcentered
+ac	600,10,151,0,-147	0	184	cedilla
+S1	600,622,0,0,-181	2	185	onesuperior
+Om	600,580,0,0,-160	2	186	ordmasculine
+fc	600,446,0,0,-120	0	187	guilsinglright
+14	600,665,57,124,-15,72	2	188	onequarter
+12	600,665,57,119,-15,72	2	189	onehalf
+34	600,666,56,109,-23,72	2	190	threequarters
+r?	600,430,157,0,-55	1	191	questiondown
+`A	600,793,0,57,47,57	2	192	Agrave
+'A	600,793,0,108,47,72	2	193	Aacute
+^A	600,775,0,57,47,57	2	194	Acircumflex
+~A	600,732,0,106,47,72	2	195	Atilde
+:A	600,731,0,57,47,57	2	196	Adieresis
+oA	600,753,0,57,47,57	2	197	Aring
+AE	600,562,0,105,47,72	2	198	AE
+,C	600,580,151,108,-43,72	2	199	Ccedilla
+`E	600,793,0,110,-3,72	2	200	Egrave
+'E	600,793,0,118,-3,72	2	201	Eacute
+^E	600,775,0,110,-3,72	2	202	Ecircumflex
+:E	600,731,0,110,-3,72	2	203	Edieresis
+`I	600,793,0,73,-46,72	2	204	Igrave
+'I	600,793,0,88,-46,72	2	205	Iacute
+^I	600,775,0,73,-46,72	2	206	Icircumflex
+:I	600,731,0,73,-46,72	2	207	Idieresis
+-D	600,562,0,95,7,72	2	208	Eth
+~N	600,732,13,162,43,72	2	209	Ntilde
+`O	600,793,18,75,-44,72	2	210	Ograve
+'O	600,793,18,88,-44,72	2	211	Oacute
+^O	600,775,18,75,-44,72	2	212	Ocircumflex
+~O	600,732,18,106,-44,72	2	213	Otilde
+:O	600,731,18,75,-44,72	2	214	Odieresis
+tmu	600,470,0,57,-53,57	0	215	multiply
+/O	600,629,80,75,-44,72	2	216	Oslash
+`U	600,793,18,152,-75,72	2	217	Ugrave
+'U	600,793,18,152,-75,72	2	218	Uacute
+^U	600,775,18,152,-75,72	2	219	Ucircumflex
+:U	600,731,18,152,-75,72	2	220	Udieresis
+'Y	600,793,0,145,-83,72	2	221	Yacute
+TP	600,562,0,56,-29,56	2	222	Thorn
+ss	600,629,15,67,2,67	2	223	germandbls
+`a	600,672,15,19,-26,19	2	224	agrave
+'a	600,672,15,62,-26,62	2	225	aacute
+^a	600,654,15,31,-26,31	2	226	acircumflex
+~a	600,606,15,79,-26,72	2	227	atilde
+:a	600,595,15,20,-26,20	2	228	adieresis
+oa	600,627,15,19,-26,19	2	229	aring
+ae	600,441,15,76,9,72	0	230	ae
+,c	600,441,151,64,-56,64	0	231	ccedilla
+`e	600,672,15,48,-56,48	2	232	egrave
+'e	600,672,15,62,-56,62	2	233	eacute
+^e	600,654,15,48,-56,48	2	234	ecircumflex
+:e	600,595,15,48,-56,48	2	235	edieresis
+`i	600,672,0,0,-45	2	236	igrave
+'i	600,672,0,62,-45,62	2	237	iacute
+^i	600,654,0,1,-45,1	2	238	icircumflex
+:i	600,595,0,0,-45	2	239	idieresis
+Sd	600,629,15,89,-52,72	2	240	eth
+~n	600,606,0,79,24,72	2	241	ntilde
+`o	600,672,15,38,-52,38	2	242	ograve
+'o	600,672,15,62,-52,62	2	243	oacute
+^o	600,654,15,38,-52,38	2	244	ocircumflex
+~o	600,606,15,79,-52,72	2	245	otilde
+:o	600,595,15,38,-52,38	2	246	odieresis
+tdi	600,467,0,23,-86,23	0	247	divide
+/o	600,506,80,38,-52,38	0	248	oslash
+`u	600,672,15,22,-51,22	2	249	ugrave
+'u	600,672,15,52,-51,52	2	250	uacute
+^u	600,654,15,22,-51,22	2	251	ucircumflex
+:u	600,595,15,22,-51,22	2	252	udieresis
+'y	600,672,157,133,54,72	3	253	yacute
+Tp	600,629,157,55,74,55	3	254	thorn
+:y	600,595,157,133,54,72	3	255	ydieresis
+IJ	600,562,18,152,18,72	2	256	IJ
+---	600,437,0,0,-173	0	257	up
+---	600,227,0,43,32,43	0	258	dectab
+u0047_030C	600,805,18,95,-33,72	2	259	Gcaron
+---	600,562,0,150,31,72	2	260	stop
+---	600,562,0,91,31,72	2	261	tab
+u2026	600,111,15,25,4,25	0	262	ellipsis
+---	600,297,0,0,-265	0	263	largebullet
+u0073_0327	600,441,151,34,-28,34	0	264	scedilla
+---	600,562,0,150,-29,72	2	265	return
+ij	600,657,157,80,13,72	3	266	ij
+---	600,562,0,97,42,72	2	267	LL
+---	600,562,0,150,31,72	2	268	square
+da	600,608,15,0,-102	2	269	arrowdown
+<-	600,483,0,143,10,72	0	270	arrowleft
+<>	600,483,0,142,14,72	0	271	arrowboth
+---	600,599,0,102,-26,72	2	272	graybox
+->	600,483,0,138,16,72	0	273	arrowright
+u00AF	600,629,0,184,-73,72	2	274	overscore
+---	600,629,0,66,17,66	2	275	ll
+u0067_030C	600,669,157,107,-11,72	3	276	gcaron
+u20A4	600,611,21,71,-68,71	2	277	lira
+---	600,580,0,73,-53,72	2	278	center
+u0053_0327	600,580,151,100,-26,72	2	279	Scedilla
+---	600,607,157,0,78	3	280	format
+ua	600,623,0,27,-159,27	2	281	arrowup
+---	600,572,15,14,-93,14	2	282	notegraphic
+u211E	600,562,15,67,23,67	2	283	prescription
+---	600,348,0,24,-58,24	0	284	indent
+---	600,426,15,0,-137	0	285	down
+---	600,348,0,30,-64,30	0	286	left
+u0049_0307	600,716,0,73,-46,72	2	287	Idot
+---	600,436,15,0,-137	0	288	merge
diff --git a/contrib/groff/font/devps/CR b/contrib/groff/font/devps/CR
index 7c4248c..df19421 100644
--- a/contrib/groff/font/devps/CR
+++ b/contrib/groff/font/devps/CR
@@ -3,246 +3,279 @@ internalname Courier
 spacewidth 600
 encoding text.enc
 charset
-ha	600,622,0,0,-94	2	0000	-- asciicircum
-ti	600,320,0,0,-63	0	0001	-- asciitilde
-vS	600,805,20,0,-72	2	0002	-- Scaron
-vZ	600,805,0,0,-86	2	0003	-- Zcaron
-vs	600,669,15,0,-80	2	0004	-- scaron
-vz	600,669,0,0,-99	2	0005	-- zcaron
-:Y	600,731,0,0,-24	2	0006	-- Ydieresis
-tm	600,562,0,23,23	2	0007	-- trademark
-aq	600,562,0,0,-259	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-236	2	0041	-- exclam
-"	600,562,0,0,-187	2	0042	-- quotedbl
+ha	600,622	2	0	asciicircum
+ti	600,320	0	1	asciitilde
+vS	600,805,20	2	2	Scaron
+vZ	600,805	2	3	Zcaron
+vs	600,669,15	2	4	scaron
+vz	600,669	2	5	zcaron
+:Y	600,731	2	6	Ydieresis
+tm	600,562,0,23,23	2	7	trademark
+aq	600,562	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15	2	33	exclam
+"	600,562	2	34	quotedbl
 dq	"
-#	600,639,32,0,-93	2	0043	-- numbersign
+#	600,639,32	2	35	numbersign
 sh	"
-$	600,662,126,0,-105	2	0044	-- dollar
+$	600,662,126	2	36	dollar
 Do	"
-%	600,622,15,0,-81	2	0045	-- percent
-&	600,543,15,0,-63	0	0046	-- ampersand
-'	600,562,0,0,-213	2	0047	-- quoteright
+%	600,622,15	2	37	percent
+&	600,543,15	0	38	ampersand
+'	600,562	2	39	quoteright
 cq	"
-(	600,622,108,0,-269	2	0050	-- parenleft
-)	600,622,108,0,-160	2	0051	-- parenright
-*	600,607,0,0,-116	2	0052	-- asterisk
-+	600,470,0,0,-80	0	0053	-- plus
-,	600,122,112,0,-181	0	0054	-- comma
--	600,285,0,0,-103	0	0055	-- hyphen
+(	600,622,108	2	40	parenleft
+)	600,622,108	2	41	parenright
+*	600,607	2	42	asterisk
++	600,470	0	43	plus
+,	600,122,112	0	44	comma
+-	600,285	0	45	hyphen
 hy	"
-.	600,109,15,0,-229	0	0056	-- period
-/	600,629,80,0,-125	2	0057	-- slash
+.	600,109,15	0	46	period
+/	600,629,80	2	47	slash
 sl	"
-0	600,622,15,0,-106	2	0060	-- zero
-1	600,622,0,0,-96	2	0061	-- one
-2	600,622,0,0,-70	2	0062	-- two
-3	600,622,15,0,-75	2	0063	-- three
-4	600,622,0,0,-78	2	0064	-- four
-5	600,607,15,0,-92	2	0065	-- five
-6	600,622,15,0,-111	2	0066	-- six
-7	600,607,0,0,-82	2	0067	-- seven
-8	600,622,15,0,-102	2	0070	-- eight
-9	600,622,15,0,-96	2	0071	-- nine
-:	600,385,15,0,-229	0	0072	-- colon
-;	600,385,112,0,-181	0	0073	-- semicolon
-<	600,472,0,0,-41	0	0074	-- less
-=	600,376,0,0,-80	0	0075	-- equal
->	600,472,0,0,-66	0	0076	-- greater
-?	600,572,15,0,-129	2	0077	-- question
-@	600,622,15,0,-77	2	0100	-- at
+0	600,622,15	2	48	zero
+1	600,622	2	49	one
+2	600,622	2	50	two
+3	600,622,15	2	51	three
+4	600,622	2	52	four
+5	600,607,15	2	53	five
+6	600,622,15	2	54	six
+7	600,607	2	55	seven
+8	600,622,15	2	56	eight
+9	600,622,15	2	57	nine
+:	600,385,15	0	58	colon
+;	600,385,112	0	59	semicolon
+<	600,472	0	60	less
+=	600,376	0	61	equal
+>	600,472	0	62	greater
+?	600,572,15	2	63	question
+@	600,622,15	2	64	at
 at	"
-A	600,562,0,0,-3	2	0101	-- A
-B	600,562,0,0,-43	2	0102	-- B
-C	600,580,18,0,-41	2	0103	-- C
-D	600,562,0,0,-43	2	0104	-- D
-E	600,562,0,0,-53	2	0105	-- E
-F	600,562,0,0,-53	2	0106	-- F
-G	600,580,18,0,-31	2	0107	-- G
-H	600,562,0,0,-32	2	0110	-- H
-I	600,562,0,0,-96	2	0111	-- I
-J	600,562,18,0,-34	2	0112	-- J
-K	600,562,0,0,-38	2	0113	-- K
-L	600,562,0,0,-47	2	0114	-- L
-M	600,562,0,0,-4	2	0115	-- M
-N	600,562,13,0,-7	2	0116	-- N
-O	600,580,18,0,-43	2	0117	-- O
-P	600,562,0,0,-79	2	0120	-- P
-Q	600,580,138,0,-43	2	0121	-- Q
-R	600,562,0,0,-38	2	0122	-- R
-S	600,580,20,0,-72	2	0123	-- S
-T	600,562,0,0,-38	2	0124	-- T
-U	600,562,18,0,-17	2	0125	-- U
-V	600,562,13,4,4	2	0126	-- V
-W	600,562,13,3,3	2	0127	-- W
-X	600,562,0,0,-23	2	0130	-- X
-Y	600,562,0,0,-24	2	0131	-- Y
-Z	600,562,0,0,-86	2	0132	-- Z
-[	600,622,108,0,-269	2	0133	-- bracketleft
+A	600,562	2	65	A
+B	600,562	2	66	B
+C	600,580,18	2	67	C
+D	600,562	2	68	D
+E	600,562	2	69	E
+F	600,562	2	70	F
+G	600,580,18	2	71	G
+H	600,562	2	72	H
+I	600,562	2	73	I
+J	600,562,18	2	74	J
+K	600,562	2	75	K
+L	600,562	2	76	L
+M	600,562	2	77	M
+N	600,562,13	2	78	N
+O	600,580,18	2	79	O
+P	600,562	2	80	P
+Q	600,580,138	2	81	Q
+R	600,562	2	82	R
+S	600,580,20	2	83	S
+T	600,562	2	84	T
+U	600,562,18	2	85	U
+V	600,562,13,4,4	2	86	V
+W	600,562,13,3,3	2	87	W
+X	600,562	2	88	X
+Y	600,562	2	89	Y
+Z	600,562	2	90	Z
+[	600,622,108	2	91	bracketleft
 lB	"
-\	600,629,80,0,-118	2	0134	-- backslash
+\	600,629,80	2	92	backslash
 rs	"
-]	600,622,108,0,-158	2	0135	-- bracketright
+]	600,622,108	2	93	bracketright
 rB	"
-a^	600,654,0,0,-124	2	0136	-- circumflex
+a^	600,654	2	94	circumflex
 ^	"
-_	600,0,125	0	0137	-- underscore
-`	600,562,0,0,-224	2	0140	-- quoteleft
+_	600,0,125	0	95	underscore
+`	600,562	2	96	quoteleft
 oq	"
-a	600,441,15,0,-53	0	0141	-- a
-b	600,629,15,0,-14	2	0142	-- b
-c	600,441,15,0,-66	0	0143	-- c
-d	600,629,15,0,-45	2	0144	-- d
-e	600,441,15,0,-66	0	0145	-- e
-f	600,629,0,0,-114	2	0146	-- f
-g	600,441,157,0,-45	1	0147	-- g
-h	600,629,0,0,-18	2	0150	-- h
-i	600,657,0,0,-95	2	0151	-- i
-j	600,657,157,0,-82	3	0152	-- j
-k	600,629,0,0,-43	2	0153	-- k
-l	600,629,0,0,-95	2	0154	-- l
-m	600,441,0,5,5	0	0155	-- m
-n	600,441,0,0,-26	0	0156	-- n
-o	600,441,15,0,-62	0	0157	-- o
-p	600,441,157,0,-9	1	0160	-- p
-q	600,441,157,0,-45	1	0161	-- q
-r	600,441,0,0,-60	0	0162	-- r
-s	600,441,15,0,-80	0	0163	-- s
-t	600,561,15,0,-87	2	0164	-- t
-u	600,426,15,0,-21	0	0165	-- u
-v	600,426,10,0,-10	0	0166	-- v
-w	600,426,10,4,4	0	0167	-- w
-x	600,426,0,0,-20	0	0170	-- x
-y	600,426,157,0,-7	1	0171	-- y
-z	600,426,0,0,-99	0	0172	-- z
-lC	600,622,108,0,-182	2	0173	-- braceleft
+a	600,441,15	0	97	a
+b	600,629,15	2	98	b
+c	600,441,15	0	99	c
+d	600,629,15	2	100	d
+e	600,441,15	0	101	e
+f	600,629	2	102	f
+g	600,441,157	1	103	g
+h	600,629	2	104	h
+i	600,657	2	105	i
+j	600,657,157	3	106	j
+k	600,629	2	107	k
+l	600,629	2	108	l
+m	600,441,0,5,5	0	109	m
+n	600,441	0	110	n
+o	600,441,15	0	111	o
+p	600,441,157	1	112	p
+q	600,441,157	1	113	q
+r	600,441	0	114	r
+s	600,441,15	0	115	s
+t	600,561,15	2	116	t
+u	600,426,15	0	117	u
+v	600,426,10	0	118	v
+w	600,426,10,4,4	0	119	w
+x	600,426	0	120	x
+y	600,426,157	1	121	y
+z	600,426	0	122	z
+lC	600,622,108	2	123	braceleft
 {	"
-ba	600,750,250,0,-275	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	600,622,108,0,-163	2	0175	-- braceright
+rC	600,622,108	2	125	braceright
 }	"
-a~	600,606,0,0,-105	2	0176	-- tilde
+a~	600,606	2	126	tilde
 ~	"
-bq	600,100,134,0,-213	0	0200	-- quotesinglbase
-Fo	600,446,0,0,-37	0	0201	-- guillemotleft
-Fc	600,446,0,0,-37	0	0202	-- guillemotright
-bu	600,383,0,0,-172	0	0203	-- bullet
-Fn	600,622,143,0,-4	2	0204	-- florin
-f/	600,665,57,0,-92	2	0205	-- fraction
-%0	600,622,15,0,-3	2	0206	-- perthousand
-dg	600,580,78,0,-141	2	0207	-- dagger
-dd	600,580,78,0,-141	2	0210	-- daggerdbl
-en	600,285,0,0,-75	0	0211	-- endash
-em	600,285	0	0212	-- emdash
-fi	600,629,0,0,-3	2	0214	-- fi
-fl	600,629,0,0,-3	2	0215	-- fl
-.i	600,426,0,0,-95	0	0220	-- dotlessi
-ga	600,672,0,0,-151	2	0222	-- grave
-a"	600,672,0,0,-133	2	0223	-- hungarumlaut
-a.	600,580,0,0,-249	2	0224	-- dotaccent
-ab	600,609,0,0,-153	2	0225	-- breve
-ah	600,669,0,0,-124	2	0226	-- caron
-ao	600,627,0,0,-218	2	0227	-- ring
-ho	600,0,151,0,-227	0	0230	-- ogonek
-lq	600,562,0,0,-143	2	0231	-- quotedblleft
-rq	600,562,0,0,-143	2	0232	-- quotedblright
-oe	600,441,15,0,-19	0	0233	-- oe
-/l	600,629,0,0,-95	2	0234	-- lslash
-Bq	600,100,134,0,-143	0	0235	-- quotedblbase
-OE	600,562,0,0,-7	2	0236	-- OE
-/L	600,562,0,0,-47	2	0237	-- Lslash
-r!	600,430,157,0,-236	1	0241	-- exclamdown
-ct	600,614,49,0,-96	2	0242	-- cent
-Po	600,611,21,0,-84	2	0243	-- sterling
-Cs	600,506,0,0,-73	0	0244	-- currency
-Ye	600,562,0,0,-26	2	0245	-- yen
-bb	600,675,175,0,-275	3	0246	-- brokenbar
-sc	600,580,78,0,-113	2	0247	-- section
-ad	600,595,0,0,-148	2	0250	-- dieresis
-co	600,580,18	2	0251	-- copyright
-Of	600,580,0,0,-156	2	0252	-- ordfeminine
-fo	600,446,0,0,-149	0	0253	-- guilsinglleft
-no	600,369,0,0,-87	0	0254	-- logicalnot
-\-	600,283,0,0,-80	0	0255	-- minus
-rg	600,580,18	2	0256	-- registered
-a-	600,565,0,0,-120	2	0257	-- macron
-de	600,622,0,0,-123	2	0260	-- degree
-t+-	600,558,0,0,-87	0	0261	-- plusminus
-S2	600,622,0,0,-177	2	0262	-- twosuperior
-S3	600,622,0,0,-155	2	0263	-- threesuperior
-aa	600,672,0,0,-242	2	0264	-- acute
-mc	600,426,157,0,-21	1	0265	-- mu
-ps	600,562,78,0,-50	2	0266	-- paragraph
-pc	600,327,0,0,-222	0	0267	-- periodcentered
-ac	600,10,151,0,-224	0	0270	-- cedilla
-S1	600,622,0,0,-172	2	0271	-- onesuperior
-Om	600,580,0,0,-157	2	0272	-- ordmasculine
-fc	600,446,0,0,-149	0	0273	-- guilsinglright
-14	600,665,57	2	0274	-- onequarter
-12	600,665,57,11	2	0275	-- onehalf
-34	600,666,56,0,-8	2	0276	-- threequarters
-r?	600,430,157,0,-108	1	0277	-- questiondown
-`A	600,793,0,0,-3	2	0300	-- Agrave
-'A	600,793,0,0,-3	2	0301	-- Aacute
-^A	600,775,0,0,-3	2	0302	-- Acircumflex
-~A	600,732,0,0,-3	2	0303	-- Atilde
-:A	600,731,0,0,-3	2	0304	-- Adieresis
-oA	600,753,0,0,-3	2	0305	-- Aring
-AE	600,562,0,0,-3	2	0306	-- AE
-,C	600,580,151,0,-41	2	0307	-- Ccedilla
-`E	600,793,0,0,-53	2	0310	-- Egrave
-'E	600,793,0,0,-53	2	0311	-- Eacute
-^E	600,775,0,0,-53	2	0312	-- Ecircumflex
-:E	600,731,0,0,-53	2	0313	-- Edieresis
-`I	600,793,0,0,-96	2	0314	-- Igrave
-'I	600,793,0,0,-96	2	0315	-- Iacute
-^I	600,775,0,0,-96	2	0316	-- Icircumflex
-:I	600,731,0,0,-96	2	0317	-- Idieresis
--D	600,562,0,0,-30	2	0320	-- Eth
-~N	600,732,13,0,-7	2	0321	-- Ntilde
-`O	600,793,18,0,-43	2	0322	-- Ograve
-'O	600,793,18,0,-43	2	0323	-- Oacute
-^O	600,775,18,0,-43	2	0324	-- Ocircumflex
-~O	600,732,18,0,-43	2	0325	-- Otilde
-:O	600,731,18,0,-43	2	0326	-- Odieresis
-tmu	600,470,0,0,-87	0	0327	-- multiply
-/O	600,629,80,0,-43	2	0330	-- Oslash
-`U	600,793,18,0,-17	2	0331	-- Ugrave
-'U	600,793,18,0,-17	2	0332	-- Uacute
-^U	600,775,18,0,-17	2	0333	-- Ucircumflex
-:U	600,731,18,0,-17	2	0334	-- Udieresis
-'Y	600,793,0,0,-24	2	0335	-- Yacute
-TP	600,562,0,0,-79	2	0336	-- Thorn
-ss	600,629,15,0,-48	2	0337	-- germandbls
-`a	600,672,15,0,-53	2	0340	-- agrave
-'a	600,672,15,0,-53	2	0341	-- aacute
-^a	600,654,15,0,-53	2	0342	-- acircumflex
-~a	600,606,15,0,-53	2	0343	-- atilde
-:a	600,595,15,0,-53	2	0344	-- adieresis
-oa	600,627,15,0,-53	2	0345	-- aring
-ae	600,441,15,0,-19	0	0346	-- ae
-,c	600,441,151,0,-66	0	0347	-- ccedilla
-`e	600,672,15,0,-66	2	0350	-- egrave
-'e	600,672,15,0,-66	2	0351	-- eacute
-^e	600,654,15,0,-66	2	0352	-- ecircumflex
-:e	600,595,15,0,-66	2	0353	-- edieresis
-`i	600,672,0,0,-95	2	0354	-- igrave
-'i	600,672,0,0,-95	2	0355	-- iacute
-^i	600,654,0,0,-94	2	0356	-- icircumflex
-:i	600,595,0,0,-95	2	0357	-- idieresis
-Sd	600,629,15,0,-62	2	0360	-- eth
-~n	600,606,0,0,-26	2	0361	-- ntilde
-`o	600,672,15,0,-62	2	0362	-- ograve
-'o	600,672,15,0,-62	2	0363	-- oacute
-^o	600,654,15,0,-62	2	0364	-- ocircumflex
-~o	600,606,15,0,-62	2	0365	-- otilde
-:o	600,595,15,0,-62	2	0366	-- odieresis
-tdi	600,467,0,0,-87	0	0367	-- divide
-/o	600,506,80,0,-62	0	0370	-- oslash
-`u	600,672,15,0,-21	2	0371	-- ugrave
-'u	600,672,15,0,-21	2	0372	-- uacute
-^u	600,654,15,0,-21	2	0373	-- ucircumflex
-:u	600,595,15,0,-21	2	0374	-- udieresis
-'y	600,672,157,0,-7	3	0375	-- yacute
-Tp	600,629,157,0,6	3	0376	-- thorn
-:y	600,595,157,0,-7	3	0377	-- ydieresis
+bq	600,100,134	0	128	quotesinglbase
+Fo	600,446	0	129	guillemotleft
+Fc	600,446	0	130	guillemotright
+bu	600,383	0	131	bullet
+Fn	600,622,143	2	132	florin
+f/	600,665,57	2	133	fraction
+%0	600,622,15	2	134	perthousand
+dg	600,580,78	2	135	dagger
+dd	600,580,78	2	136	daggerdbl
+en	600,285	0	137	endash
+em	600,285	0	138	emdash
+fi	600,629	2	140	fi
+fl	600,629	2	141	fl
+.i	600,426	0	144	dotlessi
+ga	600,672	2	146	grave
+a"	600,672	2	147	hungarumlaut
+a.	600,580	2	148	dotaccent
+ab	600,609	2	149	breve
+ah	600,669	2	150	caron
+ao	600,627	2	151	ring
+ho	600,0,151	0	152	ogonek
+lq	600,562	2	153	quotedblleft
+rq	600,562	2	154	quotedblright
+oe	600,441,15	0	155	oe
+/l	600,629	2	156	lslash
+Bq	600,100,134	0	157	quotedblbase
+OE	600,562	2	158	OE
+/L	600,562	2	159	Lslash
+r!	600,430,157	1	161	exclamdown
+ct	600,614,49	2	162	cent
+Po	600,611,21	2	163	sterling
+Cs	600,506	0	164	currency
+Ye	600,562	2	165	yen
+bb	600,675,175	3	166	brokenbar
+sc	600,580,78	2	167	section
+ad	600,595	2	168	dieresis
+co	600,580,18	2	169	copyright
+Of	600,580	2	170	ordfeminine
+fo	600,446	0	171	guilsinglleft
+tno	600,369	0	172	logicalnot
+\-	600,283	0	173	minus
+rg	600,580,18	2	174	registered
+a-	600,565	2	175	macron
+de	600,622	2	176	degree
+t+-	600,558	0	177	plusminus
+S2	600,622	2	178	twosuperior
+S3	600,622	2	179	threesuperior
+aa	600,672	2	180	acute
+mc	600,426,157	1	181	mu
+ps	600,562,78	2	182	paragraph
+pc	600,327	0	183	periodcentered
+ac	600,10,151	0	184	cedilla
+S1	600,622	2	185	onesuperior
+Om	600,580	2	186	ordmasculine
+fc	600,446	0	187	guilsinglright
+14	600,665,57	2	188	onequarter
+12	600,665,57,11	2	189	onehalf
+34	600,666,56	2	190	threequarters
+r?	600,430,157	1	191	questiondown
+`A	600,793	2	192	Agrave
+'A	600,793	2	193	Aacute
+^A	600,775	2	194	Acircumflex
+~A	600,732	2	195	Atilde
+:A	600,731	2	196	Adieresis
+oA	600,753	2	197	Aring
+AE	600,562	2	198	AE
+,C	600,580,151	2	199	Ccedilla
+`E	600,793	2	200	Egrave
+'E	600,793	2	201	Eacute
+^E	600,775	2	202	Ecircumflex
+:E	600,731	2	203	Edieresis
+`I	600,793	2	204	Igrave
+'I	600,793	2	205	Iacute
+^I	600,775	2	206	Icircumflex
+:I	600,731	2	207	Idieresis
+-D	600,562	2	208	Eth
+~N	600,732,13	2	209	Ntilde
+`O	600,793,18	2	210	Ograve
+'O	600,793,18	2	211	Oacute
+^O	600,775,18	2	212	Ocircumflex
+~O	600,732,18	2	213	Otilde
+:O	600,731,18	2	214	Odieresis
+tmu	600,470	0	215	multiply
+/O	600,629,80	2	216	Oslash
+`U	600,793,18	2	217	Ugrave
+'U	600,793,18	2	218	Uacute
+^U	600,775,18	2	219	Ucircumflex
+:U	600,731,18	2	220	Udieresis
+'Y	600,793	2	221	Yacute
+TP	600,562	2	222	Thorn
+ss	600,629,15	2	223	germandbls
+`a	600,672,15	2	224	agrave
+'a	600,672,15	2	225	aacute
+^a	600,654,15	2	226	acircumflex
+~a	600,606,15	2	227	atilde
+:a	600,595,15	2	228	adieresis
+oa	600,627,15	2	229	aring
+ae	600,441,15	0	230	ae
+,c	600,441,151	0	231	ccedilla
+`e	600,672,15	2	232	egrave
+'e	600,672,15	2	233	eacute
+^e	600,654,15	2	234	ecircumflex
+:e	600,595,15	2	235	edieresis
+`i	600,672	2	236	igrave
+'i	600,672	2	237	iacute
+^i	600,654	2	238	icircumflex
+:i	600,595	2	239	idieresis
+Sd	600,629,15	2	240	eth
+~n	600,606	2	241	ntilde
+`o	600,672,15	2	242	ograve
+'o	600,672,15	2	243	oacute
+^o	600,654,15	2	244	ocircumflex
+~o	600,606,15	2	245	otilde
+:o	600,595,15	2	246	odieresis
+tdi	600,467	0	247	divide
+/o	600,506,80	0	248	oslash
+`u	600,672,15	2	249	ugrave
+'u	600,672,15	2	250	uacute
+^u	600,654,15	2	251	ucircumflex
+:u	600,595,15	2	252	udieresis
+'y	600,672,157	3	253	yacute
+Tp	600,629,157,0,6	3	254	thorn
+:y	600,595,157	3	255	ydieresis
+IJ	600,562,18	2	256	IJ
+---	600,437	0	257	up
+---	600,227	0	258	dectab
+u0047_030C	600,805,18	2	259	Gcaron
+---	600,562	2	260	stop
+---	600,562	2	261	tab
+u2026	600,111,15	0	262	ellipsis
+---	600,297	0	263	largebullet
+u0073_0327	600,441,151	0	264	scedilla
+---	600,562	2	265	return
+ij	600,657,157	3	266	ij
+---	600,562	2	267	LL
+---	600,562	2	268	square
+da	600,608,15	2	269	arrowdown
+<-	600,483,0,24,24	0	270	arrowleft
+<>	600,483,0,28,28	0	271	arrowboth
+---	600,599	2	272	graybox
+->	600,483,0,24,24	0	273	arrowright
+u00AF	600,629	2	274	overscore
+---	600,629	2	275	ll
+u0067_030C	600,669,157	3	276	gcaron
+u20A4	600,611,21	2	277	lira
+---	600,580	2	278	center
+u0053_0327	600,580,151	2	279	Scedilla
+---	600,607,157	3	280	format
+ua	600,623	2	281	arrowup
+---	600,572,15	2	282	notegraphic
+u211E	600,562,15	2	283	prescription
+---	600,348	0	284	indent
+---	600,426,15	0	285	down
+---	600,348	0	286	left
+u0049_0307	600,716	2	287	Idot
+---	600,436,15	0	288	merge
diff --git a/contrib/groff/font/devps/EURO b/contrib/groff/font/devps/EURO
new file mode 100644
index 0000000..e1459e6
--- /dev/null
+++ b/contrib/groff/font/devps/EURO
@@ -0,0 +1,19 @@
+name EURO
+internalname FreeEuro
+charset
+---	750,685,12	3	0	Euro.symbol
+---	750,685,12	3	1	Euro.symbol.bold
+---	750,685,12,92	3	2	Euro.symbol.slanted
+---	750,685,12,100	3	3	Euro.symbol.bold.slanted
+---	741,676,14	3	4	Euro.serif
+---	800,691,19	3	5	Euro.serif.bold
+---	734,666,18,11	3	6	Euro.serif.italic
+---	800,691,19,8	3	7	Euro.serif.bold.italic
+---	756,709,23	3	8	Euro.sansserif
+---	796,710,22	3	9	Euro.sansserif.bold
+---	756,709,23,106	3	10	Euro.sansserif.slanted
+---	796,710,22,107	3	11	Euro.sansserif.bold.slanted
+---	600,576,16	3	12	Euro.mono
+---	600,597,14	3	13	Euro.mono.bold
+---	600,576,16,31	3	14	Euro.mono.slanted
+---	600,597,14,43	3	15	Euro.mono.bold.slanted
diff --git a/contrib/groff/font/devps/HB b/contrib/groff/font/devps/HB
index 6aec8f7..759f884 100644
--- a/contrib/groff/font/devps/HB
+++ b/contrib/groff/font/devps/HB
@@ -221,246 +221,247 @@ y , -80
 y a -30
 z e 10
 charset
-ha	584,698,0,0,-62	2	0000	-- asciicircum
-ti	584,343,0,0,-61	0	0001	-- asciitilde
-vS	667,936,19,0,-39	2	0002	-- Scaron
-vZ	611,936,0,0,-25	2	0003	-- Zcaron
-vs	556,750,14,0,-30	2	0004	-- scaron
-vz	500,750,0,0,-20	2	0005	-- zcaron
-:Y	667,915,0,0,-15	2	0006	-- Ydieresis
-tm	1000,718,0,0,-44	2	0007	-- trademark
-aq	238,718,0,0,-70	2	0010	-- quotesingle
-space	278	0	0040
-!	333,718,0,0,-90	2	0041	-- exclam
-"	474,718,0,0,-98	2	0042	-- quotedbl
+ha	584,698	2	0	asciicircum
+ti	584,343	0	1	asciitilde
+vS	667,936,19	2	2	Scaron
+vZ	611,936	2	3	Zcaron
+vs	556,750,14	2	4	scaron
+vz	500,750	2	5	zcaron
+:Y	667,915	2	6	Ydieresis
+tm	1000,718	2	7	trademark
+aq	238,718	2	8	quotesingle
+space	278	0	32	space
+!	333,718	2	33	exclam
+"	474,718	2	34	quotedbl
 dq	"
-#	556,698,0,0,-18	2	0043	-- numbersign
+#	556,698	2	35	numbersign
 sh	"
-$	556,775,115,0,-30	2	0044	-- dollar
+$	556,775,115	2	36	dollar
 Do	"
-%	889,710,19,0,-28	2	0045	-- percent
-&	722,718,19,0,-54	2	0046	-- ampersand
-'	278,718,0,0,-69	2	0047	-- quoteright
+%	889,710,19	2	37	percent
+&	722,718,19	2	38	ampersand
+'	278,718	2	39	quoteright
 cq	"
-(	333,734,208,0,-35	3	0050	-- parenleft
-)	333,734,208,0,-19	3	0051	-- parenright
-*	389,718,0,0,-27	2	0052	-- asterisk
-+	584,506,0,0,-40	0	0053	-- plus
-,	278,146,168,0,-64	0	0054	-- comma
--	333,345,0,0,-27	0	0055	-- hyphen
+(	333,734,208	3	40	parenleft
+)	333,734,208	3	41	parenright
+*	389,718	2	42	asterisk
++	584,506	0	43	plus
+,	278,146,168	0	44	comma
+-	333,345	0	45	hyphen
 hy	"
-.	278,146,0,0,-64	0	0056	-- period
-/	278,737,19,33,33	2	0057	-- slash
+.	278,146	0	46	period
+/	278,737,19,33,33	2	47	slash
 sl	"
-0	556,710,19,0,-32	2	0060	-- zero
-1	556,710,0,0,-69	2	0061	-- one
-2	556,710,0,0,-26	2	0062	-- two
-3	556,710,19,0,-27	2	0063	-- three
-4	556,710,0,0,-27	2	0064	-- four
-5	556,698,19,0,-27	2	0065	-- five
-6	556,710,19,0,-31	2	0066	-- six
-7	556,698,0,0,-25	2	0067	-- seven
-8	556,710,19,0,-32	2	0070	-- eight
-9	556,710,19,0,-30	2	0071	-- nine
-:	333,512,0,0,-92	0	0072	-- colon
-;	333,512,168,0,-92	0	0073	-- semicolon
-<	584,514,8,0,-38	0	0074	-- less
-=	584,419,0,0,-40	0	0075	-- equal
->	584,514,8,0,-38	0	0076	-- greater
-?	611,727,0,0,-60	2	0077	-- question
-@	975,737,19,0,-118	2	0100	-- at
+0	556,710,19	2	48	zero
+1	556,710	2	49	one
+2	556,710	2	50	two
+3	556,710,19	2	51	three
+4	556,710	2	52	four
+5	556,698,19	2	53	five
+6	556,710,19	2	54	six
+7	556,698	2	55	seven
+8	556,710,19	2	56	eight
+9	556,710,19	2	57	nine
+:	333,512	0	58	colon
+;	333,512,168	0	59	semicolon
+<	584,514,8	0	60	less
+=	584,419	0	61	equal
+>	584,514,8	0	62	greater
+?	611,727	2	63	question
+@	975,737,19	2	64	at
 at	"
-A	722,718,0,0,-20	2	0101	-- A
-B	722,718,0,0,-76	2	0102	-- B
-C	722,737,19,0,-44	2	0103	-- C
-D	722,718,0,0,-76	2	0104	-- D
-E	667,718,0,0,-76	2	0105	-- E
-F	611,718,0,0,-76	2	0106	-- F
-G	778,737,19,0,-44	2	0107	-- G
-H	722,718,0,0,-71	2	0110	-- H
-I	278,718,0,0,-64	2	0111	-- I
-J	556,718,18,0,-22	2	0112	-- J
-K	722,718,0,0,-87	2	0113	-- K
-L	611,718,0,0,-76	2	0114	-- L
-M	833,718,0,0,-69	2	0115	-- M
-N	722,718,0,0,-69	2	0116	-- N
-O	778,737,19,0,-44	2	0117	-- O
-P	667,718,0,0,-76	2	0120	-- P
-Q	778,737,52,0,-44	2	0121	-- Q
-R	722,718,0,0,-76	2	0122	-- R
-S	667,737,19,0,-39	2	0123	-- S
-T	611,718,0,0,-14	2	0124	-- T
-U	722,718,19,0,-72	2	0125	-- U
-V	667,718,0,0,-19	2	0126	-- V
-W	944,718,0,0,-16	2	0127	-- W
-X	667,718,0,0,-14	2	0130	-- X
-Y	667,718,0,0,-15	2	0131	-- Y
-Z	611,718,0,0,-25	2	0132	-- Z
-[	333,722,196,0,-63	2	0133	-- bracketleft
+A	722,718	2	65	A
+B	722,718	2	66	B
+C	722,737,19	2	67	C
+D	722,718	2	68	D
+E	667,718	2	69	E
+F	611,718	2	70	F
+G	778,737,19	2	71	G
+H	722,718	2	72	H
+I	278,718	2	73	I
+J	556,718,18	2	74	J
+K	722,718	2	75	K
+L	611,718	2	76	L
+M	833,718	2	77	M
+N	722,718	2	78	N
+O	778,737,19	2	79	O
+P	667,718	2	80	P
+Q	778,737,52	2	81	Q
+R	722,718	2	82	R
+S	667,737,19	2	83	S
+T	611,718	2	84	T
+U	722,718,19	2	85	U
+V	667,718	2	86	V
+W	944,718	2	87	W
+X	667,718	2	88	X
+Y	667,718	2	89	Y
+Z	611,718	2	90	Z
+[	333,722,196	2	91	bracketleft
 lB	"
-\	278,737,19,33,33	2	0134	-- backslash
+\	278,737,19,33,33	2	92	backslash
 rs	"
-]	333,722,196,0,-24	2	0135	-- bracketright
+]	333,722,196	2	93	bracketright
 rB	"
-a^	333,750,0,10,10	2	0136	-- circumflex
+a^	333,750,0,10,10	2	94	circumflex
 ^	"
-_	556,0,125	0	0137	-- underscore
-`	278,727,0,0,-69	2	0140	-- quoteleft
+_	556,0,125	0	95	underscore
+`	278,727	2	96	quoteleft
 oq	"
-a	556,546,14,0,-29	0	0141	-- a
-b	611,718,14,0,-61	2	0142	-- b
-c	556,546,14,0,-34	0	0143	-- c
-d	611,718,14,0,-34	2	0144	-- d
-e	556,546,14,0,-23	0	0145	-- e
-f	333,727,0,0,-10	2	0146	-- f
-g	611,546,217,0,-40	1	0147	-- g
-h	611,718,0,0,-65	2	0150	-- h
-i	278,725,0,0,-69	2	0151	-- i
-j	278,725,214,0,-3	3	0152	-- j
-k	556,718,0,6,-69	2	0153	-- k
-l	278,718,0,0,-69	2	0154	-- l
-m	889,546,0,0,-64	0	0155	-- m
-n	611,546,0,0,-65	0	0156	-- n
-o	611,546,14,0,-34	0	0157	-- o
-p	611,546,207,0,-62	1	0160	-- p
-q	611,546,207,0,-34	1	0161	-- q
-r	389,546,0,0,-64	0	0162	-- r
-s	556,546,14,0,-30	0	0163	-- s
-t	333,676,6,0,-10	2	0164	-- t
-u	611,532,14,0,-66	0	0165	-- u
-v	556,532,0,0,-13	0	0166	-- v
-w	778,532,0,0,-10	0	0167	-- w
-x	556,532,0,0,-15	0	0170	-- x
-y	556,532,214,0,-10	1	0171	-- y
-z	500,532,0,0,-20	0	0172	-- z
-lC	389,722,196,0,-48	2	0173	-- braceleft
+a	556,546,14	0	97	a
+b	611,718,14	2	98	b
+c	556,546,14	0	99	c
+d	611,718,14	2	100	d
+e	556,546,14	0	101	e
+f	333,727	2	102	f
+g	611,546,217	1	103	g
+h	611,718	2	104	h
+i	278,725	2	105	i
+j	278,725,214	3	106	j
+k	556,718,0,6	2	107	k
+l	278,718	2	108	l
+m	889,546	0	109	m
+n	611,546	0	110	n
+o	611,546,14	0	111	o
+p	611,546,207	1	112	p
+q	611,546,207	1	113	q
+r	389,546	0	114	r
+s	556,546,14	0	115	s
+t	333,676,6	2	116	t
+u	611,532,14	0	117	u
+v	556,532	0	118	v
+w	778,532	0	119	w
+x	556,532	0	120	x
+y	556,532,214	1	121	y
+z	500,532	0	122	z
+lC	389,722,196	2	123	braceleft
 {	"
-ba	280,737,19,0,-84	2	0174	-- bar
+ba	280,737,19	2	124	bar
 |	"
-rC	389,722,196,0,-24	2	0175	-- braceright
+rC	389,722,196	2	125	braceright
 }	"
-a~	333,737,0,17,17	2	0176	-- tilde
+a~	333,737,0,17,17	2	126	tilde
 ~	"
-bq	278,127,146,0,-69	0	0200	-- quotesinglbase
-Fo	556,484,0,0,-88	0	0201	-- guillemotleft
-Fc	556,484,0,0,-88	0	0202	-- guillemotright
-bu	350,524,0,0,-10	0	0203	-- bullet
-Fn	556,737,210,0,10	3	0204	-- florin
-f/	167,710,19,169,170	2	0205	-- fraction
-%0	1000,710,19,3,3	2	0206	-- perthousand
-dg	556,718,171,0,-36	2	0207	-- dagger
-dd	556,718,171,0,-36	2	0210	-- daggerdbl
-en	556,333	0	0211	-- endash
-em	1000,333	0	0212	-- emdash
-fi	611,727,0,0,-10	2	0214	-- fi
-fl	611,727,0,0,-10	2	0215	-- fl
-.i	278,532,0,0,-69	0	0220	-- dotlessi
-ga	333,750,0,0,23	2	0222	-- grave
-a"	333,750,0,153,-9	2	0223	-- hungarumlaut
-a.	333,729,0,0,-104	2	0224	-- dotaccent
-ab	333,750,0,2,2	2	0225	-- breve
-ah	333,750,0,10,10	2	0226	-- caron
-ao	333,776,0,0,-59	2	0227	-- ring
-ho	333,0,228,0,-71	1	0230	-- ogonek
-lq	500,727,0,0,-64	2	0231	-- quotedblleft
-rq	500,718,0,0,-64	2	0232	-- quotedblright
-oe	944,546,14,0,-34	0	0233	-- oe
-/l	278,718,0,18,18	2	0234	-- lslash
-Bq	500,127,146,0,-64	0	0235	-- quotedblbase
-OE	1000,737,19,0,-37	2	0236	-- OE
-/L	611,718,0,0,20	2	0237	-- Lslash
-r!	333,532,186,0,-90	0	0241	-- exclamdown
-ct	556,628,118,0,-34	0	0242	-- cent
-Po	556,718,16,0,-28	2	0243	-- sterling
-Cs	556,636,0,3,3	0	0244	-- currency
-Ye	556,698,0,9,9	2	0245	-- yen
-bb	280,737,19,0,-84	2	0246	-- brokenbar
-sc	556,727,184,0,-34	2	0247	-- section
-ad	333,729,0,0,-6	2	0250	-- dieresis
-co	737,737,19,12,11	2	0251	-- copyright
-Of	370,737,0,0,-22	2	0252	-- ordfeminine
-fo	333,484,0,0,-83	0	0253	-- guilsinglleft
-no	584,419,0,0,-40	0	0254	-- logicalnot
-\-	584,309,0,0,-40	0	0255	-- minus
-rg	737,737,19,11,11	2	0256	-- registered
-a-	333,678,0,6,6	2	0257	-- macron
-de	400,712,0,0,-57	2	0260	-- degree
-t+-	584,506,0,0,-40	0	0261	-- plusminus
-S2	333,710,0,0,-9	2	0262	-- twosuperior
-S3	333,710,0,0,-8	2	0263	-- threesuperior
-aa	333,750,0,23,-108	2	0264	-- acute
-mc	611,532,207,0,-66	1	0265	-- mu
-ps	556,700,191,0,8	2	0266	-- paragraph
-pc	278,334,0,0,-58	0	0267	-- periodcentered
-ac	333,0,228,0,-6	1	0270	-- cedilla
-S1	333,710,0,0,-26	2	0271	-- onesuperior
-Om	365,737,0,0,-6	2	0272	-- ordmasculine
-fc	333,484,0,0,-83	0	0273	-- guilsinglright
-14	834,710,19,0,-26	2	0274	-- onequarter
-12	834,710,19,0,-26	2	0275	-- onehalf
-34	834,710,19,0,-16	2	0276	-- threequarters
-r?	611,532,195,0,-55	0	0277	-- questiondown
-`A	722,936,0,0,-20	2	0300	-- Agrave
-'A	722,936,0,0,-20	2	0301	-- Aacute
-^A	722,936,0,0,-20	2	0302	-- Acircumflex
-~A	722,923,0,0,-20	2	0303	-- Atilde
-:A	722,915,0,0,-20	2	0304	-- Adieresis
-oA	722,962,0,0,-20	2	0305	-- Aring
-AE	1000,718,0,0,-5	2	0306	-- AE
-,C	722,737,228,0,-44	3	0307	-- Ccedilla
-`E	667,936,0,0,-76	2	0310	-- Egrave
-'E	667,936,0,0,-76	2	0311	-- Eacute
-^E	667,936,0,0,-76	2	0312	-- Ecircumflex
-:E	667,915,0,0,-76	2	0313	-- Edieresis
-`I	278,936,0,0,50	2	0314	-- Igrave
-'I	278,936,0,51,-64	2	0315	-- Iacute
-^I	278,936,0,38,37	2	0316	-- Icircumflex
-:I	278,915,0,22,21	2	0317	-- Idieresis
--D	722,718,0,0,5	2	0320	-- Eth
-~N	722,923,0,0,-69	2	0321	-- Ntilde
-`O	778,936,19,0,-44	2	0322	-- Ograve
-'O	778,936,19,0,-44	2	0323	-- Oacute
-^O	778,936,19,0,-44	2	0324	-- Ocircumflex
-~O	778,923,19,0,-44	2	0325	-- Otilde
-:O	778,915,19,0,-44	2	0326	-- Odieresis
-tmu	584,505,0,0,-40	0	0327	-- multiply
-/O	778,745,27,0,-33	2	0330	-- Oslash
-`U	722,936,19,0,-72	2	0331	-- Ugrave
-'U	722,936,19,0,-72	2	0332	-- Uacute
-^U	722,936,19,0,-72	2	0333	-- Ucircumflex
-:U	722,915,19,0,-72	2	0334	-- Udieresis
-'Y	667,936,0,0,-15	2	0335	-- Yacute
-TP	667,718,0,0,-76	2	0336	-- Thorn
-ss	611,731,14,0,-69	2	0337	-- germandbls
-`a	556,750,14,0,-29	2	0340	-- agrave
-'a	556,750,14,0,-29	2	0341	-- aacute
-^a	556,750,14,0,-29	2	0342	-- acircumflex
-~a	556,737,14,0,-29	2	0343	-- atilde
-:a	556,729,14,0,-29	2	0344	-- adieresis
-oa	556,776,14,0,-29	2	0345	-- aring
-ae	889,546,14,0,-29	0	0346	-- ae
-,c	556,546,228,0,-34	1	0347	-- ccedilla
-`e	556,750,14,0,-23	2	0350	-- egrave
-'e	556,750,14,0,-23	2	0351	-- eacute
-^e	556,750,14,0,-23	2	0352	-- ecircumflex
-:e	556,729,14,0,-23	2	0353	-- edieresis
-`i	278,750,0,0,50	2	0354	-- igrave
-'i	278,750,0,51,-69	2	0355	-- iacute
-^i	278,750,0,38,37	2	0356	-- icircumflex
-:i	278,729,0,22,21	2	0357	-- idieresis
-Sd	611,737,14,0,-34	2	0360	-- eth
-~n	611,737,0,0,-65	2	0361	-- ntilde
-`o	611,750,14,0,-34	2	0362	-- ograve
-'o	611,750,14,0,-34	2	0363	-- oacute
-^o	611,750,14,0,-34	2	0364	-- ocircumflex
-~o	611,737,14,0,-34	2	0365	-- otilde
-:o	611,729,14,0,-34	2	0366	-- odieresis
-tdi	584,548,42,0,-40	0	0367	-- divide
-/o	611,560,29,0,-22	0	0370	-- oslash
-`u	611,750,14,0,-66	2	0371	-- ugrave
-'u	611,750,14,0,-66	2	0372	-- uacute
-^u	611,750,14,0,-66	2	0373	-- ucircumflex
-:u	611,729,14,0,-66	2	0374	-- udieresis
-'y	556,750,214,0,-10	3	0375	-- yacute
-Tp	611,718,208,0,-62	3	0376	-- thorn
-:y	556,729,214,0,-10	3	0377	-- ydieresis
+bq	278,127,146	0	128	quotesinglbase
+Fo	556,484	0	129	guillemotleft
+Fc	556,484	0	130	guillemotright
+bu	350,524	0	131	bullet
+Fn	556,737,210,0,10	3	132	florin
+f/	167,710,19,169,170	2	133	fraction
+%0	1000,710,19,3,3	2	134	perthousand
+dg	556,718,171	2	135	dagger
+dd	556,718,171	2	136	daggerdbl
+en	556,333	0	137	endash
+em	1000,333	0	138	emdash
+fi	611,727	2	140	fi
+fl	611,727	2	141	fl
+.i	278,532	0	144	dotlessi
+ga	333,750,0,0,23	2	146	grave
+a"	333,750,0,153	2	147	hungarumlaut
+a.	333,729	2	148	dotaccent
+ab	333,750,0,2,2	2	149	breve
+ah	333,750,0,10,10	2	150	caron
+ao	333,776	2	151	ring
+ho	333,0,228	1	152	ogonek
+lq	500,727	2	153	quotedblleft
+rq	500,718	2	154	quotedblright
+oe	944,546,14	0	155	oe
+/l	278,718,0,18,18	2	156	lslash
+Bq	500,127,146	0	157	quotedblbase
+OE	1000,737,19	2	158	OE
+/L	611,718,0,0,20	2	159	Lslash
+r!	333,532,186	0	161	exclamdown
+ct	556,628,118	0	162	cent
+Po	556,718,16	2	163	sterling
+Cs	556,636,0,3,3	0	164	currency
+Ye	556,698,0,9,9	2	165	yen
+bb	280,737,19	2	166	brokenbar
+sc	556,727,184	2	167	section
+ad	333,729	2	168	dieresis
+co	737,737,19,12,11	2	169	copyright
+Of	370,737	2	170	ordfeminine
+fo	333,484	0	171	guilsinglleft
+tno	584,419	0	172	logicalnot
+\-	584,309	0	173	minus
+rg	737,737,19,11,11	2	174	registered
+a-	333,678,0,6,6	2	175	macron
+de	400,712	2	176	degree
+t+-	584,506	0	177	plusminus
+S2	333,710	2	178	twosuperior
+S3	333,710	2	179	threesuperior
+aa	333,750,0,23	2	180	acute
+mc	611,532,207	1	181	mu
+ps	556,700,191,0,8	2	182	paragraph
+pc	278,334	0	183	periodcentered
+ac	333,0,228	1	184	cedilla
+S1	333,710	2	185	onesuperior
+Om	365,737	2	186	ordmasculine
+fc	333,484	0	187	guilsinglright
+14	834,710,19	2	188	onequarter
+12	834,710,19	2	189	onehalf
+34	834,710,19	2	190	threequarters
+r?	611,532,195	0	191	questiondown
+`A	722,936	2	192	Agrave
+'A	722,936	2	193	Aacute
+^A	722,936	2	194	Acircumflex
+~A	722,923	2	195	Atilde
+:A	722,915	2	196	Adieresis
+oA	722,962	2	197	Aring
+AE	1000,718	2	198	AE
+,C	722,737,228	3	199	Ccedilla
+`E	667,936	2	200	Egrave
+'E	667,936	2	201	Eacute
+^E	667,936	2	202	Ecircumflex
+:E	667,915	2	203	Edieresis
+`I	278,936,0,0,50	2	204	Igrave
+'I	278,936,0,51	2	205	Iacute
+^I	278,936,0,38,37	2	206	Icircumflex
+:I	278,915,0,22,21	2	207	Idieresis
+-D	722,718,0,0,5	2	208	Eth
+~N	722,923	2	209	Ntilde
+`O	778,936,19	2	210	Ograve
+'O	778,936,19	2	211	Oacute
+^O	778,936,19	2	212	Ocircumflex
+~O	778,923,19	2	213	Otilde
+:O	778,915,19	2	214	Odieresis
+tmu	584,505	0	215	multiply
+/O	778,745,27	2	216	Oslash
+`U	722,936,19	2	217	Ugrave
+'U	722,936,19	2	218	Uacute
+^U	722,936,19	2	219	Ucircumflex
+:U	722,915,19	2	220	Udieresis
+'Y	667,936	2	221	Yacute
+TP	667,718	2	222	Thorn
+ss	611,731,14	2	223	germandbls
+`a	556,750,14	2	224	agrave
+'a	556,750,14	2	225	aacute
+^a	556,750,14	2	226	acircumflex
+~a	556,737,14	2	227	atilde
+:a	556,729,14	2	228	adieresis
+oa	556,776,14	2	229	aring
+ae	889,546,14	0	230	ae
+,c	556,546,228	1	231	ccedilla
+`e	556,750,14	2	232	egrave
+'e	556,750,14	2	233	eacute
+^e	556,750,14	2	234	ecircumflex
+:e	556,729,14	2	235	edieresis
+`i	278,750,0,0,50	2	236	igrave
+'i	278,750,0,51	2	237	iacute
+^i	278,750,0,38,37	2	238	icircumflex
+:i	278,729,0,22,21	2	239	idieresis
+Sd	611,737,14	2	240	eth
+~n	611,737	2	241	ntilde
+`o	611,750,14	2	242	ograve
+'o	611,750,14	2	243	oacute
+^o	611,750,14	2	244	ocircumflex
+~o	611,737,14	2	245	otilde
+:o	611,729,14	2	246	odieresis
+tdi	584,548,42	0	247	divide
+/o	611,560,29	0	248	oslash
+`u	611,750,14	2	249	ugrave
+'u	611,750,14	2	250	uacute
+^u	611,750,14	2	251	ucircumflex
+:u	611,729,14	2	252	udieresis
+'y	556,750,214	3	253	yacute
+Tp	611,718,208	3	254	thorn
+:y	556,729,214	3	255	ydieresis
+u2026	1000,146	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HBI b/contrib/groff/font/devps/HBI
index 6a7d853..2529a52 100644
--- a/contrib/groff/font/devps/HBI
+++ b/contrib/groff/font/devps/HBI
@@ -222,246 +222,247 @@ y , -80
 y a -30
 z e 10
 charset
-ha	584,698,0,57,-81,57	2	0000	-- asciicircum
-ti	584,343,0,43,-65,43	0	0001	-- asciitilde
-vS	667,936,19,101,-31,90	2	0002	-- Scaron
-vZ	611,936,0,176,25,90	2	0003	-- Zcaron
-vs	556,750,14,108,-13,90	2	0004	-- scaron
-vz	500,750,0,136,30,90	2	0005	-- zcaron
-:Y	667,915,0,189,-118,90	2	0006	-- Ydieresis
-tm	1000,718,0,159,-129,90	2	0007	-- trademark
-aq	238,718,0,133,-115,90	2	0010	-- quotesingle
-space	278	0	0040
-!	333,718,0,114,-44,90	2	0041	-- exclam
-"	474,718,0,105,-143,90	2	0042	-- quotedbl
+ha	584,698,0,57,-81,57	2	0	asciicircum
+ti	584,343,0,43,-65,43	0	1	asciitilde
+vS	667,936,19,101,-31,90	2	2	Scaron
+vZ	611,936,0,176,25,90	2	3	Zcaron
+vs	556,750,14,108,-13,90	2	4	scaron
+vz	500,750,0,136,30,90	2	5	zcaron
+:Y	667,915,0,189,-118,90	2	6	Ydieresis
+tm	1000,718,0,159,-129,90	2	7	trademark
+aq	238,718,0,133,-115,90	2	8	quotesingle
+space	278	0	32	space
+!	333,718,0,114,-44,90	2	33	exclam
+"	474,718,0,105,-143,90	2	34	quotedbl
 dq	"
-#	556,698,0,138,-10,90	2	0043	-- numbersign
+#	556,698,0,138,-10,90	2	35	numbersign
 sh	"
-$	556,775,115,116,-17,90	2	0044	-- dollar
+$	556,775,115,116,-17,90	2	36	dollar
 Do	"
-%	889,710,19,62,-86,62	2	0045	-- percent
-&	722,718,19,60,-39,60	2	0046	-- ampersand
-'	278,718,0,134,-117,90	2	0047	-- quoteright
+%	889,710,19,62,-86,62	2	37	percent
+&	722,718,19,60,-39,60	2	38	ampersand
+'	278,718,0,134,-117,90	2	39	quoteright
 cq	"
-(	333,734,208,187,-26,90	3	0050	-- parenleft
-)	333,734,208,86,75,86	3	0051	-- parenright
-*	389,718,0,142,-96,90	2	0052	-- asterisk
-+	584,506,0,76,-32,76	0	0053	-- plus
-,	278,146,168,17,22,17	0	0054	-- comma
--	333,345,0,96,-23,90	0	0055	-- hyphen
+(	333,734,208,187,-26,90	3	40	parenleft
+)	333,734,208,86,75,86	3	41	parenright
+*	389,718,0,142,-96,90	2	42	asterisk
++	584,506,0,76,-32,76	0	43	plus
+,	278,146,168,17,22,17	0	44	comma
+-	333,345,0,96,-23,90	0	45	hyphen
 hy	"
-.	278,146,0,17,-14,17	0	0056	-- period
-/	278,737,19,240,87,90	2	0057	-- slash
+.	278,146,0,17,-14,17	0	46	period
+/	278,737,19,240,87,90	2	47	slash
 sl	"
-0	556,710,19,111,-36,90	2	0060	-- zero
-1	556,710,0,23,-123,23	2	0061	-- one
-2	556,710,0,113,24,90	2	0062	-- two
-3	556,710,19,102,-15,90	2	0063	-- three
-4	556,710,0,92,-10,90	2	0064	-- four
-5	556,698,19,130,-14,90	2	0065	-- five
-6	556,710,19,113,-35,90	2	0066	-- six
-7	556,698,0,170,-75,90	2	0067	-- seven
-8	556,710,19,110,-19,90	2	0070	-- eight
-9	556,710,19,109,-28,90	2	0071	-- nine
-:	333,512,0,68,-42,68	0	0072	-- colon
-;	333,512,168,68,-6,68	0	0073	-- semicolon
-<	584,514,8,121,-32,90	0	0074	-- less
-=	584,419,0,99,-8,90	0	0075	-- equal
->	584,514,8,75,14,75	0	0076	-- greater
-?	611,727,0,110,-115,90	2	0077	-- question
-@	975,737,19,29,-136,29	2	0100	-- at
+0	556,710,19,111,-36,90	2	48	zero
+1	556,710,0,23,-123,23	2	49	one
+2	556,710,0,113,24,90	2	50	two
+3	556,710,19,102,-15,90	2	51	three
+4	556,710,0,92,-10,90	2	52	four
+5	556,698,19,130,-14,90	2	53	five
+6	556,710,19,113,-35,90	2	54	six
+7	556,698,0,170,-75,90	2	55	seven
+8	556,710,19,110,-19,90	2	56	eight
+9	556,710,19,109,-28,90	2	57	nine
+:	333,512,0,68,-42,68	0	58	colon
+;	333,512,168,68,-6,68	0	59	semicolon
+<	584,514,8,121,-32,90	0	60	less
+=	584,419,0,99,-8,90	0	61	equal
+>	584,514,8,75,14,75	0	62	greater
+?	611,727,0,110,-115,90	2	63	question
+@	975,737,19,29,-136,29	2	64	at
 at	"
-A	722,718,0,30,30,30	2	0101	-- A
-B	722,718,0,92,-26,90	2	0102	-- B
-C	722,737,19,117,-57,90	2	0103	-- C
-D	722,718,0,105,-26,90	2	0104	-- D
-E	667,718,0,140,-26,90	2	0105	-- E
-F	611,718,0,179,-26,90	2	0106	-- F
-G	778,737,19,89,-58,89	2	0107	-- G
-H	722,718,0,132,-21,90	2	0110	-- H
-I	278,718,0,139,-14,90	2	0111	-- I
-J	556,718,18,131,-10,90	2	0112	-- J
-K	722,718,0,186,-37,90	2	0113	-- K
-L	611,718,0,50,-26,50	2	0114	-- L
-M	833,718,0,135,-19,90	2	0115	-- M
-N	722,718,0,135,-19,90	2	0116	-- N
-O	778,737,19,95,-57,90	2	0117	-- O
-P	667,718,0,121,-26,90	2	0120	-- P
-Q	778,737,52,95,-57,90	2	0121	-- Q
-R	722,718,0,106,-26,90	2	0122	-- R
-S	667,737,19,101,-31,90	2	0123	-- S
-T	611,718,0,190,-90,90	2	0124	-- T
-U	722,718,19,132,-66,90	2	0125	-- U
-V	667,718,0,184,-122,90	2	0126	-- V
-W	944,718,0,188,-119,90	2	0127	-- W
-X	667,718,0,174,36,90	2	0130	-- X
-Y	667,718,0,189,-118,90	2	0131	-- Y
-Z	611,718,0,176,25,90	2	0132	-- Z
-[	333,722,196,179,29,90	2	0133	-- bracketleft
+A	722,718,0,30,30,30	2	65	A
+B	722,718,0,92,-26,90	2	66	B
+C	722,737,19,117,-57,90	2	67	C
+D	722,718,0,105,-26,90	2	68	D
+E	667,718,0,140,-26,90	2	69	E
+F	611,718,0,179,-26,90	2	70	F
+G	778,737,19,89,-58,89	2	71	G
+H	722,718,0,132,-21,90	2	72	H
+I	278,718,0,139,-14,90	2	73	I
+J	556,718,18,131,-10,90	2	74	J
+K	722,718,0,186,-37,90	2	75	K
+L	611,718,0,50,-26,50	2	76	L
+M	833,718,0,135,-19,90	2	77	M
+N	722,718,0,135,-19,90	2	78	N
+O	778,737,19,95,-57,90	2	79	O
+P	667,718,0,121,-26,90	2	80	P
+Q	778,737,52,95,-57,90	2	81	Q
+R	722,718,0,106,-26,90	2	82	R
+S	667,737,19,101,-31,90	2	83	S
+T	611,718,0,190,-90,90	2	84	T
+U	722,718,19,132,-66,90	2	85	U
+V	667,718,0,184,-122,90	2	86	V
+W	944,718,0,188,-119,90	2	87	W
+X	667,718,0,174,36,90	2	88	X
+Y	667,718,0,189,-118,90	2	89	Y
+Z	611,718,0,176,25,90	2	90	Z
+[	333,722,196,179,29,90	2	91	bracketleft
 lB	"
-\	278,737,19,79,-74,79	2	0134	-- backslash
+\	278,737,19,79,-74,79	2	92	backslash
 rs	"
-]	333,722,196,140,68,90	2	0135	-- bracketright
+]	333,722,196,140,68,90	2	93	bracketright
 rB	"
-a^	333,750,0,188,-68,90	2	0136	-- circumflex
+a^	333,750,0,188,-68,90	2	94	circumflex
 ^	"
-_	556,0,125,34,77,34	0	0137	-- underscore
-`	278,727,0,133,-115,90	2	0140	-- quoteleft
+_	556,0,125,34,77,34	0	95	underscore
+`	278,727,0,133,-115,90	2	96	quoteleft
 oq	"
-a	556,546,14,77,-5,77	0	0141	-- a
-b	611,718,14,84,-11,84	2	0142	-- b
-c	556,546,14,93,-29,90	0	0143	-- c
-d	611,718,14,143,-32,90	2	0144	-- d
-e	556,546,14,87,-20,87	0	0145	-- e
-f	333,727,0,186,-37,90	2	0146	-- f
-g	611,546,217,105,12,90	1	0147	-- g
-h	611,718,0,68,-15,68	2	0150	-- h
-i	278,725,0,135,-19,90	2	0151	-- i
-j	278,725,214,135,92,90	3	0152	-- j
-k	556,718,0,164,-19,90	2	0153	-- k
-l	278,718,0,134,-19,90	2	0154	-- l
-m	889,546,0,70,-14,70	0	0155	-- m
-n	611,546,0,68,-15,68	0	0156	-- n
-o	611,546,14,82,-32,82	0	0157	-- o
-p	611,546,207,84,32,84	1	0160	-- p
-q	611,546,207,104,-30,90	1	0161	-- q
-r	389,546,0,150,-14,90	0	0162	-- r
-s	556,546,14,78,-13,78	0	0163	-- s
-t	333,676,6,139,-50,90	2	0164	-- t
-u	611,532,14,97,-48,90	0	0165	-- u
-v	556,532,0,150,-76,90	0	0166	-- v
-w	778,532,0,154,-73,90	0	0167	-- w
-x	556,532,0,142,35,90	0	0170	-- x
-y	556,532,214,146,8,90	1	0171	-- y
-z	500,532,0,133,30,90	0	0172	-- z
-lC	389,722,196,179,-44,90	2	0173	-- braceleft
+a	556,546,14,77,-5,77	0	97	a
+b	611,718,14,84,-11,84	2	98	b
+c	556,546,14,93,-29,90	0	99	c
+d	611,718,14,143,-32,90	2	100	d
+e	556,546,14,87,-20,87	0	101	e
+f	333,727,0,186,-37,90	2	102	f
+g	611,546,217,105,12,90	1	103	g
+h	611,718,0,68,-15,68	2	104	h
+i	278,725,0,135,-19,90	2	105	i
+j	278,725,214,135,92,90	3	106	j
+k	556,718,0,164,-19,90	2	107	k
+l	278,718,0,134,-19,90	2	108	l
+m	889,546,0,70,-14,70	0	109	m
+n	611,546,0,68,-15,68	0	110	n
+o	611,546,14,82,-32,82	0	111	o
+p	611,546,207,84,32,84	1	112	p
+q	611,546,207,104,-30,90	1	113	q
+r	389,546,0,150,-14,90	0	114	r
+s	556,546,14,78,-13,78	0	115	s
+t	333,676,6,139,-50,90	2	116	t
+u	611,532,14,97,-48,90	0	117	u
+v	556,532,0,150,-76,90	0	118	v
+w	778,532,0,154,-73,90	0	119	w
+x	556,532,0,142,35,90	0	120	x
+y	556,532,214,146,8,90	1	121	y
+z	500,532,0,133,30,90	0	122	z
+lC	389,722,196,179,-44,90	2	123	braceleft
 {	"
-ba	280,737,19,123,-30,90	2	0174	-- bar
+ba	280,737,19,123,-30,90	2	124	bar
 |	"
-rC	389,722,196,68,68,68	2	0175	-- braceright
+rC	389,722,196,68,68,68	2	125	braceright
 }	"
-a~	333,737,0,224,-63,90	2	0176	-- tilde
+a~	333,737,0,224,-63,90	2	126	tilde
 ~	"
-bq	278,127,146,8,9,8	0	0200	-- quotesinglbase
-Fo	556,484,0,65,-85,65	0	0201	-- guillemotleft
-Fc	556,484,0,34,-54,34	0	0202	-- guillemotright
-bu	350,524,0,120,-33,90	0	0203	-- bullet
-Fn	556,737,210,163,100,90	3	0204	-- florin
-f/	167,710,19,370,224,90	2	0205	-- fraction
-%0	1000,710,19,88,-26,88	2	0206	-- perthousand
-dg	556,718,171,120,-68,90	2	0207	-- dagger
-dd	556,718,171,122,4,90	2	0210	-- daggerdbl
-en	556,333,0,121,2,90	0	0211	-- endash
-em	1000,333,0,121,2,90	0	0212	-- emdash
-fi	611,727,0,135,-37,90	2	0214	-- fi
-fl	611,727,0,134,-37,90	2	0215	-- fl
-.i	278,532,0,94,-19,90	0	0220	-- dotlessi
-ga	333,750,0,70,-86,70	2	0222	-- grave
-a"	333,750,0,362,-87,90	2	0223	-- hungarumlaut
-a.	333,729,0,102,-185,90	2	0224	-- dotaccent
-ab	333,750,0,211,-106,90	2	0225	-- breve
-ah	333,750,0,219,-99,90	2	0226	-- caron
-ao	333,776,0,137,-150,90	2	0227	-- ring
-ho	333,0,228,0,9	1	0230	-- ogonek
-lq	500,727,0,138,-110,90	2	0231	-- quotedblleft
-rq	500,718,0,139,-112,90	2	0232	-- quotedblright
-oe	944,546,14,83,-32,83	0	0233	-- oe
-/l	278,718,0,179,10,90	2	0234	-- lslash
-Bq	500,127,146,13,14,13	0	0235	-- quotedblbase
-OE	1000,737,19,164,-49,90	2	0236	-- OE
-/L	611,718,0,50,16,50	2	0237	-- Lslash
-r!	333,532,186,70,0,70	0	0241	-- exclamdown
-ct	556,628,118,93,-29,90	0	0242	-- cent
-Po	556,718,16,129,0,90	2	0243	-- sterling
-Cs	556,636,0,174,23,90	0	0244	-- currency
-Ye	556,698,0,207,-10,90	2	0245	-- yen
-bb	280,737,19,123,-30,90	2	0246	-- brokenbar
-sc	556,727,184,92,-11,90	2	0247	-- section
-ad	333,729,0,199,-87,90	2	0250	-- dieresis
-co	737,737,19,148,-6,90	2	0251	-- copyright
-Of	370,737,0,145,-42,90	2	0252	-- ordfeminine
-fo	333,484,0,70,-80,70	0	0253	-- guilsinglleft
-no	584,419,0,99,-55,90	0	0254	-- logicalnot
-\-	584,309,0,76,-32,76	0	0255	-- minus
-rg	737,737,19,147,-5,90	2	0256	-- registered
-a-	333,678,0,200,-72,90	2	0257	-- macron
-de	400,712,0,117,-125,90	2	0260	-- degree
-t+-	584,506,0,91,10,90	0	0261	-- plusminus
-S2	333,710,0,166,-19,90	2	0262	-- twosuperior
-S3	333,710,0,158,-41,90	2	0263	-- threesuperior
-aa	333,750,0,232,-186,90	2	0264	-- acute
-mc	611,532,207,97,28,90	1	0265	-- mu
-ps	556,700,191,182,-48,90	2	0266	-- paragraph
-pc	278,334,0,48,-60,48	0	0267	-- periodcentered
-ac	333,0,228,0,87	1	0270	-- cedilla
-S1	333,710,0,105,-98,90	2	0271	-- onesuperior
-Om	365,737,0,170,-42,90	2	0272	-- ordmasculine
-fc	333,484,0,39,-49,39	0	0273	-- guilsinglright
-14	834,710,19,22,-82,22	2	0274	-- onequarter
-12	834,710,19,74,-82,74	2	0275	-- onehalf
-34	834,710,19,55,-49,55	2	0276	-- threequarters
-r?	611,532,195,0,-3	0	0277	-- questiondown
-`A	722,936,0,30,30,30	2	0300	-- Agrave
-'A	722,936,0,78,30,78	2	0301	-- Aacute
-^A	722,936,0,34,30,34	2	0302	-- Acircumflex
-~A	722,923,0,69,30,69	2	0303	-- Atilde
-:A	722,915,0,44,30,44	2	0304	-- Adieresis
-oA	722,962,0,30,30,30	2	0305	-- Aring
-AE	1000,718,0,150,45,90	2	0306	-- AE
-,C	722,737,228,117,-57,90	3	0307	-- Ccedilla
-`E	667,936,0,140,-26,90	2	0310	-- Egrave
-'E	667,936,0,140,-26,90	2	0311	-- Eacute
-^E	667,936,0,140,-26,90	2	0312	-- Ecircumflex
-:E	667,915,0,140,-26,90	2	0313	-- Edieresis
-`I	278,936,0,139,-14,90	2	0314	-- Igrave
-'I	278,936,0,300,-14,90	2	0315	-- Iacute
-^I	278,936,0,256,-14,90	2	0316	-- Icircumflex
-:I	278,915,0,266,-14,90	2	0317	-- Idieresis
--D	722,718,0,105,-12,90	2	0320	-- Eth
-~N	722,923,0,135,-19,90	2	0321	-- Ntilde
-`O	778,936,19,95,-57,90	2	0322	-- Ograve
-'O	778,936,19,95,-57,90	2	0323	-- Oacute
-^O	778,936,19,95,-57,90	2	0324	-- Ocircumflex
-~O	778,923,19,95,-57,90	2	0325	-- Otilde
-:O	778,915,19,95,-57,90	2	0326	-- Odieresis
-tmu	584,505,0,101,-7,90	0	0327	-- multiply
-/O	778,745,27,166,15,90	2	0330	-- Oslash
-`U	722,936,19,132,-66,90	2	0331	-- Ugrave
-'U	722,936,19,132,-66,90	2	0332	-- Uacute
-^U	722,936,19,132,-66,90	2	0333	-- Ucircumflex
-:U	722,915,19,132,-66,90	2	0334	-- Udieresis
-'Y	667,936,0,189,-118,90	2	0335	-- Yacute
-TP	667,718,0,99,-26,90	2	0336	-- Thorn
-ss	611,731,14,96,-19,90	2	0337	-- germandbls
-`a	556,750,14,77,-5,77	2	0340	-- agrave
-'a	556,750,14,121,-5,90	2	0341	-- aacute
-^a	556,750,14,77,-5,77	2	0342	-- acircumflex
-~a	556,737,14,113,-5,90	2	0343	-- atilde
-:a	556,729,14,88,-5,88	2	0344	-- adieresis
-oa	556,776,14,77,-5,77	2	0345	-- aring
-ae	889,546,14,84,-6,84	0	0346	-- ae
-,c	556,546,228,93,-29,90	1	0347	-- ccedilla
-`e	556,750,14,87,-20,87	2	0350	-- egrave
-'e	556,750,14,121,-20,90	2	0351	-- eacute
-^e	556,750,14,87,-20,87	2	0352	-- ecircumflex
-:e	556,729,14,88,-20,88	2	0353	-- edieresis
-`i	278,750,0,98,-19,90	2	0354	-- igrave
-'i	278,750,0,260,-19,90	2	0355	-- iacute
-^i	278,750,0,216,-19,90	2	0356	-- icircumflex
-:i	278,729,0,227,-19,90	2	0357	-- idieresis
-Sd	611,737,14,109,-32,90	2	0360	-- eth
-~n	611,737,0,85,-15,85	2	0361	-- ntilde
-`o	611,750,14,82,-32,82	2	0362	-- ograve
-'o	611,750,14,93,-32,90	2	0363	-- oacute
-^o	611,750,14,82,-32,82	2	0364	-- ocircumflex
-~o	611,737,14,85,-32,85	2	0365	-- otilde
-:o	611,729,14,82,-32,82	2	0366	-- odieresis
-tdi	584,548,42,76,-32,76	0	0367	-- divide
-/o	611,560,29,140,28,90	0	0370	-- oslash
-`u	611,750,14,97,-48,90	2	0371	-- ugrave
-'u	611,750,14,97,-48,90	2	0372	-- uacute
-^u	611,750,14,97,-48,90	2	0373	-- ucircumflex
-:u	611,729,14,97,-48,90	2	0374	-- udieresis
-'y	556,750,214,146,8,90	3	0375	-- yacute
-Tp	611,718,208,84,32,84	3	0376	-- thorn
-:y	556,729,214,146,8,90	3	0377	-- ydieresis
+bq	278,127,146,8,9,8	0	128	quotesinglbase
+Fo	556,484,0,65,-85,65	0	129	guillemotleft
+Fc	556,484,0,34,-54,34	0	130	guillemotright
+bu	350,524,0,120,-33,90	0	131	bullet
+Fn	556,737,210,163,100,90	3	132	florin
+f/	167,710,19,370,224,90	2	133	fraction
+%0	1000,710,19,88,-26,88	2	134	perthousand
+dg	556,718,171,120,-68,90	2	135	dagger
+dd	556,718,171,122,4,90	2	136	daggerdbl
+en	556,333,0,121,2,90	0	137	endash
+em	1000,333,0,121,2,90	0	138	emdash
+fi	611,727,0,135,-37,90	2	140	fi
+fl	611,727,0,134,-37,90	2	141	fl
+.i	278,532,0,94,-19,90	0	144	dotlessi
+ga	333,750,0,70,-86,70	2	146	grave
+a"	333,750,0,362,-87,90	2	147	hungarumlaut
+a.	333,729,0,102,-185,90	2	148	dotaccent
+ab	333,750,0,211,-106,90	2	149	breve
+ah	333,750,0,219,-99,90	2	150	caron
+ao	333,776,0,137,-150,90	2	151	ring
+ho	333,0,228,0,9	1	152	ogonek
+lq	500,727,0,138,-110,90	2	153	quotedblleft
+rq	500,718,0,139,-112,90	2	154	quotedblright
+oe	944,546,14,83,-32,83	0	155	oe
+/l	278,718,0,179,10,90	2	156	lslash
+Bq	500,127,146,13,14,13	0	157	quotedblbase
+OE	1000,737,19,164,-49,90	2	158	OE
+/L	611,718,0,50,16,50	2	159	Lslash
+r!	333,532,186,70,0,70	0	161	exclamdown
+ct	556,628,118,93,-29,90	0	162	cent
+Po	556,718,16,129,0,90	2	163	sterling
+Cs	556,636,0,174,23,90	0	164	currency
+Ye	556,698,0,207,-10,90	2	165	yen
+bb	280,737,19,123,-30,90	2	166	brokenbar
+sc	556,727,184,92,-11,90	2	167	section
+ad	333,729,0,199,-87,90	2	168	dieresis
+co	737,737,19,148,-6,90	2	169	copyright
+Of	370,737,0,145,-42,90	2	170	ordfeminine
+fo	333,484,0,70,-80,70	0	171	guilsinglleft
+tno	584,419,0,99,-55,90	0	172	logicalnot
+\-	584,309,0,76,-32,76	0	173	minus
+rg	737,737,19,147,-5,90	2	174	registered
+a-	333,678,0,200,-72,90	2	175	macron
+de	400,712,0,117,-125,90	2	176	degree
+t+-	584,506,0,91,10,90	0	177	plusminus
+S2	333,710,0,166,-19,90	2	178	twosuperior
+S3	333,710,0,158,-41,90	2	179	threesuperior
+aa	333,750,0,232,-186,90	2	180	acute
+mc	611,532,207,97,28,90	1	181	mu
+ps	556,700,191,182,-48,90	2	182	paragraph
+pc	278,334,0,48,-60,48	0	183	periodcentered
+ac	333,0,228,0,87	1	184	cedilla
+S1	333,710,0,105,-98,90	2	185	onesuperior
+Om	365,737,0,170,-42,90	2	186	ordmasculine
+fc	333,484,0,39,-49,39	0	187	guilsinglright
+14	834,710,19,22,-82,22	2	188	onequarter
+12	834,710,19,74,-82,74	2	189	onehalf
+34	834,710,19,55,-49,55	2	190	threequarters
+r?	611,532,195,0,-3	0	191	questiondown
+`A	722,936,0,30,30,30	2	192	Agrave
+'A	722,936,0,78,30,78	2	193	Aacute
+^A	722,936,0,34,30,34	2	194	Acircumflex
+~A	722,923,0,69,30,69	2	195	Atilde
+:A	722,915,0,44,30,44	2	196	Adieresis
+oA	722,962,0,30,30,30	2	197	Aring
+AE	1000,718,0,150,45,90	2	198	AE
+,C	722,737,228,117,-57,90	3	199	Ccedilla
+`E	667,936,0,140,-26,90	2	200	Egrave
+'E	667,936,0,140,-26,90	2	201	Eacute
+^E	667,936,0,140,-26,90	2	202	Ecircumflex
+:E	667,915,0,140,-26,90	2	203	Edieresis
+`I	278,936,0,139,-14,90	2	204	Igrave
+'I	278,936,0,300,-14,90	2	205	Iacute
+^I	278,936,0,256,-14,90	2	206	Icircumflex
+:I	278,915,0,266,-14,90	2	207	Idieresis
+-D	722,718,0,105,-12,90	2	208	Eth
+~N	722,923,0,135,-19,90	2	209	Ntilde
+`O	778,936,19,95,-57,90	2	210	Ograve
+'O	778,936,19,95,-57,90	2	211	Oacute
+^O	778,936,19,95,-57,90	2	212	Ocircumflex
+~O	778,923,19,95,-57,90	2	213	Otilde
+:O	778,915,19,95,-57,90	2	214	Odieresis
+tmu	584,505,0,101,-7,90	0	215	multiply
+/O	778,745,27,166,15,90	2	216	Oslash
+`U	722,936,19,132,-66,90	2	217	Ugrave
+'U	722,936,19,132,-66,90	2	218	Uacute
+^U	722,936,19,132,-66,90	2	219	Ucircumflex
+:U	722,915,19,132,-66,90	2	220	Udieresis
+'Y	667,936,0,189,-118,90	2	221	Yacute
+TP	667,718,0,99,-26,90	2	222	Thorn
+ss	611,731,14,96,-19,90	2	223	germandbls
+`a	556,750,14,77,-5,77	2	224	agrave
+'a	556,750,14,121,-5,90	2	225	aacute
+^a	556,750,14,77,-5,77	2	226	acircumflex
+~a	556,737,14,113,-5,90	2	227	atilde
+:a	556,729,14,88,-5,88	2	228	adieresis
+oa	556,776,14,77,-5,77	2	229	aring
+ae	889,546,14,84,-6,84	0	230	ae
+,c	556,546,228,93,-29,90	1	231	ccedilla
+`e	556,750,14,87,-20,87	2	232	egrave
+'e	556,750,14,121,-20,90	2	233	eacute
+^e	556,750,14,87,-20,87	2	234	ecircumflex
+:e	556,729,14,88,-20,88	2	235	edieresis
+`i	278,750,0,98,-19,90	2	236	igrave
+'i	278,750,0,260,-19,90	2	237	iacute
+^i	278,750,0,216,-19,90	2	238	icircumflex
+:i	278,729,0,227,-19,90	2	239	idieresis
+Sd	611,737,14,109,-32,90	2	240	eth
+~n	611,737,0,85,-15,85	2	241	ntilde
+`o	611,750,14,82,-32,82	2	242	ograve
+'o	611,750,14,93,-32,90	2	243	oacute
+^o	611,750,14,82,-32,82	2	244	ocircumflex
+~o	611,737,14,85,-32,85	2	245	otilde
+:o	611,729,14,82,-32,82	2	246	odieresis
+tdi	584,548,42,76,-32,76	0	247	divide
+/o	611,560,29,140,28,90	0	248	oslash
+`u	611,750,14,97,-48,90	2	249	ugrave
+'u	611,750,14,97,-48,90	2	250	uacute
+^u	611,750,14,97,-48,90	2	251	ucircumflex
+:u	611,729,14,97,-48,90	2	252	udieresis
+'y	556,750,214,146,8,90	3	253	yacute
+Tp	611,718,208,84,32,84	3	254	thorn
+:y	556,729,214,146,8,90	3	255	ydieresis
+u2026	1000,146,0,0,-42	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HI b/contrib/groff/font/devps/HI
index d1bd197..f260113 100644
--- a/contrib/groff/font/devps/HI
+++ b/contrib/groff/font/devps/HI
@@ -262,246 +262,247 @@ y a -20
 z o -15
 z e -15
 charset
-ha	469,688,0,120,8,89	2	0000	-- asciicircum
-ti	584,326,0,46,-61,46	0	0001	-- asciitilde
-vS	667,929,19,96,-40,89	2	0002	-- Scaron
-vZ	611,929,0,180,27,89	2	0003	-- Zcaron
-vs	500,734,15,102,-13,89	2	0004	-- scaron
-vz	500,734,0,121,19,89	2	0005	-- zcaron
-:Y	667,901,0,189,-117,89	2	0006	-- Ydieresis
-tm	1000,718,0,106,-136,89	2	0007	-- trademark
-aq	191,718,0,144,-107,89	2	0010	-- quotesingle
-space	278	0	0040
-!	278,718,0,112,-40,89	2	0041	-- exclam
-"	355,718,0,133,-118,89	2	0042	-- quotedbl
+ha	469,688,0,120,8,89	2	0	asciicircum
+ti	584,326,0,46,-61,46	0	1	asciitilde
+vS	667,929,19,96,-40,89	2	2	Scaron
+vZ	611,929,0,180,27,89	2	3	Zcaron
+vs	500,734,15,102,-13,89	2	4	scaron
+vz	500,734,0,121,19,89	2	5	zcaron
+:Y	667,901,0,189,-117,89	2	6	Ydieresis
+tm	1000,718,0,106,-136,89	2	7	trademark
+aq	191,718,0,144,-107,89	2	8	quotesingle
+space	278	0	32	space
+!	278,718,0,112,-40,89	2	33	exclam
+"	355,718,0,133,-118,89	2	34	quotedbl
 dq	"
-#	556,688,0,125,-23,89	2	0043	-- numbersign
+#	556,688,0,125,-23,89	2	35	numbersign
 sh	"
-$	556,775,115,111,-19,89	2	0044	-- dollar
+$	556,775,115,111,-19,89	2	36	dollar
 Do	"
-%	889,703,19,50,-97,50	2	0045	-- percent
-&	667,718,15,30,-27,30	2	0046	-- ampersand
-'	222,718,0,138,-101,89	2	0047	-- quoteright
+%	889,703,19,50,-97,50	2	37	percent
+&	667,718,15,30,-27,30	2	38	ampersand
+'	222,718,0,138,-101,89	2	39	quoteright
 cq	"
-(	333,733,207,171,-58,89	3	0050	-- parenleft
-)	333,733,207,54,59,54	3	0051	-- parenright
-*	389,718,0,136,-115,89	2	0052	-- asterisk
-+	584,505,0,72,-35,72	0	0053	-- plus
-,	278,106,147,0,-6	0	0054	-- comma
--	333,322,0,74,-43,74	0	0055	-- hyphen
+(	333,733,207,171,-58,89	3	40	parenleft
+)	333,733,207,54,59,54	3	41	parenright
+*	389,718,0,136,-115,89	2	42	asterisk
++	584,505,0,72,-35,72	0	43	plus
+,	278,106,147,0,-6	0	44	comma
+-	333,322,0,74,-43,74	0	45	hyphen
 hy	"
-.	278,106,0,0,-37	0	0056	-- period
-/	278,737,19,224,71,89	2	0057	-- slash
+.	278,106,0,0,-37	0	46	period
+/	278,737,19,224,71,89	2	47	slash
 sl	"
-0	556,703,19,102,-43,89	2	0060	-- zero
-1	556,703,0,2,-157,2	2	0061	-- one
-2	556,703,0,111,24,89	2	0062	-- two
-3	556,703,19,104,-25,89	2	0063	-- three
-4	556,703,0,70,-11,70	2	0064	-- four
-5	556,688,19,115,-18,89	2	0065	-- five
-6	556,703,19,109,-41,89	2	0066	-- six
-7	556,688,0,163,-87,89	2	0067	-- seven
-8	556,703,19,101,-24,89	2	0070	-- eight
-9	556,703,19,103,-32,89	2	0071	-- nine
-:	278,516,0,73,-37,73	0	0072	-- colon
-;	278,516,147,73,-6,73	0	0073	-- semicolon
-<	584,495,0,107,-44,89	0	0074	-- less
-=	584,390,0,94,-13,89	0	0075	-- equal
->	584,495,0,63,0,63	0	0076	-- greater
-?	556,727,0,104,-111,89	2	0077	-- question
-@	1015,737,19,0,-165	2	0100	-- at
+0	556,703,19,102,-43,89	2	48	zero
+1	556,703,0,2,-157,2	2	49	one
+2	556,703,0,111,24,89	2	50	two
+3	556,703,19,104,-25,89	2	51	three
+4	556,703,0,70,-11,70	2	52	four
+5	556,688,19,115,-18,89	2	53	five
+6	556,703,19,109,-41,89	2	54	six
+7	556,688,0,163,-87,89	2	55	seven
+8	556,703,19,101,-24,89	2	56	eight
+9	556,703,19,103,-32,89	2	57	nine
+:	278,516,0,73,-37,73	0	58	colon
+;	278,516,147,73,-6,73	0	59	semicolon
+<	584,495,0,107,-44,89	0	60	less
+=	584,390,0,94,-13,89	0	61	equal
+>	584,495,0,63,0,63	0	62	greater
+?	556,727,0,104,-111,89	2	63	question
+@	1015,737,19,0,-165	2	64	at
 at	"
-A	667,718,0,37,36,37	2	0101	-- A
-B	667,718,0,95,-24,89	2	0102	-- B
-C	722,737,19,110,-58,89	2	0103	-- C
-D	722,718,0,92,-31,89	2	0104	-- D
-E	667,718,0,145,-36,89	2	0105	-- E
-F	611,718,0,175,-36,89	2	0106	-- F
-G	778,737,19,71,-61,71	2	0107	-- G
-H	722,718,0,127,-27,89	2	0110	-- H
-I	278,718,0,113,-41,89	2	0111	-- I
-J	500,718,19,131,3,89	2	0112	-- J
-K	667,718,0,191,-26,89	2	0113	-- K
-L	556,718,0,49,-26,49	2	0114	-- L
-M	833,718,0,131,-23,89	2	0115	-- M
-N	722,718,0,127,-26,89	2	0116	-- N
-O	778,737,19,98,-55,89	2	0117	-- O
-P	667,718,0,120,-36,89	2	0120	-- P
-Q	778,737,56,98,-55,89	2	0121	-- Q
-R	722,718,0,101,-38,89	2	0122	-- R
-S	667,737,19,96,-40,89	2	0123	-- S
-T	611,718,0,189,-98,89	2	0124	-- T
-U	722,718,19,125,-73,89	2	0125	-- U
-V	667,718,0,183,-123,89	2	0126	-- V
-W	944,718,0,187,-119,89	2	0127	-- W
-X	667,718,0,173,31,89	2	0130	-- X
-Y	667,718,0,189,-117,89	2	0131	-- Y
-Z	611,718,0,180,27,89	2	0132	-- Z
-[	278,722,196,175,29,89	2	0133	-- bracketleft
+A	667,718,0,37,36,37	2	65	A
+B	667,718,0,95,-24,89	2	66	B
+C	722,737,19,110,-58,89	2	67	C
+D	722,718,0,92,-31,89	2	68	D
+E	667,718,0,145,-36,89	2	69	E
+F	611,718,0,175,-36,89	2	70	F
+G	778,737,19,71,-61,71	2	71	G
+H	722,718,0,127,-27,89	2	72	H
+I	278,718,0,113,-41,89	2	73	I
+J	500,718,19,131,3,89	2	74	J
+K	667,718,0,191,-26,89	2	75	K
+L	556,718,0,49,-26,49	2	76	L
+M	833,718,0,131,-23,89	2	77	M
+N	722,718,0,127,-26,89	2	78	N
+O	778,737,19,98,-55,89	2	79	O
+P	667,718,0,120,-36,89	2	80	P
+Q	778,737,56,98,-55,89	2	81	Q
+R	722,718,0,101,-38,89	2	82	R
+S	667,737,19,96,-40,89	2	83	S
+T	611,718,0,189,-98,89	2	84	T
+U	722,718,19,125,-73,89	2	85	U
+V	667,718,0,183,-123,89	2	86	V
+W	944,718,0,187,-119,89	2	87	W
+X	667,718,0,173,31,89	2	88	X
+Y	667,718,0,189,-117,89	2	89	Y
+Z	611,718,0,180,27,89	2	90	Z
+[	278,722,196,175,29,89	2	91	bracketleft
 lB	"
-\	278,737,19,63,-90,63	2	0134	-- backslash
+\	278,737,19,63,-90,63	2	92	backslash
 rs	"
-]	278,722,196,140,64,89	2	0135	-- bracketright
+]	278,722,196,140,64,89	2	93	bracketright
 rB	"
-a^	333,734,0,155,-97,89	2	0136	-- circumflex
+a^	333,734,0,155,-97,89	2	94	circumflex
 ^	"
-_	556,0,125,34,77,34	0	0137	-- underscore
-`	222,725,0,151,-115,89	2	0140	-- quoteleft
+_	556,0,125,34,77,34	0	95	underscore
+`	222,725,0,151,-115,89	2	96	quoteleft
 oq	"
-a	556,538,15,53,-11,53	0	0141	-- a
-b	556,718,15,78,-8,78	2	0142	-- b
-c	500,538,15,103,-24,89	0	0143	-- c
-d	556,718,15,146,-34,89	2	0144	-- d
-e	556,538,15,72,-34,72	0	0145	-- e
-f	278,728,0,188,-36,89	2	0146	-- f
-g	556,538,220,104,8,89	1	0147	-- g
-h	556,718,0,67,-15,67	2	0150	-- h
-i	222,718,0,136,-17,89	2	0151	-- i
-j	222,718,210,136,110,89	3	0152	-- j
-k	500,718,0,150,-17,89	2	0153	-- k
-l	222,718,0,136,-17,89	2	0154	-- l
-m	833,538,0,69,-15,69	0	0155	-- m
-n	556,538,0,67,-15,67	0	0156	-- n
-o	556,538,14,79,-33,79	0	0157	-- o
-p	556,538,207,78,36,78	1	0160	-- p
-q	556,538,207,99,-34,89	1	0161	-- q
-r	333,538,0,163,-27,89	0	0162	-- r
-s	500,538,15,79,-13,79	0	0163	-- s
-t	278,669,7,140,-52,89	2	0164	-- t
-u	556,523,15,94,-44,89	0	0165	-- u
-v	500,523,0,153,-69,89	0	0166	-- v
-w	722,523,0,148,-75,89	0	0167	-- w
-x	500,523,0,144,39,89	0	0170	-- x
-y	500,523,214,150,35,89	1	0171	-- y
-z	500,523,0,121,19,89	0	0172	-- z
-lC	334,722,196,161,-42,89	2	0173	-- braceleft
+a	556,538,15,53,-11,53	0	97	a
+b	556,718,15,78,-8,78	2	98	b
+c	500,538,15,103,-24,89	0	99	c
+d	556,718,15,146,-34,89	2	100	d
+e	556,538,15,72,-34,72	0	101	e
+f	278,728,0,188,-36,89	2	102	f
+g	556,538,220,104,8,89	1	103	g
+h	556,718,0,67,-15,67	2	104	h
+i	222,718,0,136,-17,89	2	105	i
+j	222,718,210,136,110,89	3	106	j
+k	500,718,0,150,-17,89	2	107	k
+l	222,718,0,136,-17,89	2	108	l
+m	833,538,0,69,-15,69	0	109	m
+n	556,538,0,67,-15,67	0	110	n
+o	556,538,14,79,-33,79	0	111	o
+p	556,538,207,78,36,78	1	112	p
+q	556,538,207,99,-34,89	1	113	q
+r	333,538,0,163,-27,89	0	114	r
+s	500,538,15,79,-13,79	0	115	s
+t	278,669,7,140,-52,89	2	116	t
+u	556,523,15,94,-44,89	0	117	u
+v	500,523,0,153,-69,89	0	118	v
+w	722,523,0,148,-75,89	0	119	w
+x	500,523,0,144,39,89	0	120	x
+y	500,523,214,150,35,89	1	121	y
+z	500,523,0,121,19,89	0	122	z
+lC	334,722,196,161,-42,89	2	123	braceleft
 {	"
-ba	260,737,19,114,-40,89	2	0174	-- bar
+ba	260,737,19,114,-40,89	2	124	bar
 |	"
-rC	334,722,196,70,50,70	2	0175	-- braceright
+rC	334,722,196,70,50,70	2	125	braceright
 }	"
-a~	333,722,0,207,-75,89	2	0176	-- tilde
+a~	333,722,0,207,-75,89	2	126	tilde
 ~	"
-bq	222,106,149,8,29,8	0	0200	-- quotesinglbase
-Fo	556,446,0,48,-96,48	0	0201	-- guillemotleft
-Fc	556,446,0,22,-70,22	0	0202	-- guillemotright
-bu	350,517,0,113,-41,89	0	0203	-- bullet
-Fn	556,737,207,148,102,89	3	0204	-- florin
-f/	167,703,19,365,220,89	2	0205	-- fraction
-%0	1000,703,19,79,-38,79	2	0206	-- perthousand
-dg	556,718,159,116,-85,89	2	0207	-- dagger
-dd	556,718,159,117,-2,89	2	0210	-- daggerdbl
-en	556,313,0,117,-1,89	0	0211	-- endash
-em	1000,313,0,117,-1,89	0	0212	-- emdash
-fi	500,728,0,137,-36,89	2	0214	-- fi
-fl	500,728,0,135,-36,89	2	0215	-- fl
-.i	278,523,0,66,-45,66	0	0220	-- dotlessi
-ga	333,734,0,54,-120,54	2	0222	-- grave
-a"	333,734,0,282,-107,89	2	0223	-- hungarumlaut
-a.	333,706,0,79,-199,79	2	0224	-- dotaccent
-ab	333,731,0,193,-117,89	2	0225	-- breve
-ah	333,734,0,185,-127,89	2	0226	-- caron
-ao	333,756,0,119,-164,89	2	0227	-- ring
-ho	333,0,225,0,7	1	0230	-- ogonek
-lq	333,725,0,178,-88,89	2	0231	-- quotedblleft
-rq	333,718,0,165,-74,89	2	0232	-- quotedblright
-oe	944,538,15,70,-33,70	0	0233	-- oe
-/l	222,718,0,175,9,89	2	0234	-- lslash
-Bq	333,106,149,35,56,35	0	0235	-- quotedblbase
-OE	1000,737,19,166,-48,89	2	0236	-- OE
-/L	556,718,0,49,9,49	2	0237	-- Lslash
-r!	333,523,195,43,-27,43	0	0241	-- exclamdown
-ct	556,623,115,78,-45,78	0	0242	-- cent
-Po	556,718,16,128,1,89	2	0243	-- sterling
-Cs	556,603,0,140,-10,89	0	0244	-- currency
-Ye	556,688,0,193,-31,89	2	0245	-- yen
-bb	260,737,19,114,-40,89	2	0246	-- brokenbar
-sc	556,737,191,78,-26,78	2	0247	-- section
-ad	333,706,0,160,-118,89	2	0250	-- dieresis
-co	737,737,19,150,-4,89	2	0251	-- copyright
-Of	370,737,0,129,-50,89	2	0252	-- ordfeminine
-fo	333,446,0,57,-87,57	0	0253	-- guilsinglleft
-no	584,390,0,94,-56,89	0	0254	-- logicalnot
-\-	584,289,0,72,-35,72	0	0255	-- minus
-rg	737,737,19,150,-4,89	2	0256	-- registered
-a-	333,684,0,185,-93,89	2	0257	-- macron
-de	400,703,0,118,-119,89	2	0260	-- degree
-t+-	584,506,0,84,11,84	0	0261	-- plusminus
-S2	333,703,0,166,-14,89	2	0262	-- twosuperior
-S3	333,703,0,153,-40,89	2	0263	-- threesuperior
-aa	333,734,0,192,-198,89	2	0264	-- acute
-mc	556,523,207,94,26,89	1	0265	-- mu
-ps	537,718,173,163,-76,89	2	0266	-- paragraph
-pc	278,315,0,29,-79,29	0	0267	-- periodcentered
-ac	333,0,225,0,48	1	0270	-- cedilla
-S1	333,703,0,88,-116,88	2	0271	-- onesuperior
-Om	365,737,0,153,-50,89	2	0272	-- ordmasculine
-fc	333,446,0,31,-61,31	0	0273	-- guilsinglright
-14	834,703,19,18,-100,18	2	0274	-- onequarter
-12	834,703,19,55,-64,55	2	0275	-- onehalf
-34	834,703,19,77,-80,77	2	0276	-- threequarters
-r?	611,525,201,0,-35	0	0277	-- questiondown
-`A	667,929,0,37,36,37	2	0300	-- Agrave
-'A	667,929,0,66,36,66	2	0301	-- Aacute
-^A	667,929,0,37,36,37	2	0302	-- Acircumflex
-~A	667,917,0,82,36,82	2	0303	-- Atilde
-:A	667,901,0,37,36,37	2	0304	-- Adieresis
-oA	667,931,0,37,36,37	2	0305	-- Aring
-AE	1000,718,0,147,42,89	2	0306	-- AE
-,C	722,737,225,110,-58,89	3	0307	-- Ccedilla
-`E	667,929,0,145,-36,89	2	0310	-- Egrave
-'E	667,929,0,145,-36,89	2	0311	-- Eacute
-^E	667,929,0,145,-36,89	2	0312	-- Ecircumflex
-:E	667,901,0,145,-36,89	2	0313	-- Edieresis
-`I	278,929,0,123,-41,89	2	0314	-- Igrave
-'I	278,929,0,261,-41,89	2	0315	-- Iacute
-^I	278,929,0,224,-41,89	2	0316	-- Icircumflex
-:I	278,901,0,230,-41,89	2	0317	-- Idieresis
--D	722,718,0,92,-19,89	2	0320	-- Eth
-~N	722,917,0,127,-26,89	2	0321	-- Ntilde
-`O	778,929,19,98,-55,89	2	0322	-- Ograve
-'O	778,929,19,98,-55,89	2	0323	-- Oacute
-^O	778,929,19,98,-55,89	2	0324	-- Ocircumflex
-~O	778,917,19,98,-55,89	2	0325	-- Otilde
-:O	778,901,19,98,-55,89	2	0326	-- Odieresis
-tmu	584,506,0,108,0,89	0	0327	-- multiply
-/O	778,737,19,162,7,89	2	0330	-- Oslash
-`U	722,929,19,125,-73,89	2	0331	-- Ugrave
-'U	722,929,19,125,-73,89	2	0332	-- Uacute
-^U	722,929,19,125,-73,89	2	0333	-- Ucircumflex
-:U	722,901,19,125,-73,89	2	0334	-- Udieresis
-'Y	667,929,0,189,-117,89	2	0335	-- Yacute
-TP	667,718,0,95,-36,89	2	0336	-- Thorn
-ss	611,728,15,97,-17,89	2	0337	-- germandbls
-`a	556,734,15,53,-11,53	2	0340	-- agrave
-'a	556,734,15,81,-11,81	2	0341	-- aacute
-^a	556,734,15,53,-11,53	2	0342	-- acircumflex
-~a	556,722,15,86,-11,86	2	0343	-- atilde
-:a	556,706,15,53,-11,53	2	0344	-- adieresis
-oa	556,756,15,53,-11,53	2	0345	-- aring
-ae	889,538,15,70,-11,70	0	0346	-- ae
-,c	500,538,225,103,-24,89	1	0347	-- ccedilla
-`e	556,734,15,72,-34,72	2	0350	-- egrave
-'e	556,734,15,81,-34,81	2	0351	-- eacute
-^e	556,734,15,72,-34,72	2	0352	-- ecircumflex
-:e	556,706,15,72,-34,72	2	0353	-- edieresis
-`i	278,734,0,82,-45,82	2	0354	-- igrave
-'i	278,734,0,220,-45,89	2	0355	-- iacute
-^i	278,734,0,183,-45,89	2	0356	-- icircumflex
-:i	278,706,0,188,-45,89	2	0357	-- idieresis
-Sd	556,737,15,111,-31,89	2	0360	-- eth
-~n	556,722,0,86,-15,86	2	0361	-- ntilde
-`o	556,734,14,79,-33,79	2	0362	-- ograve
-'o	556,734,14,81,-33,81	2	0363	-- oacute
-^o	556,734,14,79,-33,79	2	0364	-- ocircumflex
-~o	556,722,14,96,-33,89	2	0365	-- otilde
-:o	556,706,14,79,-33,79	2	0366	-- odieresis
-tdi	584,524,19,72,-35,72	0	0367	-- divide
-/o	611,545,22,86,21,86	0	0370	-- oslash
-`u	556,734,15,94,-44,89	2	0371	-- ugrave
-'u	556,734,15,94,-44,89	2	0372	-- uacute
-^u	556,734,15,94,-44,89	2	0373	-- ucircumflex
-:u	556,706,15,94,-44,89	2	0374	-- udieresis
-'y	500,734,214,150,35,89	3	0375	-- yacute
-Tp	556,718,207,78,36,78	3	0376	-- thorn
-:y	500,706,214,150,35,89	3	0377	-- ydieresis
+bq	222,106,149,8,29,8	0	128	quotesinglbase
+Fo	556,446,0,48,-96,48	0	129	guillemotleft
+Fc	556,446,0,22,-70,22	0	130	guillemotright
+bu	350,517,0,113,-41,89	0	131	bullet
+Fn	556,737,207,148,102,89	3	132	florin
+f/	167,703,19,365,220,89	2	133	fraction
+%0	1000,703,19,79,-38,79	2	134	perthousand
+dg	556,718,159,116,-85,89	2	135	dagger
+dd	556,718,159,117,-2,89	2	136	daggerdbl
+en	556,313,0,117,-1,89	0	137	endash
+em	1000,313,0,117,-1,89	0	138	emdash
+fi	500,728,0,137,-36,89	2	140	fi
+fl	500,728,0,135,-36,89	2	141	fl
+.i	278,523,0,66,-45,66	0	144	dotlessi
+ga	333,734,0,54,-120,54	2	146	grave
+a"	333,734,0,282,-107,89	2	147	hungarumlaut
+a.	333,706,0,79,-199,79	2	148	dotaccent
+ab	333,731,0,193,-117,89	2	149	breve
+ah	333,734,0,185,-127,89	2	150	caron
+ao	333,756,0,119,-164,89	2	151	ring
+ho	333,0,225,0,7	1	152	ogonek
+lq	333,725,0,178,-88,89	2	153	quotedblleft
+rq	333,718,0,165,-74,89	2	154	quotedblright
+oe	944,538,15,70,-33,70	0	155	oe
+/l	222,718,0,175,9,89	2	156	lslash
+Bq	333,106,149,35,56,35	0	157	quotedblbase
+OE	1000,737,19,166,-48,89	2	158	OE
+/L	556,718,0,49,9,49	2	159	Lslash
+r!	333,523,195,43,-27,43	0	161	exclamdown
+ct	556,623,115,78,-45,78	0	162	cent
+Po	556,718,16,128,1,89	2	163	sterling
+Cs	556,603,0,140,-10,89	0	164	currency
+Ye	556,688,0,193,-31,89	2	165	yen
+bb	260,737,19,114,-40,89	2	166	brokenbar
+sc	556,737,191,78,-26,78	2	167	section
+ad	333,706,0,160,-118,89	2	168	dieresis
+co	737,737,19,150,-4,89	2	169	copyright
+Of	370,737,0,129,-50,89	2	170	ordfeminine
+fo	333,446,0,57,-87,57	0	171	guilsinglleft
+tno	584,390,0,94,-56,89	0	172	logicalnot
+\-	584,289,0,72,-35,72	0	173	minus
+rg	737,737,19,150,-4,89	2	174	registered
+a-	333,684,0,185,-93,89	2	175	macron
+de	400,703,0,118,-119,89	2	176	degree
+t+-	584,506,0,84,11,84	0	177	plusminus
+S2	333,703,0,166,-14,89	2	178	twosuperior
+S3	333,703,0,153,-40,89	2	179	threesuperior
+aa	333,734,0,192,-198,89	2	180	acute
+mc	556,523,207,94,26,89	1	181	mu
+ps	537,718,173,163,-76,89	2	182	paragraph
+pc	278,315,0,29,-79,29	0	183	periodcentered
+ac	333,0,225,0,48	1	184	cedilla
+S1	333,703,0,88,-116,88	2	185	onesuperior
+Om	365,737,0,153,-50,89	2	186	ordmasculine
+fc	333,446,0,31,-61,31	0	187	guilsinglright
+14	834,703,19,18,-100,18	2	188	onequarter
+12	834,703,19,55,-64,55	2	189	onehalf
+34	834,703,19,77,-80,77	2	190	threequarters
+r?	611,525,201,0,-35	0	191	questiondown
+`A	667,929,0,37,36,37	2	192	Agrave
+'A	667,929,0,66,36,66	2	193	Aacute
+^A	667,929,0,37,36,37	2	194	Acircumflex
+~A	667,917,0,82,36,82	2	195	Atilde
+:A	667,901,0,37,36,37	2	196	Adieresis
+oA	667,931,0,37,36,37	2	197	Aring
+AE	1000,718,0,147,42,89	2	198	AE
+,C	722,737,225,110,-58,89	3	199	Ccedilla
+`E	667,929,0,145,-36,89	2	200	Egrave
+'E	667,929,0,145,-36,89	2	201	Eacute
+^E	667,929,0,145,-36,89	2	202	Ecircumflex
+:E	667,901,0,145,-36,89	2	203	Edieresis
+`I	278,929,0,123,-41,89	2	204	Igrave
+'I	278,929,0,261,-41,89	2	205	Iacute
+^I	278,929,0,224,-41,89	2	206	Icircumflex
+:I	278,901,0,230,-41,89	2	207	Idieresis
+-D	722,718,0,92,-19,89	2	208	Eth
+~N	722,917,0,127,-26,89	2	209	Ntilde
+`O	778,929,19,98,-55,89	2	210	Ograve
+'O	778,929,19,98,-55,89	2	211	Oacute
+^O	778,929,19,98,-55,89	2	212	Ocircumflex
+~O	778,917,19,98,-55,89	2	213	Otilde
+:O	778,901,19,98,-55,89	2	214	Odieresis
+tmu	584,506,0,108,0,89	0	215	multiply
+/O	778,737,19,162,7,89	2	216	Oslash
+`U	722,929,19,125,-73,89	2	217	Ugrave
+'U	722,929,19,125,-73,89	2	218	Uacute
+^U	722,929,19,125,-73,89	2	219	Ucircumflex
+:U	722,901,19,125,-73,89	2	220	Udieresis
+'Y	667,929,0,189,-117,89	2	221	Yacute
+TP	667,718,0,95,-36,89	2	222	Thorn
+ss	611,728,15,97,-17,89	2	223	germandbls
+`a	556,734,15,53,-11,53	2	224	agrave
+'a	556,734,15,81,-11,81	2	225	aacute
+^a	556,734,15,53,-11,53	2	226	acircumflex
+~a	556,722,15,86,-11,86	2	227	atilde
+:a	556,706,15,53,-11,53	2	228	adieresis
+oa	556,756,15,53,-11,53	2	229	aring
+ae	889,538,15,70,-11,70	0	230	ae
+,c	500,538,225,103,-24,89	1	231	ccedilla
+`e	556,734,15,72,-34,72	2	232	egrave
+'e	556,734,15,81,-34,81	2	233	eacute
+^e	556,734,15,72,-34,72	2	234	ecircumflex
+:e	556,706,15,72,-34,72	2	235	edieresis
+`i	278,734,0,82,-45,82	2	236	igrave
+'i	278,734,0,220,-45,89	2	237	iacute
+^i	278,734,0,183,-45,89	2	238	icircumflex
+:i	278,706,0,188,-45,89	2	239	idieresis
+Sd	556,737,15,111,-31,89	2	240	eth
+~n	556,722,0,86,-15,86	2	241	ntilde
+`o	556,734,14,79,-33,79	2	242	ograve
+'o	556,734,14,81,-33,81	2	243	oacute
+^o	556,734,14,79,-33,79	2	244	ocircumflex
+~o	556,722,14,96,-33,89	2	245	otilde
+:o	556,706,14,79,-33,79	2	246	odieresis
+tdi	584,524,19,72,-35,72	0	247	divide
+/o	611,545,22,86,21,86	0	248	oslash
+`u	556,734,15,94,-44,89	2	249	ugrave
+'u	556,734,15,94,-44,89	2	250	uacute
+^u	556,734,15,94,-44,89	2	251	ucircumflex
+:u	556,706,15,94,-44,89	2	252	udieresis
+'y	500,734,214,150,35,89	3	253	yacute
+Tp	556,718,207,78,36,78	3	254	thorn
+:y	500,706,214,150,35,89	3	255	ydieresis
+u2026	1000,106,0,0,-65	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNB b/contrib/groff/font/devps/HNB
index 2a117f4..f4131f9 100644
--- a/contrib/groff/font/devps/HNB
+++ b/contrib/groff/font/devps/HNB
@@ -221,246 +221,247 @@ y , -65
 y a -24
 z e 8
 charset
-ha	479,698,0,0,-51	2	0000	-- asciicircum
-ti	479,343,0,0,-50	0	0001	-- asciitilde
-vS	547,936,19,0,-32	2	0002	-- Scaron
-vZ	501,936,0,0,-20	2	0003	-- Zcaron
-vs	456,750,14,0,-25	2	0004	-- scaron
-vz	410,750,0,0,-16	2	0005	-- zcaron
-:Y	547,915,0,0,-12	2	0006	-- Ydieresis
-tm	820,718,0,0,-36	2	0007	-- trademark
-aq	195,718,0,0,-57	2	0010	-- quotesingle
-space	228	0	0040
-!	273,718,0,0,-74	2	0041	-- exclam
-"	389,718,0,0,-80	2	0042	-- quotedbl
+ha	479,698	2	0	asciicircum
+ti	479,343	0	1	asciitilde
+vS	547,936,19	2	2	Scaron
+vZ	501,936	2	3	Zcaron
+vs	456,750,14	2	4	scaron
+vz	410,750	2	5	zcaron
+:Y	547,915	2	6	Ydieresis
+tm	820,718	2	7	trademark
+aq	195,718	2	8	quotesingle
+space	228	0	32	space
+!	273,718	2	33	exclam
+"	389,718	2	34	quotedbl
 dq	"
-#	456,698,0,0,-15	2	0043	-- numbersign
+#	456,698	2	35	numbersign
 sh	"
-$	456,775,115,0,-25	2	0044	-- dollar
+$	456,775,115	2	36	dollar
 Do	"
-%	729,710,19,0,-23	2	0045	-- percent
-&	592,718,19,0,-44	2	0046	-- ampersand
-'	228,718,0,0,-57	2	0047	-- quoteright
+%	729,710,19	2	37	percent
+&	592,718,19	2	38	ampersand
+'	228,718	2	39	quoteright
 cq	"
-(	273,734,208,0,-29	3	0050	-- parenleft
-)	273,734,208,0,-16	3	0051	-- parenright
-*	319,718,0,0,-22	2	0052	-- asterisk
-+	479,506,0,0,-33	0	0053	-- plus
-,	228,146,168,0,-52	0	0054	-- comma
--	273,345,0,0,-22	0	0055	-- hyphen
+(	273,734,208	3	40	parenleft
+)	273,734,208	3	41	parenright
+*	319,718	2	42	asterisk
++	479,506	0	43	plus
+,	228,146,168	0	44	comma
+-	273,345	0	45	hyphen
 hy	"
-.	228,146,0,0,-52	0	0056	-- period
-/	228,737,19,27,27	2	0057	-- slash
+.	228,146	0	46	period
+/	228,737,19,27,27	2	47	slash
 sl	"
-0	456,710,19,0,-26	2	0060	-- zero
-1	456,710,0,0,-57	2	0061	-- one
-2	456,710,0,0,-21	2	0062	-- two
-3	456,710,19,0,-22	2	0063	-- three
-4	456,710,0,0,-22	2	0064	-- four
-5	456,698,19,0,-22	2	0065	-- five
-6	456,710,19,0,-25	2	0066	-- six
-7	456,698,0,0,-20	2	0067	-- seven
-8	456,710,19,0,-26	2	0070	-- eight
-9	456,710,19,0,-25	2	0071	-- nine
-:	273,512,0,0,-75	0	0072	-- colon
-;	273,512,168,0,-75	0	0073	-- semicolon
-<	479,514,8,0,-31	0	0074	-- less
-=	479,419,0,0,-33	0	0075	-- equal
->	479,514,8,0,-31	0	0076	-- greater
-?	501,727,0,0,-49	2	0077	-- question
-@	800,737,19,0,-97	2	0100	-- at
+0	456,710,19	2	48	zero
+1	456,710	2	49	one
+2	456,710	2	50	two
+3	456,710,19	2	51	three
+4	456,710	2	52	four
+5	456,698,19	2	53	five
+6	456,710,19	2	54	six
+7	456,698	2	55	seven
+8	456,710,19	2	56	eight
+9	456,710,19	2	57	nine
+:	273,512	0	58	colon
+;	273,512,168	0	59	semicolon
+<	479,514,8	0	60	less
+=	479,419	0	61	equal
+>	479,514,8	0	62	greater
+?	501,727	2	63	question
+@	800,737,19	2	64	at
 at	"
-A	592,718,0,0,-16	2	0101	-- A
-B	592,718,0,0,-62	2	0102	-- B
-C	592,737,19,0,-36	2	0103	-- C
-D	592,718,0,0,-62	2	0104	-- D
-E	547,718,0,0,-62	2	0105	-- E
-F	501,718,0,0,-62	2	0106	-- F
-G	638,737,19,0,-36	2	0107	-- G
-H	592,718,0,0,-58	2	0110	-- H
-I	228,718,0,0,-52	2	0111	-- I
-J	456,718,18,0,-18	2	0112	-- J
-K	592,718,0,0,-71	2	0113	-- K
-L	501,718,0,0,-62	2	0114	-- L
-M	683,718,0,0,-57	2	0115	-- M
-N	592,718,0,0,-57	2	0116	-- N
-O	638,737,19,0,-36	2	0117	-- O
-P	547,718,0,0,-62	2	0120	-- P
-Q	638,737,52,0,-36	2	0121	-- Q
-R	592,718,0,0,-62	2	0122	-- R
-S	547,737,19,0,-32	2	0123	-- S
-T	501,718,0,0,-11	2	0124	-- T
-U	592,718,19,0,-59	2	0125	-- U
-V	547,718,0,0,-16	2	0126	-- V
-W	774,718,0,0,-13	2	0127	-- W
-X	547,718,0,0,-11	2	0130	-- X
-Y	547,718,0,0,-12	2	0131	-- Y
-Z	501,718,0,0,-20	2	0132	-- Z
-[	273,722,196,0,-52	2	0133	-- bracketleft
+A	592,718	2	65	A
+B	592,718	2	66	B
+C	592,737,19	2	67	C
+D	592,718	2	68	D
+E	547,718	2	69	E
+F	501,718	2	70	F
+G	638,737,19	2	71	G
+H	592,718	2	72	H
+I	228,718	2	73	I
+J	456,718,18	2	74	J
+K	592,718	2	75	K
+L	501,718	2	76	L
+M	683,718	2	77	M
+N	592,718	2	78	N
+O	638,737,19	2	79	O
+P	547,718	2	80	P
+Q	638,737,52	2	81	Q
+R	592,718	2	82	R
+S	547,737,19	2	83	S
+T	501,718	2	84	T
+U	592,718,19	2	85	U
+V	547,718	2	86	V
+W	774,718	2	87	W
+X	547,718	2	88	X
+Y	547,718	2	89	Y
+Z	501,718	2	90	Z
+[	273,722,196	2	91	bracketleft
 lB	"
-\	228,737,19,27,27	2	0134	-- backslash
+\	228,737,19,27,27	2	92	backslash
 rs	"
-]	273,722,196,0,-20	2	0135	-- bracketright
+]	273,722,196	2	93	bracketright
 rB	"
-a^	273,750,0,8,8	2	0136	-- circumflex
+a^	273,750,0,8,8	2	94	circumflex
 ^	"
-_	456,0,125	0	0137	-- underscore
-`	228,727,0,0,-57	2	0140	-- quoteleft
+_	456,0,125	0	95	underscore
+`	228,727	2	96	quoteleft
 oq	"
-a	456,546,14,0,-24	0	0141	-- a
-b	501,718,14,0,-50	2	0142	-- b
-c	456,546,14,0,-28	0	0143	-- c
-d	501,718,14,0,-28	2	0144	-- d
-e	456,546,14,0,-19	0	0145	-- e
-f	273,727,0,0,-8	2	0146	-- f
-g	501,546,217,0,-33	1	0147	-- g
-h	501,718,0,0,-53	2	0150	-- h
-i	228,725,0,0,-57	2	0151	-- i
-j	228,725,214,0,-2	3	0152	-- j
-k	456,718,0,5,-57	2	0153	-- k
-l	228,718,0,0,-57	2	0154	-- l
-m	729,546,0,0,-52	0	0155	-- m
-n	501,546,0,0,-53	0	0156	-- n
-o	501,546,14,0,-28	0	0157	-- o
-p	501,546,207,0,-51	1	0160	-- p
-q	501,546,207,0,-28	1	0161	-- q
-r	319,546,0,0,-52	0	0162	-- r
-s	456,546,14,0,-25	0	0163	-- s
-t	273,676,6,0,-8	2	0164	-- t
-u	501,532,14,0,-54	0	0165	-- u
-v	456,532,0,0,-11	0	0166	-- v
-w	638,532,0,0,-8	0	0167	-- w
-x	456,532,0,0,-12	0	0170	-- x
-y	456,532,214,0,-8	1	0171	-- y
-z	410,532,0,0,-16	0	0172	-- z
-lC	319,722,196,0,-39	2	0173	-- braceleft
+a	456,546,14	0	97	a
+b	501,718,14	2	98	b
+c	456,546,14	0	99	c
+d	501,718,14	2	100	d
+e	456,546,14	0	101	e
+f	273,727	2	102	f
+g	501,546,217	1	103	g
+h	501,718	2	104	h
+i	228,725	2	105	i
+j	228,725,214	3	106	j
+k	456,718,0,5	2	107	k
+l	228,718	2	108	l
+m	729,546	0	109	m
+n	501,546	0	110	n
+o	501,546,14	0	111	o
+p	501,546,207	1	112	p
+q	501,546,207	1	113	q
+r	319,546	0	114	r
+s	456,546,14	0	115	s
+t	273,676,6	2	116	t
+u	501,532,14	0	117	u
+v	456,532	0	118	v
+w	638,532	0	119	w
+x	456,532	0	120	x
+y	456,532,214	1	121	y
+z	410,532	0	122	z
+lC	319,722,196	2	123	braceleft
 {	"
-ba	230,737,19,0,-69	2	0174	-- bar
+ba	230,737,19	2	124	bar
 |	"
-rC	319,722,196,0,-20	2	0175	-- braceright
+rC	319,722,196	2	125	braceright
 }	"
-a~	273,737,0,14,14	2	0176	-- tilde
+a~	273,737,0,14,14	2	126	tilde
 ~	"
-bq	228,127,146,0,-57	0	0200	-- quotesinglbase
-Fo	456,484,0,0,-72	0	0201	-- guillemotleft
-Fc	456,484,0,0,-72	0	0202	-- guillemotright
-bu	287,524,0,0,-8	0	0203	-- bullet
-Fn	456,737,210,0,8	3	0204	-- florin
-f/	137,710,19,139,139	2	0205	-- fraction
-%0	820,710,19,2,2	2	0206	-- perthousand
-dg	456,718,171,0,-30	2	0207	-- dagger
-dd	456,718,171,0,-30	2	0210	-- daggerdbl
-en	456,333	0	0211	-- endash
-em	820,333	0	0212	-- emdash
-fi	501,727,0,0,-8	2	0214	-- fi
-fl	501,727,0,0,-8	2	0215	-- fl
-.i	228,532,0,0,-57	0	0220	-- dotlessi
-ga	273,750,0,0,19	2	0222	-- grave
-a"	273,750,0,126,-7	2	0223	-- hungarumlaut
-a.	273,729,0,0,-85	2	0224	-- dotaccent
-ab	273,750,0,2,2	2	0225	-- breve
-ah	273,750,0,8,8	2	0226	-- caron
-ao	273,776,0,0,-48	2	0227	-- ring
-ho	273,0,228,0,-58	1	0230	-- ogonek
-lq	410,727,0,0,-52	2	0231	-- quotedblleft
-rq	410,718,0,0,-52	2	0232	-- quotedblright
-oe	774,546,14,0,-28	0	0233	-- oe
-/l	228,718,0,15,15	2	0234	-- lslash
-Bq	410,127,146,0,-52	0	0235	-- quotedblbase
-OE	820,737,19,0,-30	2	0236	-- OE
-/L	501,718,0,0,16	2	0237	-- Lslash
-r!	273,532,186,0,-74	0	0241	-- exclamdown
-ct	456,628,118,0,-28	0	0242	-- cent
-Po	456,718,16,0,-23	2	0243	-- sterling
-Cs	456,636,0,2,2	0	0244	-- currency
-Ye	456,698,0,7,7	2	0245	-- yen
-bb	230,737,19,0,-69	2	0246	-- brokenbar
-sc	456,727,184,0,-28	2	0247	-- section
-ad	273,729,0,0,-5	2	0250	-- dieresis
-co	604,737,19,10,9	2	0251	-- copyright
-Of	303,737,0,0,-18	2	0252	-- ordfeminine
-fo	273,484,0,0,-68	0	0253	-- guilsinglleft
-no	479,419,0,0,-33	0	0254	-- logicalnot
-\-	479,309,0,0,-33	0	0255	-- minus
-rg	604,737,19,9,9	2	0256	-- registered
-a-	273,678,0,5,5	2	0257	-- macron
-de	328,712,0,0,-47	2	0260	-- degree
-t+-	479,506,0,0,-33	0	0261	-- plusminus
-S2	273,710,0,0,-7	2	0262	-- twosuperior
-S3	273,710,0,0,-7	2	0263	-- threesuperior
-aa	273,750,0,19,-89	2	0264	-- acute
-mc	501,532,207,0,-54	1	0265	-- mu
-ps	456,700,191,0,7	2	0266	-- paragraph
-pc	228,334,0,0,-48	0	0267	-- periodcentered
-ac	273,0,228,0,-5	1	0270	-- cedilla
-S1	273,710,0,0,-21	2	0271	-- onesuperior
-Om	299,737,0,0,-5	2	0272	-- ordmasculine
-fc	273,484,0,0,-68	0	0273	-- guilsinglright
-14	684,710,19,0,-21	2	0274	-- onequarter
-12	684,710,19,0,-21	2	0275	-- onehalf
-34	684,710,19,0,-13	2	0276	-- threequarters
-r?	501,532,195,0,-45	0	0277	-- questiondown
-`A	592,936,0,0,-16	2	0300	-- Agrave
-'A	592,936,0,0,-16	2	0301	-- Aacute
-^A	592,936,0,0,-16	2	0302	-- Acircumflex
-~A	592,923,0,0,-16	2	0303	-- Atilde
-:A	592,915,0,0,-16	2	0304	-- Adieresis
-oA	592,962,0,0,-16	2	0305	-- Aring
-AE	820,718,0,0,-4	2	0306	-- AE
-,C	592,737,228,0,-36	3	0307	-- Ccedilla
-`E	547,936,0,0,-62	2	0310	-- Egrave
-'E	547,936,0,0,-62	2	0311	-- Eacute
-^E	547,936,0,0,-62	2	0312	-- Ecircumflex
-:E	547,915,0,0,-62	2	0313	-- Edieresis
-`I	228,936,0,0,41	2	0314	-- Igrave
-'I	228,936,0,42,-52	2	0315	-- Iacute
-^I	228,936,0,31,30	2	0316	-- Icircumflex
-:I	228,915,0,18,17	2	0317	-- Idieresis
--D	592,718,0,0,4	2	0320	-- Eth
-~N	592,923,0,0,-57	2	0321	-- Ntilde
-`O	638,936,19,0,-36	2	0322	-- Ograve
-'O	638,936,19,0,-36	2	0323	-- Oacute
-^O	638,936,19,0,-36	2	0324	-- Ocircumflex
-~O	638,923,19,0,-36	2	0325	-- Otilde
-:O	638,915,19,0,-36	2	0326	-- Odieresis
-tmu	479,505,0,0,-33	0	0327	-- multiply
-/O	638,745,27,0,-27	2	0330	-- Oslash
-`U	592,936,19,0,-59	2	0331	-- Ugrave
-'U	592,936,19,0,-59	2	0332	-- Uacute
-^U	592,936,19,0,-59	2	0333	-- Ucircumflex
-:U	592,915,19,0,-59	2	0334	-- Udieresis
-'Y	547,936,0,0,-12	2	0335	-- Yacute
-TP	547,718,0,0,-62	2	0336	-- Thorn
-ss	501,731,14,0,-57	2	0337	-- germandbls
-`a	456,750,14,0,-24	2	0340	-- agrave
-'a	456,750,14,0,-24	2	0341	-- aacute
-^a	456,750,14,0,-24	2	0342	-- acircumflex
-~a	456,737,14,0,-24	2	0343	-- atilde
-:a	456,729,14,0,-24	2	0344	-- adieresis
-oa	456,776,14,0,-24	2	0345	-- aring
-ae	729,546,14,0,-24	0	0346	-- ae
-,c	456,546,228,0,-28	1	0347	-- ccedilla
-`e	456,750,14,0,-19	2	0350	-- egrave
-'e	456,750,14,0,-19	2	0351	-- eacute
-^e	456,750,14,0,-19	2	0352	-- ecircumflex
-:e	456,729,14,0,-19	2	0353	-- edieresis
-`i	228,750,0,0,41	2	0354	-- igrave
-'i	228,750,0,42,-57	2	0355	-- iacute
-^i	228,750,0,31,30	2	0356	-- icircumflex
-:i	228,729,0,18,17	2	0357	-- idieresis
-Sd	501,737,14,0,-28	2	0360	-- eth
-~n	501,737,0,0,-53	2	0361	-- ntilde
-`o	501,750,14,0,-28	2	0362	-- ograve
-'o	501,750,14,0,-28	2	0363	-- oacute
-^o	501,750,14,0,-28	2	0364	-- ocircumflex
-~o	501,737,14,0,-28	2	0365	-- otilde
-:o	501,729,14,0,-28	2	0366	-- odieresis
-tdi	479,548,42,0,-33	0	0367	-- divide
-/o	501,560,29,0,-18	0	0370	-- oslash
-`u	501,750,14,0,-54	2	0371	-- ugrave
-'u	501,750,14,0,-54	2	0372	-- uacute
-^u	501,750,14,0,-54	2	0373	-- ucircumflex
-:u	501,729,14,0,-54	2	0374	-- udieresis
-'y	456,750,214,0,-8	3	0375	-- yacute
-Tp	501,718,208,0,-51	3	0376	-- thorn
-:y	456,729,214,0,-8	3	0377	-- ydieresis
+bq	228,127,146	0	128	quotesinglbase
+Fo	456,484	0	129	guillemotleft
+Fc	456,484	0	130	guillemotright
+bu	287,524	0	131	bullet
+Fn	456,737,210,0,8	3	132	florin
+f/	137,710,19,139,139	2	133	fraction
+%0	820,710,19,2,2	2	134	perthousand
+dg	456,718,171	2	135	dagger
+dd	456,718,171	2	136	daggerdbl
+en	456,333	0	137	endash
+em	820,333	0	138	emdash
+fi	501,727	2	140	fi
+fl	501,727	2	141	fl
+.i	228,532	0	144	dotlessi
+ga	273,750,0,0,19	2	146	grave
+a"	273,750,0,126	2	147	hungarumlaut
+a.	273,729	2	148	dotaccent
+ab	273,750,0,2,2	2	149	breve
+ah	273,750,0,8,8	2	150	caron
+ao	273,776	2	151	ring
+ho	273,0,228	1	152	ogonek
+lq	410,727	2	153	quotedblleft
+rq	410,718	2	154	quotedblright
+oe	774,546,14	0	155	oe
+/l	228,718,0,15,15	2	156	lslash
+Bq	410,127,146	0	157	quotedblbase
+OE	820,737,19	2	158	OE
+/L	501,718,0,0,16	2	159	Lslash
+r!	273,532,186	0	161	exclamdown
+ct	456,628,118	0	162	cent
+Po	456,718,16	2	163	sterling
+Cs	456,636,0,2,2	0	164	currency
+Ye	456,698,0,7,7	2	165	yen
+bb	230,737,19	2	166	brokenbar
+sc	456,727,184	2	167	section
+ad	273,729	2	168	dieresis
+co	604,737,19,10,9	2	169	copyright
+Of	303,737	2	170	ordfeminine
+fo	273,484	0	171	guilsinglleft
+tno	479,419	0	172	logicalnot
+\-	479,309	0	173	minus
+rg	604,737,19,9,9	2	174	registered
+a-	273,678,0,5,5	2	175	macron
+de	328,712	2	176	degree
+t+-	479,506	0	177	plusminus
+S2	273,710	2	178	twosuperior
+S3	273,710	2	179	threesuperior
+aa	273,750,0,19	2	180	acute
+mc	501,532,207	1	181	mu
+ps	456,700,191,0,7	2	182	paragraph
+pc	228,334	0	183	periodcentered
+ac	273,0,228	1	184	cedilla
+S1	273,710	2	185	onesuperior
+Om	299,737	2	186	ordmasculine
+fc	273,484	0	187	guilsinglright
+14	684,710,19	2	188	onequarter
+12	684,710,19	2	189	onehalf
+34	684,710,19	2	190	threequarters
+r?	501,532,195	0	191	questiondown
+`A	592,936	2	192	Agrave
+'A	592,936	2	193	Aacute
+^A	592,936	2	194	Acircumflex
+~A	592,923	2	195	Atilde
+:A	592,915	2	196	Adieresis
+oA	592,962	2	197	Aring
+AE	820,718	2	198	AE
+,C	592,737,228	3	199	Ccedilla
+`E	547,936	2	200	Egrave
+'E	547,936	2	201	Eacute
+^E	547,936	2	202	Ecircumflex
+:E	547,915	2	203	Edieresis
+`I	228,936,0,0,41	2	204	Igrave
+'I	228,936,0,42	2	205	Iacute
+^I	228,936,0,31,30	2	206	Icircumflex
+:I	228,915,0,18,17	2	207	Idieresis
+-D	592,718,0,0,4	2	208	Eth
+~N	592,923	2	209	Ntilde
+`O	638,936,19	2	210	Ograve
+'O	638,936,19	2	211	Oacute
+^O	638,936,19	2	212	Ocircumflex
+~O	638,923,19	2	213	Otilde
+:O	638,915,19	2	214	Odieresis
+tmu	479,505	0	215	multiply
+/O	638,745,27	2	216	Oslash
+`U	592,936,19	2	217	Ugrave
+'U	592,936,19	2	218	Uacute
+^U	592,936,19	2	219	Ucircumflex
+:U	592,915,19	2	220	Udieresis
+'Y	547,936	2	221	Yacute
+TP	547,718	2	222	Thorn
+ss	501,731,14	2	223	germandbls
+`a	456,750,14	2	224	agrave
+'a	456,750,14	2	225	aacute
+^a	456,750,14	2	226	acircumflex
+~a	456,737,14	2	227	atilde
+:a	456,729,14	2	228	adieresis
+oa	456,776,14	2	229	aring
+ae	729,546,14	0	230	ae
+,c	456,546,228	1	231	ccedilla
+`e	456,750,14	2	232	egrave
+'e	456,750,14	2	233	eacute
+^e	456,750,14	2	234	ecircumflex
+:e	456,729,14	2	235	edieresis
+`i	228,750,0,0,41	2	236	igrave
+'i	228,750,0,42	2	237	iacute
+^i	228,750,0,31,30	2	238	icircumflex
+:i	228,729,0,18,17	2	239	idieresis
+Sd	501,737,14	2	240	eth
+~n	501,737	2	241	ntilde
+`o	501,750,14	2	242	ograve
+'o	501,750,14	2	243	oacute
+^o	501,750,14	2	244	ocircumflex
+~o	501,737,14	2	245	otilde
+:o	501,729,14	2	246	odieresis
+tdi	479,548,42	0	247	divide
+/o	501,560,29	0	248	oslash
+`u	501,750,14	2	249	ugrave
+'u	501,750,14	2	250	uacute
+^u	501,750,14	2	251	ucircumflex
+:u	501,729,14	2	252	udieresis
+'y	456,750,214	3	253	yacute
+Tp	501,718,208	3	254	thorn
+:y	456,729,214	3	255	ydieresis
+u2026	820,146	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNBI b/contrib/groff/font/devps/HNBI
index e7e8349..771dd75 100644
--- a/contrib/groff/font/devps/HNBI
+++ b/contrib/groff/font/devps/HNBI
@@ -222,246 +222,247 @@ y , -80
 y a -30
 z e 10
 charset
-ha	479,698,0,55,-57,55	2	0000	-- asciicircum
-ti	479,343,0,44,-44,44	0	0001	-- asciitilde
-vS	547,936,19,91,-16,90	2	0002	-- Scaron
-vZ	501,936,0,153,30,90	2	0003	-- Zcaron
-vs	456,750,14,98,-2,90	2	0004	-- scaron
-vz	410,750,0,121,34,90	2	0005	-- zcaron
-:Y	547,915,0,164,-87,90	2	0006	-- Ydieresis
-tm	820,718,0,139,-96,90	2	0007	-- trademark
-aq	195,718,0,118,-85,90	2	0010	-- quotesingle
-space	228	0	0040
-!	273,718,0,102,-27,90	2	0041	-- exclam
-"	389,718,0,94,-108,90	2	0042	-- quotedbl
+ha	479,698,0,55,-57,55	2	0	asciicircum
+ti	479,343,0,44,-44,44	0	1	asciitilde
+vS	547,936,19,91,-16,90	2	2	Scaron
+vZ	501,936,0,153,30,90	2	3	Zcaron
+vs	456,750,14,98,-2,90	2	4	scaron
+vz	410,750,0,121,34,90	2	5	zcaron
+:Y	547,915,0,164,-87,90	2	6	Ydieresis
+tm	820,718,0,139,-96,90	2	7	trademark
+aq	195,718,0,118,-85,90	2	8	quotesingle
+space	228	0	32	space
+!	273,718,0,102,-27,90	2	33	exclam
+"	389,718,0,94,-108,90	2	34	quotedbl
 dq	"
-#	456,698,0,122,1,90	2	0043	-- numbersign
+#	456,698,0,122,1,90	2	35	numbersign
 sh	"
-$	456,775,115,104,-5,90	2	0044	-- dollar
+$	456,775,115,104,-5,90	2	36	dollar
 Do	"
-%	729,710,19,60,-62,60	2	0045	-- percent
-&	592,718,19,58,-23,58	2	0046	-- ampersand
-'	228,718,0,119,-87,90	2	0047	-- quoteright
+%	729,710,19,60,-62,60	2	37	percent
+&	592,718,19,58,-23,58	2	38	ampersand
+'	228,718,0,119,-87,90	2	39	quoteright
 cq	"
-(	273,734,208,162,-12,90	3	0050	-- parenleft
-)	273,734,208,79,71,79	3	0051	-- parenright
-*	319,718,0,125,-70,90	2	0052	-- asterisk
-+	479,506,0,71,-17,71	0	0053	-- plus
-,	228,146,168,23,27,23	0	0054	-- comma
--	273,345,0,88,-10,88	0	0055	-- hyphen
+(	273,734,208,162,-12,90	3	40	parenleft
+)	273,734,208,79,71,79	3	41	parenright
+*	319,718,0,125,-70,90	2	42	asterisk
++	479,506,0,71,-17,71	0	43	plus
+,	228,146,168,23,27,23	0	44	comma
+-	273,345,0,88,-10,88	0	45	hyphen
 hy	"
-.	228,146,0,23,-2,23	0	0056	-- period
-/	228,737,19,205,80,90	2	0057	-- slash
+.	228,146,0,23,-2,23	0	46	period
+/	228,737,19,205,80,90	2	47	slash
 sl	"
-0	456,710,19,100,-21,90	2	0060	-- zero
-1	456,710,0,28,-92,28	2	0061	-- one
-2	456,710,0,102,29,90	2	0062	-- two
-3	456,710,19,93,-4,90	2	0063	-- three
-4	456,710,0,84,0,84	2	0064	-- four
-5	456,698,19,116,-3,90	2	0065	-- five
-6	456,710,19,101,-20,90	2	0066	-- six
-7	456,698,0,149,-52,90	2	0067	-- seven
-8	456,710,19,99,-7,90	2	0070	-- eight
-9	456,710,19,98,-14,90	2	0071	-- nine
-:	273,512,0,65,-25,65	0	0072	-- colon
-;	273,512,168,65,4,65	0	0073	-- semicolon
-<	479,514,8,108,-17,90	0	0074	-- less
-=	479,419,0,90,2,90	0	0075	-- equal
->	479,514,8,71,20,71	0	0076	-- greater
-?	501,727,0,99,-85,90	2	0077	-- question
-@	800,737,19,32,-102,32	2	0100	-- at
+0	456,710,19,100,-21,90	2	48	zero
+1	456,710,0,28,-92,28	2	49	one
+2	456,710,0,102,29,90	2	50	two
+3	456,710,19,93,-4,90	2	51	three
+4	456,710,0,84,0,84	2	52	four
+5	456,698,19,116,-3,90	2	53	five
+6	456,710,19,101,-20,90	2	54	six
+7	456,698,0,149,-52,90	2	55	seven
+8	456,710,19,99,-7,90	2	56	eight
+9	456,710,19,98,-14,90	2	57	nine
+:	273,512,0,65,-25,65	0	58	colon
+;	273,512,168,65,4,65	0	59	semicolon
+<	479,514,8,108,-17,90	0	60	less
+=	479,419,0,90,2,90	0	61	equal
+>	479,514,8,71,20,71	0	62	greater
+?	501,727,0,99,-85,90	2	63	question
+@	800,737,19,32,-102,32	2	64	at
 at	"
-A	592,718,0,34,34,34	2	0101	-- A
-B	592,718,0,84,-12,84	2	0102	-- B
-C	592,737,19,105,-38,90	2	0103	-- C
-D	592,718,0,95,-12,90	2	0104	-- D
-E	547,718,0,123,-12,90	2	0105	-- E
-F	501,718,0,155,-12,90	2	0106	-- F
-G	638,737,19,82,-39,82	2	0107	-- G
-H	592,718,0,117,-8,90	2	0110	-- H
-I	228,718,0,123,-2,90	2	0111	-- I
-J	456,718,18,116,1,90	2	0112	-- J
-K	592,718,0,161,-21,90	2	0113	-- K
-L	501,718,0,50,-12,50	2	0114	-- L
-M	683,718,0,119,-7,90	2	0115	-- M
-N	592,718,0,119,-7,90	2	0116	-- N
-O	638,737,19,87,-38,87	2	0117	-- O
-P	547,718,0,108,-12,90	2	0120	-- P
-Q	638,737,52,87,-38,87	2	0121	-- Q
-R	592,718,0,96,-12,90	2	0122	-- R
-S	547,737,19,91,-16,90	2	0123	-- S
-T	501,718,0,164,-64,90	2	0124	-- T
-U	592,718,19,117,-46,90	2	0125	-- U
-V	547,718,0,159,-91,90	2	0126	-- V
-W	774,718,0,163,-88,90	2	0127	-- W
-X	547,718,0,151,39,90	2	0130	-- X
-Y	547,718,0,164,-87,90	2	0131	-- Y
-Z	501,718,0,153,30,90	2	0132	-- Z
-[	273,722,196,156,33,90	2	0133	-- bracketleft
+A	592,718,0,34,34,34	2	65	A
+B	592,718,0,84,-12,84	2	66	B
+C	592,737,19,105,-38,90	2	67	C
+D	592,718,0,95,-12,90	2	68	D
+E	547,718,0,123,-12,90	2	69	E
+F	501,718,0,155,-12,90	2	70	F
+G	638,737,19,82,-39,82	2	71	G
+H	592,718,0,117,-8,90	2	72	H
+I	228,718,0,123,-2,90	2	73	I
+J	456,718,18,116,1,90	2	74	J
+K	592,718,0,161,-21,90	2	75	K
+L	501,718,0,50,-12,50	2	76	L
+M	683,718,0,119,-7,90	2	77	M
+N	592,718,0,119,-7,90	2	78	N
+O	638,737,19,87,-38,87	2	79	O
+P	547,718,0,108,-12,90	2	80	P
+Q	638,737,52,87,-38,87	2	81	Q
+R	592,718,0,96,-12,90	2	82	R
+S	547,737,19,91,-16,90	2	83	S
+T	501,718,0,164,-64,90	2	84	T
+U	592,718,19,117,-46,90	2	85	U
+V	547,718,0,159,-91,90	2	86	V
+W	774,718,0,163,-88,90	2	87	W
+X	547,718,0,151,39,90	2	88	X
+Y	547,718,0,164,-87,90	2	89	Y
+Z	501,718,0,153,30,90	2	90	Z
+[	273,722,196,156,33,90	2	91	bracketleft
 lB	"
-\	228,737,19,74,-51,74	2	0134	-- backslash
+\	228,737,19,74,-51,74	2	92	backslash
 rs	"
-]	273,722,196,124,64,90	2	0135	-- bracketright
+]	273,722,196,124,64,90	2	93	bracketright
 rB	"
-a^	273,750,0,164,-47,90	2	0136	-- circumflex
+a^	273,750,0,164,-47,90	2	94	circumflex
 ^	"
-_	456,0,125,37,72,37	0	0137	-- underscore
-`	228,727,0,118,-86,90	2	0140	-- quoteleft
+_	456,0,125,37,72,37	0	95	underscore
+`	228,727,0,118,-86,90	2	96	quoteleft
 oq	"
-a	456,546,14,72,5,72	0	0141	-- a
-b	501,718,14,78,0,78	2	0142	-- b
-c	456,546,14,85,-15,85	0	0143	-- c
-d	501,718,14,126,-17,90	2	0144	-- d
-e	456,546,14,80,-8,80	0	0145	-- e
-f	273,727,0,162,-21,90	2	0146	-- f
-g	501,546,217,95,19,90	1	0147	-- g
-h	501,718,0,65,-3,65	2	0150	-- h
-i	228,725,0,120,-7,90	2	0151	-- i
-j	228,725,214,120,85,90	3	0152	-- j
-k	456,718,0,143,-7,90	2	0153	-- k
-l	228,718,0,119,-7,90	2	0154	-- l
-m	729,546,0,67,-2,67	0	0155	-- m
-n	501,546,0,65,-3,65	0	0156	-- n
-o	501,546,14,76,-17,76	0	0157	-- o
-p	501,546,207,78,35,78	1	0160	-- p
-q	501,546,207,94,-16,90	1	0161	-- q
-r	319,546,0,132,-2,90	0	0162	-- r
-s	456,546,14,73,-2,73	0	0163	-- s
-t	273,676,6,123,-32,90	2	0164	-- t
-u	501,532,14,89,-30,89	0	0165	-- u
-v	456,532,0,132,-53,90	0	0166	-- v
-w	638,532,0,135,-51,90	0	0167	-- w
-x	456,532,0,125,38,90	0	0170	-- x
-y	456,532,214,129,16,90	1	0171	-- y
-z	410,532,0,118,34,90	0	0172	-- z
-lC	319,722,196,156,-27,90	2	0173	-- braceleft
+a	456,546,14,72,5,72	0	97	a
+b	501,718,14,78,0,78	2	98	b
+c	456,546,14,85,-15,85	0	99	c
+d	501,718,14,126,-17,90	2	100	d
+e	456,546,14,80,-8,80	0	101	e
+f	273,727,0,162,-21,90	2	102	f
+g	501,546,217,95,19,90	1	103	g
+h	501,718,0,65,-3,65	2	104	h
+i	228,725,0,120,-7,90	2	105	i
+j	228,725,214,120,85,90	3	106	j
+k	456,718,0,143,-7,90	2	107	k
+l	228,718,0,119,-7,90	2	108	l
+m	729,546,0,67,-2,67	0	109	m
+n	501,546,0,65,-3,65	0	110	n
+o	501,546,14,76,-17,76	0	111	o
+p	501,546,207,78,35,78	1	112	p
+q	501,546,207,94,-16,90	1	113	q
+r	319,546,0,132,-2,90	0	114	r
+s	456,546,14,73,-2,73	0	115	s
+t	273,676,6,123,-32,90	2	116	t
+u	501,532,14,89,-30,89	0	117	u
+v	456,532,0,132,-53,90	0	118	v
+w	638,532,0,135,-51,90	0	119	w
+x	456,532,0,125,38,90	0	120	x
+y	456,532,214,129,16,90	1	121	y
+z	410,532,0,118,34,90	0	122	z
+lC	319,722,196,156,-27,90	2	123	braceleft
 {	"
-ba	230,737,19,109,-16,90	2	0174	-- bar
+ba	230,737,19,109,-16,90	2	124	bar
 |	"
-rC	319,722,196,64,64,64	2	0175	-- braceright
+rC	319,722,196,64,64,64	2	125	braceright
 }	"
-a~	273,737,0,192,-42,90	2	0176	-- tilde
+a~	273,737,0,192,-42,90	2	126	tilde
 ~	"
-bq	228,127,146,16,16,16	0	0200	-- quotesinglbase
-Fo	456,484,0,62,-61,62	0	0201	-- guillemotleft
-Fc	456,484,0,37,-35,37	0	0202	-- guillemotright
-bu	287,524,0,108,-18,90	0	0203	-- bullet
-Fn	456,737,210,142,91,90	3	0204	-- florin
-f/	137,710,19,312,193,90	2	0205	-- fraction
-%0	820,710,19,81,-12,81	2	0206	-- perthousand
-dg	456,718,171,107,-47,90	2	0207	-- dagger
-dd	456,718,171,109,12,90	2	0210	-- daggerdbl
-en	456,333,0,108,10,90	0	0211	-- endash
-em	820,333,0,108,10,90	0	0212	-- emdash
-fi	501,727,0,120,-21,90	2	0214	-- fi
-fl	501,727,0,119,-21,90	2	0215	-- fl
-.i	228,532,0,86,-7,86	0	0220	-- dotlessi
-ga	273,750,0,67,-62,67	2	0222	-- grave
-a"	273,750,0,306,-63,90	2	0223	-- hungarumlaut
-a.	273,729,0,93,-142,90	2	0224	-- dotaccent
-ab	273,750,0,182,-78,90	2	0225	-- breve
-ah	273,750,0,189,-73,90	2	0226	-- caron
-ao	273,776,0,121,-114,90	2	0227	-- ring
-ho	273,0,228,0,17	1	0230	-- ogonek
-lq	410,727,0,122,-82,90	2	0231	-- quotedblleft
-rq	410,718,0,123,-82,90	2	0232	-- quotedblright
-oe	774,546,14,77,-17,77	0	0233	-- oe
-/l	228,718,0,156,17,90	2	0234	-- lslash
-Bq	410,127,146,20,21,20	0	0235	-- quotedblbase
-OE	820,737,19,143,-31,90	2	0236	-- OE
-/L	501,718,0,50,22,50	2	0237	-- Lslash
-r!	273,532,186,67,9,67	0	0241	-- exclamdown
-ct	456,628,118,85,-15,85	0	0242	-- cent
-Po	456,718,16,114,9,90	2	0243	-- sterling
-Cs	456,636,0,152,28,90	0	0244	-- currency
-Ye	456,698,0,179,1,90	2	0245	-- yen
-bb	230,737,19,109,-16,90	2	0246	-- brokenbar
-sc	456,727,184,85,0,85	2	0247	-- section
-ad	273,729,0,172,-62,90	2	0250	-- dieresis
-co	604,737,19,131,4,90	2	0251	-- copyright
-Of	303,737,0,128,-25,90	2	0252	-- ordfeminine
-fo	273,484,0,66,-56,66	0	0253	-- guilsinglleft
-no	479,419,0,90,-36,90	0	0254	-- logicalnot
-\-	479,309,0,71,-17,71	0	0255	-- minus
-rg	604,737,19,130,5,90	2	0256	-- registered
-a-	273,678,0,173,-50,90	2	0257	-- macron
-de	328,712,0,105,-93,90	2	0260	-- degree
-t+-	479,506,0,83,17,83	0	0261	-- plusminus
-S2	273,710,0,145,-7,90	2	0262	-- twosuperior
-S3	273,710,0,138,-25,90	2	0263	-- threesuperior
-aa	273,750,0,200,-144,90	2	0264	-- acute
-mc	501,532,207,89,32,89	1	0265	-- mu
-ps	456,700,191,158,-30,90	2	0266	-- paragraph
-pc	228,334,0,48,-40,48	0	0267	-- periodcentered
-ac	273,0,228,0,80	1	0270	-- cedilla
-S1	273,710,0,95,-71,90	2	0271	-- onesuperior
-Om	299,737,0,149,-25,90	2	0272	-- ordmasculine
-fc	273,484,0,41,-31,41	0	0273	-- guilsinglright
-14	684,710,19,27,-58,27	2	0274	-- onequarter
-12	684,710,19,70,-58,70	2	0275	-- onehalf
-34	684,710,19,54,-32,54	2	0276	-- threequarters
-r?	501,532,195,8,6,8	0	0277	-- questiondown
-`A	592,936,0,34,34,34	2	0300	-- Agrave
-'A	592,936,0,73,34,73	2	0301	-- Aacute
-^A	592,936,0,37,34,37	2	0302	-- Acircumflex
-~A	592,923,0,66,34,66	2	0303	-- Atilde
-:A	592,915,0,46,34,46	2	0304	-- Adieresis
-oA	592,962,0,34,34,34	2	0305	-- Aring
-AE	820,718,0,132,46,90	2	0306	-- AE
-,C	592,737,228,105,-38,90	3	0307	-- Ccedilla
-`E	547,936,0,123,-12,90	2	0310	-- Egrave
-'E	547,936,0,123,-12,90	2	0311	-- Eacute
-^E	547,936,0,123,-12,90	2	0312	-- Ecircumflex
-:E	547,915,0,123,-12,90	2	0313	-- Edieresis
-`I	228,936,0,123,-2,90	2	0314	-- Igrave
-'I	228,936,0,255,-2,90	2	0315	-- Iacute
-^I	228,936,0,219,-2,90	2	0316	-- Icircumflex
-:I	228,915,0,227,-2,90	2	0317	-- Idieresis
--D	592,718,0,95,-1,90	2	0320	-- Eth
-~N	592,923,0,119,-7,90	2	0321	-- Ntilde
-`O	638,936,19,87,-38,87	2	0322	-- Ograve
-'O	638,936,19,87,-38,87	2	0323	-- Oacute
-^O	638,936,19,87,-38,87	2	0324	-- Ocircumflex
-~O	638,923,19,87,-38,87	2	0325	-- Otilde
-:O	638,915,19,87,-38,87	2	0326	-- Odieresis
-tmu	479,505,0,91,3,90	0	0327	-- multiply
-/O	638,745,27,145,21,90	2	0330	-- Oslash
-`U	592,936,19,117,-46,90	2	0331	-- Ugrave
-'U	592,936,19,117,-46,90	2	0332	-- Uacute
-^U	592,936,19,117,-46,90	2	0333	-- Ucircumflex
-:U	592,915,19,117,-46,90	2	0334	-- Udieresis
-'Y	547,936,0,164,-87,90	2	0335	-- Yacute
-TP	547,718,0,91,-12,90	2	0336	-- Thorn
-ss	501,731,14,88,-7,88	2	0337	-- germandbls
-`a	456,750,14,72,5,72	2	0340	-- agrave
-'a	456,750,14,108,5,90	2	0341	-- aacute
-^a	456,750,14,72,5,72	2	0342	-- acircumflex
-~a	456,737,14,101,5,90	2	0343	-- atilde
-:a	456,729,14,81,5,81	2	0344	-- adieresis
-oa	456,776,14,72,5,72	2	0345	-- aring
-ae	729,546,14,78,4,78	0	0346	-- ae
-,c	456,546,228,85,-15,85	1	0347	-- ccedilla
-`e	456,750,14,80,-8,80	2	0350	-- egrave
-'e	456,750,14,108,-8,90	2	0351	-- eacute
-^e	456,750,14,80,-8,80	2	0352	-- ecircumflex
-:e	456,729,14,81,-8,81	2	0353	-- edieresis
-`i	228,750,0,90,-7,90	2	0354	-- igrave
-'i	228,750,0,222,-7,90	2	0355	-- iacute
-^i	228,750,0,186,-7,90	2	0356	-- icircumflex
-:i	228,729,0,195,-7,90	2	0357	-- idieresis
-Sd	501,737,14,98,-17,90	2	0360	-- eth
-~n	501,737,0,78,-3,78	2	0361	-- ntilde
-`o	501,750,14,76,-17,76	2	0362	-- ograve
-'o	501,750,14,86,-17,86	2	0363	-- oacute
-^o	501,750,14,76,-17,76	2	0364	-- ocircumflex
-~o	501,737,14,78,-17,78	2	0365	-- otilde
-:o	501,729,14,76,-17,76	2	0366	-- odieresis
-tdi	479,548,42,71,-17,71	0	0367	-- divide
-/o	501,560,29,124,32,90	0	0370	-- oslash
-`u	501,750,14,89,-30,89	2	0371	-- ugrave
-'u	501,750,14,89,-30,89	2	0372	-- uacute
-^u	501,750,14,89,-30,89	2	0373	-- ucircumflex
-:u	501,729,14,89,-30,89	2	0374	-- udieresis
-'y	456,750,214,129,16,90	3	0375	-- yacute
-Tp	501,718,208,78,35,78	3	0376	-- thorn
-:y	456,729,214,129,16,90	3	0377	-- ydieresis
+bq	228,127,146,16,16,16	0	128	quotesinglbase
+Fo	456,484,0,62,-61,62	0	129	guillemotleft
+Fc	456,484,0,37,-35,37	0	130	guillemotright
+bu	287,524,0,108,-18,90	0	131	bullet
+Fn	456,737,210,142,91,90	3	132	florin
+f/	137,710,19,312,193,90	2	133	fraction
+%0	820,710,19,81,-12,81	2	134	perthousand
+dg	456,718,171,107,-47,90	2	135	dagger
+dd	456,718,171,109,12,90	2	136	daggerdbl
+en	456,333,0,108,10,90	0	137	endash
+em	820,333,0,108,10,90	0	138	emdash
+fi	501,727,0,120,-21,90	2	140	fi
+fl	501,727,0,119,-21,90	2	141	fl
+.i	228,532,0,86,-7,86	0	144	dotlessi
+ga	273,750,0,67,-62,67	2	146	grave
+a"	273,750,0,306,-63,90	2	147	hungarumlaut
+a.	273,729,0,93,-142,90	2	148	dotaccent
+ab	273,750,0,182,-78,90	2	149	breve
+ah	273,750,0,189,-73,90	2	150	caron
+ao	273,776,0,121,-114,90	2	151	ring
+ho	273,0,228,0,17	1	152	ogonek
+lq	410,727,0,122,-82,90	2	153	quotedblleft
+rq	410,718,0,123,-82,90	2	154	quotedblright
+oe	774,546,14,77,-17,77	0	155	oe
+/l	228,718,0,156,17,90	2	156	lslash
+Bq	410,127,146,20,21,20	0	157	quotedblbase
+OE	820,737,19,143,-31,90	2	158	OE
+/L	501,718,0,50,22,50	2	159	Lslash
+r!	273,532,186,67,9,67	0	161	exclamdown
+ct	456,628,118,85,-15,85	0	162	cent
+Po	456,718,16,114,9,90	2	163	sterling
+Cs	456,636,0,152,28,90	0	164	currency
+Ye	456,698,0,179,1,90	2	165	yen
+bb	230,737,19,109,-16,90	2	166	brokenbar
+sc	456,727,184,85,0,85	2	167	section
+ad	273,729,0,172,-62,90	2	168	dieresis
+co	604,737,19,131,4,90	2	169	copyright
+Of	303,737,0,128,-25,90	2	170	ordfeminine
+fo	273,484,0,66,-56,66	0	171	guilsinglleft
+tno	479,419,0,90,-36,90	0	172	logicalnot
+\-	479,309,0,71,-17,71	0	173	minus
+rg	604,737,19,130,5,90	2	174	registered
+a-	273,678,0,173,-50,90	2	175	macron
+de	328,712,0,105,-93,90	2	176	degree
+t+-	479,506,0,83,17,83	0	177	plusminus
+S2	273,710,0,145,-7,90	2	178	twosuperior
+S3	273,710,0,138,-25,90	2	179	threesuperior
+aa	273,750,0,200,-144,90	2	180	acute
+mc	501,532,207,89,32,89	1	181	mu
+ps	456,700,191,158,-30,90	2	182	paragraph
+pc	228,334,0,48,-40,48	0	183	periodcentered
+ac	273,0,228,0,80	1	184	cedilla
+S1	273,710,0,95,-71,90	2	185	onesuperior
+Om	299,737,0,149,-25,90	2	186	ordmasculine
+fc	273,484,0,41,-31,41	0	187	guilsinglright
+14	684,710,19,27,-58,27	2	188	onequarter
+12	684,710,19,70,-58,70	2	189	onehalf
+34	684,710,19,54,-32,54	2	190	threequarters
+r?	501,532,195,8,6,8	0	191	questiondown
+`A	592,936,0,34,34,34	2	192	Agrave
+'A	592,936,0,73,34,73	2	193	Aacute
+^A	592,936,0,37,34,37	2	194	Acircumflex
+~A	592,923,0,66,34,66	2	195	Atilde
+:A	592,915,0,46,34,46	2	196	Adieresis
+oA	592,962,0,34,34,34	2	197	Aring
+AE	820,718,0,132,46,90	2	198	AE
+,C	592,737,228,105,-38,90	3	199	Ccedilla
+`E	547,936,0,123,-12,90	2	200	Egrave
+'E	547,936,0,123,-12,90	2	201	Eacute
+^E	547,936,0,123,-12,90	2	202	Ecircumflex
+:E	547,915,0,123,-12,90	2	203	Edieresis
+`I	228,936,0,123,-2,90	2	204	Igrave
+'I	228,936,0,255,-2,90	2	205	Iacute
+^I	228,936,0,219,-2,90	2	206	Icircumflex
+:I	228,915,0,227,-2,90	2	207	Idieresis
+-D	592,718,0,95,-1,90	2	208	Eth
+~N	592,923,0,119,-7,90	2	209	Ntilde
+`O	638,936,19,87,-38,87	2	210	Ograve
+'O	638,936,19,87,-38,87	2	211	Oacute
+^O	638,936,19,87,-38,87	2	212	Ocircumflex
+~O	638,923,19,87,-38,87	2	213	Otilde
+:O	638,915,19,87,-38,87	2	214	Odieresis
+tmu	479,505,0,91,3,90	0	215	multiply
+/O	638,745,27,145,21,90	2	216	Oslash
+`U	592,936,19,117,-46,90	2	217	Ugrave
+'U	592,936,19,117,-46,90	2	218	Uacute
+^U	592,936,19,117,-46,90	2	219	Ucircumflex
+:U	592,915,19,117,-46,90	2	220	Udieresis
+'Y	547,936,0,164,-87,90	2	221	Yacute
+TP	547,718,0,91,-12,90	2	222	Thorn
+ss	501,731,14,88,-7,88	2	223	germandbls
+`a	456,750,14,72,5,72	2	224	agrave
+'a	456,750,14,108,5,90	2	225	aacute
+^a	456,750,14,72,5,72	2	226	acircumflex
+~a	456,737,14,101,5,90	2	227	atilde
+:a	456,729,14,81,5,81	2	228	adieresis
+oa	456,776,14,72,5,72	2	229	aring
+ae	729,546,14,78,4,78	0	230	ae
+,c	456,546,228,85,-15,85	1	231	ccedilla
+`e	456,750,14,80,-8,80	2	232	egrave
+'e	456,750,14,108,-8,90	2	233	eacute
+^e	456,750,14,80,-8,80	2	234	ecircumflex
+:e	456,729,14,81,-8,81	2	235	edieresis
+`i	228,750,0,90,-7,90	2	236	igrave
+'i	228,750,0,222,-7,90	2	237	iacute
+^i	228,750,0,186,-7,90	2	238	icircumflex
+:i	228,729,0,195,-7,90	2	239	idieresis
+Sd	501,737,14,98,-17,90	2	240	eth
+~n	501,737,0,78,-3,78	2	241	ntilde
+`o	501,750,14,76,-17,76	2	242	ograve
+'o	501,750,14,86,-17,86	2	243	oacute
+^o	501,750,14,76,-17,76	2	244	ocircumflex
+~o	501,737,14,78,-17,78	2	245	otilde
+:o	501,729,14,76,-17,76	2	246	odieresis
+tdi	479,548,42,71,-17,71	0	247	divide
+/o	501,560,29,124,32,90	0	248	oslash
+`u	501,750,14,89,-30,89	2	249	ugrave
+'u	501,750,14,89,-30,89	2	250	uacute
+^u	501,750,14,89,-30,89	2	251	ucircumflex
+:u	501,729,14,89,-30,89	2	252	udieresis
+'y	456,750,214,129,16,90	3	253	yacute
+Tp	501,718,208,78,35,78	3	254	thorn
+:y	456,729,214,129,16,90	3	255	ydieresis
+u2026	820,146,0,0,-25	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNI b/contrib/groff/font/devps/HNI
index 64a5376..1c63dfe 100644
--- a/contrib/groff/font/devps/HNI
+++ b/contrib/groff/font/devps/HNI
@@ -262,246 +262,247 @@ y a -20
 z o -15
 z e -15
 charset
-ha	385,688,0,107,15,89	2	0000	-- asciicircum
-ti	479,326,0,47,-41,47	0	0001	-- asciitilde
-vS	547,929,19,87,-24,87	2	0002	-- Scaron
-vZ	501,929,0,156,31,89	2	0003	-- Zcaron
-vs	410,734,15,93,-2,89	2	0004	-- scaron
-vz	410,734,0,108,25,89	2	0005	-- zcaron
-:Y	547,901,0,164,-87,89	2	0006	-- Ydieresis
-tm	820,718,0,96,-102,89	2	0007	-- trademark
-aq	157,718,0,126,-79,89	2	0010	-- quotesingle
-space	228	0	0040
-!	228,718,0,100,-24,89	2	0041	-- exclam
-"	291,718,0,118,-88,89	2	0042	-- quotedbl
+ha	385,688,0,107,15,89	2	0	asciicircum
+ti	479,326,0,47,-41,47	0	1	asciitilde
+vS	547,929,19,87,-24,87	2	2	Scaron
+vZ	501,929,0,156,31,89	2	3	Zcaron
+vs	410,734,15,93,-2,89	2	4	scaron
+vz	410,734,0,108,25,89	2	5	zcaron
+:Y	547,901,0,164,-87,89	2	6	Ydieresis
+tm	820,718,0,96,-102,89	2	7	trademark
+aq	157,718,0,126,-79,89	2	8	quotesingle
+space	228	0	32	space
+!	228,718,0,100,-24,89	2	33	exclam
+"	291,718,0,118,-88,89	2	34	quotedbl
 dq	"
-#	456,688,0,111,-10,89	2	0043	-- numbersign
+#	456,688,0,111,-10,89	2	35	numbersign
 sh	"
-$	456,775,115,100,-7,89	2	0044	-- dollar
+$	456,775,115,100,-7,89	2	36	dollar
 Do	"
-%	729,703,19,50,-70,50	2	0045	-- percent
-&	547,718,15,33,-13,33	2	0046	-- ampersand
-'	182,718,0,122,-74,89	2	0047	-- quoteright
+%	729,703,19,50,-70,50	2	37	percent
+&	547,718,15,33,-13,33	2	38	ampersand
+'	182,718,0,122,-74,89	2	39	quoteright
 cq	"
-(	273,733,207,149,-39,89	3	0050	-- parenleft
-)	273,733,207,53,57,53	3	0051	-- parenright
-*	319,718,0,120,-85,89	2	0052	-- asterisk
-+	479,505,0,68,-20,68	0	0053	-- plus
-,	228,106,147,0,4	0	0054	-- comma
--	273,322,0,70,-27,70	0	0055	-- hyphen
+(	273,733,207,149,-39,89	3	40	parenleft
+)	273,733,207,53,57,53	3	41	parenright
+*	319,718,0,120,-85,89	2	42	asterisk
++	479,505,0,68,-20,68	0	43	plus
+,	228,106,147,0,4	0	44	comma
+-	273,322,0,70,-27,70	0	45	hyphen
 hy	"
-.	228,106,0,0,-21	0	0056	-- period
-/	228,737,19,192,67,89	2	0057	-- slash
+.	228,106,0,0,-21	0	46	period
+/	228,737,19,192,67,89	2	47	slash
 sl	"
-0	456,703,19,93,-27,89	2	0060	-- zero
-1	456,703,0,11,-120,11	2	0061	-- one
-2	456,703,0,100,29,89	2	0062	-- two
-3	456,703,19,94,-11,89	2	0063	-- three
-4	456,703,0,66,0,66	2	0064	-- four
-5	456,688,19,103,-5,89	2	0065	-- five
-6	456,703,19,98,-24,89	2	0066	-- six
-7	456,688,0,143,-62,89	2	0067	-- seven
-8	456,703,19,91,-10,89	2	0070	-- eight
-9	456,703,19,93,-17,89	2	0071	-- nine
-:	228,516,0,69,-21,69	0	0072	-- colon
-;	228,516,147,69,4,69	0	0073	-- semicolon
-<	479,495,0,97,-27,89	0	0074	-- less
-=	479,390,0,86,-2,86	0	0075	-- equal
->	479,495,0,61,9,61	0	0076	-- greater
-?	456,727,0,94,-82,89	2	0077	-- question
-@	832,737,19,9,-126,9	2	0100	-- at
+0	456,703,19,93,-27,89	2	48	zero
+1	456,703,0,11,-120,11	2	49	one
+2	456,703,0,100,29,89	2	50	two
+3	456,703,19,94,-11,89	2	51	three
+4	456,703,0,66,0,66	2	52	four
+5	456,688,19,103,-5,89	2	53	five
+6	456,703,19,98,-24,89	2	54	six
+7	456,688,0,143,-62,89	2	55	seven
+8	456,703,19,91,-10,89	2	56	eight
+9	456,703,19,93,-17,89	2	57	nine
+:	228,516,0,69,-21,69	0	58	colon
+;	228,516,147,69,4,69	0	59	semicolon
+<	479,495,0,97,-27,89	0	60	less
+=	479,390,0,86,-2,86	0	61	equal
+>	479,495,0,61,9,61	0	62	greater
+?	456,727,0,94,-82,89	2	63	question
+@	832,737,19,9,-126,9	2	64	at
 at	"
-A	547,718,0,39,39,39	2	0101	-- A
-B	547,718,0,86,-11,86	2	0102	-- B
-C	592,737,19,98,-38,89	2	0103	-- C
-D	592,718,0,84,-16,84	2	0104	-- D
-E	547,718,0,128,-21,89	2	0105	-- E
-F	501,718,0,152,-21,89	2	0106	-- F
-G	638,737,19,67,-41,67	2	0107	-- G
-H	592,718,0,113,-13,89	2	0110	-- H
-I	228,718,0,101,-25,89	2	0111	-- I
-J	410,718,19,116,11,89	2	0112	-- J
-K	547,718,0,165,-12,89	2	0113	-- K
-L	456,718,0,49,-12,49	2	0114	-- L
-M	683,718,0,116,-10,89	2	0115	-- M
-N	592,718,0,113,-12,89	2	0116	-- N
-O	638,737,19,89,-36,89	2	0117	-- O
-P	547,718,0,107,-21,89	2	0120	-- P
-Q	638,737,56,89,-36,89	2	0121	-- Q
-R	592,718,0,92,-22,89	2	0122	-- R
-S	547,737,19,87,-24,87	2	0123	-- S
-T	501,718,0,164,-72,89	2	0124	-- T
-U	592,718,19,111,-51,89	2	0125	-- U
-V	547,718,0,159,-92,89	2	0126	-- V
-W	774,718,0,162,-88,89	2	0127	-- W
-X	547,718,0,150,34,89	2	0130	-- X
-Y	547,718,0,164,-87,89	2	0131	-- Y
-Z	501,718,0,156,31,89	2	0132	-- Z
-[	228,722,196,153,33,89	2	0133	-- bracketleft
+A	547,718,0,39,39,39	2	65	A
+B	547,718,0,86,-11,86	2	66	B
+C	592,737,19,98,-38,89	2	67	C
+D	592,718,0,84,-16,84	2	68	D
+E	547,718,0,128,-21,89	2	69	E
+F	501,718,0,152,-21,89	2	70	F
+G	638,737,19,67,-41,67	2	71	G
+H	592,718,0,113,-13,89	2	72	H
+I	228,718,0,101,-25,89	2	73	I
+J	410,718,19,116,11,89	2	74	J
+K	547,718,0,165,-12,89	2	75	K
+L	456,718,0,49,-12,49	2	76	L
+M	683,718,0,116,-10,89	2	77	M
+N	592,718,0,113,-12,89	2	78	N
+O	638,737,19,89,-36,89	2	79	O
+P	547,718,0,107,-21,89	2	80	P
+Q	638,737,56,89,-36,89	2	81	Q
+R	592,718,0,92,-22,89	2	82	R
+S	547,737,19,87,-24,87	2	83	S
+T	501,718,0,164,-72,89	2	84	T
+U	592,718,19,111,-51,89	2	85	U
+V	547,718,0,159,-92,89	2	86	V
+W	774,718,0,162,-88,89	2	87	W
+X	547,718,0,150,34,89	2	88	X
+Y	547,718,0,164,-87,89	2	89	Y
+Z	501,718,0,156,31,89	2	90	Z
+[	228,722,196,153,33,89	2	91	bracketleft
 lB	"
-\	228,737,19,61,-65,61	2	0134	-- backslash
+\	228,737,19,61,-65,61	2	92	backslash
 rs	"
-]	228,722,196,124,61,89	2	0135	-- bracketright
+]	228,722,196,124,61,89	2	93	bracketright
 rB	"
-a^	273,734,0,136,-71,89	2	0136	-- circumflex
+a^	273,734,0,136,-71,89	2	94	circumflex
 ^	"
-_	456,0,125,37,72,37	0	0137	-- underscore
-`	182,725,0,133,-85,89	2	0140	-- quoteleft
+_	456,0,125,37,72,37	0	95	underscore
+`	182,725,0,133,-85,89	2	96	quoteleft
 oq	"
-a	456,538,15,52,0,52	0	0141	-- a
-b	456,718,15,73,2,73	2	0142	-- b
-c	410,538,15,94,-11,89	0	0143	-- c
-d	456,718,15,128,-19,89	2	0144	-- d
-e	456,538,15,68,-19,68	0	0145	-- e
-f	228,728,0,163,-21,89	2	0146	-- f
-g	456,538,220,94,16,89	1	0147	-- g
-h	456,718,0,64,-3,64	2	0150	-- h
-i	182,718,0,120,-5,89	2	0151	-- i
-j	182,718,210,120,99,89	3	0152	-- j
-k	410,718,0,132,-5,89	2	0153	-- k
-l	182,718,0,120,-5,89	2	0154	-- l
-m	683,538,0,66,-3,66	0	0155	-- m
-n	456,538,0,64,-3,64	0	0156	-- n
-o	456,538,14,73,-18,73	0	0157	-- o
-p	456,538,207,73,39,73	1	0160	-- p
-q	456,538,207,90,-19,89	1	0161	-- q
-r	273,538,0,142,-13,89	0	0162	-- r
-s	410,538,15,74,-2,74	0	0163	-- s
-t	228,669,7,124,-34,89	2	0164	-- t
-u	456,523,15,86,-27,86	0	0165	-- u
-v	410,523,0,135,-48,89	0	0166	-- v
-w	592,523,0,131,-53,89	0	0167	-- w
-x	410,523,0,127,41,89	0	0170	-- x
-y	410,523,214,132,38,89	1	0171	-- y
-z	410,523,0,108,25,89	0	0172	-- z
-lC	274,722,196,141,-25,89	2	0173	-- braceleft
+a	456,538,15,52,0,52	0	97	a
+b	456,718,15,73,2,73	2	98	b
+c	410,538,15,94,-11,89	0	99	c
+d	456,718,15,128,-19,89	2	100	d
+e	456,538,15,68,-19,68	0	101	e
+f	228,728,0,163,-21,89	2	102	f
+g	456,538,220,94,16,89	1	103	g
+h	456,718,0,64,-3,64	2	104	h
+i	182,718,0,120,-5,89	2	105	i
+j	182,718,210,120,99,89	3	106	j
+k	410,718,0,132,-5,89	2	107	k
+l	182,718,0,120,-5,89	2	108	l
+m	683,538,0,66,-3,66	0	109	m
+n	456,538,0,64,-3,64	0	110	n
+o	456,538,14,73,-18,73	0	111	o
+p	456,538,207,73,39,73	1	112	p
+q	456,538,207,90,-19,89	1	113	q
+r	273,538,0,142,-13,89	0	114	r
+s	410,538,15,74,-2,74	0	115	s
+t	228,669,7,124,-34,89	2	116	t
+u	456,523,15,86,-27,86	0	117	u
+v	410,523,0,135,-48,89	0	118	v
+w	592,523,0,131,-53,89	0	119	w
+x	410,523,0,127,41,89	0	120	x
+y	410,523,214,132,38,89	1	121	y
+z	410,523,0,108,25,89	0	122	z
+lC	274,722,196,141,-25,89	2	123	braceleft
 {	"
-ba	213,737,19,102,-24,89	2	0174	-- bar
+ba	213,737,19,102,-24,89	2	124	bar
 |	"
-rC	274,722,196,67,50,67	2	0175	-- braceright
+rC	274,722,196,67,50,67	2	125	braceright
 }	"
-a~	273,722,0,179,-52,89	2	0176	-- tilde
+a~	273,722,0,179,-52,89	2	126	tilde
 ~	"
-bq	182,106,149,15,33,15	0	0200	-- quotesinglbase
-Fo	456,446,0,48,-70,48	0	0201	-- guillemotleft
-Fc	456,446,0,27,-48,27	0	0202	-- guillemotright
-bu	287,517,0,102,-24,89	0	0203	-- bullet
-Fn	456,737,207,131,93,89	3	0204	-- florin
-f/	137,703,19,309,189,89	2	0205	-- fraction
-%0	820,703,19,74,-22,74	2	0206	-- perthousand
-dg	456,718,159,104,-60,89	2	0207	-- dagger
-dd	456,718,159,105,7,89	2	0210	-- daggerdbl
-en	456,313,0,104,8,89	0	0211	-- endash
-em	820,313,0,105,8,89	0	0212	-- emdash
-fi	410,728,0,121,-21,89	2	0214	-- fi
-fl	410,728,0,119,-21,89	2	0215	-- fl
-.i	228,523,0,63,-28,63	0	0220	-- dotlessi
-ga	273,734,0,53,-89,53	2	0222	-- grave
-a"	273,734,0,240,-79,89	2	0223	-- hungarumlaut
-a.	273,706,0,74,-154,74	2	0224	-- dotaccent
-ab	273,731,0,168,-87,89	2	0225	-- breve
-ah	273,734,0,161,-95,89	2	0226	-- caron
-ao	273,756,0,107,-125,89	2	0227	-- ring
-ho	273,0,225,0,15	1	0230	-- ogonek
-lq	273,725,0,155,-63,89	2	0231	-- quotedblleft
-rq	273,718,0,144,-52,89	2	0232	-- quotedblright
-oe	774,538,15,67,-18,67	0	0233	-- oe
-/l	182,718,0,152,16,89	2	0234	-- lslash
-Bq	273,106,149,37,55,37	0	0235	-- quotedblbase
-OE	820,737,19,145,-30,89	2	0236	-- OE
-/L	456,718,0,49,16,49	2	0237	-- Lslash
-r!	273,523,195,44,-13,44	0	0241	-- exclamdown
-ct	456,623,115,73,-28,73	0	0242	-- cent
-Po	456,718,16,114,10,89	2	0243	-- sterling
-Cs	456,603,0,124,1,89	0	0244	-- currency
-Ye	456,688,0,167,-17,89	2	0245	-- yen
-bb	213,737,19,102,-24,89	2	0246	-- brokenbar
-sc	456,737,191,73,-13,73	2	0247	-- section
-ad	273,706,0,140,-88,89	2	0250	-- dieresis
-co	604,737,19,133,6,89	2	0251	-- copyright
-Of	303,737,0,115,-32,89	2	0252	-- ordfeminine
-fo	273,446,0,56,-62,56	0	0253	-- guilsinglleft
-no	479,390,0,86,-37,86	0	0254	-- logicalnot
-\-	479,289,0,68,-20,68	0	0255	-- minus
-rg	604,737,19,133,6,89	2	0256	-- registered
-a-	273,684,0,161,-67,89	2	0257	-- macron
-de	328,703,0,106,-88,89	2	0260	-- degree
-t+-	479,506,0,78,18,78	0	0261	-- plusminus
-S2	273,703,0,145,-2,89	2	0262	-- twosuperior
-S3	273,703,0,135,-24,89	2	0263	-- threesuperior
-aa	273,734,0,167,-153,89	2	0264	-- acute
-mc	456,523,207,86,30,86	1	0265	-- mu
-ps	440,718,173,143,-53,89	2	0266	-- paragraph
-pc	228,315,0,33,-56,33	0	0267	-- periodcentered
-ac	273,0,225,0,48	1	0270	-- cedilla
-S1	273,703,0,82,-86,82	2	0271	-- onesuperior
-Om	299,737,0,135,-32,89	2	0272	-- ordmasculine
-fc	273,446,0,34,-41,34	0	0273	-- guilsinglright
-14	684,703,19,24,-73,24	2	0274	-- onequarter
-12	684,703,19,54,-43,54	2	0275	-- onehalf
-34	684,703,19,72,-56,72	2	0276	-- threequarters
-r?	501,525,201,0,-20	0	0277	-- questiondown
-`A	547,929,0,39,39,39	2	0300	-- Agrave
-'A	547,929,0,63,39,63	2	0301	-- Aacute
-^A	547,929,0,39,39,39	2	0302	-- Acircumflex
-~A	547,917,0,76,39,76	2	0303	-- Atilde
-:A	547,901,0,39,39,39	2	0304	-- Adieresis
-oA	547,931,0,39,39,39	2	0305	-- Aring
-AE	820,718,0,129,43,89	2	0306	-- AE
-,C	592,737,225,98,-38,89	3	0307	-- Ccedilla
-`E	547,929,0,128,-21,89	2	0310	-- Egrave
-'E	547,929,0,128,-21,89	2	0311	-- Eacute
-^E	547,929,0,128,-21,89	2	0312	-- Ecircumflex
-:E	547,901,0,128,-21,89	2	0313	-- Edieresis
-`I	228,929,0,110,-25,89	2	0314	-- Igrave
-'I	228,929,0,223,-25,89	2	0315	-- Iacute
-^I	228,929,0,193,-25,89	2	0316	-- Icircumflex
-:I	228,901,0,197,-25,89	2	0317	-- Idieresis
--D	592,718,0,84,-7,84	2	0320	-- Eth
-~N	592,917,0,113,-12,89	2	0321	-- Ntilde
-`O	638,929,19,89,-36,89	2	0322	-- Ograve
-'O	638,929,19,89,-36,89	2	0323	-- Oacute
-^O	638,929,19,89,-36,89	2	0324	-- Ocircumflex
-~O	638,917,19,89,-36,89	2	0325	-- Otilde
-:O	638,901,19,89,-36,89	2	0326	-- Odieresis
-tmu	479,506,0,97,9,89	0	0327	-- multiply
-/O	638,737,19,142,15,89	2	0330	-- Oslash
-`U	592,929,19,111,-51,89	2	0331	-- Ugrave
-'U	592,929,19,111,-51,89	2	0332	-- Uacute
-^U	592,929,19,111,-51,89	2	0333	-- Ucircumflex
-:U	592,901,19,111,-51,89	2	0334	-- Udieresis
-'Y	547,929,0,164,-87,89	2	0335	-- Yacute
-TP	547,718,0,87,-21,87	2	0336	-- Thorn
-ss	501,728,15,88,-5,88	2	0337	-- germandbls
-`a	456,734,15,52,0,52	2	0340	-- agrave
-'a	456,734,15,75,0,75	2	0341	-- aacute
-^a	456,734,15,52,0,52	2	0342	-- acircumflex
-~a	456,722,15,80,0,80	2	0343	-- atilde
-:a	456,706,15,52,0,52	2	0344	-- adieresis
-oa	456,756,15,52,0,52	2	0345	-- aring
-ae	729,538,15,67,0,67	0	0346	-- ae
-,c	410,538,225,94,-11,89	1	0347	-- ccedilla
-`e	456,734,15,68,-19,68	2	0350	-- egrave
-'e	456,734,15,75,-19,75	2	0351	-- eacute
-^e	456,734,15,68,-19,68	2	0352	-- ecircumflex
-:e	456,706,15,68,-19,68	2	0353	-- edieresis
-`i	228,734,0,76,-28,76	2	0354	-- igrave
-'i	228,734,0,189,-28,89	2	0355	-- iacute
-^i	228,734,0,159,-28,89	2	0356	-- icircumflex
-:i	228,706,0,163,-28,89	2	0357	-- idieresis
-Sd	456,737,15,100,-17,89	2	0360	-- eth
-~n	456,722,0,80,-3,80	2	0361	-- ntilde
-`o	456,734,14,73,-18,73	2	0362	-- ograve
-'o	456,734,14,75,-18,75	2	0363	-- oacute
-^o	456,734,14,73,-18,73	2	0364	-- ocircumflex
-~o	456,722,14,88,-18,88	2	0365	-- otilde
-:o	456,706,14,73,-18,73	2	0366	-- odieresis
-tdi	479,524,19,68,-20,68	0	0367	-- divide
-/o	501,545,22,80,26,80	0	0370	-- oslash
-`u	456,734,15,86,-27,86	2	0371	-- ugrave
-'u	456,734,15,86,-27,86	2	0372	-- uacute
-^u	456,734,15,86,-27,86	2	0373	-- ucircumflex
-:u	456,706,15,86,-27,86	2	0374	-- udieresis
-'y	410,734,214,132,38,89	3	0375	-- yacute
-Tp	456,718,207,73,39,73	3	0376	-- thorn
-:y	410,706,214,132,38,89	3	0377	-- ydieresis
+bq	182,106,149,15,33,15	0	128	quotesinglbase
+Fo	456,446,0,48,-70,48	0	129	guillemotleft
+Fc	456,446,0,27,-48,27	0	130	guillemotright
+bu	287,517,0,102,-24,89	0	131	bullet
+Fn	456,737,207,131,93,89	3	132	florin
+f/	137,703,19,309,189,89	2	133	fraction
+%0	820,703,19,74,-22,74	2	134	perthousand
+dg	456,718,159,104,-60,89	2	135	dagger
+dd	456,718,159,105,7,89	2	136	daggerdbl
+en	456,313,0,104,8,89	0	137	endash
+em	820,313,0,105,8,89	0	138	emdash
+fi	410,728,0,121,-21,89	2	140	fi
+fl	410,728,0,119,-21,89	2	141	fl
+.i	228,523,0,63,-28,63	0	144	dotlessi
+ga	273,734,0,53,-89,53	2	146	grave
+a"	273,734,0,240,-79,89	2	147	hungarumlaut
+a.	273,706,0,74,-154,74	2	148	dotaccent
+ab	273,731,0,168,-87,89	2	149	breve
+ah	273,734,0,161,-95,89	2	150	caron
+ao	273,756,0,107,-125,89	2	151	ring
+ho	273,0,225,0,15	1	152	ogonek
+lq	273,725,0,155,-63,89	2	153	quotedblleft
+rq	273,718,0,144,-52,89	2	154	quotedblright
+oe	774,538,15,67,-18,67	0	155	oe
+/l	182,718,0,152,16,89	2	156	lslash
+Bq	273,106,149,37,55,37	0	157	quotedblbase
+OE	820,737,19,145,-30,89	2	158	OE
+/L	456,718,0,49,16,49	2	159	Lslash
+r!	273,523,195,44,-13,44	0	161	exclamdown
+ct	456,623,115,73,-28,73	0	162	cent
+Po	456,718,16,114,10,89	2	163	sterling
+Cs	456,603,0,124,1,89	0	164	currency
+Ye	456,688,0,167,-17,89	2	165	yen
+bb	213,737,19,102,-24,89	2	166	brokenbar
+sc	456,737,191,73,-13,73	2	167	section
+ad	273,706,0,140,-88,89	2	168	dieresis
+co	604,737,19,133,6,89	2	169	copyright
+Of	303,737,0,115,-32,89	2	170	ordfeminine
+fo	273,446,0,56,-62,56	0	171	guilsinglleft
+tno	479,390,0,86,-37,86	0	172	logicalnot
+\-	479,289,0,68,-20,68	0	173	minus
+rg	604,737,19,133,6,89	2	174	registered
+a-	273,684,0,161,-67,89	2	175	macron
+de	328,703,0,106,-88,89	2	176	degree
+t+-	479,506,0,78,18,78	0	177	plusminus
+S2	273,703,0,145,-2,89	2	178	twosuperior
+S3	273,703,0,135,-24,89	2	179	threesuperior
+aa	273,734,0,167,-153,89	2	180	acute
+mc	456,523,207,86,30,86	1	181	mu
+ps	440,718,173,143,-53,89	2	182	paragraph
+pc	228,315,0,33,-56,33	0	183	periodcentered
+ac	273,0,225,0,48	1	184	cedilla
+S1	273,703,0,82,-86,82	2	185	onesuperior
+Om	299,737,0,135,-32,89	2	186	ordmasculine
+fc	273,446,0,34,-41,34	0	187	guilsinglright
+14	684,703,19,24,-73,24	2	188	onequarter
+12	684,703,19,54,-43,54	2	189	onehalf
+34	684,703,19,72,-56,72	2	190	threequarters
+r?	501,525,201,0,-20	0	191	questiondown
+`A	547,929,0,39,39,39	2	192	Agrave
+'A	547,929,0,63,39,63	2	193	Aacute
+^A	547,929,0,39,39,39	2	194	Acircumflex
+~A	547,917,0,76,39,76	2	195	Atilde
+:A	547,901,0,39,39,39	2	196	Adieresis
+oA	547,931,0,39,39,39	2	197	Aring
+AE	820,718,0,129,43,89	2	198	AE
+,C	592,737,225,98,-38,89	3	199	Ccedilla
+`E	547,929,0,128,-21,89	2	200	Egrave
+'E	547,929,0,128,-21,89	2	201	Eacute
+^E	547,929,0,128,-21,89	2	202	Ecircumflex
+:E	547,901,0,128,-21,89	2	203	Edieresis
+`I	228,929,0,110,-25,89	2	204	Igrave
+'I	228,929,0,223,-25,89	2	205	Iacute
+^I	228,929,0,193,-25,89	2	206	Icircumflex
+:I	228,901,0,197,-25,89	2	207	Idieresis
+-D	592,718,0,84,-7,84	2	208	Eth
+~N	592,917,0,113,-12,89	2	209	Ntilde
+`O	638,929,19,89,-36,89	2	210	Ograve
+'O	638,929,19,89,-36,89	2	211	Oacute
+^O	638,929,19,89,-36,89	2	212	Ocircumflex
+~O	638,917,19,89,-36,89	2	213	Otilde
+:O	638,901,19,89,-36,89	2	214	Odieresis
+tmu	479,506,0,97,9,89	0	215	multiply
+/O	638,737,19,142,15,89	2	216	Oslash
+`U	592,929,19,111,-51,89	2	217	Ugrave
+'U	592,929,19,111,-51,89	2	218	Uacute
+^U	592,929,19,111,-51,89	2	219	Ucircumflex
+:U	592,901,19,111,-51,89	2	220	Udieresis
+'Y	547,929,0,164,-87,89	2	221	Yacute
+TP	547,718,0,87,-21,87	2	222	Thorn
+ss	501,728,15,88,-5,88	2	223	germandbls
+`a	456,734,15,52,0,52	2	224	agrave
+'a	456,734,15,75,0,75	2	225	aacute
+^a	456,734,15,52,0,52	2	226	acircumflex
+~a	456,722,15,80,0,80	2	227	atilde
+:a	456,706,15,52,0,52	2	228	adieresis
+oa	456,756,15,52,0,52	2	229	aring
+ae	729,538,15,67,0,67	0	230	ae
+,c	410,538,225,94,-11,89	1	231	ccedilla
+`e	456,734,15,68,-19,68	2	232	egrave
+'e	456,734,15,75,-19,75	2	233	eacute
+^e	456,734,15,68,-19,68	2	234	ecircumflex
+:e	456,706,15,68,-19,68	2	235	edieresis
+`i	228,734,0,76,-28,76	2	236	igrave
+'i	228,734,0,189,-28,89	2	237	iacute
+^i	228,734,0,159,-28,89	2	238	icircumflex
+:i	228,706,0,163,-28,89	2	239	idieresis
+Sd	456,737,15,100,-17,89	2	240	eth
+~n	456,722,0,80,-3,80	2	241	ntilde
+`o	456,734,14,73,-18,73	2	242	ograve
+'o	456,734,14,75,-18,75	2	243	oacute
+^o	456,734,14,73,-18,73	2	244	ocircumflex
+~o	456,722,14,88,-18,88	2	245	otilde
+:o	456,706,14,73,-18,73	2	246	odieresis
+tdi	479,524,19,68,-20,68	0	247	divide
+/o	501,545,22,80,26,80	0	248	oslash
+`u	456,734,15,86,-27,86	2	249	ugrave
+'u	456,734,15,86,-27,86	2	250	uacute
+^u	456,734,15,86,-27,86	2	251	ucircumflex
+:u	456,706,15,86,-27,86	2	252	udieresis
+'y	410,734,214,132,38,89	3	253	yacute
+Tp	456,718,207,73,39,73	3	254	thorn
+:y	410,706,214,132,38,89	3	255	ydieresis
+u2026	820,106,0,0,-44	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNR b/contrib/groff/font/devps/HNR
index 15737bc..5acaac0 100644
--- a/contrib/groff/font/devps/HNR
+++ b/contrib/groff/font/devps/HNR
@@ -261,246 +261,247 @@ y a -15
 z o -11
 z e -11
 charset
-ha	385,688,0,11,11	2	0000	-- asciicircum
-ti	479,326,0,0,-50	0	0001	-- asciitilde
-vS	547,929,19,0,-40	2	0002	-- Scaron
-vZ	501,929,0,0,-19	2	0003	-- Zcaron
-vs	410,734,15,0,-26	2	0004	-- scaron
-vz	410,734,0,0,-25	2	0005	-- zcaron
-:Y	547,901,0,0,-11	2	0006	-- Ydieresis
-tm	820,718,0,0,-38	2	0007	-- trademark
-aq	157,718,0,0,-48	2	0010	-- quotesingle
-space	228	0	0040
-!	228,718,0,0,-74	2	0041	-- exclam
-"	291,718,0,0,-57	2	0042	-- quotedbl
+ha	385,688,0,11,11	2	0	asciicircum
+ti	479,326	0	1	asciitilde
+vS	547,929,19	2	2	Scaron
+vZ	501,929	2	3	Zcaron
+vs	410,734,15	2	4	scaron
+vz	410,734	2	5	zcaron
+:Y	547,901	2	6	Ydieresis
+tm	820,718	2	7	trademark
+aq	157,718	2	8	quotesingle
+space	228	0	32	space
+!	228,718	2	33	exclam
+"	291,718	2	34	quotedbl
 dq	"
-#	456,688,0,0,-23	2	0043	-- numbersign
+#	456,688	2	35	numbersign
 sh	"
-$	456,775,115,0,-26	2	0044	-- dollar
+$	456,775,115	2	36	dollar
 Do	"
-%	729,703,19,0,-32	2	0045	-- percent
-&	547,718,15,0,-36	2	0046	-- ampersand
-'	182,718,0,0,-43	2	0047	-- quoteright
+%	729,703,19	2	37	percent
+&	547,718,15	2	38	ampersand
+'	182,718	2	39	quoteright
 cq	"
-(	273,733,207,0,-56	3	0050	-- parenleft
-)	273,733,207,0,-28	3	0051	-- parenright
-*	319,718,0,0,-32	2	0052	-- asterisk
-+	479,505,0,0,-32	0	0053	-- plus
-,	228,106,147,0,-71	0	0054	-- comma
--	273,322,0,0,-36	0	0055	-- hyphen
+(	273,733,207	3	40	parenleft
+)	273,733,207	3	41	parenright
+*	319,718	2	42	asterisk
++	479,505	0	43	plus
+,	228,106,147	0	44	comma
+-	273,322	0	45	hyphen
 hy	"
-.	228,106,0,0,-71	0	0056	-- period
-/	228,737,19,14,14	2	0057	-- slash
+.	228,106	0	46	period
+/	228,737,19,14,14	2	47	slash
 sl	"
-0	456,703,19,0,-30	2	0060	-- zero
-1	456,703,0,0,-83	2	0061	-- one
-2	456,703,0,0,-21	2	0062	-- two
-3	456,703,19,0,-28	2	0063	-- three
-4	456,703,0,0,-20	2	0064	-- four
-5	456,688,19,0,-26	2	0065	-- five
-6	456,703,19,0,-31	2	0066	-- six
-7	456,688,0,0,-30	2	0067	-- seven
-8	456,703,19,0,-31	2	0070	-- eight
-9	456,703,19,0,-34	2	0071	-- nine
-:	228,516,0,0,-71	0	0072	-- colon
-;	228,516,147,0,-71	0	0073	-- semicolon
-<	479,495,0,0,-39	0	0074	-- less
-=	479,390,0,0,-32	0	0075	-- equal
->	479,495,0,0,-39	0	0076	-- greater
-?	456,727,0,0,-46	2	0077	-- question
-@	832,737,19,0,-121	2	0100	-- at
+0	456,703,19	2	48	zero
+1	456,703	2	49	one
+2	456,703	2	50	two
+3	456,703,19	2	51	three
+4	456,703	2	52	four
+5	456,688,19	2	53	five
+6	456,703,19	2	54	six
+7	456,688	2	55	seven
+8	456,703,19	2	56	eight
+9	456,703,19	2	57	nine
+:	228,516	0	58	colon
+;	228,516,147	0	59	semicolon
+<	479,495	0	60	less
+=	479,390	0	61	equal
+>	479,495	0	62	greater
+?	456,727	2	63	question
+@	832,737,19	2	64	at
 at	"
-A	547,718,0,0,-11	2	0101	-- A
-B	547,718,0,0,-61	2	0102	-- B
-C	592,737,19,0,-36	2	0103	-- C
-D	592,718,0,0,-66	2	0104	-- D
-E	547,718,0,0,-71	2	0105	-- E
-F	501,718,0,0,-71	2	0106	-- F
-G	638,737,19,0,-39	2	0107	-- G
-H	592,718,0,0,-63	2	0110	-- H
-I	228,718,0,0,-75	2	0111	-- I
-J	410,718,19,0,-14	2	0112	-- J
-K	547,718,0,0,-62	2	0113	-- K
-L	456,718,0,0,-62	2	0114	-- L
-M	683,718,0,0,-60	2	0115	-- M
-N	592,718,0,0,-62	2	0116	-- N
-O	638,737,19,0,-32	2	0117	-- O
-P	547,718,0,0,-71	2	0120	-- P
-Q	638,737,56,0,-32	2	0121	-- Q
-R	592,718,0,0,-72	2	0122	-- R
-S	547,737,19,0,-40	2	0123	-- S
-T	501,718,0,0,-11	2	0124	-- T
-U	592,718,19,0,-65	2	0125	-- U
-V	547,718,0,0,-16	2	0126	-- V
-W	774,718,0,0,-13	2	0127	-- W
-X	547,718,0,0,-16	2	0130	-- X
-Y	547,718,0,0,-11	2	0131	-- Y
-Z	501,718,0,0,-19	2	0132	-- Z
-[	228,722,196,0,-52	2	0133	-- bracketleft
+A	547,718	2	65	A
+B	547,718	2	66	B
+C	592,737,19	2	67	C
+D	592,718	2	68	D
+E	547,718	2	69	E
+F	501,718	2	70	F
+G	638,737,19	2	71	G
+H	592,718	2	72	H
+I	228,718	2	73	I
+J	410,718,19	2	74	J
+K	547,718	2	75	K
+L	456,718	2	76	L
+M	683,718	2	77	M
+N	592,718	2	78	N
+O	638,737,19	2	79	O
+P	547,718	2	80	P
+Q	638,737,56	2	81	Q
+R	592,718	2	82	R
+S	547,737,19	2	83	S
+T	501,718	2	84	T
+U	592,718,19	2	85	U
+V	547,718	2	86	V
+W	774,718	2	87	W
+X	547,718	2	88	X
+Y	547,718	2	89	Y
+Z	501,718	2	90	Z
+[	228,722,196	2	91	bracketleft
 lB	"
-\	228,737,19,14,14	2	0134	-- backslash
+\	228,737,19,14,14	2	92	backslash
 rs	"
-]	228,722,196,0,-23	2	0135	-- bracketright
+]	228,722,196	2	93	bracketright
 rB	"
-a^	273,734,0,0,-17	2	0136	-- circumflex
+a^	273,734	2	94	circumflex
 ^	"
-_	456,0,125	0	0137	-- underscore
-`	182,725,0,0,-53	2	0140	-- quoteleft
+_	456,0,125	0	95	underscore
+`	182,725	2	96	quoteleft
 oq	"
-a	456,538,15,0,-30	0	0141	-- a
-b	456,718,15,0,-48	2	0142	-- b
-c	410,538,15,0,-25	0	0143	-- c
-d	456,718,15,0,-29	2	0144	-- d
-e	456,538,15,0,-33	0	0145	-- e
-f	228,728,0,0,-11	2	0146	-- f
-g	456,538,220,0,-33	1	0147	-- g
-h	456,718,0,0,-53	2	0150	-- h
-i	182,718,0,0,-55	2	0151	-- i
-j	182,718,210,0,13	3	0152	-- j
-k	410,718,0,1,-55	2	0153	-- k
-l	182,718,0,0,-55	2	0154	-- l
-m	683,538,0,0,-53	0	0155	-- m
-n	456,538,0,0,-53	0	0156	-- n
-o	456,538,14,0,-29	0	0157	-- o
-p	456,538,207,0,-48	1	0160	-- p
-q	456,538,207,0,-29	1	0161	-- q
-r	273,538,0,0,-63	0	0162	-- r
-s	410,538,15,0,-26	0	0163	-- s
-t	228,669,7,0,-11	2	0164	-- t
-u	456,523,15,0,-56	0	0165	-- u
-v	410,523,0,0,-7	0	0166	-- v
-w	592,523,0,0,-11	0	0167	-- w
-x	410,523,0,0,-9	0	0170	-- x
-y	410,523,214,0,-9	1	0171	-- y
-z	410,523,0,0,-25	0	0172	-- z
-lC	274,722,196,0,-34	2	0173	-- braceleft
+a	456,538,15	0	97	a
+b	456,718,15	2	98	b
+c	410,538,15	0	99	c
+d	456,718,15	2	100	d
+e	456,538,15	0	101	e
+f	228,728	2	102	f
+g	456,538,220	1	103	g
+h	456,718	2	104	h
+i	182,718	2	105	i
+j	182,718,210,0,13	3	106	j
+k	410,718,0,1	2	107	k
+l	182,718	2	108	l
+m	683,538	0	109	m
+n	456,538	0	110	n
+o	456,538,14	0	111	o
+p	456,538,207	1	112	p
+q	456,538,207	1	113	q
+r	273,538	0	114	r
+s	410,538,15	0	115	s
+t	228,669,7	2	116	t
+u	456,523,15	0	117	u
+v	410,523	0	118	v
+w	592,523	0	119	w
+x	410,523	0	120	x
+y	410,523,214	1	121	y
+z	410,523	0	122	z
+lC	274,722,196	2	123	braceleft
 {	"
-ba	213,737,19,0,-77	2	0174	-- bar
+ba	213,737,19	2	124	bar
 |	"
-rC	274,722,196,0,-34	2	0175	-- braceright
+rC	274,722,196	2	125	braceright
 }	"
-a~	273,722,0,3,3	2	0176	-- tilde
+a~	273,722,0,3,3	2	126	tilde
 ~	"
-bq	182,106,149,0,-43	0	0200	-- quotesinglbase
-Fo	456,446,0,0,-80	0	0201	-- guillemotleft
-Fc	456,446,0,0,-80	0	0202	-- guillemotright
-bu	287,517,0,0,-15	0	0203	-- bullet
-Fn	456,737,207,0,9	3	0204	-- florin
-f/	137,703,19,136,136	2	0205	-- fraction
-%0	820,703,19,0,-6	2	0206	-- perthousand
-dg	456,718,159,0,-35	2	0207	-- dagger
-dd	456,718,159,0,-35	2	0210	-- daggerdbl
-en	456,313	0	0211	-- endash
-em	820,313	0	0212	-- emdash
-fi	410,728,0,0,-11	2	0214	-- fi
-fl	410,728,0,0,-11	2	0215	-- fl
-.i	228,523,0,0,-78	0	0220	-- dotlessi
-ga	273,734,0,0,-11	2	0222	-- grave
-a"	273,734,0,62,-25	2	0223	-- hungarumlaut
-a.	273,706,0,0,-99	2	0224	-- dotaccent
-ab	273,731,0,0,-11	2	0225	-- breve
-ah	273,734,0,0,-17	2	0226	-- caron
-ao	273,756,0,0,-61	2	0227	-- ring
-ho	273,0,225,0,-60	1	0230	-- ogonek
-lq	273,725,0,0,-31	2	0231	-- quotedblleft
-rq	273,718,0,0,-21	2	0232	-- quotedblright
-oe	774,538,15,0,-29	0	0233	-- oe
-/l	182,718,0,16,16	2	0234	-- lslash
-Bq	273,106,149,0,-21	0	0235	-- quotedblbase
-OE	820,737,19,0,-30	2	0236	-- OE
-/L	456,718,0,0,16	2	0237	-- Lslash
-r!	273,523,195,0,-97	0	0241	-- exclamdown
-ct	456,623,115,0,-42	0	0242	-- cent
-Po	456,718,16,0,-27	2	0243	-- sterling
-Cs	456,603,0,0,-23	0	0244	-- currency
-Ye	456,688,0,0,-2	2	0245	-- yen
-bb	213,737,19,0,-77	2	0246	-- brokenbar
-sc	456,737,191,0,-35	2	0247	-- section
-ad	273,706,0,0,-33	2	0250	-- dieresis
-co	604,737,19,13,11	2	0251	-- copyright
-Of	303,737,0,0,-20	2	0252	-- ordfeminine
-fo	273,446,0,0,-72	0	0253	-- guilsinglleft
-no	479,390,0,0,-32	0	0254	-- logicalnot
-\-	479,289,0,0,-32	0	0255	-- minus
-rg	604,737,19,13,11	2	0256	-- registered
-a-	273,684,0,0,-8	2	0257	-- macron
-de	328,703,0,0,-44	2	0260	-- degree
-t+-	479,506,0,0,-32	0	0261	-- plusminus
-S2	273,703,0,0,-3	2	0262	-- twosuperior
-S3	273,703,0,0,-4	2	0263	-- threesuperior
-aa	273,734,0,0,-100	2	0264	-- acute
-mc	456,523,207,0,-56	1	0265	-- mu
-ps	440,718,173,0,-15	2	0266	-- paragraph
-pc	228,315,0,0,-63	0	0267	-- periodcentered
-ac	273,0,225,0,-37	1	0270	-- cedilla
-S1	273,703,0,0,-35	2	0271	-- onesuperior
-Om	299,737,0,0,-20	2	0272	-- ordmasculine
-fc	273,446,0,0,-72	0	0273	-- guilsinglright
-14	684,703,19,0,-60	2	0274	-- onequarter
-12	684,703,19,0,-35	2	0275	-- onehalf
-34	684,703,19,0,-37	2	0276	-- threequarters
-r?	501,525,201,0,-75	0	0277	-- questiondown
-`A	547,929,0,0,-11	2	0300	-- Agrave
-'A	547,929,0,0,-11	2	0301	-- Aacute
-^A	547,929,0,0,-11	2	0302	-- Acircumflex
-~A	547,917,0,0,-11	2	0303	-- Atilde
-:A	547,901,0,0,-11	2	0304	-- Adieresis
-oA	547,931,0,0,-11	2	0305	-- Aring
-AE	820,718,0,0,-7	2	0306	-- AE
-,C	592,737,225,0,-36	3	0307	-- Ccedilla
-`E	547,929,0,0,-71	2	0310	-- Egrave
-'E	547,929,0,0,-71	2	0311	-- Eacute
-^E	547,929,0,0,-71	2	0312	-- Ecircumflex
-:E	547,901,0,0,-71	2	0313	-- Edieresis
-`I	228,929,0,0,11	2	0314	-- Igrave
-'I	228,929,0,11,-75	2	0315	-- Iacute
-^I	228,929,0,6,5	2	0316	-- Icircumflex
-:I	228,901,0,0,-11	2	0317	-- Idieresis
--D	592,718	2	0320	-- Eth
-~N	592,917,0,0,-62	2	0321	-- Ntilde
-`O	638,929,19,0,-32	2	0322	-- Ograve
-'O	638,929,19,0,-32	2	0323	-- Oacute
-^O	638,929,19,0,-32	2	0324	-- Ocircumflex
-~O	638,917,19,0,-32	2	0325	-- Otilde
-:O	638,901,19,0,-32	2	0326	-- Odieresis
-tmu	479,506,0,0,-32	0	0327	-- multiply
-/O	638,737,19,0,-32	2	0330	-- Oslash
-`U	592,929,19,0,-65	2	0331	-- Ugrave
-'U	592,929,19,0,-65	2	0332	-- Uacute
-^U	592,929,19,0,-65	2	0333	-- Ucircumflex
-:U	592,901,19,0,-65	2	0334	-- Udieresis
-'Y	547,929,0,0,-11	2	0335	-- Yacute
-TP	547,718,0,0,-71	2	0336	-- Thorn
-ss	501,728,15,0,-55	2	0337	-- germandbls
-`a	456,734,15,0,-30	2	0340	-- agrave
-'a	456,734,15,0,-30	2	0341	-- aacute
-^a	456,734,15,0,-30	2	0342	-- acircumflex
-~a	456,722,15,0,-30	2	0343	-- atilde
-:a	456,706,15,0,-30	2	0344	-- adieresis
-oa	456,756,15,0,-30	2	0345	-- aring
-ae	729,538,15,0,-30	0	0346	-- ae
-,c	410,538,225,0,-25	1	0347	-- ccedilla
-`e	456,734,15,0,-33	2	0350	-- egrave
-'e	456,734,15,0,-33	2	0351	-- eacute
-^e	456,734,15,0,-33	2	0352	-- ecircumflex
-:e	456,706,15,0,-33	2	0353	-- edieresis
-`i	228,734,0,0,11	2	0354	-- igrave
-'i	228,734,0,11,-78	2	0355	-- iacute
-^i	228,734,0,6,5	2	0356	-- icircumflex
-:i	228,706,0,0,-11	2	0357	-- idieresis
-Sd	456,737,15,0,-29	2	0360	-- eth
-~n	456,722,0,0,-53	2	0361	-- ntilde
-`o	456,734,14,0,-29	2	0362	-- ograve
-'o	456,734,14,0,-29	2	0363	-- oacute
-^o	456,734,14,0,-29	2	0364	-- ocircumflex
-~o	456,722,14,0,-29	2	0365	-- otilde
-:o	456,706,14,0,-29	2	0366	-- odieresis
-tdi	479,524,19,0,-32	0	0367	-- divide
-/o	501,545,22,0,-23	0	0370	-- oslash
-`u	456,734,15,0,-56	2	0371	-- ugrave
-'u	456,734,15,0,-56	2	0372	-- uacute
-^u	456,734,15,0,-56	2	0373	-- ucircumflex
-:u	456,706,15,0,-56	2	0374	-- udieresis
-'y	410,734,214,0,-9	3	0375	-- yacute
-Tp	456,718,207,0,-48	3	0376	-- thorn
-:y	410,706,214,0,-9	3	0377	-- ydieresis
+bq	182,106,149	0	128	quotesinglbase
+Fo	456,446	0	129	guillemotleft
+Fc	456,446	0	130	guillemotright
+bu	287,517	0	131	bullet
+Fn	456,737,207,0,9	3	132	florin
+f/	137,703,19,136,136	2	133	fraction
+%0	820,703,19	2	134	perthousand
+dg	456,718,159	2	135	dagger
+dd	456,718,159	2	136	daggerdbl
+en	456,313	0	137	endash
+em	820,313	0	138	emdash
+fi	410,728	2	140	fi
+fl	410,728	2	141	fl
+.i	228,523	0	144	dotlessi
+ga	273,734	2	146	grave
+a"	273,734,0,62	2	147	hungarumlaut
+a.	273,706	2	148	dotaccent
+ab	273,731	2	149	breve
+ah	273,734	2	150	caron
+ao	273,756	2	151	ring
+ho	273,0,225	1	152	ogonek
+lq	273,725	2	153	quotedblleft
+rq	273,718	2	154	quotedblright
+oe	774,538,15	0	155	oe
+/l	182,718,0,16,16	2	156	lslash
+Bq	273,106,149	0	157	quotedblbase
+OE	820,737,19	2	158	OE
+/L	456,718,0,0,16	2	159	Lslash
+r!	273,523,195	0	161	exclamdown
+ct	456,623,115	0	162	cent
+Po	456,718,16	2	163	sterling
+Cs	456,603	0	164	currency
+Ye	456,688	2	165	yen
+bb	213,737,19	2	166	brokenbar
+sc	456,737,191	2	167	section
+ad	273,706	2	168	dieresis
+co	604,737,19,13,11	2	169	copyright
+Of	303,737	2	170	ordfeminine
+fo	273,446	0	171	guilsinglleft
+tno	479,390	0	172	logicalnot
+\-	479,289	0	173	minus
+rg	604,737,19,13,11	2	174	registered
+a-	273,684	2	175	macron
+de	328,703	2	176	degree
+t+-	479,506	0	177	plusminus
+S2	273,703	2	178	twosuperior
+S3	273,703	2	179	threesuperior
+aa	273,734	2	180	acute
+mc	456,523,207	1	181	mu
+ps	440,718,173	2	182	paragraph
+pc	228,315	0	183	periodcentered
+ac	273,0,225	1	184	cedilla
+S1	273,703	2	185	onesuperior
+Om	299,737	2	186	ordmasculine
+fc	273,446	0	187	guilsinglright
+14	684,703,19	2	188	onequarter
+12	684,703,19	2	189	onehalf
+34	684,703,19	2	190	threequarters
+r?	501,525,201	0	191	questiondown
+`A	547,929	2	192	Agrave
+'A	547,929	2	193	Aacute
+^A	547,929	2	194	Acircumflex
+~A	547,917	2	195	Atilde
+:A	547,901	2	196	Adieresis
+oA	547,931	2	197	Aring
+AE	820,718	2	198	AE
+,C	592,737,225	3	199	Ccedilla
+`E	547,929	2	200	Egrave
+'E	547,929	2	201	Eacute
+^E	547,929	2	202	Ecircumflex
+:E	547,901	2	203	Edieresis
+`I	228,929,0,0,11	2	204	Igrave
+'I	228,929,0,11	2	205	Iacute
+^I	228,929,0,6,5	2	206	Icircumflex
+:I	228,901	2	207	Idieresis
+-D	592,718	2	208	Eth
+~N	592,917	2	209	Ntilde
+`O	638,929,19	2	210	Ograve
+'O	638,929,19	2	211	Oacute
+^O	638,929,19	2	212	Ocircumflex
+~O	638,917,19	2	213	Otilde
+:O	638,901,19	2	214	Odieresis
+tmu	479,506	0	215	multiply
+/O	638,737,19	2	216	Oslash
+`U	592,929,19	2	217	Ugrave
+'U	592,929,19	2	218	Uacute
+^U	592,929,19	2	219	Ucircumflex
+:U	592,901,19	2	220	Udieresis
+'Y	547,929	2	221	Yacute
+TP	547,718	2	222	Thorn
+ss	501,728,15	2	223	germandbls
+`a	456,734,15	2	224	agrave
+'a	456,734,15	2	225	aacute
+^a	456,734,15	2	226	acircumflex
+~a	456,722,15	2	227	atilde
+:a	456,706,15	2	228	adieresis
+oa	456,756,15	2	229	aring
+ae	729,538,15	0	230	ae
+,c	410,538,225	1	231	ccedilla
+`e	456,734,15	2	232	egrave
+'e	456,734,15	2	233	eacute
+^e	456,734,15	2	234	ecircumflex
+:e	456,706,15	2	235	edieresis
+`i	228,734,0,0,11	2	236	igrave
+'i	228,734,0,11	2	237	iacute
+^i	228,734,0,6,5	2	238	icircumflex
+:i	228,706	2	239	idieresis
+Sd	456,737,15	2	240	eth
+~n	456,722	2	241	ntilde
+`o	456,734,14	2	242	ograve
+'o	456,734,14	2	243	oacute
+^o	456,734,14	2	244	ocircumflex
+~o	456,722,14	2	245	otilde
+:o	456,706,14	2	246	odieresis
+tdi	479,524,19	0	247	divide
+/o	501,545,22	0	248	oslash
+`u	456,734,15	2	249	ugrave
+'u	456,734,15	2	250	uacute
+^u	456,734,15	2	251	ucircumflex
+:u	456,706,15	2	252	udieresis
+'y	410,734,214	3	253	yacute
+Tp	456,718,207	3	254	thorn
+:y	410,706,214	3	255	ydieresis
+u2026	820,106	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HR b/contrib/groff/font/devps/HR
index 45f2c0e..469f47f 100644
--- a/contrib/groff/font/devps/HR
+++ b/contrib/groff/font/devps/HR
@@ -261,246 +261,247 @@ y a -20
 z o -15
 z e -15
 charset
-ha	469,688,0,14,14	2	0000	-- asciicircum
-ti	584,326,0,0,-61	0	0001	-- asciitilde
-vS	667,929,19,0,-49	2	0002	-- Scaron
-vZ	611,929,0,0,-23	2	0003	-- Zcaron
-vs	500,734,15,0,-32	2	0004	-- scaron
-vz	500,734,0,0,-31	2	0005	-- zcaron
-:Y	667,901,0,0,-14	2	0006	-- Ydieresis
-tm	1000,718,0,0,-46	2	0007	-- trademark
-aq	191,718,0,0,-59	2	0010	-- quotesingle
-space	278	0	0040
-!	278,718,0,0,-90	2	0041	-- exclam
-"	355,718,0,0,-70	2	0042	-- quotedbl
+ha	469,688,0,14,14	2	0	asciicircum
+ti	584,326	0	1	asciitilde
+vS	667,929,19	2	2	Scaron
+vZ	611,929	2	3	Zcaron
+vs	500,734,15	2	4	scaron
+vz	500,734	2	5	zcaron
+:Y	667,901	2	6	Ydieresis
+tm	1000,718	2	7	trademark
+aq	191,718	2	8	quotesingle
+space	278	0	32	space
+!	278,718	2	33	exclam
+"	355,718	2	34	quotedbl
 dq	"
-#	556,688,0,0,-28	2	0043	-- numbersign
+#	556,688	2	35	numbersign
 sh	"
-$	556,775,115,0,-32	2	0044	-- dollar
+$	556,775,115	2	36	dollar
 Do	"
-%	889,703,19,0,-39	2	0045	-- percent
-&	667,718,15,0,-44	2	0046	-- ampersand
-'	222,718,0,0,-53	2	0047	-- quoteright
+%	889,703,19	2	37	percent
+&	667,718,15	2	38	ampersand
+'	222,718	2	39	quoteright
 cq	"
-(	333,733,207,0,-68	3	0050	-- parenleft
-)	333,733,207,0,-34	3	0051	-- parenright
-*	389,718,0,0,-39	2	0052	-- asterisk
-+	584,505,0,0,-39	0	0053	-- plus
-,	278,106,147,0,-87	0	0054	-- comma
--	333,322,0,0,-44	0	0055	-- hyphen
+(	333,733,207	3	40	parenleft
+)	333,733,207	3	41	parenright
+*	389,718	2	42	asterisk
++	584,505	0	43	plus
+,	278,106,147	0	44	comma
+-	333,322	0	45	hyphen
 hy	"
-.	278,106,0,0,-87	0	0056	-- period
-/	278,737,19,17,17	2	0057	-- slash
+.	278,106	0	46	period
+/	278,737,19,17,17	2	47	slash
 sl	"
-0	556,703,19,0,-37	2	0060	-- zero
-1	556,703,0,0,-101	2	0061	-- one
-2	556,703,0,0,-26	2	0062	-- two
-3	556,703,19,0,-34	2	0063	-- three
-4	556,703,0,0,-25	2	0064	-- four
-5	556,688,19,0,-32	2	0065	-- five
-6	556,703,19,0,-38	2	0066	-- six
-7	556,688,0,0,-37	2	0067	-- seven
-8	556,703,19,0,-38	2	0070	-- eight
-9	556,703,19,0,-42	2	0071	-- nine
-:	278,516,0,0,-87	0	0072	-- colon
-;	278,516,147,0,-87	0	0073	-- semicolon
-<	584,495,0,0,-48	0	0074	-- less
-=	584,390,0,0,-39	0	0075	-- equal
->	584,495,0,0,-48	0	0076	-- greater
-?	556,727,0,0,-56	2	0077	-- question
-@	1015,737,19,0,-147	2	0100	-- at
+0	556,703,19	2	48	zero
+1	556,703	2	49	one
+2	556,703	2	50	two
+3	556,703,19	2	51	three
+4	556,703	2	52	four
+5	556,688,19	2	53	five
+6	556,703,19	2	54	six
+7	556,688	2	55	seven
+8	556,703,19	2	56	eight
+9	556,703,19	2	57	nine
+:	278,516	0	58	colon
+;	278,516,147	0	59	semicolon
+<	584,495	0	60	less
+=	584,390	0	61	equal
+>	584,495	0	62	greater
+?	556,727	2	63	question
+@	1015,737,19	2	64	at
 at	"
-A	667,718,0,0,-14	2	0101	-- A
-B	667,718,0,0,-74	2	0102	-- B
-C	722,737,19,0,-44	2	0103	-- C
-D	722,718,0,0,-81	2	0104	-- D
-E	667,718,0,0,-86	2	0105	-- E
-F	611,718,0,0,-86	2	0106	-- F
-G	778,737,19,0,-48	2	0107	-- G
-H	722,718,0,0,-77	2	0110	-- H
-I	278,718,0,0,-91	2	0111	-- I
-J	500,718,19,0,-17	2	0112	-- J
-K	667,718,0,0,-76	2	0113	-- K
-L	556,718,0,0,-76	2	0114	-- L
-M	833,718,0,0,-73	2	0115	-- M
-N	722,718,0,0,-76	2	0116	-- N
-O	778,737,19,0,-39	2	0117	-- O
-P	667,718,0,0,-86	2	0120	-- P
-Q	778,737,56,0,-39	2	0121	-- Q
-R	722,718,0,0,-88	2	0122	-- R
-S	667,737,19,0,-49	2	0123	-- S
-T	611,718,0,0,-14	2	0124	-- T
-U	722,718,19,0,-79	2	0125	-- U
-V	667,718,0,0,-20	2	0126	-- V
-W	944,718,0,0,-16	2	0127	-- W
-X	667,718,0,0,-19	2	0130	-- X
-Y	667,718,0,0,-14	2	0131	-- Y
-Z	611,718,0,0,-23	2	0132	-- Z
-[	278,722,196,0,-63	2	0133	-- bracketleft
+A	667,718	2	65	A
+B	667,718	2	66	B
+C	722,737,19	2	67	C
+D	722,718	2	68	D
+E	667,718	2	69	E
+F	611,718	2	70	F
+G	778,737,19	2	71	G
+H	722,718	2	72	H
+I	278,718	2	73	I
+J	500,718,19	2	74	J
+K	667,718	2	75	K
+L	556,718	2	76	L
+M	833,718	2	77	M
+N	722,718	2	78	N
+O	778,737,19	2	79	O
+P	667,718	2	80	P
+Q	778,737,56	2	81	Q
+R	722,718	2	82	R
+S	667,737,19	2	83	S
+T	611,718	2	84	T
+U	722,718,19	2	85	U
+V	667,718	2	86	V
+W	944,718	2	87	W
+X	667,718	2	88	X
+Y	667,718	2	89	Y
+Z	611,718	2	90	Z
+[	278,722,196	2	91	bracketleft
 lB	"
-\	278,737,19,17,17	2	0134	-- backslash
+\	278,737,19,17,17	2	92	backslash
 rs	"
-]	278,722,196,0,-28	2	0135	-- bracketright
+]	278,722,196	2	93	bracketright
 rB	"
-a^	333,734,0,0,-21	2	0136	-- circumflex
+a^	333,734	2	94	circumflex
 ^	"
-_	556,0,125	0	0137	-- underscore
-`	222,725,0,0,-65	2	0140	-- quoteleft
+_	556,0,125	0	95	underscore
+`	222,725	2	96	quoteleft
 oq	"
-a	556,538,15,0,-36	0	0141	-- a
-b	556,718,15,0,-58	2	0142	-- b
-c	500,538,15,0,-30	0	0143	-- c
-d	556,718,15,0,-35	2	0144	-- d
-e	556,538,15,0,-40	0	0145	-- e
-f	278,728,0,0,-14	2	0146	-- f
-g	556,538,220,0,-40	1	0147	-- g
-h	556,718,0,0,-65	2	0150	-- h
-i	222,718,0,0,-67	2	0151	-- i
-j	222,718,210,0,16	3	0152	-- j
-k	500,718,0,1,-67	2	0153	-- k
-l	222,718,0,0,-67	2	0154	-- l
-m	833,538,0,0,-65	0	0155	-- m
-n	556,538,0,0,-65	0	0156	-- n
-o	556,538,14,0,-35	0	0157	-- o
-p	556,538,207,0,-58	1	0160	-- p
-q	556,538,207,0,-35	1	0161	-- q
-r	333,538,0,0,-77	0	0162	-- r
-s	500,538,15,0,-32	0	0163	-- s
-t	278,669,7,0,-14	2	0164	-- t
-u	556,523,15,0,-68	0	0165	-- u
-v	500,523,0,0,-8	0	0166	-- v
-w	722,523,0,0,-14	0	0167	-- w
-x	500,523,0,0,-11	0	0170	-- x
-y	500,523,214,0,-11	1	0171	-- y
-z	500,523,0,0,-31	0	0172	-- z
-lC	334,722,196,0,-42	2	0173	-- braceleft
+a	556,538,15	0	97	a
+b	556,718,15	2	98	b
+c	500,538,15	0	99	c
+d	556,718,15	2	100	d
+e	556,538,15	0	101	e
+f	278,728	2	102	f
+g	556,538,220	1	103	g
+h	556,718	2	104	h
+i	222,718	2	105	i
+j	222,718,210,0,16	3	106	j
+k	500,718,0,1	2	107	k
+l	222,718	2	108	l
+m	833,538	0	109	m
+n	556,538	0	110	n
+o	556,538,14	0	111	o
+p	556,538,207	1	112	p
+q	556,538,207	1	113	q
+r	333,538	0	114	r
+s	500,538,15	0	115	s
+t	278,669,7	2	116	t
+u	556,523,15	0	117	u
+v	500,523	0	118	v
+w	722,523	0	119	w
+x	500,523	0	120	x
+y	500,523,214	1	121	y
+z	500,523	0	122	z
+lC	334,722,196	2	123	braceleft
 {	"
-ba	260,737,19,0,-94	2	0174	-- bar
+ba	260,737,19	2	124	bar
 |	"
-rC	334,722,196,0,-42	2	0175	-- braceright
+rC	334,722,196	2	125	braceright
 }	"
-a~	333,722,0,4,4	2	0176	-- tilde
+a~	333,722,0,4,4	2	126	tilde
 ~	"
-bq	222,106,149,0,-53	0	0200	-- quotesinglbase
-Fo	556,446,0,0,-97	0	0201	-- guillemotleft
-Fc	556,446,0,0,-97	0	0202	-- guillemotright
-bu	350,517,0,0,-18	0	0203	-- bullet
-Fn	556,737,207,0,11	3	0204	-- florin
-f/	167,703,19,166,166	2	0205	-- fraction
-%0	1000,703,19,0,-7	2	0206	-- perthousand
-dg	556,718,159,0,-43	2	0207	-- dagger
-dd	556,718,159,0,-43	2	0210	-- daggerdbl
-en	556,313	0	0211	-- endash
-em	1000,313	0	0212	-- emdash
-fi	500,728,0,0,-14	2	0214	-- fi
-fl	500,728,0,0,-14	2	0215	-- fl
-.i	278,523,0,0,-95	0	0220	-- dotlessi
-ga	333,734,0,0,-14	2	0222	-- grave
-a"	333,734,0,76,-31	2	0223	-- hungarumlaut
-a.	333,706,0,0,-121	2	0224	-- dotaccent
-ab	333,731,0,0,-13	2	0225	-- breve
-ah	333,734,0,0,-21	2	0226	-- caron
-ao	333,756,0,0,-75	2	0227	-- ring
-ho	333,0,225,0,-73	1	0230	-- ogonek
-lq	333,725,0,0,-38	2	0231	-- quotedblleft
-rq	333,718,0,0,-26	2	0232	-- quotedblright
-oe	944,538,15,0,-35	0	0233	-- oe
-/l	222,718,0,20,20	2	0234	-- lslash
-Bq	333,106,149,0,-26	0	0235	-- quotedblbase
-OE	1000,737,19,0,-36	2	0236	-- OE
-/L	556,718,0,0,20	2	0237	-- Lslash
-r!	333,523,195,0,-118	0	0241	-- exclamdown
-ct	556,623,115,0,-51	0	0242	-- cent
-Po	556,718,16,0,-33	2	0243	-- sterling
-Cs	556,603,0,0,-28	0	0244	-- currency
-Ye	556,688,0,0,-3	2	0245	-- yen
-bb	260,737,19,0,-94	2	0246	-- brokenbar
-sc	556,737,191,0,-43	2	0247	-- section
-ad	333,706,0,0,-40	2	0250	-- dieresis
-co	737,737,19,15,14	2	0251	-- copyright
-Of	370,737,0,0,-24	2	0252	-- ordfeminine
-fo	333,446,0,0,-88	0	0253	-- guilsinglleft
-no	584,390,0,0,-39	0	0254	-- logicalnot
-\-	584,289,0,0,-39	0	0255	-- minus
-rg	737,737,19,15,14	2	0256	-- registered
-a-	333,684,0,0,-10	2	0257	-- macron
-de	400,703,0,0,-54	2	0260	-- degree
-t+-	584,506,0,0,-39	0	0261	-- plusminus
-S2	333,703,0,0,-4	2	0262	-- twosuperior
-S3	333,703,0,0,-5	2	0263	-- threesuperior
-aa	333,734,0,0,-122	2	0264	-- acute
-mc	556,523,207,0,-68	1	0265	-- mu
-ps	537,718,173,0,-18	2	0266	-- paragraph
-pc	278,315,0,0,-77	0	0267	-- periodcentered
-ac	333,0,225,0,-45	1	0270	-- cedilla
-S1	333,703,0,0,-43	2	0271	-- onesuperior
-Om	365,737,0,0,-25	2	0272	-- ordmasculine
-fc	333,446,0,0,-88	0	0273	-- guilsinglright
-14	834,703,19,0,-73	2	0274	-- onequarter
-12	834,703,19,0,-43	2	0275	-- onehalf
-34	834,703,19,0,-45	2	0276	-- threequarters
-r?	611,525,201,0,-91	0	0277	-- questiondown
-`A	667,929,0,0,-14	2	0300	-- Agrave
-'A	667,929,0,0,-14	2	0301	-- Aacute
-^A	667,929,0,0,-14	2	0302	-- Acircumflex
-~A	667,917,0,0,-14	2	0303	-- Atilde
-:A	667,901,0,0,-14	2	0304	-- Adieresis
-oA	667,931,0,0,-14	2	0305	-- Aring
-AE	1000,718,0,0,-8	2	0306	-- AE
-,C	722,737,225,0,-44	3	0307	-- Ccedilla
-`E	667,929,0,0,-86	2	0310	-- Egrave
-'E	667,929,0,0,-86	2	0311	-- Eacute
-^E	667,929,0,0,-86	2	0312	-- Ecircumflex
-:E	667,901,0,0,-86	2	0313	-- Edieresis
-`I	278,929,0,0,13	2	0314	-- Igrave
-'I	278,929,0,14,-91	2	0315	-- Iacute
-^I	278,929,0,7,6	2	0316	-- Icircumflex
-:I	278,901,0,0,-13	2	0317	-- Idieresis
--D	722,718	2	0320	-- Eth
-~N	722,917,0,0,-76	2	0321	-- Ntilde
-`O	778,929,19,0,-39	2	0322	-- Ograve
-'O	778,929,19,0,-39	2	0323	-- Oacute
-^O	778,929,19,0,-39	2	0324	-- Ocircumflex
-~O	778,917,19,0,-39	2	0325	-- Otilde
-:O	778,901,19,0,-39	2	0326	-- Odieresis
-tmu	584,506,0,0,-39	0	0327	-- multiply
-/O	778,737,19,0,-39	2	0330	-- Oslash
-`U	722,929,19,0,-79	2	0331	-- Ugrave
-'U	722,929,19,0,-79	2	0332	-- Uacute
-^U	722,929,19,0,-79	2	0333	-- Ucircumflex
-:U	722,901,19,0,-79	2	0334	-- Udieresis
-'Y	667,929,0,0,-14	2	0335	-- Yacute
-TP	667,718,0,0,-86	2	0336	-- Thorn
-ss	611,728,15,0,-67	2	0337	-- germandbls
-`a	556,734,15,0,-36	2	0340	-- agrave
-'a	556,734,15,0,-36	2	0341	-- aacute
-^a	556,734,15,0,-36	2	0342	-- acircumflex
-~a	556,722,15,0,-36	2	0343	-- atilde
-:a	556,706,15,0,-36	2	0344	-- adieresis
-oa	556,756,15,0,-36	2	0345	-- aring
-ae	889,538,15,0,-36	0	0346	-- ae
-,c	500,538,225,0,-30	1	0347	-- ccedilla
-`e	556,734,15,0,-40	2	0350	-- egrave
-'e	556,734,15,0,-40	2	0351	-- eacute
-^e	556,734,15,0,-40	2	0352	-- ecircumflex
-:e	556,706,15,0,-40	2	0353	-- edieresis
-`i	278,734,0,0,13	2	0354	-- igrave
-'i	278,734,0,14,-95	2	0355	-- iacute
-^i	278,734,0,7,6	2	0356	-- icircumflex
-:i	278,706,0,0,-13	2	0357	-- idieresis
-Sd	556,737,15,0,-35	2	0360	-- eth
-~n	556,722,0,0,-65	2	0361	-- ntilde
-`o	556,734,14,0,-35	2	0362	-- ograve
-'o	556,734,14,0,-35	2	0363	-- oacute
-^o	556,734,14,0,-35	2	0364	-- ocircumflex
-~o	556,722,14,0,-35	2	0365	-- otilde
-:o	556,706,14,0,-35	2	0366	-- odieresis
-tdi	584,524,19,0,-39	0	0367	-- divide
-/o	611,545,22,0,-28	0	0370	-- oslash
-`u	556,734,15,0,-68	2	0371	-- ugrave
-'u	556,734,15,0,-68	2	0372	-- uacute
-^u	556,734,15,0,-68	2	0373	-- ucircumflex
-:u	556,706,15,0,-68	2	0374	-- udieresis
-'y	500,734,214,0,-11	3	0375	-- yacute
-Tp	556,718,207,0,-58	3	0376	-- thorn
-:y	500,706,214,0,-11	3	0377	-- ydieresis
+bq	222,106,149	0	128	quotesinglbase
+Fo	556,446	0	129	guillemotleft
+Fc	556,446	0	130	guillemotright
+bu	350,517	0	131	bullet
+Fn	556,737,207,0,11	3	132	florin
+f/	167,703,19,166,166	2	133	fraction
+%0	1000,703,19	2	134	perthousand
+dg	556,718,159	2	135	dagger
+dd	556,718,159	2	136	daggerdbl
+en	556,313	0	137	endash
+em	1000,313	0	138	emdash
+fi	500,728	2	140	fi
+fl	500,728	2	141	fl
+.i	278,523	0	144	dotlessi
+ga	333,734	2	146	grave
+a"	333,734,0,76	2	147	hungarumlaut
+a.	333,706	2	148	dotaccent
+ab	333,731	2	149	breve
+ah	333,734	2	150	caron
+ao	333,756	2	151	ring
+ho	333,0,225	1	152	ogonek
+lq	333,725	2	153	quotedblleft
+rq	333,718	2	154	quotedblright
+oe	944,538,15	0	155	oe
+/l	222,718,0,20,20	2	156	lslash
+Bq	333,106,149	0	157	quotedblbase
+OE	1000,737,19	2	158	OE
+/L	556,718,0,0,20	2	159	Lslash
+r!	333,523,195	0	161	exclamdown
+ct	556,623,115	0	162	cent
+Po	556,718,16	2	163	sterling
+Cs	556,603	0	164	currency
+Ye	556,688	2	165	yen
+bb	260,737,19	2	166	brokenbar
+sc	556,737,191	2	167	section
+ad	333,706	2	168	dieresis
+co	737,737,19,15,14	2	169	copyright
+Of	370,737	2	170	ordfeminine
+fo	333,446	0	171	guilsinglleft
+tno	584,390	0	172	logicalnot
+\-	584,289	0	173	minus
+rg	737,737,19,15,14	2	174	registered
+a-	333,684	2	175	macron
+de	400,703	2	176	degree
+t+-	584,506	0	177	plusminus
+S2	333,703	2	178	twosuperior
+S3	333,703	2	179	threesuperior
+aa	333,734	2	180	acute
+mc	556,523,207	1	181	mu
+ps	537,718,173	2	182	paragraph
+pc	278,315	0	183	periodcentered
+ac	333,0,225	1	184	cedilla
+S1	333,703	2	185	onesuperior
+Om	365,737	2	186	ordmasculine
+fc	333,446	0	187	guilsinglright
+14	834,703,19	2	188	onequarter
+12	834,703,19	2	189	onehalf
+34	834,703,19	2	190	threequarters
+r?	611,525,201	0	191	questiondown
+`A	667,929	2	192	Agrave
+'A	667,929	2	193	Aacute
+^A	667,929	2	194	Acircumflex
+~A	667,917	2	195	Atilde
+:A	667,901	2	196	Adieresis
+oA	667,931	2	197	Aring
+AE	1000,718	2	198	AE
+,C	722,737,225	3	199	Ccedilla
+`E	667,929	2	200	Egrave
+'E	667,929	2	201	Eacute
+^E	667,929	2	202	Ecircumflex
+:E	667,901	2	203	Edieresis
+`I	278,929,0,0,13	2	204	Igrave
+'I	278,929,0,14	2	205	Iacute
+^I	278,929,0,7,6	2	206	Icircumflex
+:I	278,901	2	207	Idieresis
+-D	722,718	2	208	Eth
+~N	722,917	2	209	Ntilde
+`O	778,929,19	2	210	Ograve
+'O	778,929,19	2	211	Oacute
+^O	778,929,19	2	212	Ocircumflex
+~O	778,917,19	2	213	Otilde
+:O	778,901,19	2	214	Odieresis
+tmu	584,506	0	215	multiply
+/O	778,737,19	2	216	Oslash
+`U	722,929,19	2	217	Ugrave
+'U	722,929,19	2	218	Uacute
+^U	722,929,19	2	219	Ucircumflex
+:U	722,901,19	2	220	Udieresis
+'Y	667,929	2	221	Yacute
+TP	667,718	2	222	Thorn
+ss	611,728,15	2	223	germandbls
+`a	556,734,15	2	224	agrave
+'a	556,734,15	2	225	aacute
+^a	556,734,15	2	226	acircumflex
+~a	556,722,15	2	227	atilde
+:a	556,706,15	2	228	adieresis
+oa	556,756,15	2	229	aring
+ae	889,538,15	0	230	ae
+,c	500,538,225	1	231	ccedilla
+`e	556,734,15	2	232	egrave
+'e	556,734,15	2	233	eacute
+^e	556,734,15	2	234	ecircumflex
+:e	556,706,15	2	235	edieresis
+`i	278,734,0,0,13	2	236	igrave
+'i	278,734,0,14	2	237	iacute
+^i	278,734,0,7,6	2	238	icircumflex
+:i	278,706	2	239	idieresis
+Sd	556,737,15	2	240	eth
+~n	556,722	2	241	ntilde
+`o	556,734,14	2	242	ograve
+'o	556,734,14	2	243	oacute
+^o	556,734,14	2	244	ocircumflex
+~o	556,722,14	2	245	otilde
+:o	556,706,14	2	246	odieresis
+tdi	584,524,19	0	247	divide
+/o	611,545,22	0	248	oslash
+`u	556,734,15	2	249	ugrave
+'u	556,734,15	2	250	uacute
+^u	556,734,15	2	251	ucircumflex
+:u	556,706,15	2	252	udieresis
+'y	500,734,214	3	253	yacute
+Tp	556,718,207	3	254	thorn
+:y	500,706,214	3	255	ydieresis
+u2026	1000,106	0	256	ellipsis
diff --git a/contrib/groff/font/devps/Makefile.sub b/contrib/groff/font/devps/Makefile.sub
index 434a0ac..337ae12 100644
--- a/contrib/groff/font/devps/Makefile.sub
+++ b/contrib/groff/font/devps/Makefile.sub
@@ -2,12 +2,15 @@ DEV=ps
 DISTFILES=text.enc download \
   S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
   CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \
-  NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
+  NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI \
+  EURO freeeuro.pfa
 PSFILES=prologue symbolsl.pfa zapfdr.pfa
-DEVGENFILES=generate/Makefile generate/afmname generate/dingbats.map \
-  generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
+DEVGENFILES=generate/Makefile generate/dingbats.map \
+  generate/dingbats.rmap generate/lgreekmap \
   generate/symbolchars generate/symbolsl.afm generate/textmap
+DEVGENSCRIPTS=generate/afmname generate/symbol.sed
 DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
+DEVSCRIPTS=$(DEVGENSCRIPTS)
 
 CLEANADD=DESC $(PSFILES)
 
diff --git a/contrib/groff/font/devps/NB b/contrib/groff/font/devps/NB
index 10313f0..66c2793 100644
--- a/contrib/groff/font/devps/NB
+++ b/contrib/groff/font/devps/NB
@@ -133,246 +133,247 @@ w , -100
 y . -100
 y , -100
 charset
-ha	606,690,0,0,-66	2	0000	-- asciicircum
-ti	606,346,0,0,-72	0	0001	-- asciitilde
-vS	667,952,15,0,-51	2	0002	-- Scaron
-vZ	667,952,0,0,-28	2	0003	-- Zcaron
-vs	500,725,15,0,-48	2	0004	-- scaron
-vz	537,725,0,0,-38	2	0005	-- zcaron
-:Y	722,921,0,12,12	2	0006	-- Ydieresis
-tm	1000,722,0,0,-6	2	0007	-- trademark
-aq	241,737,0,0,-53	2	0010	-- quotesingle
-space	287	0	0040
-!	296,737,15,0,-53	2	0041	-- exclam
-"	333,737	2	0042	-- quotedbl
+ha	606,690	2	0	asciicircum
+ti	606,346	0	1	asciitilde
+vS	667,952,15	2	2	Scaron
+vZ	667,952	2	3	Zcaron
+vs	500,725,15	2	4	scaron
+vz	537,725	2	5	zcaron
+:Y	722,921,0,12,12	2	6	Ydieresis
+tm	1000,722	2	7	trademark
+aq	241,737	2	8	quotesingle
+space	287	0	32	space
+!	296,737,15	2	33	exclam
+"	333,737	2	34	quotedbl
 dq	"
-#	574,690,0,0,-36	2	0043	-- numbersign
+#	574,690	2	35	numbersign
 sh	"
-$	574,810,141,0,-25	2	0044	-- dollar
+$	574,810,141	2	36	dollar
 Do	"
-%	833,705,15,0,-14	2	0045	-- percent
-&	852,737,15,0,-34	2	0046	-- ampersand
-'	241,737,0,0,-22	2	0047	-- quoteright
+%	833,705,15	2	37	percent
+&	852,737,15	2	38	ampersand
+'	241,737	2	39	quoteright
 cq	"
-(	389,745,117,0,-77	2	0050	-- parenleft
-)	389,745,117,0,-44	2	0051	-- parenright
-*	500,737,0,0,-54	2	0052	-- asterisk
-+	606,506,0,0,-50	0	0053	-- plus
-,	278,175,184,0,-40	0	0054	-- comma
--	333,302,0,0,-42	0	0055	-- hyphen
+(	389,745,117	2	40	parenleft
+)	389,745,117	2	41	parenright
+*	500,737	2	42	asterisk
++	606,506	0	43	plus
+,	278,175,184	0	44	comma
+-	333,302	0	45	hyphen
 hy	"
-.	278,175,15,0,-44	0	0056	-- period
-/	278,737,15,42,42	2	0057	-- slash
+.	278,175,15	0	46	period
+/	278,737,15,42,42	2	47	slash
 sl	"
-0	574,705,15,0,-27	2	0060	-- zero
-1	574,705,0,0,-83	2	0061	-- one
-2	574,705,0,0,-19	2	0062	-- two
-3	574,705,15,0,-23	2	0063	-- three
-4	574,705,0,0,-19	2	0064	-- four
-5	574,705,15,0,-32	2	0065	-- five
-6	574,705,15,0,-27	2	0066	-- six
-7	574,705,15,0,-45	2	0067	-- seven
-8	574,705,15,0,-27	2	0070	-- eight
-9	574,705,15,0,-27	2	0071	-- nine
-:	278,485,15,0,-44	0	0072	-- colon
-;	278,485,184,0,-40	0	0073	-- semicolon
-<	606,515,9,0,-50	0	0074	-- less
-=	606,403,0,0,-50	0	0075	-- equal
->	606,515,9,0,-50	0	0076	-- greater
-?	500,737,15,0,-23	2	0077	-- question
-@	747,737,15,3,2	2	0100	-- at
+0	574,705,15	2	48	zero
+1	574,705	2	49	one
+2	574,705	2	50	two
+3	574,705,15	2	51	three
+4	574,705	2	52	four
+5	574,705,15	2	53	five
+6	574,705,15	2	54	six
+7	574,705,15	2	55	seven
+8	574,705,15	2	56	eight
+9	574,705,15	2	57	nine
+:	278,485,15	0	58	colon
+;	278,485,184	0	59	semicolon
+<	606,515,9	0	60	less
+=	606,403	0	61	equal
+>	606,515,9	0	62	greater
+?	500,737,15	2	63	question
+@	747,737,15,3,2	2	64	at
 at	"
-A	759,737,0,19,19	2	0101	-- A
-B	778,722,0,0,-19	2	0102	-- B
-C	778,737,15,0,-39	2	0103	-- C
-D	833,722,0,0,-19	2	0104	-- D
-E	759,722,0,0,-19	2	0105	-- E
-F	722,722,0,0,-19	2	0106	-- F
-G	833,737,15,0,-39	2	0107	-- G
-H	870,722,0,0,-19	2	0110	-- H
-I	444,722,0,0,-29	2	0111	-- I
-J	648,722,15,0,-6	2	0112	-- J
-K	815,722,0,7,-19	2	0113	-- K
-L	722,722,0,0,-19	2	0114	-- L
-M	981,722,0,0,-10	2	0115	-- M
-N	833,722,10,0,-5	2	0116	-- N
-O	833,737,15,0,-39	2	0117	-- O
-P	759,722,0,0,-24	2	0120	-- P
-Q	833,737,189,0,-39	2	0121	-- Q
-R	815,722,15,0,-19	2	0122	-- R
-S	667,737,15,0,-51	2	0123	-- S
-T	722,722,0,0,-16	2	0124	-- T
-U	833,722,15,0,-14	2	0125	-- U
-V	759,722,10,19,19	2	0126	-- V
-W	981,722,10,0,-7	2	0127	-- W
-X	722,722,0,12,12	2	0130	-- X
-Y	722,722,0,12,12	2	0131	-- Y
-Z	667,722,0,0,-28	2	0132	-- Z
-[	389,737,109,0,-84	2	0133	-- bracketleft
+A	759,737,0,19,19	2	65	A
+B	778,722	2	66	B
+C	778,737,15	2	67	C
+D	833,722	2	68	D
+E	759,722	2	69	E
+F	722,722	2	70	F
+G	833,737,15	2	71	G
+H	870,722	2	72	H
+I	444,722	2	73	I
+J	648,722,15	2	74	J
+K	815,722,0,7	2	75	K
+L	722,722	2	76	L
+M	981,722	2	77	M
+N	833,722,10	2	78	N
+O	833,737,15	2	79	O
+P	759,722	2	80	P
+Q	833,737,189	2	81	Q
+R	815,722,15	2	82	R
+S	667,737,15	2	83	S
+T	722,722	2	84	T
+U	833,722,15	2	85	U
+V	759,722,10,19,19	2	86	V
+W	981,722,10	2	87	W
+X	722,722,0,12,12	2	88	X
+Y	722,722,0,12,12	2	89	Y
+Z	667,722	2	90	Z
+[	389,737,109	2	91	bracketleft
 lB	"
-\	606,737,15,0,-122	2	0134	-- backslash
+\	606,737,15	2	92	backslash
 rs	"
-]	389,737,109,0,-50	2	0135	-- bracketright
+]	389,737,109	2	93	bracketright
 rB	"
-a^	333,725,0,11,10	2	0136	-- circumflex
+a^	333,725,0,11,10	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	241,737,0,0,-22	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	241,737	2	96	quoteleft
 oq	"
-a	611,485,15,0,-40	0	0141	-- a
-b	648,737,15,0,-4	2	0142	-- b
-c	556,485,15,0,-32	0	0143	-- c
-d	667,737,15,0,-32	2	0144	-- d
-e	574,485,15,0,-32	0	0145	-- e
-f	389,737,0,72,-11	2	0146	-- f
-g	611,535,205,12,-30	1	0147	-- g
-h	685,737,0,0,-17	2	0150	-- h
-i	370,737,0,0,-26	2	0151	-- i
-j	352,737,205,0,86	3	0152	-- j
-k	667,737,0,0,-17	2	0153	-- k
-l	352,737,0,0,-17	2	0154	-- l
-m	963,485,0,0,-17	0	0155	-- m
-n	685,485,0,0,-17	0	0156	-- n
-o	611,485,15,0,-32	0	0157	-- o
-p	667,485,205,0,-17	1	0160	-- p
-q	648,485,205,0,-32	1	0161	-- q
-r	519,485,0,0,-17	0	0162	-- r
-s	500,485,15,0,-48	0	0163	-- s
-t	426,675,15,0,-21	2	0164	-- t
-u	685,475,15,0,-17	0	0165	-- u
-v	611,475,10,0,-12	0	0166	-- v
-w	889,475,10,0,-16	0	0167	-- w
-x	611,475,0,0,-12	0	0170	-- x
-y	611,475,205,0,-12	1	0171	-- y
-z	537,475,0,0,-38	0	0172	-- z
-lC	389,737,109,0,-36	2	0173	-- braceleft
+a	611,485,15	0	97	a
+b	648,737,15	2	98	b
+c	556,485,15	0	99	c
+d	667,737,15	2	100	d
+e	574,485,15	0	101	e
+f	389,737,0,72	2	102	f
+g	611,535,205,12	1	103	g
+h	685,737	2	104	h
+i	370,737	2	105	i
+j	352,737,205,0,86	3	106	j
+k	667,737	2	107	k
+l	352,737	2	108	l
+m	963,485	0	109	m
+n	685,485	0	110	n
+o	611,485,15	0	111	o
+p	667,485,205	1	112	p
+q	648,485,205	1	113	q
+r	519,485	0	114	r
+s	500,485,15	0	115	s
+t	426,675,15	2	116	t
+u	685,475,15	0	117	u
+v	611,475,10	0	118	v
+w	889,475,10	0	119	w
+x	611,475	0	120	x
+y	611,475,205	1	121	y
+z	537,475	0	122	z
+lC	389,737,109	2	123	braceleft
 {	"
-ba	606,750,250,0,-249	3	0174	-- bar
+ba	606,750,250	3	124	bar
 |	"
-rC	389,737,109,0,-76	2	0175	-- braceright
+rC	389,737,109	2	125	braceright
 }	"
-a~	333,705,0,24,24	2	0176	-- tilde
+a~	333,705,0,24,24	2	126	tilde
 ~	"
-bq	241,175,184,0,-22	0	0200	-- quotesinglbase
-Fo	500,397,0,0,-46	0	0201	-- guillemotleft
-Fc	500,397,0,0,-46	0	0202	-- guillemotright
-bu	606,542,0,0,-122	0	0203	-- bullet
-Fn	574,737,205,0,-14	3	0204	-- florin
-f/	167,705,15,165,165	2	0205	-- fraction
-%0	1000,705,15,0,-7	2	0206	-- perthousand
-dg	500,737,101,0,-39	2	0207	-- dagger
-dd	500,737,89,0,-39	2	0210	-- daggerdbl
-en	500,292	0	0211	-- endash
-em	1000,292	0	0212	-- emdash
-fi	685,737,0,0,-11	2	0214	-- fi
-fl	685,737,0,0,-11	2	0215	-- fl
-.i	370,475,0,0,-26	0	0220	-- dotlessi
-ga	333,737,0,0,-2	2	0222	-- grave
-a"	333,737,0,98,16	2	0223	-- hungarumlaut
-a.	333,694,0,0,-95	2	0224	-- dotaccent
-ab	333,714,0,0,-9	2	0225	-- breve
-ah	333,725,0,11,10	2	0226	-- caron
-ao	333,761,0,0,-58	2	0227	-- ring
-ho	333,3,163,13,-168	0	0230	-- ogonek
-lq	481,737,0,0,-22	2	0231	-- quotedblleft
-rq	481,737,0,0,-22	2	0232	-- quotedblright
-oe	907,485,15,0,-32	0	0233	-- oe
-/l	352,737,0,0,-17	2	0234	-- lslash
-Bq	481,175,184,0,-22	0	0235	-- quotedblbase
-OE	1000,722	2	0236	-- OE
-/L	722,722,0,0,-19	2	0237	-- Lslash
-r!	296,547,205,0,-53	1	0241	-- exclamdown
-ct	574,572,102,0,-32	0	0242	-- cent
-Po	574,705,15,0,-16	2	0243	-- sterling
-Cs	574,605,0,0,-27	0	0244	-- currency
-Ye	574,690,0,10,10	2	0245	-- yen
-bb	606,675,175,0,-249	2	0246	-- brokenbar
-sc	500,737,86,0,-62	2	0247	-- section
-ad	333,694,0,12,12	2	0250	-- dieresis
-co	747,737,15,3,2	2	0251	-- copyright
-Of	367,705,0,26,-1	2	0252	-- ordfeminine
-fo	333,397,0,0,-62	0	0253	-- guilsinglleft
-no	606,403,0,0,-50	0	0254	-- logicalnot
-\-	606,307,0,0,-50	0	0255	-- minus
-rg	747,737,15,3,2	2	0256	-- registered
-a-	333,664,0,6,6	0	0257	-- macron
-de	400,705,0,0,-57	2	0260	-- degree
-t+-	606,506,0,0,-50	0	0261	-- plusminus
-S2	344,705,0,6,3	2	0262	-- twosuperior
-S3	344,705,0,11,3	2	0263	-- threesuperior
-aa	333,737,0,0,-84	2	0264	-- acute
-mc	685,475,205,0,-17	1	0265	-- mu
-ps	747,722,71,0,-96	2	0266	-- paragraph
-pc	278,372,0,0,-53	0	0267	-- periodcentered
-ac	333,0,224,0,-17	1	0270	-- cedilla
-S1	344,705,0,0,-31	2	0271	-- onesuperior
-Om	367,705,0,0,-1	2	0272	-- ordmasculine
-fc	333,397,0,0,-62	0	0273	-- guilsinglright
-14	861,705,15,0,-31	2	0274	-- onequarter
-12	861,705,15,0,-31	2	0275	-- onehalf
-34	861,705,15,0,-15	2	0276	-- threequarters
-r?	500,547,205,0,-23	1	0277	-- questiondown
-`A	759,964,0,19,19	2	0300	-- Agrave
-'A	759,964,0,19,19	2	0301	-- Aacute
-^A	759,952,0,19,19	2	0302	-- Acircumflex
-~A	759,932,0,19,19	2	0303	-- Atilde
-:A	759,921,0,19,19	2	0304	-- Adieresis
-oA	759,988,0,19,19	2	0305	-- Aring
-AE	981,722,0,0,29	2	0306	-- AE
-,C	778,737,224,0,-39	3	0307	-- Ccedilla
-`E	759,964,0,0,-19	2	0310	-- Egrave
-'E	759,964,0,0,-19	2	0311	-- Eacute
-^E	759,952,0,0,-19	2	0312	-- Ecircumflex
-:E	759,921,0,0,-19	2	0313	-- Edieresis
-`I	444,964,0,0,-29	2	0314	-- Igrave
-'I	444,964,0,0,-29	2	0315	-- Iacute
-^I	444,952,0,0,-29	2	0316	-- Icircumflex
-:I	444,921,0,0,-29	2	0317	-- Idieresis
--D	833,722,0,0,-19	2	0320	-- Eth
-~N	833,932,10,0,-5	2	0321	-- Ntilde
-`O	833,964,15,0,-39	2	0322	-- Ograve
-'O	833,964,15,0,-39	2	0323	-- Oacute
-^O	833,952,15,0,-39	2	0324	-- Ocircumflex
-~O	833,932,15,0,-39	2	0325	-- Otilde
-:O	833,921,15,0,-39	2	0326	-- Odieresis
-tmu	606,491,0,0,-65	0	0327	-- multiply
-/O	833,775,53,0,-39	2	0330	-- Oslash
-`U	833,964,15,0,-14	2	0331	-- Ugrave
-'U	833,964,15,0,-14	2	0332	-- Uacute
-^U	833,952,15,0,-14	2	0333	-- Ucircumflex
-:U	833,921,15,0,-14	2	0334	-- Udieresis
-'Y	722,964,0,12,12	2	0335	-- Yacute
-TP	759,722,0,0,-24	2	0336	-- Thorn
-ss	611,737,15,0,2	2	0337	-- germandbls
-`a	611,737,15,0,-40	2	0340	-- agrave
-'a	611,737,15,0,-40	2	0341	-- aacute
-^a	611,725,15,0,-40	2	0342	-- acircumflex
-~a	611,705,15,0,-40	2	0343	-- atilde
-:a	611,694,15,0,-40	2	0344	-- adieresis
-oa	611,761,15,0,-40	2	0345	-- aring
-ae	870,485,15,0,-32	0	0346	-- ae
-,c	556,485,224,0,-32	1	0347	-- ccedilla
-`e	574,737,15,0,-32	2	0350	-- egrave
-'e	574,737,15,0,-32	2	0351	-- eacute
-^e	574,725,15,0,-32	2	0352	-- ecircumflex
-:e	574,694,15,0,-32	2	0353	-- edieresis
-`i	370,737,0,0,-21	2	0354	-- igrave
-'i	370,737,0,0,-26	2	0355	-- iacute
-^i	370,725,0,0,-9	2	0356	-- icircumflex
-:i	370,694,0,0,-7	2	0357	-- idieresis
-Sd	611,737,15,0,-32	2	0360	-- eth
-~n	685,705,0,0,-17	2	0361	-- ntilde
-`o	611,737,15,0,-32	2	0362	-- ograve
-'o	611,737,15,0,-32	2	0363	-- oacute
-^o	611,725,15,0,-32	2	0364	-- ocircumflex
-~o	611,705,15,0,-32	2	0365	-- otilde
-:o	611,694,15,0,-32	2	0366	-- odieresis
-tdi	606,546,40,0,-50	0	0367	-- divide
-/o	611,573,103,0,-32	0	0370	-- oslash
-`u	685,737,15,0,-17	2	0371	-- ugrave
-'u	685,737,15,0,-17	2	0372	-- uacute
-^u	685,725,15,0,-17	2	0373	-- ucircumflex
-:u	685,694,15,0,-17	2	0374	-- udieresis
-'y	611,737,205,0,-12	3	0375	-- yacute
-Tp	667,737,205,0,-17	3	0376	-- thorn
-:y	611,694,205,0,-12	3	0377	-- ydieresis
+bq	241,175,184	0	128	quotesinglbase
+Fo	500,397	0	129	guillemotleft
+Fc	500,397	0	130	guillemotright
+bu	606,542	0	131	bullet
+Fn	574,737,205	3	132	florin
+f/	167,705,15,165,165	2	133	fraction
+%0	1000,705,15	2	134	perthousand
+dg	500,737,101	2	135	dagger
+dd	500,737,89	2	136	daggerdbl
+en	500,292	0	137	endash
+em	1000,292	0	138	emdash
+fi	685,737	2	140	fi
+fl	685,737	2	141	fl
+.i	370,475	0	144	dotlessi
+ga	333,737	2	146	grave
+a"	333,737,0,98,16	2	147	hungarumlaut
+a.	333,694	2	148	dotaccent
+ab	333,714	2	149	breve
+ah	333,725,0,11,10	2	150	caron
+ao	333,761	2	151	ring
+ho	333,3,163,13	0	152	ogonek
+lq	481,737	2	153	quotedblleft
+rq	481,737	2	154	quotedblright
+oe	907,485,15	0	155	oe
+/l	352,737	2	156	lslash
+Bq	481,175,184	0	157	quotedblbase
+OE	1000,722	2	158	OE
+/L	722,722	2	159	Lslash
+r!	296,547,205	1	161	exclamdown
+ct	574,572,102	0	162	cent
+Po	574,705,15	2	163	sterling
+Cs	574,605	0	164	currency
+Ye	574,690,0,10,10	2	165	yen
+bb	606,675,175	2	166	brokenbar
+sc	500,737,86	2	167	section
+ad	333,694,0,12,12	2	168	dieresis
+co	747,737,15,3,2	2	169	copyright
+Of	367,705,0,26	2	170	ordfeminine
+fo	333,397	0	171	guilsinglleft
+tno	606,403	0	172	logicalnot
+\-	606,307	0	173	minus
+rg	747,737,15,3,2	2	174	registered
+a-	333,664,0,6,6	0	175	macron
+de	400,705	2	176	degree
+t+-	606,506	0	177	plusminus
+S2	344,705,0,6,3	2	178	twosuperior
+S3	344,705,0,11,3	2	179	threesuperior
+aa	333,737	2	180	acute
+mc	685,475,205	1	181	mu
+ps	747,722,71	2	182	paragraph
+pc	278,372	0	183	periodcentered
+ac	333,0,224	1	184	cedilla
+S1	344,705	2	185	onesuperior
+Om	367,705	2	186	ordmasculine
+fc	333,397	0	187	guilsinglright
+14	861,705,15	2	188	onequarter
+12	861,705,15	2	189	onehalf
+34	861,705,15	2	190	threequarters
+r?	500,547,205	1	191	questiondown
+`A	759,964,0,19,19	2	192	Agrave
+'A	759,964,0,19,19	2	193	Aacute
+^A	759,952,0,19,19	2	194	Acircumflex
+~A	759,932,0,19,19	2	195	Atilde
+:A	759,921,0,19,19	2	196	Adieresis
+oA	759,988,0,19,19	2	197	Aring
+AE	981,722,0,0,29	2	198	AE
+,C	778,737,224	3	199	Ccedilla
+`E	759,964	2	200	Egrave
+'E	759,964	2	201	Eacute
+^E	759,952	2	202	Ecircumflex
+:E	759,921	2	203	Edieresis
+`I	444,964	2	204	Igrave
+'I	444,964	2	205	Iacute
+^I	444,952	2	206	Icircumflex
+:I	444,921	2	207	Idieresis
+-D	833,722	2	208	Eth
+~N	833,932,10	2	209	Ntilde
+`O	833,964,15	2	210	Ograve
+'O	833,964,15	2	211	Oacute
+^O	833,952,15	2	212	Ocircumflex
+~O	833,932,15	2	213	Otilde
+:O	833,921,15	2	214	Odieresis
+tmu	606,491	0	215	multiply
+/O	833,775,53	2	216	Oslash
+`U	833,964,15	2	217	Ugrave
+'U	833,964,15	2	218	Uacute
+^U	833,952,15	2	219	Ucircumflex
+:U	833,921,15	2	220	Udieresis
+'Y	722,964,0,12,12	2	221	Yacute
+TP	759,722	2	222	Thorn
+ss	611,737,15,0,2	2	223	germandbls
+`a	611,737,15	2	224	agrave
+'a	611,737,15	2	225	aacute
+^a	611,725,15	2	226	acircumflex
+~a	611,705,15	2	227	atilde
+:a	611,694,15	2	228	adieresis
+oa	611,761,15	2	229	aring
+ae	870,485,15	0	230	ae
+,c	556,485,224	1	231	ccedilla
+`e	574,737,15	2	232	egrave
+'e	574,737,15	2	233	eacute
+^e	574,725,15	2	234	ecircumflex
+:e	574,694,15	2	235	edieresis
+`i	370,737	2	236	igrave
+'i	370,737	2	237	iacute
+^i	370,725	2	238	icircumflex
+:i	370,694	2	239	idieresis
+Sd	611,737,15	2	240	eth
+~n	685,705	2	241	ntilde
+`o	611,737,15	2	242	ograve
+'o	611,737,15	2	243	oacute
+^o	611,725,15	2	244	ocircumflex
+~o	611,705,15	2	245	otilde
+:o	611,694,15	2	246	odieresis
+tdi	606,546,40	0	247	divide
+/o	611,573,103	0	248	oslash
+`u	685,737,15	2	249	ugrave
+'u	685,737,15	2	250	uacute
+^u	685,725,15	2	251	ucircumflex
+:u	685,694,15	2	252	udieresis
+'y	611,737,205	3	253	yacute
+Tp	667,737,205	3	254	thorn
+:y	611,694,205	3	255	ydieresis
+u2026	1000,175,15	0	256	ellipsis
diff --git a/contrib/groff/font/devps/NBI b/contrib/groff/font/devps/NBI
index d6ecc03..e633e6e 100644
--- a/contrib/groff/font/devps/NBI
+++ b/contrib/groff/font/devps/NBI
@@ -253,246 +253,247 @@ y , -25
 y a 8
 z e 4
 charset
-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,50,50,50	2	0041	-- exclam
-"	400,737,0,78,-16,78	2	0042	-- quotedbl
+ha	606,690,0,0,-16	2	0	asciicircum
+ti	606,346,0,0,-22	0	1	asciitilde
+vS	685,930,15,31,49,31	2	2	Scaron
+vZ	704,930,0,57,83,57	2	3	Zcaron
+vs	481,705,15,46,50,46	2	4	scaron
+vz	519,695,15,4,69,4	2	5	zcaron
+:Y	704,915,0,121,37,109	2	6	Ydieresis
+tm	950,722,0,117,8,109	2	7	trademark
+aq	287,737,0,13,-62,13	2	8	quotesingle
+space	287	0	32	space
+!	333,737,15,50,50,50	2	33	exclam
+"	400,737,0,78,-16,78	2	34	quotedbl
 dq	"
-#	574,690,0,20,20,20	2	0043	-- numbersign
+#	574,690,0,20,20,20	2	35	numbersign
 sh	"
-$	574,810,120,41,41,41	2	0044	-- dollar
+$	574,810,120,41,41,41	2	36	dollar
 Do	"
-%	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
+%	889,727,28,0,-4	2	37	percent
+&	889,737,15,0,18	2	38	ampersand
+'	259,737,0,66,2,66	2	39	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
+(	407,745,117,97,-22,97	2	40	parenleft
+)	407,745,117,0,120	2	41	parenright
+*	500,737,0,48,-8,48	2	42	asterisk
++	606,506	0	43	plus
+,	287,157,192,0,107	0	44	comma
+-	333,299,0,0,48	0	45	hyphen
 hy	"
-.	287,157,15,0,70	0	0056	-- period
-/	278,737,15,92,91,92	2	0057	-- slash
+.	287,157,15,0,70	0	46	period
+/	278,737,15,92,91,92	2	47	slash
 sl	"
-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
+0	574,705,15,29,29,29	2	48	zero
+1	574,705,0,0,25	2	49	one
+2	574,705,3,14,88,14	2	50	two
+3	574,705,15,12,57,12	2	51	three
+4	574,705,0,20,63,20	2	52	four
+5	574,705,15,50,50,50	2	53	five
+6	574,705,15,50,19,50	2	54	six
+7	574,705,15,69,-14,69	2	55	seven
+8	574,705,15,28,50,28	2	56	eight
+9	574,705,15,19,50,19	2	57	nine
+:	287,477,15,0,70	0	58	colon
+;	287,477,192,0,107	0	59	semicolon
+<	606,515,9	0	60	less
+=	606,403	0	61	equal
+>	606,514,8	0	62	greater
+?	481,737,15,20,-29,20	2	63	question
+@	747,737,15,54,54,54	2	64	at
 at	"
-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
+A	741,737,0,25,125,25	2	65	A
+B	759,722,0,12,100,12	2	66	B
+C	759,737,15,50,13,50	2	67	C
+D	833,722,0,13,97,13	2	68	D
+E	741,722,0,39,91,39	2	69	E
+F	704,722,0,76,91,76	2	70	F
+G	815,737,15,40,13,40	2	71	G
+H	870,722,0,91,91,91	2	72	H
+I	444,722,0,91,91,91	2	73	I
+J	667,722,15,91,70,91	2	74	J
+K	778,722,0,104,91,104	2	75	K
+L	704,722,0,16,91,16	2	76	L
+M	944,722,0,94,94,94	2	77	M
+N	852,722,10,111,111,109	2	78	N
+O	833,737,15,13,13,13	2	79	O
+P	741,722,0,39,91,39	2	80	P
+Q	833,737,189,13,13,13	2	81	Q
+R	796,722,15,3,91,3	2	82	R
+S	685,737,15,31,49,31	2	83	S
+T	722,722,0,87,9,87	2	84	T
+U	833,722,15,117,-38,109	2	85	U
+V	741,722,10,111,18,109	2	86	V
+W	944,722,10,106,10,106	2	87	W
+X	741,722,0,110,132,109	2	88	X
+Y	704,722,0,121,37,109	2	89	Y
+Z	704,722,0,57,83,57	2	90	Z
+[	407,737,109,107,49,107	2	91	bracketleft
 lB	"
-\	606,737,15,0,-111	2	0134	-- backslash
+\	606,737,15,0,-111	2	92	backslash
 rs	"
-]	407,737,109,5,151,5	2	0135	-- bracketright
+]	407,737,109,5,151,5	2	93	bracketright
 rB	"
-a^	333,705,0,82,27,82	2	0136	-- circumflex
+a^	333,705,0,82,27,82	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	259,737,0,65,3,65	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	259,737,0,65,3,65	2	96	quoteleft
 oq	"
-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
+a	667,477,15,19,44,19	0	97	a
+b	611,737,15,0,21	2	98	b
+c	537,477,15,0,50	0	99	c
+d	667,737,15,43,50,43	2	100	d
+e	519,477,15,10,50,10	0	101	e
+f	389,737,205,211,98,109	3	102	f
+g	611,528,205,43,113,43	1	103	g
+h	685,737,15,4,50,4	2	104	h
+i	389,737,15,6,18,6	2	105	i
+j	370,737,205,27,255,27	3	106	j
+k	648,737,15,0,61	2	107	k
+l	389,737,15,36,18,36	2	108	l
+m	944,477,15,15,50,15	0	109	m
+n	685,477,15,4,50,4	0	110	n
+o	574,477,15,6,50,6	0	111	o
+p	648,477,205,0,169	1	112	p
+q	630,477,205,7,50,7	1	113	q
+r	519,486,0,58,50,58	0	114	r
+s	481,477,15,4,50,4	0	115	s
+t	407,650,15,46,26,46	2	116	t
+u	685,477,15,0,20	0	117	u
+v	556,477,15,0,20	0	118	v
+w	833,477,15,0,20	0	119	w
+x	574,477,15,50,96,50	0	120	x
+y	519,477,205,24,116,24	1	121	y
+z	519,477,15,4,69,4	0	122	z
+lC	407,737,109,51,-2,51	2	123	braceleft
 {	"
-ba	606,750,250,0,-199	3	0174	-- bar
+ba	606,750,250,0,-199	3	124	bar
 |	"
-rC	407,737,109,0,75	2	0175	-- braceright
+rC	407,737,109,0,75	2	125	braceright
 }	"
-a~	333,690,0,115,22,109	2	0176	-- tilde
+a~	333,690,0,115,22,109	2	126	tilde
 ~	"
-bq	259,157,192,0,107	0	0200	-- quotesinglbase
-Fo	481,407,0,18,85,18	0	0201	-- guillemotleft
-Fc	481,407,0,22,81,22	0	0202	-- guillemotright
-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
-ct	574,578,144,0,20	0	0242	-- cent
-Po	574,705,15,42,68,42	2	0243	-- sterling
-Cs	574,605,0,23,23,23	0	0244	-- currency
-Ye	574,690,0,105,33,105	2	0245	-- yen
-bb	606,675,175,0,-199	2	0246	-- brokenbar
-sc	500,737,146,65,80,65	2	0247	-- section
-ad	333,690,0,110,17,109	2	0250	-- dieresis
-co	747,737,15,53,52,53	2	0251	-- copyright
-Of	412,705,0,98,3,98	2	0252	-- ordfeminine
-fo	278,407,0,16,75,16	0	0253	-- guilsinglleft
-no	606,403	0	0254	-- logicalnot
-\-	606,307	0	0255	-- minus
-rg	747,737,15,53,52,53	2	0256	-- registered
-a-	333,649,0,121,3,109	2	0257	-- macron
-de	400,705,0,22,-36,22	2	0260	-- degree
-t+-	606,506	0	0261	-- plusminus
-S2	344,705,0,68,67,68	2	0262	-- twosuperior
-S3	344,705,0,67,47,67	2	0263	-- threesuperior
-aa	333,722,0,89,-73,89	2	0264	-- acute
-mc	685,477,205,0,139	1	0265	-- mu
-ps	650,722,131,81,25,81	2	0266	-- paragraph
-pc	287,372,0,0,-7	0	0267	-- periodcentered
-ac	333,3,220,0,71	1	0270	-- cedilla
-S1	344,705,0,32,31,32	2	0271	-- onesuperior
-Om	356,705,0,88,8,88	2	0272	-- ordmasculine
-fc	278,407,0,15,76,15	0	0273	-- guilsinglright
-14	861,705,15,0,33	2	0274	-- onequarter
-12	861,705,15,0,33	2	0275	-- onehalf
-34	861,705,15,0,15	2	0276	-- threequarters
-r?	481,547,205,0,50	1	0277	-- questiondown
-`A	741,947,0,25,125,25	2	0300	-- Agrave
-'A	741,947,0,25,125,25	2	0301	-- Aacute
-^A	741,930,0,25,125,25	2	0302	-- Acircumflex
-~A	741,915,0,25,125,25	2	0303	-- Atilde
-:A	741,915,0,25,125,25	2	0304	-- Adieresis
-oA	741,991,0,25,125,25	2	0305	-- Aring
-AE	889,722,0,76,136,76	2	0306	-- AE
-,C	759,737,220,50,13,50	3	0307	-- Ccedilla
-`E	741,947,0,39,91,39	2	0310	-- Egrave
-'E	741,947,0,39,91,39	2	0311	-- Eacute
-^E	741,930,0,39,91,39	2	0312	-- Ecircumflex
-:E	741,915,0,39,91,39	2	0313	-- Edieresis
-`I	444,947,0,91,91,91	2	0314	-- Igrave
-'I	444,947,0,94,91,94	2	0315	-- Iacute
-^I	444,930,0,91,91,91	2	0316	-- Icircumflex
-:I	444,915,0,115,91,109	2	0317	-- Idieresis
--D	833,722,0,13,97,13	2	0320	-- Eth
-~N	852,915,10,111,111,109	2	0321	-- Ntilde
-`O	833,947,15,13,13,13	2	0322	-- Ograve
-'O	833,947,15,13,13,13	2	0323	-- Oacute
-^O	833,930,15,13,13,13	2	0324	-- Ocircumflex
-~O	833,915,15,13,13,13	2	0325	-- Otilde
-:O	833,915,15,13,13,13	2	0326	-- Odieresis
-tmu	606,491,0,0,-15	0	0327	-- multiply
-/O	833,790,68,15,15,15	2	0330	-- Oslash
-`U	833,947,15,117,-38,109	2	0331	-- Ugrave
-'U	833,947,15,117,-38,109	2	0332	-- Uacute
-^U	833,930,15,117,-38,109	2	0333	-- Ucircumflex
-:U	833,915,15,117,-38,109	2	0334	-- Udieresis
-'Y	704,947,0,121,37,109	2	0335	-- Yacute
-TP	741,722,0,0,91	2	0336	-- Thorn
-ss	574,737,205,16,141,16	3	0337	-- germandbls
-`a	667,722,15,19,44,19	2	0340	-- agrave
-'a	667,722,15,19,44,19	2	0341	-- aacute
-^a	667,705,15,19,44,19	2	0342	-- acircumflex
-~a	667,690,15,19,44,19	2	0343	-- atilde
-:a	667,690,15,19,44,19	2	0344	-- adieresis
-oa	667,746,15,19,44,19	2	0345	-- aring
-ae	815,477,15,10,68,10	0	0346	-- ae
-,c	537,477,220,0,50	1	0347	-- ccedilla
-`e	519,722,15,10,50,10	2	0350	-- egrave
-'e	519,722,15,10,50,10	2	0351	-- eacute
-^e	519,705,15,10,50,10	2	0352	-- ecircumflex
-:e	519,690,15,17,50,17	2	0353	-- edieresis
-`i	389,715,15,6,18,6	2	0354	-- igrave
-'i	389,715,15,31,18,31	2	0355	-- iacute
-^i	389,698,15,24,29,24	2	0356	-- icircumflex
-:i	389,683,15,52,19,52	2	0357	-- idieresis
-Sd	574,752,15,6,50,6	2	0360	-- eth
-~n	685,690,15,4,50,4	2	0361	-- ntilde
-`o	574,722,15,6,50,6	2	0362	-- ograve
-'o	574,722,15,6,50,6	2	0363	-- oacute
-^o	574,705,15,6,50,6	2	0364	-- ocircumflex
-~o	574,690,15,6,50,6	2	0365	-- otilde
-:o	574,690,15,6,50,6	2	0366	-- odieresis
-tdi	606,546,40	0	0367	-- divide
-/o	574,583,121,6,50,6	0	0370	-- oslash
-`u	685,722,15,0,20	2	0371	-- ugrave
-'u	685,722,15,0,20	2	0372	-- uacute
-^u	685,705,15,0,20	2	0373	-- ucircumflex
-:u	685,690,15,0,20	2	0374	-- udieresis
-'y	519,722,205,24,116,24	3	0375	-- yacute
-Tp	648,737,205,0,169	3	0376	-- thorn
-:y	519,690,205,24,116,24	3	0377	-- ydieresis
+bq	259,157,192,0,107	0	128	quotesinglbase
+Fo	481,407,0,18,85,18	0	129	guillemotleft
+Fc	481,407,0,22,81,22	0	130	guillemotright
+bu	606,542,0,0,-72	0	131	bullet
+Fn	574,737,205,51,93,51	3	132	florin
+f/	167,705,15,216,216,109	2	133	fraction
+%0	1167,727,28,30,30,30	2	134	perthousand
+dg	500,737,146,58,2,58	2	135	dagger
+dd	500,737,150,58,110,58	2	136	daggerdbl
+en	500,287,0,29,97,29	0	137	endash
+em	1000,287,0,29,97,29	0	138	emdash
+fi	685,737,205,6,120,6	3	140	fi
+fl	685,737,205,36,120,36	3	141	fl
+.i	389,477,15,6,18,6	0	144	dotlessi
+ga	333,722,0,11,-24,11	2	146	grave
+a"	333,722,0,197,35,109	2	147	hungarumlaut
+a.	333,690,0,6,-95,6	2	148	dotaccent
+ab	333,698,0,107,-17,107	2	149	breve
+ah	333,705,0,120,-10,109	2	150	caron
+ao	333,746,0,52,-61,52	2	151	ring
+ho	333,0,155,0,-18	0	152	ogonek
+lq	481,737,0,90,-4,90	2	153	quotedblleft
+rq	481,737,0,79,7,79	2	154	quotedblright
+oe	852,477,15,10,56,10	0	155	oe
+/l	389,737,15,51,45,51	2	156	lslash
+Bq	481,157,192,0,107	0	157	quotedblbase
+OE	963,722,0,76,21,76	2	158	OE
+/L	704,722,0,16,91,16	2	159	Lslash
+r!	333,547,205,6,94,6	1	161	exclamdown
+ct	574,578,144,0,20	0	162	cent
+Po	574,705,15,42,68,42	2	163	sterling
+Cs	574,605,0,23,23,23	0	164	currency
+Ye	574,690,0,105,33,105	2	165	yen
+bb	606,675,175,0,-199	2	166	brokenbar
+sc	500,737,146,65,80,65	2	167	section
+ad	333,690,0,110,17,109	2	168	dieresis
+co	747,737,15,53,52,53	2	169	copyright
+Of	412,705,0,98,3,98	2	170	ordfeminine
+fo	278,407,0,16,75,16	0	171	guilsinglleft
+tno	606,403	0	172	logicalnot
+\-	606,307	0	173	minus
+rg	747,737,15,53,52,53	2	174	registered
+a-	333,649,0,121,3,109	2	175	macron
+de	400,705,0,22,-36,22	2	176	degree
+t+-	606,506	0	177	plusminus
+S2	344,705,0,68,67,68	2	178	twosuperior
+S3	344,705,0,67,47,67	2	179	threesuperior
+aa	333,722,0,89,-73,89	2	180	acute
+mc	685,477,205,0,139	1	181	mu
+ps	650,722,131,81,25,81	2	182	paragraph
+pc	287,372,0,0,-7	0	183	periodcentered
+ac	333,3,220,0,71	1	184	cedilla
+S1	344,705,0,32,31,32	2	185	onesuperior
+Om	356,705,0,88,8,88	2	186	ordmasculine
+fc	278,407,0,15,76,15	0	187	guilsinglright
+14	861,705,15,0,33	2	188	onequarter
+12	861,705,15,0,33	2	189	onehalf
+34	861,705,15,0,15	2	190	threequarters
+r?	481,547,205,0,50	1	191	questiondown
+`A	741,947,0,25,125,25	2	192	Agrave
+'A	741,947,0,25,125,25	2	193	Aacute
+^A	741,930,0,25,125,25	2	194	Acircumflex
+~A	741,915,0,25,125,25	2	195	Atilde
+:A	741,915,0,25,125,25	2	196	Adieresis
+oA	741,991,0,25,125,25	2	197	Aring
+AE	889,722,0,76,136,76	2	198	AE
+,C	759,737,220,50,13,50	3	199	Ccedilla
+`E	741,947,0,39,91,39	2	200	Egrave
+'E	741,947,0,39,91,39	2	201	Eacute
+^E	741,930,0,39,91,39	2	202	Ecircumflex
+:E	741,915,0,39,91,39	2	203	Edieresis
+`I	444,947,0,91,91,91	2	204	Igrave
+'I	444,947,0,94,91,94	2	205	Iacute
+^I	444,930,0,91,91,91	2	206	Icircumflex
+:I	444,915,0,115,91,109	2	207	Idieresis
+-D	833,722,0,13,97,13	2	208	Eth
+~N	852,915,10,111,111,109	2	209	Ntilde
+`O	833,947,15,13,13,13	2	210	Ograve
+'O	833,947,15,13,13,13	2	211	Oacute
+^O	833,930,15,13,13,13	2	212	Ocircumflex
+~O	833,915,15,13,13,13	2	213	Otilde
+:O	833,915,15,13,13,13	2	214	Odieresis
+tmu	606,491,0,0,-15	0	215	multiply
+/O	833,790,68,15,15,15	2	216	Oslash
+`U	833,947,15,117,-38,109	2	217	Ugrave
+'U	833,947,15,117,-38,109	2	218	Uacute
+^U	833,930,15,117,-38,109	2	219	Ucircumflex
+:U	833,915,15,117,-38,109	2	220	Udieresis
+'Y	704,947,0,121,37,109	2	221	Yacute
+TP	741,722,0,0,91	2	222	Thorn
+ss	574,737,205,16,141,16	3	223	germandbls
+`a	667,722,15,19,44,19	2	224	agrave
+'a	667,722,15,19,44,19	2	225	aacute
+^a	667,705,15,19,44,19	2	226	acircumflex
+~a	667,690,15,19,44,19	2	227	atilde
+:a	667,690,15,19,44,19	2	228	adieresis
+oa	667,746,15,19,44,19	2	229	aring
+ae	815,477,15,10,68,10	0	230	ae
+,c	537,477,220,0,50	1	231	ccedilla
+`e	519,722,15,10,50,10	2	232	egrave
+'e	519,722,15,10,50,10	2	233	eacute
+^e	519,705,15,10,50,10	2	234	ecircumflex
+:e	519,690,15,17,50,17	2	235	edieresis
+`i	389,715,15,6,18,6	2	236	igrave
+'i	389,715,15,31,18,31	2	237	iacute
+^i	389,698,15,24,29,24	2	238	icircumflex
+:i	389,683,15,52,19,52	2	239	idieresis
+Sd	574,752,15,6,50,6	2	240	eth
+~n	685,690,15,4,50,4	2	241	ntilde
+`o	574,722,15,6,50,6	2	242	ograve
+'o	574,722,15,6,50,6	2	243	oacute
+^o	574,705,15,6,50,6	2	244	ocircumflex
+~o	574,690,15,6,50,6	2	245	otilde
+:o	574,690,15,6,50,6	2	246	odieresis
+tdi	606,546,40	0	247	divide
+/o	574,583,121,6,50,6	0	248	oslash
+`u	685,722,15,0,20	2	249	ugrave
+'u	685,722,15,0,20	2	250	uacute
+^u	685,705,15,0,20	2	251	ucircumflex
+:u	685,690,15,0,20	2	252	udieresis
+'y	519,722,205,24,116,24	3	253	yacute
+Tp	648,737,205,0,169	3	254	thorn
+:y	519,690,205,24,116,24	3	255	ydieresis
+u2026	1000,157,15,0,-31	0	256	ellipsis
diff --git a/contrib/groff/font/devps/NI b/contrib/groff/font/devps/NI
index 09aa5a4..b27ce51 100644
--- a/contrib/groff/font/devps/NI
+++ b/contrib/groff/font/devps/NI
@@ -194,246 +194,247 @@ w , -75
 y . -75
 y , -75
 charset
-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,20,33,20	2	0041	-- exclam
-"	400,737,0,13,-77,13	2	0042	-- quotedbl
+ha	606,690,0,0,-39	2	0	asciicircum
+ti	606,322,0,0,-22	0	1	asciitilde
+vS	667,946,15,21,56,21	2	2	Scaron
+vZ	667,946,0,50,75,50	2	3	Zcaron
+vs	444,690,15,40,48,40	2	4	scaron
+vz	463,690,15,30,83,30	2	5	zcaron
+:Y	685,902,0,125,19,107	2	6	Ydieresis
+tm	950,722,0,68,18,68	2	7	trademark
+aq	278,737,0,9,-101,9	2	8	quotesingle
+space	278	0	32	space
+!	333,737,15,20,33,20	2	33	exclam
+"	400,737,0,13,-77,13	2	34	quotedbl
 dq	"
-#	556,690,0,22,22,22	2	0043	-- numbersign
+#	556,690,0,22,22,22	2	35	numbersign
 sh	"
-$	556,808,142,30,46,30	2	0044	-- dollar
+$	556,808,142,30,46,30	2	36	dollar
 Do	"
-%	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
+%	833,705,15,7,7,7	2	37	percent
+&	852,737,15,0,26	2	38	ampersand
+'	204,737,0,75,11,75	2	39	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
+(	333,745,117,128,-3,107	2	40	parenleft
+)	333,745,117,0,143	2	41	parenright
+*	500,737,0,50,-30,50	2	42	asterisk
++	606,506	0	43	plus
+,	278,109,165,0,89	0	44	comma
+-	333,274,0,0,18	0	45	hyphen
 hy	"
-.	278,109,15,0,33	0	0056	-- period
-/	606,737,15,0,-82	2	0057	-- slash
+.	278,109,15,0,33	0	46	period
+/	606,737,15,0,-82	2	47	slash
 sl	"
-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
+0	556,705,15,20,20,20	2	48	zero
+1	556,705	2	49	one
+2	556,705,0,0,87	2	50	two
+3	556,705,15,0,52	2	51	three
+4	556,705,0,6,58,6	2	52	four
+5	556,705,15,34,46,34	2	53	five
+6	556,705,15,42,14,42	2	54	six
+7	556,705,15,55,-19,55	2	55	seven
+8	556,705,15,20,44,20	2	56	eight
+9	556,705,15,14,42,14	2	57	nine
+:	278,466,15,1,33,1	0	58	colon
+;	278,466,165,1,89,1	0	59	semicolon
+<	606,514,8,0,14	0	60	less
+=	606,389	0	61	equal
+>	606,514,8,14,-14,14	0	62	greater
+?	444,737,15,23,-52,23	2	63	question
+@	747,737,15,53,52,53	2	64	at
 at	"
-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
+A	704,737,0,14,137,14	2	65	A
+B	722,722,0,0,83	2	66	B
+C	722,737,15,40,10,40	2	67	C
+D	778,722,0,10,83,10	2	68	D
+E	722,722,0,28,83,28	2	69	E
+F	667,722,0,83,83,83	2	70	F
+G	778,737,15,35,10,35	2	71	G
+H	833,722,0,83,83,83	2	72	H
+I	407,722,0,78,83,78	2	73	I
+J	611,722,15,90,64,90	2	74	J
+K	741,722,0,125,83,107	2	75	K
+L	667,722,0,10,83,10	2	76	L
+M	944,722,0,83,83,83	2	77	M
+N	815,722,15,101,101,101	2	78	N
+O	778,737,15,10,10,10	2	79	O
+P	667,722,0,50,83,50	2	80	P
+Q	778,737,190,10,10,10	2	81	Q
+R	741,722,15,1,95,1	2	82	R
+S	667,737,15,21,56,21	2	83	S
+T	685,722,0,90,10,90	2	84	T
+U	815,722,15,102,-43,102	2	85	U
+V	704,722,10,125,14,107	2	86	V
+W	926,722,10,102,-3,102	2	87	W
+X	704,722,0,125,125,107	2	88	X
+Y	685,722,0,125,19,107	2	89	Y
+Z	667,722,0,50,75,50	2	90	Z
+[	333,737,109,105,105,105	2	91	bracketleft
 lB	"
-\	606,737,15,0,-82	2	0134	-- backslash
+\	606,737,15,0,-82	2	92	backslash
 rs	"
-]	333,737,109,83,127,83	2	0135	-- bracketright
+]	333,737,109,83,127,83	2	93	bracketright
 rB	"
-a^	333,690,0,48,13,48	2	0136	-- circumflex
+a^	333,690,0,48,13,48	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	204,737,0,75,11,75	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	204,737,0,75,11,75	2	96	quoteleft
 oq	"
-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
+a	574,466,15,0,48	0	97	a
+b	556,737,15,0,18	2	98	b
+c	444,466,15,0,48	0	99	c
+d	611,737,15,24,48,24	2	100	d
+e	444,466,15,0,56	0	101	e
+f	333,737,205,187,118,107	3	102	f
+g	537,497,205,36,129,36	1	103	g
+h	611,737,15,1,36,1	2	104	h
+i	333,715,15,0,21	2	105	i
+j	315,715,205,53,216,53	3	106	j
+k	556,737,15,0,50	2	107	k
+l	333,737,15,9,36,9	2	108	l
+m	889,466,15,1,36,1	0	109	m
+n	611,466,15,1,36,1	0	110	n
+o	500,466,15,0,48	0	111	o
+p	574,466,205,0,151	1	112	p
+q	556,466,205,0,48	1	113	q
+r	444,466,0,40,40,40	0	114	r
+s	444,466,15,0,48	0	115	s
+t	352,619,15,26,26,26	2	116	t
+u	611,466,15,0,6	0	117	u
+v	519,466,15,0,19	0	118	v
+w	778,466,15,0,19	0	119	w
+x	500,466,15,21,83,21	0	120	x
+y	500,466,205,0,133	1	121	y
+z	463,466,15,3,83,3	0	122	z
+lC	333,737,109,111,12,107	2	123	braceleft
 {	"
-ba	606,750,250,0,-217	3	0174	-- bar
+ba	606,750,250,0,-217	3	124	bar
 |	"
-rC	333,737,109,0,137	2	0175	-- braceright
+rC	333,737,109,0,137	2	125	braceright
 }	"
-a~	333,649,0,100,-2,100	2	0176	-- tilde
+a~	333,649,0,100,-2,100	2	126	tilde
 ~	"
-bq	204,109,165,0,128	0	0200	-- quotesinglbase
-Fo	426,402,0,26,65,26	0	0201	-- guillemotleft
-Fc	426,402,0,26,65,26	0	0202	-- guillemotright
-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
-ct	556,580,144,0,-12	0	0242	-- cent
-Po	556,705,15,38,63,38	2	0243	-- sterling
-Cs	556,597,0,24,24,24	0	0244	-- currency
-Ye	556,690,0,118,10,107	2	0245	-- yen
-bb	606,675,175,0,-217	2	0246	-- brokenbar
-sc	500,737,147,30,60,30	2	0247	-- section
-ad	333,646,0,76,-9,76	2	0250	-- dieresis
-co	747,737,15,53,52,53	2	0251	-- copyright
-Of	422,705,0,48,-22,48	2	0252	-- ordfeminine
-fo	333,402,0,0,10	0	0253	-- guilsinglleft
-no	606,389	0	0254	-- logicalnot
-\-	606,289	0	0255	-- minus
-rg	747,737,15,53,52,53	2	0256	-- registered
-a-	333,610,0,80,-2,80	0	0257	-- macron
-de	400,705,0,22,-36,22	2	0260	-- degree
-t+-	606,506	0	0261	-- plusminus
-S2	333,705,0,76,50,76	2	0262	-- twosuperior
-S3	333,705,0,76,28,76	2	0263	-- threesuperior
-aa	333,690,0,72,-82,72	2	0264	-- acute
-mc	611,466,205,0,110	1	0265	-- mu
-ps	650,722,132,65,2,65	2	0266	-- paragraph
-pc	278,374,0,0,-21	0	0267	-- periodcentered
-ac	333,0,215,0,47	1	0270	-- cedilla
-S1	333,705,0,28,16,28	2	0271	-- onesuperior
-Om	372,705,0,48,-16,48	2	0272	-- ordmasculine
-fc	333,402,0,0,10	0	0273	-- guilsinglright
-14	834,705,15,0,16	2	0274	-- onequarter
-12	834,705,15,0,16	2	0275	-- onehalf
-34	834,705,15,0,28	2	0276	-- threequarters
-r?	444,547,205,0,53	1	0277	-- questiondown
-`A	704,946,0,14,137,14	2	0300	-- Agrave
-'A	704,946,0,14,137,14	2	0301	-- Aacute
-^A	704,946,0,14,137,14	2	0302	-- Acircumflex
-~A	704,905,0,14,137,14	2	0303	-- Atilde
-:A	704,902,0,14,137,14	2	0304	-- Adieresis
-oA	704,958,0,14,137,14	2	0305	-- Aring
-AE	870,722,0,68,137,68	2	0306	-- AE
-,C	722,737,215,40,10,40	3	0307	-- Ccedilla
-`E	722,946,0,28,83,28	2	0310	-- Egrave
-'E	722,946,0,28,83,28	2	0311	-- Eacute
-^E	722,946,0,28,83,28	2	0312	-- Ecircumflex
-:E	722,902,0,28,83,28	2	0313	-- Edieresis
-`I	407,946,0,78,83,78	2	0314	-- Igrave
-'I	407,946,0,95,83,95	2	0315	-- Iacute
-^I	407,946,0,78,83,78	2	0316	-- Icircumflex
-:I	407,902,0,99,83,99	2	0317	-- Idieresis
--D	778,722,0,10,83,10	2	0320	-- Eth
-~N	815,905,15,101,101,101	2	0321	-- Ntilde
-`O	778,946,15,10,10,10	2	0322	-- Ograve
-'O	778,946,15,10,10,10	2	0323	-- Oacute
-^O	778,946,15,10,10,10	2	0324	-- Ocircumflex
-~O	778,905,15,10,10,10	2	0325	-- Otilde
-:O	778,902,15,10,10,10	2	0326	-- Odieresis
-tmu	606,482,0,0,-24	0	0327	-- multiply
-/O	778,780,68,20,34,20	2	0330	-- Oslash
-`U	815,946,15,102,-43,102	2	0331	-- Ugrave
-'U	815,946,15,102,-43,102	2	0332	-- Uacute
-^U	815,946,15,102,-43,102	2	0333	-- Ucircumflex
-:U	815,902,15,102,-43,102	2	0334	-- Udieresis
-'Y	685,946,0,125,19,107	2	0335	-- Yacute
-TP	667,722,0,10,83,10	2	0336	-- Thorn
-ss	556,737,205,19,126,19	3	0337	-- germandbls
-`a	574,690,15,0,48	2	0340	-- agrave
-'a	574,690,15,0,48	2	0341	-- aacute
-^a	574,690,15,0,48	2	0342	-- acircumflex
-~a	574,649,15,0,48	2	0343	-- atilde
-:a	574,646,15,0,48	2	0344	-- adieresis
-oa	574,712,15,0,48	2	0345	-- aring
-ae	722,466,15,0,68	0	0346	-- ae
-,c	444,466,215,0,48	1	0347	-- ccedilla
-`e	444,690,15,0,56	2	0350	-- egrave
-'e	444,690,15,17,56,17	2	0351	-- eacute
-^e	444,690,15,0,56	2	0352	-- ecircumflex
-:e	444,646,15,21,56,21	2	0353	-- edieresis
-`i	333,690,15,0,21	2	0354	-- igrave
-'i	333,690,15,72,21,72	2	0355	-- iacute
-^i	333,690,15,48,21,48	2	0356	-- icircumflex
-:i	333,646,15,76,21,76	2	0357	-- idieresis
-Sd	500,737,15,0,48	2	0360	-- eth
-~n	611,649,15,1,36,1	2	0361	-- ntilde
-`o	500,690,15,0,48	2	0362	-- ograve
-'o	500,690,15,0,48	2	0363	-- oacute
-^o	500,690,15,0,48	2	0364	-- ocircumflex
-~o	500,649,15,17,48,17	2	0365	-- otilde
-:o	500,646,15,0,48	2	0366	-- odieresis
-tdi	606,528,22	0	0367	-- divide
-/o	500,549,121,0,48	0	0370	-- oslash
-`u	611,690,15,0,6	2	0371	-- ugrave
-'u	611,690,15,0,6	2	0372	-- uacute
-^u	611,690,15,0,6	2	0373	-- ucircumflex
-:u	611,646,15,0,6	2	0374	-- udieresis
-'y	500,690,205,0,133	3	0375	-- yacute
-Tp	574,737,205,0,151	3	0376	-- thorn
-:y	500,646,205,0,133	3	0377	-- ydieresis
+bq	204,109,165,0,128	0	128	quotesinglbase
+Fo	426,402,0,26,65,26	0	129	guillemotleft
+Fc	426,402,0,26,65,26	0	130	guillemotright
+bu	606,542,0,0,-72	0	131	bullet
+Fn	556,737,205,63,108,63	3	132	florin
+f/	167,705,15,184,184,107	2	133	fraction
+%0	1000,705,15,44,44,44	2	134	perthousand
+dg	500,737,147,56,-1,56	2	135	dagger
+dd	500,737,147,56,104,56	2	136	daggerdbl
+en	500,268,0,37,77,37	0	137	endash
+em	1000,268,0,37,77,37	0	138	emdash
+fi	611,737,205,0,118	3	140	fi
+fl	611,737,205,26,118,26	3	141	fl
+.i	333,466,15,0,21	0	144	dotlessi
+ga	333,690,0,0,-21	2	146	grave
+a"	333,690,0,172,18,107	2	147	hungarumlaut
+a.	333,646,0,0,-96	2	148	dotaccent
+ab	333,677,0,87,-19,87	2	149	breve
+ah	333,690,0,95,-23,95	2	150	caron
+ao	333,712,0,31,-64,31	2	151	ring
+ho	333,0,215,0,-18	1	152	ogonek
+lq	389,737,0,67,11,67	2	153	quotedblleft
+rq	389,737,0,67,11,67	2	154	quotedblright
+oe	778,466,15,0,48	0	155	oe
+/l	333,737,15,57,75,57	2	156	lslash
+Bq	389,109,165,0,128	0	157	quotedblbase
+OE	981,722,0,44,10,44	2	158	OE
+/L	667,722,0,10,83,10	2	159	Lslash
+r!	333,547,205,0,72	1	161	exclamdown
+ct	556,580,144,0,-12	0	162	cent
+Po	556,705,15,38,63,38	2	163	sterling
+Cs	556,597,0,24,24,24	0	164	currency
+Ye	556,690,0,118,10,107	2	165	yen
+bb	606,675,175,0,-217	2	166	brokenbar
+sc	500,737,147,30,60,30	2	167	section
+ad	333,646,0,76,-9,76	2	168	dieresis
+co	747,737,15,53,52,53	2	169	copyright
+Of	422,705,0,48,-22,48	2	170	ordfeminine
+fo	333,402,0,0,10	0	171	guilsinglleft
+tno	606,389	0	172	logicalnot
+\-	606,289	0	173	minus
+rg	747,737,15,53,52,53	2	174	registered
+a-	333,610,0,80,-2,80	0	175	macron
+de	400,705,0,22,-36,22	2	176	degree
+t+-	606,506	0	177	plusminus
+S2	333,705,0,76,50,76	2	178	twosuperior
+S3	333,705,0,76,28,76	2	179	threesuperior
+aa	333,690,0,72,-82,72	2	180	acute
+mc	611,466,205,0,110	1	181	mu
+ps	650,722,132,65,2,65	2	182	paragraph
+pc	278,374,0,0,-21	0	183	periodcentered
+ac	333,0,215,0,47	1	184	cedilla
+S1	333,705,0,28,16,28	2	185	onesuperior
+Om	372,705,0,48,-16,48	2	186	ordmasculine
+fc	333,402,0,0,10	0	187	guilsinglright
+14	834,705,15,0,16	2	188	onequarter
+12	834,705,15,0,16	2	189	onehalf
+34	834,705,15,0,28	2	190	threequarters
+r?	444,547,205,0,53	1	191	questiondown
+`A	704,946,0,14,137,14	2	192	Agrave
+'A	704,946,0,14,137,14	2	193	Aacute
+^A	704,946,0,14,137,14	2	194	Acircumflex
+~A	704,905,0,14,137,14	2	195	Atilde
+:A	704,902,0,14,137,14	2	196	Adieresis
+oA	704,958,0,14,137,14	2	197	Aring
+AE	870,722,0,68,137,68	2	198	AE
+,C	722,737,215,40,10,40	3	199	Ccedilla
+`E	722,946,0,28,83,28	2	200	Egrave
+'E	722,946,0,28,83,28	2	201	Eacute
+^E	722,946,0,28,83,28	2	202	Ecircumflex
+:E	722,902,0,28,83,28	2	203	Edieresis
+`I	407,946,0,78,83,78	2	204	Igrave
+'I	407,946,0,95,83,95	2	205	Iacute
+^I	407,946,0,78,83,78	2	206	Icircumflex
+:I	407,902,0,99,83,99	2	207	Idieresis
+-D	778,722,0,10,83,10	2	208	Eth
+~N	815,905,15,101,101,101	2	209	Ntilde
+`O	778,946,15,10,10,10	2	210	Ograve
+'O	778,946,15,10,10,10	2	211	Oacute
+^O	778,946,15,10,10,10	2	212	Ocircumflex
+~O	778,905,15,10,10,10	2	213	Otilde
+:O	778,902,15,10,10,10	2	214	Odieresis
+tmu	606,482,0,0,-24	0	215	multiply
+/O	778,780,68,20,34,20	2	216	Oslash
+`U	815,946,15,102,-43,102	2	217	Ugrave
+'U	815,946,15,102,-43,102	2	218	Uacute
+^U	815,946,15,102,-43,102	2	219	Ucircumflex
+:U	815,902,15,102,-43,102	2	220	Udieresis
+'Y	685,946,0,125,19,107	2	221	Yacute
+TP	667,722,0,10,83,10	2	222	Thorn
+ss	556,737,205,19,126,19	3	223	germandbls
+`a	574,690,15,0,48	2	224	agrave
+'a	574,690,15,0,48	2	225	aacute
+^a	574,690,15,0,48	2	226	acircumflex
+~a	574,649,15,0,48	2	227	atilde
+:a	574,646,15,0,48	2	228	adieresis
+oa	574,712,15,0,48	2	229	aring
+ae	722,466,15,0,68	0	230	ae
+,c	444,466,215,0,48	1	231	ccedilla
+`e	444,690,15,0,56	2	232	egrave
+'e	444,690,15,17,56,17	2	233	eacute
+^e	444,690,15,0,56	2	234	ecircumflex
+:e	444,646,15,21,56,21	2	235	edieresis
+`i	333,690,15,0,21	2	236	igrave
+'i	333,690,15,72,21,72	2	237	iacute
+^i	333,690,15,48,21,48	2	238	icircumflex
+:i	333,646,15,76,21,76	2	239	idieresis
+Sd	500,737,15,0,48	2	240	eth
+~n	611,649,15,1,36,1	2	241	ntilde
+`o	500,690,15,0,48	2	242	ograve
+'o	500,690,15,0,48	2	243	oacute
+^o	500,690,15,0,48	2	244	ocircumflex
+~o	500,649,15,17,48,17	2	245	otilde
+:o	500,646,15,0,48	2	246	odieresis
+tdi	606,528,22	0	247	divide
+/o	500,549,121,0,48	0	248	oslash
+`u	611,690,15,0,6	2	249	ugrave
+'u	611,690,15,0,6	2	250	uacute
+^u	611,690,15,0,6	2	251	ucircumflex
+:u	611,646,15,0,6	2	252	udieresis
+'y	500,690,205,0,133	3	253	yacute
+Tp	574,737,205,0,151	3	254	thorn
+:y	500,646,205,0,133	3	255	ydieresis
+u2026	1000,109,15,0,-9	0	256	ellipsis
diff --git a/contrib/groff/font/devps/NR b/contrib/groff/font/devps/NR
index 7e148c8..ae9e2ff 100644
--- a/contrib/groff/font/devps/NR
+++ b/contrib/groff/font/devps/NR
@@ -181,246 +181,247 @@ w a -18
 y . -125
 y , -125
 charset
-ha	606,690,0,0,-89	2	0000	-- asciicircum
-ti	606,322,0,0,-72	0	0001	-- asciitilde
-vS	630,933,15,0,-47	2	0002	-- Scaron
-vZ	611,933,0,0,-24	2	0003	-- Zcaron
-vs	463,695,15,0,-46	2	0004	-- scaron
-vz	481,695,0,0,-42	2	0005	-- zcaron
-:Y	704,883,0,11,11	2	0006	-- Ydieresis
-tm	1000,722,0,0,-32	2	0007	-- trademark
-aq	204,737,0,0,-59	2	0010	-- quotesingle
-space	278	0	0040
-!	296,737,15,0,-86	2	0041	-- exclam
-"	389,737,0,0,-61	2	0042	-- quotedbl
+ha	606,690	2	0	asciicircum
+ti	606,322	0	1	asciitilde
+vS	630,933,15	2	2	Scaron
+vZ	611,933	2	3	Zcaron
+vs	463,695,15	2	4	scaron
+vz	481,695	2	5	zcaron
+:Y	704,883,0,11,11	2	6	Ydieresis
+tm	1000,722	2	7	trademark
+aq	204,737	2	8	quotesingle
+space	278	0	32	space
+!	296,737,15	2	33	exclam
+"	389,737	2	34	quotedbl
 dq	"
-#	556,690,0,0,-28	2	0043	-- numbersign
+#	556,690	2	35	numbersign
 sh	"
-$	556,813,138,0,-45	2	0044	-- dollar
+$	556,813,138	2	36	dollar
 Do	"
-%	833,705,15,0,-43	2	0045	-- percent
-&	815,737,15,0,-51	2	0046	-- ampersand
-'	204,737,0,0,-25	2	0047	-- quoteright
+%	833,705,15	2	37	percent
+&	815,737,15	2	38	ampersand
+'	204,737	2	39	quoteright
 cq	"
-(	333,745,117,0,-40	2	0050	-- parenleft
-)	333,745,117,0,-54	2	0051	-- parenright
-*	500,737,0,0,-57	2	0052	-- asterisk
-+	606,506,0,0,-50	0	0053	-- plus
-,	278,109,185,0,-62	0	0054	-- comma
--	333,277,0,0,-42	0	0055	-- hyphen
+(	333,745,117	2	40	parenleft
+)	333,745,117	2	41	parenright
+*	500,737	2	42	asterisk
++	606,506	0	43	plus
+,	278,109,185	0	44	comma
+-	333,277	0	45	hyphen
 hy	"
-.	278,109,15,0,-77	0	0056	-- period
-/	278,737,15,32,32	2	0057	-- slash
+.	278,109,15	0	46	period
+/	278,737,15,32,32	2	47	slash
 sl	"
-0	556,705,15,0,-42	2	0060	-- zero
-1	556,705,0,0,-100	2	0061	-- one
-2	556,705,0,0,-35	2	0062	-- two
-3	556,705,15,0,-42	2	0063	-- three
-4	556,705,0,0,-28	2	0064	-- four
-5	556,705,15,0,-46	2	0065	-- five
-6	556,705,15,0,-41	2	0066	-- six
-7	556,705,15,0,-59	2	0067	-- seven
-8	556,705,15,0,-42	2	0070	-- eight
-9	556,705,15,0,-41	2	0071	-- nine
-:	278,474,15,0,-77	0	0072	-- colon
-;	278,474,185,0,-62	0	0073	-- semicolon
-<	606,514,8,0,-50	0	0074	-- less
-=	606,389,0,0,-50	0	0075	-- equal
->	606,514,8,0,-50	0	0076	-- greater
-?	444,737,15,0,-29	2	0077	-- question
-@	737,737,15,7,8	2	0100	-- at
+0	556,705,15	2	48	zero
+1	556,705	2	49	one
+2	556,705	2	50	two
+3	556,705,15	2	51	three
+4	556,705	2	52	four
+5	556,705,15	2	53	five
+6	556,705,15	2	54	six
+7	556,705,15	2	55	seven
+8	556,705,15	2	56	eight
+9	556,705,15	2	57	nine
+:	278,474,15	0	58	colon
+;	278,474,185	0	59	semicolon
+<	606,514,8	0	60	less
+=	606,389	0	61	equal
+>	606,514,8	0	62	greater
+?	444,737,15	2	63	question
+@	737,737,15,7,8	2	64	at
 at	"
-A	722,737,0,8,8	2	0101	-- A
-B	722,722,0,0,-29	2	0102	-- B
-C	722,737,15,0,-45	2	0103	-- C
-D	778,722,0,0,-29	2	0104	-- D
-E	722,722,0,0,-29	2	0105	-- E
-F	667,722,0,0,-29	2	0106	-- F
-G	778,737,15,0,-45	2	0107	-- G
-H	833,722,0,0,-29	2	0110	-- H
-I	407,722,0,0,-38	2	0111	-- I
-J	556,722,15,0,-5	2	0112	-- J
-K	778,722,0,25,-29	2	0113	-- K
-L	667,722,0,0,-29	2	0114	-- L
-M	944,722,0,0,-29	2	0115	-- M
-N	815,722,15,0,-24	2	0116	-- N
-O	778,737,15,0,-45	2	0117	-- O
-P	667,722,0,0,-29	2	0120	-- P
-Q	778,737,190,0,-45	2	0121	-- Q
-R	722,722,15,0,-29	2	0122	-- R
-S	630,737,15,0,-47	2	0123	-- S
-T	667,722,0,0,-19	2	0124	-- T
-U	815,722,15,0,-16	2	0125	-- U
-V	722,722,10,8,8	2	0126	-- V
-W	981,722,10,0,-5	2	0127	-- W
-X	704,722,0,8,8	2	0130	-- X
-Y	704,722,0,11,11	2	0131	-- Y
-Z	611,722,0,0,-24	2	0132	-- Z
-[	333,737,109,0,-126	2	0133	-- bracketleft
+A	722,737,0,8,8	2	65	A
+B	722,722	2	66	B
+C	722,737,15	2	67	C
+D	778,722	2	68	D
+E	722,722	2	69	E
+F	667,722	2	70	F
+G	778,737,15	2	71	G
+H	833,722	2	72	H
+I	407,722	2	73	I
+J	556,722,15	2	74	J
+K	778,722,0,25	2	75	K
+L	667,722	2	76	L
+M	944,722	2	77	M
+N	815,722,15	2	78	N
+O	778,737,15	2	79	O
+P	667,722	2	80	P
+Q	778,737,190	2	81	Q
+R	722,722,15	2	82	R
+S	630,737,15	2	83	S
+T	667,722	2	84	T
+U	815,722,15	2	85	U
+V	722,722,10,8,8	2	86	V
+W	981,722,10	2	87	W
+X	704,722,0,8,8	2	88	X
+Y	704,722,0,11,11	2	89	Y
+Z	611,722	2	90	Z
+[	333,737,109	2	91	bracketleft
 lB	"
-\	606,737,15,0,-132	2	0134	-- backslash
+\	606,737,15	2	92	backslash
 rs	"
-]	333,737,109,0,-18	2	0135	-- bracketright
+]	333,737,109	2	93	bracketright
 rB	"
-a^	333,695,0,0,-10	2	0136	-- circumflex
+a^	333,695	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	204,737,0,0,-25	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	204,737	2	96	quoteleft
 oq	"
-a	556,479,15,0,-44	0	0141	-- a
-b	556,737,15,0,-10	2	0142	-- b
-c	444,479,15,0,-34	0	0143	-- c
-d	574,737,15,0,-34	2	0144	-- d
-e	500,479,15,0,-34	0	0145	-- e
-f	333,737,0,104,-18	2	0146	-- f
-g	537,494,205,5,-23	1	0147	-- g
-h	611,737,0,0,-7	2	0150	-- h
-i	315,722,0,0,-18	2	0151	-- i
-j	296,722,205,0,86	3	0152	-- j
-k	593,737,0,0,-10	2	0153	-- k
-l	315,737,0,0,-18	2	0154	-- l
-m	889,479,0,0,-26	0	0155	-- m
-n	611,479,0,0,-22	0	0156	-- n
-o	500,479,15,0,-34	0	0157	-- o
-p	574,479,205,0,-22	1	0160	-- p
-q	556,479,205,0,-34	1	0161	-- q
-r	444,479,0,0,-18	0	0162	-- r
-s	463,479,15,0,-46	0	0163	-- s
-t	389,666,15,0,-18	2	0164	-- t
-u	611,464,15,0,-22	0	0165	-- u
-v	537,464,10,0,6	0	0166	-- v
-w	778,464,10,0,-1	0	0167	-- w
-x	537,464,0,0,-8	0	0170	-- x
-y	537,464,205,0,-4	1	0171	-- y
-z	481,464,0,0,-42	0	0172	-- z
-lC	333,737,109,0,-54	2	0173	-- braceleft
+a	556,479,15	0	97	a
+b	556,737,15	2	98	b
+c	444,479,15	0	99	c
+d	574,737,15	2	100	d
+e	500,479,15	0	101	e
+f	333,737,0,104	2	102	f
+g	537,494,205,5	1	103	g
+h	611,737	2	104	h
+i	315,722	2	105	i
+j	296,722,205,0,86	3	106	j
+k	593,737	2	107	k
+l	315,737	2	108	l
+m	889,479	0	109	m
+n	611,479	0	110	n
+o	500,479,15	0	111	o
+p	574,479,205	1	112	p
+q	556,479,205	1	113	q
+r	444,479	0	114	r
+s	463,479,15	0	115	s
+t	389,666,15	2	116	t
+u	611,464,15	0	117	u
+v	537,464,10,0,6	0	118	v
+w	778,464,10	0	119	w
+x	537,464	0	120	x
+y	537,464,205	1	121	y
+z	481,464	0	122	z
+lC	333,737,109	2	123	braceleft
 {	"
-ba	606,750,250,0,-267	3	0174	-- bar
+ba	606,750,250	3	124	bar
 |	"
-rC	333,737,109,0,-54	2	0175	-- braceright
+rC	333,737,109	2	125	braceright
 }	"
-a~	333,655,0,0,-1	0	0176	-- tilde
+a~	333,655	0	126	tilde
 ~	"
-bq	204,109,185,0,-25	0	0200	-- quotesinglbase
-Fo	426,398,0,0,-39	0	0201	-- guillemotleft
-Fc	426,398,0,0,-39	0	0202	-- guillemotright
-bu	606,542,0,0,-122	0	0203	-- bullet
-Fn	556,737,205	3	0204	-- florin
-f/	167,705,15,195,195	2	0205	-- fraction
-%0	1000,705,15,0,-6	2	0206	-- perthousand
-dg	500,737,147,0,-42	2	0207	-- dagger
-dd	500,737,149,0,-42	2	0210	-- daggerdbl
-en	556,268	0	0211	-- endash
-em	1000,268	0	0212	-- emdash
-fi	611,737,0,0,-18	2	0214	-- fi
-fl	611,737,0,0,-18	2	0215	-- fl
-.i	315,464,0,0,-18	0	0220	-- dotlessi
-ga	333,699,0,0,-17	2	0222	-- grave
-a"	333,699,0,83,9	2	0223	-- hungarumlaut
-a.	333,645,0,0,-116	0	0224	-- dotaccent
-ab	333,685,0,0,-25	2	0225	-- breve
-ah	333,695,0,0,-10	2	0226	-- caron
-ao	333,722,0,0,-66	2	0227	-- ring
-ho	333,0,215,0,-68	1	0230	-- ogonek
-lq	389,737,0,0,-25	2	0231	-- quotedblleft
-rq	389,737,0,0,-25	2	0232	-- quotedblright
-oe	833,479,15,0,-34	0	0233	-- oe
-/l	315,737,0,0,-18	2	0234	-- lslash
-Bq	389,109,185,0,-25	0	0235	-- quotedblbase
-OE	1000,722,0,0,-21	2	0236	-- OE
-/L	667,722,0,0,-29	2	0237	-- Lslash
-r!	296,547,205,0,-86	1	0241	-- exclamdown
-ct	556,584,141,0,-74	0	0242	-- cent
-Po	556,705,15,0,-18	2	0243	-- sterling
-Cs	556,597,0,0,-26	0	0244	-- currency
-Ye	556,690,0,1,1	2	0245	-- yen
-bb	606,675,175,0,-267	2	0246	-- brokenbar
-sc	500,737,147,0,-55	2	0247	-- section
-ad	333,645,0,0,-16	0	0250	-- dieresis
-co	737,737,15,7,8	2	0251	-- copyright
-Of	334,705,0,4,4	2	0252	-- ordfeminine
-fo	259,398,0,0,-39	0	0253	-- guilsinglleft
-no	606,389,0,0,-50	0	0254	-- logicalnot
-\-	606,289,0,0,-50	0	0255	-- minus
-rg	737,737,15,7,8	2	0256	-- registered
-a-	333,623,0,0,-10	0	0257	-- macron
-de	400,705,0,0,-57	2	0260	-- degree
-t+-	606,506,0,0,-50	0	0261	-- plusminus
-S2	333,705,0,0,-14	2	0262	-- twosuperior
-S3	333,705,0,0,-18	2	0263	-- threesuperior
-aa	333,699,0,0,-91	2	0264	-- acute
-mc	611,464,205,0,-22	1	0265	-- mu
-ps	606,722,132,0,-60	2	0266	-- paragraph
-pc	278,374,0,0,-71	0	0267	-- periodcentered
-ac	333,0,215,0,-29	1	0270	-- cedilla
-S1	333,705,0,0,-39	2	0271	-- onesuperior
-Om	300,705,0,0,-4	2	0272	-- ordmasculine
-fc	259,398,0,0,-39	0	0273	-- guilsinglright
-14	834,705,15,0,-39	2	0274	-- onequarter
-12	834,705,15,0,-39	2	0275	-- onehalf
-34	834,705,15,0,-28	2	0276	-- threequarters
-r?	444,547,205,0,-29	1	0277	-- questiondown
-`A	722,937,0,8,8	2	0300	-- Agrave
-'A	722,937,0,8,8	2	0301	-- Aacute
-^A	722,933,0,8,8	2	0302	-- Acircumflex
-~A	722,893,0,8,8	2	0303	-- Atilde
-:A	722,883,0,8,8	2	0304	-- Adieresis
-oA	722,965,0,8,8	2	0305	-- Aring
-AE	1000,722	2	0306	-- AE
-,C	722,737,215,0,-45	3	0307	-- Ccedilla
-`E	722,937,0,0,-29	2	0310	-- Egrave
-'E	722,937,0,0,-29	2	0311	-- Eacute
-^E	722,933,0,0,-29	2	0312	-- Ecircumflex
-:E	722,883,0,0,-29	2	0313	-- Edieresis
-`I	407,937,0,0,-38	2	0314	-- Igrave
-'I	407,937,0,0,-38	2	0315	-- Iacute
-^I	407,933,0,0,-38	2	0316	-- Icircumflex
-:I	407,883,0,0,-38	2	0317	-- Idieresis
--D	778,722,0,0,-29	2	0320	-- Eth
-~N	815,893,15,0,-24	2	0321	-- Ntilde
-`O	778,937,15,0,-45	2	0322	-- Ograve
-'O	778,937,15,0,-45	2	0323	-- Oacute
-^O	778,933,15,0,-45	2	0324	-- Ocircumflex
-~O	778,893,15,0,-45	2	0325	-- Otilde
-:O	778,883,15,0,-45	2	0326	-- Odieresis
-tmu	606,482,0,0,-74	0	0327	-- multiply
-/O	778,778,56,0,-45	2	0330	-- Oslash
-`U	815,937,15,0,-16	2	0331	-- Ugrave
-'U	815,937,15,0,-16	2	0332	-- Uacute
-^U	815,933,15,0,-16	2	0333	-- Ucircumflex
-:U	815,883,15,0,-16	2	0334	-- Udieresis
-'Y	704,937,0,11,11	2	0335	-- Yacute
-TP	667,722,0,0,-29	2	0336	-- Thorn
-ss	574,737,15,0,-30	2	0337	-- germandbls
-`a	556,699,15,0,-44	2	0340	-- agrave
-'a	556,699,15,0,-44	2	0341	-- aacute
-^a	556,695,15,0,-44	2	0342	-- acircumflex
-~a	556,655,15,0,-44	0	0343	-- atilde
-:a	556,645,15,0,-44	0	0344	-- adieresis
-oa	556,732,15,0,-44	2	0345	-- aring
-ae	796,479,15,0,-34	0	0346	-- ae
-,c	444,479,215,0,-34	1	0347	-- ccedilla
-`e	500,699,15,0,-34	2	0350	-- egrave
-'e	500,699,15,0,-34	2	0351	-- eacute
-^e	500,695,15,0,-34	2	0352	-- ecircumflex
-:e	500,645,15,0,-34	0	0353	-- edieresis
-`i	315,699,0,0,-8	2	0354	-- igrave
-'i	315,699,0,0,-18	2	0355	-- iacute
-^i	315,695,0,0,-1	2	0356	-- icircumflex
-:i	315,645,0,0,-7	0	0357	-- idieresis
-Sd	500,752,15,0,-34	2	0360	-- eth
-~n	611,655,0,0,-22	0	0361	-- ntilde
-`o	500,699,15,0,-34	2	0362	-- ograve
-'o	500,699,15,0,-34	2	0363	-- oacute
-^o	500,695,15,0,-34	2	0364	-- ocircumflex
-~o	500,655,15,0,-34	0	0365	-- otilde
-:o	500,645,15,0,-34	0	0366	-- odieresis
-tdi	606,528,22,0,-50	0	0367	-- divide
-/o	500,561,97,0,-34	0	0370	-- oslash
-`u	611,699,15,0,-22	2	0371	-- ugrave
-'u	611,699,15,0,-22	2	0372	-- uacute
-^u	611,695,15,0,-22	2	0373	-- ucircumflex
-:u	611,645,15,0,-22	0	0374	-- udieresis
-'y	537,699,205,0,-4	3	0375	-- yacute
-Tp	574,737,205,0,-22	3	0376	-- thorn
-:y	537,645,205,0,-4	1	0377	-- ydieresis
+bq	204,109,185	0	128	quotesinglbase
+Fo	426,398	0	129	guillemotleft
+Fc	426,398	0	130	guillemotright
+bu	606,542	0	131	bullet
+Fn	556,737,205	3	132	florin
+f/	167,705,15,195,195	2	133	fraction
+%0	1000,705,15	2	134	perthousand
+dg	500,737,147	2	135	dagger
+dd	500,737,149	2	136	daggerdbl
+en	556,268	0	137	endash
+em	1000,268	0	138	emdash
+fi	611,737	2	140	fi
+fl	611,737	2	141	fl
+.i	315,464	0	144	dotlessi
+ga	333,699	2	146	grave
+a"	333,699,0,83,9	2	147	hungarumlaut
+a.	333,645	0	148	dotaccent
+ab	333,685	2	149	breve
+ah	333,695	2	150	caron
+ao	333,722	2	151	ring
+ho	333,0,215	1	152	ogonek
+lq	389,737	2	153	quotedblleft
+rq	389,737	2	154	quotedblright
+oe	833,479,15	0	155	oe
+/l	315,737	2	156	lslash
+Bq	389,109,185	0	157	quotedblbase
+OE	1000,722	2	158	OE
+/L	667,722	2	159	Lslash
+r!	296,547,205	1	161	exclamdown
+ct	556,584,141	0	162	cent
+Po	556,705,15	2	163	sterling
+Cs	556,597	0	164	currency
+Ye	556,690,0,1,1	2	165	yen
+bb	606,675,175	2	166	brokenbar
+sc	500,737,147	2	167	section
+ad	333,645	0	168	dieresis
+co	737,737,15,7,8	2	169	copyright
+Of	334,705,0,4,4	2	170	ordfeminine
+fo	259,398	0	171	guilsinglleft
+tno	606,389	0	172	logicalnot
+\-	606,289	0	173	minus
+rg	737,737,15,7,8	2	174	registered
+a-	333,623	0	175	macron
+de	400,705	2	176	degree
+t+-	606,506	0	177	plusminus
+S2	333,705	2	178	twosuperior
+S3	333,705	2	179	threesuperior
+aa	333,699	2	180	acute
+mc	611,464,205	1	181	mu
+ps	606,722,132	2	182	paragraph
+pc	278,374	0	183	periodcentered
+ac	333,0,215	1	184	cedilla
+S1	333,705	2	185	onesuperior
+Om	300,705	2	186	ordmasculine
+fc	259,398	0	187	guilsinglright
+14	834,705,15	2	188	onequarter
+12	834,705,15	2	189	onehalf
+34	834,705,15	2	190	threequarters
+r?	444,547,205	1	191	questiondown
+`A	722,937,0,8,8	2	192	Agrave
+'A	722,937,0,8,8	2	193	Aacute
+^A	722,933,0,8,8	2	194	Acircumflex
+~A	722,893,0,8,8	2	195	Atilde
+:A	722,883,0,8,8	2	196	Adieresis
+oA	722,965,0,8,8	2	197	Aring
+AE	1000,722	2	198	AE
+,C	722,737,215	3	199	Ccedilla
+`E	722,937	2	200	Egrave
+'E	722,937	2	201	Eacute
+^E	722,933	2	202	Ecircumflex
+:E	722,883	2	203	Edieresis
+`I	407,937	2	204	Igrave
+'I	407,937	2	205	Iacute
+^I	407,933	2	206	Icircumflex
+:I	407,883	2	207	Idieresis
+-D	778,722	2	208	Eth
+~N	815,893,15	2	209	Ntilde
+`O	778,937,15	2	210	Ograve
+'O	778,937,15	2	211	Oacute
+^O	778,933,15	2	212	Ocircumflex
+~O	778,893,15	2	213	Otilde
+:O	778,883,15	2	214	Odieresis
+tmu	606,482	0	215	multiply
+/O	778,778,56	2	216	Oslash
+`U	815,937,15	2	217	Ugrave
+'U	815,937,15	2	218	Uacute
+^U	815,933,15	2	219	Ucircumflex
+:U	815,883,15	2	220	Udieresis
+'Y	704,937,0,11,11	2	221	Yacute
+TP	667,722	2	222	Thorn
+ss	574,737,15	2	223	germandbls
+`a	556,699,15	2	224	agrave
+'a	556,699,15	2	225	aacute
+^a	556,695,15	2	226	acircumflex
+~a	556,655,15	0	227	atilde
+:a	556,645,15	0	228	adieresis
+oa	556,732,15	2	229	aring
+ae	796,479,15	0	230	ae
+,c	444,479,215	1	231	ccedilla
+`e	500,699,15	2	232	egrave
+'e	500,699,15	2	233	eacute
+^e	500,695,15	2	234	ecircumflex
+:e	500,645,15	0	235	edieresis
+`i	315,699	2	236	igrave
+'i	315,699	2	237	iacute
+^i	315,695	2	238	icircumflex
+:i	315,645	0	239	idieresis
+Sd	500,752,15	2	240	eth
+~n	611,655	0	241	ntilde
+`o	500,699,15	2	242	ograve
+'o	500,699,15	2	243	oacute
+^o	500,695,15	2	244	ocircumflex
+~o	500,655,15	0	245	otilde
+:o	500,645,15	0	246	odieresis
+tdi	606,528,22	0	247	divide
+/o	500,561,97	0	248	oslash
+`u	611,699,15	2	249	ugrave
+'u	611,699,15	2	250	uacute
+^u	611,695,15	2	251	ucircumflex
+:u	611,645,15	0	252	udieresis
+'y	537,699,205	3	253	yacute
+Tp	574,737,205	3	254	thorn
+:y	537,645,205	1	255	ydieresis
+u2026	1000,109,15	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PB b/contrib/groff/font/devps/PB
index cd1a5c1..e105758 100644
--- a/contrib/groff/font/devps/PB
+++ b/contrib/groff/font/devps/PB
@@ -120,246 +120,247 @@ w , -92
 y . -92
 y , -92
 charset
-ha	606,678,0,0,-52	2	0000	-- asciicircum
-ti	606,342,0,0,-51	0	0001	-- asciitilde
-vS	611,909,17,0,-57	2	0002	-- Scaron
-vZ	667,909,3,0,-24	2	0003	-- Zcaron
-vs	444,693,17,0,-39	2	0004	-- scaron
-vz	500,693,3,0,-16	2	0005	-- zcaron
-:Y	667,895,3,0,-15	2	0006	-- Ydieresis
-tm	998,678,0,0,-38	2	0007	-- trademark
-aq	227,695,0,0,-45	2	0010	-- quotesingle
-space	250	0	0040
-!	278,688,12,0,-63	2	0041	-- exclam
-"	402,695,0,0,-22	2	0042	-- quotedbl
+ha	606,678	2	0	asciicircum
+ti	606,342	0	1	asciitilde
+vS	611,909,17	2	2	Scaron
+vZ	667,909,3	2	3	Zcaron
+vs	444,693,17	2	4	scaron
+vz	500,693,3	2	5	zcaron
+:Y	667,895,3	2	6	Ydieresis
+tm	998,678	2	7	trademark
+aq	227,695	2	8	quotesingle
+space	250	0	32	space
+!	278,688,12	2	33	exclam
+"	402,695	2	34	quotedbl
 dq	"
-#	500,673,0,0,-4	2	0043	-- numbersign
+#	500,673	2	35	numbersign
 sh	"
-$	500,721,114,0,-28	2	0044	-- dollar
+$	500,721,114	2	36	dollar
 Do	"
-%	889,714,9,0,-61	2	0045	-- percent
-&	833,684,17,0,-52	2	0046	-- ampersand
-'	278,695,0,0,-29	2	0047	-- quoteright
+%	889,714,9	2	37	percent
+&	833,684,17	2	38	ampersand
+'	278,695	2	39	quoteright
 cq	"
-(	333,723,104,0,-65	2	0050	-- parenleft
-)	333,723,104,0,-28	2	0051	-- parenright
-*	444,695,0,0,-44	2	0052	-- asterisk
-+	606,505,0,0,-51	0	0053	-- plus
-,	250,141,166,0,6	0	0054	-- comma
--	333,305,0,0,-16	0	0055	-- hyphen
+(	333,723,104	2	40	parenleft
+)	333,723,104	2	41	parenright
+*	444,695	2	42	asterisk
++	606,505	0	43	plus
+,	250,141,166,0,6	0	44	comma
+-	333,305	0	45	hyphen
 hy	"
-.	250,144,12,0,-47	0	0056	-- period
-/	296,720,17,9,9	2	0057	-- slash
+.	250,144,12	0	46	period
+/	296,720,17,9,9	2	47	slash
 sl	"
-0	500,660,17,0,-33	2	0060	-- zero
-1	500,670,3,0,-35	2	0061	-- one
-2	500,660,3,0,-25	2	0062	-- two
-3	500,660,17,0,-22	2	0063	-- three
-4	500,672,3,0,-12	2	0064	-- four
-5	500,656,17,0,-42	2	0065	-- five
-6	500,660,17,0,-37	2	0066	-- six
-7	500,656,3,0,-46	2	0067	-- seven
-8	500,660,17,0,-34	2	0070	-- eight
-9	500,660,17,0,-31	2	0071	-- nine
-:	250,454,12,0,-47	0	0072	-- colon
-;	250,454,166,0,6	0	0073	-- semicolon
-<	606,519,15,0,-49	0	0074	-- less
-=	606,396,0,0,-51	0	0075	-- equal
->	606,519,15,0,-49	0	0076	-- greater
-?	444,687,12,0,-43	2	0077	-- question
-@	747,681,12,0,-42	2	0100	-- at
+0	500,660,17	2	48	zero
+1	500,670,3	2	49	one
+2	500,660,3	2	50	two
+3	500,660,17	2	51	three
+4	500,672,3	2	52	four
+5	500,656,17	2	53	five
+6	500,660,17	2	54	six
+7	500,656,3	2	55	seven
+8	500,660,17	2	56	eight
+9	500,660,17	2	57	nine
+:	250,454,12	0	58	colon
+;	250,454,166,0,6	0	59	semicolon
+<	606,519,15	0	60	less
+=	606,396	0	61	equal
+>	606,519,15	0	62	greater
+?	444,687,12	2	63	question
+@	747,681,12	2	64	at
 at	"
-A	778,686,3,0,-24	2	0101	-- A
-B	667,681,3,0,-39	2	0102	-- B
-C	722,695,17,0,-44	2	0103	-- C
-D	833,681,3,0,-35	2	0104	-- D
-E	611,681,4,0,-39	2	0105	-- E
-F	556,681,3,0,-28	2	0106	-- F
-G	833,695,17,0,-47	2	0107	-- G
-H	833,681,3,0,-36	2	0110	-- H
-I	389,681,3,0,-39	2	0111	-- I
-J	389,681,213,0,11	2	0112	-- J
-K	778,681,3,0,-39	2	0113	-- K
-L	611,681,4,0,-39	2	0114	-- L
-M	1000,681,10,0,-32	2	0115	-- M
-N	833,681,16,0,-35	2	0116	-- N
-O	833,695,17,0,-47	2	0117	-- O
-P	611,681,3,0,-39	2	0120	-- P
-Q	833,695,184,0,-47	2	0121	-- Q
-R	722,681,3,0,-39	2	0122	-- R
-S	611,695,17,0,-57	2	0123	-- S
-T	667,681,3,0,-17	2	0124	-- T
-U	778,681,17,0,-26	2	0125	-- U
-V	778,681,3,0,-20	2	0126	-- V
-W	1000,686,3,0,-17	2	0127	-- W
-X	667,695,3,0,-17	2	0130	-- X
-Y	667,695,3,0,-15	2	0131	-- Y
-Z	667,681,3,0,-24	2	0132	-- Z
-[	333,720,104,0,-73	2	0133	-- bracketleft
+A	778,686,3	2	65	A
+B	667,681,3	2	66	B
+C	722,695,17	2	67	C
+D	833,681,3	2	68	D
+E	611,681,4	2	69	E
+F	556,681,3	2	70	F
+G	833,695,17	2	71	G
+H	833,681,3	2	72	H
+I	389,681,3	2	73	I
+J	389,681,213,0,11	2	74	J
+K	778,681,3	2	75	K
+L	611,681,4	2	76	L
+M	1000,681,10	2	77	M
+N	833,681,16	2	78	N
+O	833,695,17	2	79	O
+P	611,681,3	2	80	P
+Q	833,695,184	2	81	Q
+R	722,681,3	2	82	R
+S	611,695,17	2	83	S
+T	667,681,3	2	84	T
+U	778,681,17	2	85	U
+V	778,681,3	2	86	V
+W	1000,686,3	2	87	W
+X	667,695,3	2	88	X
+Y	667,695,3	2	89	Y
+Z	667,681,3	2	90	Z
+[	333,720,104	2	91	bracketleft
 lB	"
-\	606,720,0,0,-72	2	0134	-- backslash
+\	606,720	2	92	backslash
 rs	"
-]	333,720,104,0,-42	2	0135	-- bracketright
+]	333,720,104	2	93	bracketright
 rB	"
-a^	333,681,0,2,2	2	0136	-- circumflex
+a^	333,681,0,2,2	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	278,695,0,0,-29	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	278,695	2	96	quoteleft
 oq	"
-a	500,471,17,0,-40	0	0141	-- a
-b	611,720,17,0,-10	2	0142	-- b
-c	444,471,17,0,-37	0	0143	-- c
-d	611,720,17,0,-42	2	0144	-- d
-e	500,471,17,0,-42	0	0145	-- e
-f	389,720,3,0,-34	2	0146	-- f
-g	556,471,266,0,-26	1	0147	-- g
-h	611,720,3,0,-24	2	0150	-- h
-i	333,706,3,0,-34	2	0151	-- i
-j	333,706,266,0,-3	3	0152	-- j
-k	611,720,3,0,-21	2	0153	-- k
-l	333,720,3,0,-24	2	0154	-- l
-m	889,471,3,0,-24	0	0155	-- m
-n	611,471,3,0,-24	0	0156	-- n
-o	556,471,17,0,-40	0	0157	-- o
-p	611,471,258,0,-29	1	0160	-- p
-q	611,471,258,0,-52	1	0161	-- q
-r	389,471,3,0,-30	0	0162	-- r
-s	444,471,17,0,-39	0	0163	-- s
-t	333,632,17,0,-22	2	0164	-- t
-u	611,471,17,0,-25	0	0165	-- u
-v	556,459,3,0,-11	0	0166	-- v
-w	833,471,3,0,-13	0	0167	-- w
-x	500,471,3,0,-20	0	0170	-- x
-y	556,459,266,0,-10	1	0171	-- y
-z	500,459,3,0,-16	0	0172	-- z
-lC	310,725,117,0,-5	2	0173	-- braceleft
+a	500,471,17	0	97	a
+b	611,720,17	2	98	b
+c	444,471,17	0	99	c
+d	611,720,17	2	100	d
+e	500,471,17	0	101	e
+f	389,720,3	2	102	f
+g	556,471,266	1	103	g
+h	611,720,3	2	104	h
+i	333,706,3	2	105	i
+j	333,706,266	3	106	j
+k	611,720,3	2	107	k
+l	333,720,3	2	108	l
+m	889,471,3	0	109	m
+n	611,471,3	0	110	n
+o	556,471,17	0	111	o
+p	611,471,258	1	112	p
+q	611,471,258	1	113	q
+r	389,471,3	0	114	r
+s	444,471,17	0	115	s
+t	333,632,17	2	116	t
+u	611,471,17	0	117	u
+v	556,459,3	0	118	v
+w	833,471,3	0	119	w
+x	500,471,3	0	120	x
+y	556,459,266	1	121	y
+z	500,459,3	0	122	z
+lC	310,725,117	2	123	braceleft
 {	"
-ba	606,720,0,0,-260	2	0174	-- bar
+ba	606,720	2	124	bar
 |	"
-rC	310,725,117,0,-22	2	0175	-- braceright
+rC	310,725,117	2	125	braceright
 }	"
-a~	333,661,0,16,16	2	0176	-- tilde
+a~	333,661,0,16,16	2	126	tilde
 ~	"
-bq	333,130,160,0,-56	0	0200	-- quotesinglbase
-Fo	500,438,0,0,-36	0	0201	-- guillemotleft
-Fc	500,438,0,0,-37	0	0202	-- guillemotright
-bu	606,516,0,0,-131	0	0203	-- bullet
-Fn	500,703,242,0,-11	2	0204	-- florin
-f/	167,660,0,153,152	2	0205	-- fraction
-%0	1000,724,9,0,-33	2	0206	-- perthousand
-dg	500,682,6,0,-29	2	0207	-- dagger
-dd	500,682,245,0,-32	2	0210	-- daggerdbl
-en	500,291	0	0211	-- endash
-em	1000,291	0	0212	-- emdash
-fi	611,720,3,0,-10	2	0214	-- fi
-fl	611,720,3,0,-17	2	0215	-- fl
-.i	333,471,3,0,-34	0	0220	-- dotlessi
-ga	333,691,0,0,-18	2	0222	-- grave
-a"	333,691,0,57,56	2	0223	-- hungarumlaut
-a.	333,671,0,0,-100	2	0224	-- dotaccent
-ab	333,669,0,0,-15	2	0225	-- breve
-ah	333,685,0,2,2	2	0226	-- caron
-ao	333,700,0,0,-67	2	0227	-- ring
-ho	333,0,246,0,-60	0	0230	-- ogonek
-lq	500,695,0,0,-34	2	0231	-- quotedblleft
-rq	500,695,0,0,-34	2	0232	-- quotedblright
-oe	833,471,17,0,-48	0	0233	-- oe
-/l	333,720,3,1,4	2	0234	-- lslash
-Bq	500,130,160,0,-34	0	0235	-- quotedblbase
-OE	1000,695,17,0,-43	2	0236	-- OE
-/L	611,681,4,0,-16	2	0237	-- Lslash
-r!	278,471,227,0,-59	0	0241	-- exclamdown
-ct	500,554,106,0,-73	0	0242	-- cent
-Po	500,676,19,1,2	2	0243	-- sterling
-Cs	500,533,0,0,-32	0	0244	-- currency
-Ye	500,695,3,0,-17	2	0245	-- yen
-bb	606,720,0,0,-260	2	0246	-- brokenbar
-sc	500,695,217,0,-30	2	0247	-- section
-ad	333,671,0,8,8	2	0250	-- dieresis
-co	747,695,17,0,-26	2	0251	-- copyright
-Of	438,660,0,0,-77	2	0252	-- ordfeminine
-fo	389,438,0,0,-82	0	0253	-- guilsinglleft
-no	606,396,0,0,-51	0	0254	-- logicalnot
-\-	606,298,0,0,-51	0	0255	-- minus
-rg	747,695,17,0,-26	2	0256	-- registered
-a-	333,609,0,0,-1	0	0257	-- macron
-de	400,660,0,0,-50	2	0260	-- degree
-t+-	606,505,0,0,-51	0	0261	-- plusminus
-S2	300,660,0,0,-5	2	0262	-- twosuperior
-S3	300,667,0,0,-9	2	0263	-- threesuperior
-aa	333,691,0,0,-78	2	0264	-- acute
-mc	611,471,225,0,-25	0	0265	-- mu
-ps	641,683,161,0,-19	2	0266	-- paragraph
-pc	250,335,0,0,-47	0	0267	-- periodcentered
-ac	333,0,225,0,-73	0	0270	-- cedilla
-S1	300,665,0,0,-14	2	0271	-- onesuperior
-Om	488,660,0,0,-89	2	0272	-- ordmasculine
-fc	389,438,0,0,-82	0	0273	-- guilsinglright
-14	750,665,2,0,-19	2	0274	-- onequarter
-12	750,665,2,0,-9	2	0275	-- onehalf
-34	750,667,2,0,-15	2	0276	-- threequarters
-r?	444,471,231,0,-33	0	0277	-- questiondown
-`A	778,915,3,0,-24	2	0300	-- Agrave
-'A	778,915,3,0,-24	2	0301	-- Aacute
-^A	778,905,3,0,-24	2	0302	-- Acircumflex
-~A	778,885,3,0,-24	2	0303	-- Atilde
-:A	778,895,3,0,-24	2	0304	-- Adieresis
-oA	778,924,3,0,-24	2	0305	-- Aring
-AE	1000,681,4,0,-12	2	0306	-- AE
-,C	722,695,225,0,-44	2	0307	-- Ccedilla
-`E	611,915,4,0,-39	2	0310	-- Egrave
-'E	611,915,4,0,-39	2	0311	-- Eacute
-^E	611,905,4,0,-39	2	0312	-- Ecircumflex
-:E	611,895,4,0,-39	2	0313	-- Edieresis
-`I	389,915,3,0,-39	2	0314	-- Igrave
-'I	389,915,3,0,-39	2	0315	-- Iacute
-^I	389,905,3,0,-26	2	0316	-- Icircumflex
-:I	389,895,3,0,-20	2	0317	-- Idieresis
--D	833,681,3,0,-10	2	0320	-- Eth
-~N	833,885,16,0,-35	2	0321	-- Ntilde
-`O	833,915,17,0,-47	2	0322	-- Ograve
-'O	833,915,17,0,-47	2	0323	-- Oacute
-^O	833,905,17,0,-47	2	0324	-- Ocircumflex
-~O	833,885,17,0,-47	2	0325	-- Otilde
-:O	833,895,17,0,-47	2	0326	-- Odieresis
-tmu	606,483,0,0,-72	0	0327	-- multiply
-/O	833,698,20,0,-32	2	0330	-- Oslash
-`U	778,915,17,0,-26	2	0331	-- Ugrave
-'U	778,915,17,0,-26	2	0332	-- Uacute
-^U	778,905,17,0,-26	2	0333	-- Ucircumflex
-:U	778,895,17,0,-26	2	0334	-- Udieresis
-'Y	667,915,3,0,-15	2	0335	-- Yacute
-TP	611,681,3,0,-39	2	0336	-- Thorn
-ss	611,720,17,0,-30	2	0337	-- germandbls
-`a	500,711,17,0,-40	2	0340	-- agrave
-'a	500,711,17,0,-40	2	0341	-- aacute
-^a	500,701,17,0,-40	2	0342	-- acircumflex
-~a	500,673,17,0,-40	2	0343	-- atilde
-:a	500,691,17,0,-40	2	0344	-- adieresis
-oa	500,700,17,0,-40	2	0345	-- aring
-ae	778,471,17,0,-46	0	0346	-- ae
-,c	444,471,225,0,-37	0	0347	-- ccedilla
-`e	500,711,17,0,-42	2	0350	-- egrave
-'e	500,711,17,0,-42	2	0351	-- eacute
-^e	500,701,17,0,-42	2	0352	-- ecircumflex
-:e	500,691,17,0,-42	2	0353	-- edieresis
-`i	333,711,3,0,-18	2	0354	-- igrave
-'i	333,711,3,0,-34	2	0355	-- iacute
-^i	333,701,3,2,2	2	0356	-- icircumflex
-:i	333,691,3,8,8	2	0357	-- idieresis
-Sd	556,720,17,0,-40	2	0360	-- eth
-~n	611,673,3,0,-24	2	0361	-- ntilde
-`o	556,711,17,0,-40	2	0362	-- ograve
-'o	556,711,17,0,-40	2	0363	-- oacute
-^o	556,701,17,0,-40	2	0364	-- ocircumflex
-~o	556,673,17,0,-40	2	0365	-- otilde
-:o	556,691,17,0,-40	2	0366	-- odieresis
-tdi	606,510,0,0,-51	0	0367	-- divide
-/o	556,471,18,0,-23	0	0370	-- oslash
-`u	611,711,17,0,-25	2	0371	-- ugrave
-'u	611,711,17,0,-25	2	0372	-- uacute
-^u	611,701,17,0,-25	2	0373	-- ucircumflex
-:u	611,691,17,0,-25	2	0374	-- udieresis
-'y	556,711,266,0,-10	3	0375	-- yacute
-Tp	611,720,258,0,-17	3	0376	-- thorn
-:y	556,691,266,0,-10	3	0377	-- ydieresis
+bq	333,130,160	0	128	quotesinglbase
+Fo	500,438	0	129	guillemotleft
+Fc	500,438	0	130	guillemotright
+bu	606,516	0	131	bullet
+Fn	500,703,242	2	132	florin
+f/	167,660,0,153,152	2	133	fraction
+%0	1000,724,9	2	134	perthousand
+dg	500,682,6	2	135	dagger
+dd	500,682,245	2	136	daggerdbl
+en	500,291	0	137	endash
+em	1000,291	0	138	emdash
+fi	611,720,3	2	140	fi
+fl	611,720,3	2	141	fl
+.i	333,471,3	0	144	dotlessi
+ga	333,691	2	146	grave
+a"	333,691,0,57,56	2	147	hungarumlaut
+a.	333,671	2	148	dotaccent
+ab	333,669	2	149	breve
+ah	333,685,0,2,2	2	150	caron
+ao	333,700	2	151	ring
+ho	333,0,246	0	152	ogonek
+lq	500,695	2	153	quotedblleft
+rq	500,695	2	154	quotedblright
+oe	833,471,17	0	155	oe
+/l	333,720,3,1,4	2	156	lslash
+Bq	500,130,160	0	157	quotedblbase
+OE	1000,695,17	2	158	OE
+/L	611,681,4	2	159	Lslash
+r!	278,471,227	0	161	exclamdown
+ct	500,554,106	0	162	cent
+Po	500,676,19,1,2	2	163	sterling
+Cs	500,533	0	164	currency
+Ye	500,695,3	2	165	yen
+bb	606,720	2	166	brokenbar
+sc	500,695,217	2	167	section
+ad	333,671,0,8,8	2	168	dieresis
+co	747,695,17	2	169	copyright
+Of	438,660	2	170	ordfeminine
+fo	389,438	0	171	guilsinglleft
+tno	606,396	0	172	logicalnot
+\-	606,298	0	173	minus
+rg	747,695,17	2	174	registered
+a-	333,609	0	175	macron
+de	400,660	2	176	degree
+t+-	606,505	0	177	plusminus
+S2	300,660	2	178	twosuperior
+S3	300,667	2	179	threesuperior
+aa	333,691	2	180	acute
+mc	611,471,225	0	181	mu
+ps	641,683,161	2	182	paragraph
+pc	250,335	0	183	periodcentered
+ac	333,0,225	0	184	cedilla
+S1	300,665	2	185	onesuperior
+Om	488,660	2	186	ordmasculine
+fc	389,438	0	187	guilsinglright
+14	750,665,2	2	188	onequarter
+12	750,665,2	2	189	onehalf
+34	750,667,2	2	190	threequarters
+r?	444,471,231	0	191	questiondown
+`A	778,915,3	2	192	Agrave
+'A	778,915,3	2	193	Aacute
+^A	778,905,3	2	194	Acircumflex
+~A	778,885,3	2	195	Atilde
+:A	778,895,3	2	196	Adieresis
+oA	778,924,3	2	197	Aring
+AE	1000,681,4	2	198	AE
+,C	722,695,225	2	199	Ccedilla
+`E	611,915,4	2	200	Egrave
+'E	611,915,4	2	201	Eacute
+^E	611,905,4	2	202	Ecircumflex
+:E	611,895,4	2	203	Edieresis
+`I	389,915,3	2	204	Igrave
+'I	389,915,3	2	205	Iacute
+^I	389,905,3	2	206	Icircumflex
+:I	389,895,3	2	207	Idieresis
+-D	833,681,3	2	208	Eth
+~N	833,885,16	2	209	Ntilde
+`O	833,915,17	2	210	Ograve
+'O	833,915,17	2	211	Oacute
+^O	833,905,17	2	212	Ocircumflex
+~O	833,885,17	2	213	Otilde
+:O	833,895,17	2	214	Odieresis
+tmu	606,483	0	215	multiply
+/O	833,698,20	2	216	Oslash
+`U	778,915,17	2	217	Ugrave
+'U	778,915,17	2	218	Uacute
+^U	778,905,17	2	219	Ucircumflex
+:U	778,895,17	2	220	Udieresis
+'Y	667,915,3	2	221	Yacute
+TP	611,681,3	2	222	Thorn
+ss	611,720,17	2	223	germandbls
+`a	500,711,17	2	224	agrave
+'a	500,711,17	2	225	aacute
+^a	500,701,17	2	226	acircumflex
+~a	500,673,17	2	227	atilde
+:a	500,691,17	2	228	adieresis
+oa	500,700,17	2	229	aring
+ae	778,471,17	0	230	ae
+,c	444,471,225	0	231	ccedilla
+`e	500,711,17	2	232	egrave
+'e	500,711,17	2	233	eacute
+^e	500,701,17	2	234	ecircumflex
+:e	500,691,17	2	235	edieresis
+`i	333,711,3	2	236	igrave
+'i	333,711,3	2	237	iacute
+^i	333,701,3,2,2	2	238	icircumflex
+:i	333,691,3,8,8	2	239	idieresis
+Sd	556,720,17	2	240	eth
+~n	611,673,3	2	241	ntilde
+`o	556,711,17	2	242	ograve
+'o	556,711,17	2	243	oacute
+^o	556,701,17	2	244	ocircumflex
+~o	556,673,17	2	245	otilde
+:o	556,691,17	2	246	odieresis
+tdi	606,510	0	247	divide
+/o	556,471,18	0	248	oslash
+`u	611,711,17	2	249	ugrave
+'u	611,711,17	2	250	uacute
+^u	611,701,17	2	251	ucircumflex
+:u	611,691,17	2	252	udieresis
+'y	556,711,266	3	253	yacute
+Tp	611,720,258	3	254	thorn
+:y	556,691,266	3	255	ydieresis
+u2026	1000,144,12	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PBI b/contrib/groff/font/devps/PBI
index 55784ba..31f5019 100644
--- a/contrib/groff/font/devps/PBI
+++ b/contrib/groff/font/devps/PBI
@@ -124,246 +124,247 @@ w , -55
 y . -37
 y , -37
 charset
-ha	606,678,0,0,-13	2	0000	-- asciicircum
-ti	606,346,0,0,-1	0	0001	-- asciitilde
-vS	556,896,17,51,0,51	2	0002	-- Scaron
-vZ	667,896,3,59,49,59	2	0003	-- Zcaron
-vs	444,692,17,95,25,66	2	0004	-- scaron
-vz	500,692,17,67,19,66	2	0005	-- zcaron
-:Y	611,880,3,114,-4,66	2	0006	-- Ydieresis
-tm	1000,678,0,11,12,11	2	0007	-- trademark
-aq	250,720,0,93,-77,66	2	0010	-- quotesingle
-space	250	0	0040
-!	333,695,17,39,-8,39	2	0041	-- exclam
-"	500,720,0,43,-87,43	2	0042	-- quotedbl
+ha	606,678,0,0,-13	2	0	asciicircum
+ti	606,346,0,0,-1	0	1	asciitilde
+vS	556,896,17,51,0,51	2	2	Scaron
+vZ	667,896,3,59,49,59	2	3	Zcaron
+vs	444,692,17,95,25,66	2	4	scaron
+vz	500,692,17,67,19,66	2	5	zcaron
+:Y	611,880,3,114,-4,66	2	6	Ydieresis
+tm	1000,678,0,11,12,11	2	7	trademark
+aq	250,720,0,93,-77,66	2	8	quotesingle
+space	250	0	32	space
+!	333,695,17,39,-8,39	2	33	exclam
+"	500,720,0,43,-87,43	2	34	quotedbl
 dq	"
-#	500,673,0,46,46,46	2	0043	-- numbersign
+#	500,673,0,46,46,46	2	35	numbersign
 sh	"
-$	500,737,108,27,30,27	2	0044	-- dollar
+$	500,737,108,27,30,27	2	36	dollar
 Do	"
-%	889,697,17,0,-6	2	0045	-- percent
-&	833,695,17,28,-24,28	2	0046	-- ampersand
-'	278,720,0,74,-26,66	2	0047	-- quoteright
+%	889,697,17,0,-6	2	37	percent
+&	833,695,17,28,-24,28	2	38	ampersand
+'	278,720,0,74,-26,66	2	39	quoteright
 cq	"
-(	333,723,129,85,-8,66	2	0050	-- parenleft
-)	333,723,129,15,62,15	2	0051	-- parenright
-*	444,695,0,45,-34,45	2	0052	-- asterisk
-+	606,501,5	0	0053	-- plus
-,	250,147,164,8,83,8	0	0054	-- comma
--	389,300,0,23,13,23	0	0055	-- hyphen
+(	333,723,129,85,-8,66	2	40	parenleft
+)	333,723,129,15,62,15	2	41	parenright
+*	444,695,0,45,-34,45	2	42	asterisk
++	606,501,5	0	43	plus
+,	250,147,164,8,83,8	0	44	comma
+-	389,300,0,23,13,23	0	45	hyphen
 hy	"
-.	250,135,17,0,2	0	0056	-- period
-/	315,720,17,50,49,50	2	0057	-- slash
+.	250,135,17,0,2	0	46	period
+/	315,720,17,50,49,50	2	47	slash
 sl	"
-0	500,683,17,40,8,40	2	0060	-- zero
-1	500,678,3,0,9	2	0061	-- one
-2	500,683,3,4,49,4	2	0062	-- two
-3	500,683,17,0,42	2	0063	-- three
-4	500,683,3,37,47,37	2	0064	-- four
-5	500,675,17,31,36,31	2	0065	-- five
-6	500,683,17,38,11,38	2	0066	-- six
-7	500,674,3,94,-19,66	2	0067	-- seven
-8	500,683,17,34,24,34	2	0070	-- eight
-9	500,683,17,41,23,41	2	0071	-- nine
-:	250,452,17,36,12,36	0	0072	-- colon
-;	250,452,164,47,83,47	0	0073	-- semicolon
-<	606,517,21,2,1,2	0	0074	-- less
-=	606,390,0,0,-1	0	0075	-- equal
->	606,517,21,1,2,1	0	0076	-- greater
-?	444,695,17,56,-41,56	2	0077	-- question
-@	833,681,12,0,-32	2	0100	-- at
+0	500,683,17,40,8,40	2	48	zero
+1	500,678,3,0,9	2	49	one
+2	500,683,3,4,49,4	2	50	two
+3	500,683,17,0,42	2	51	three
+4	500,683,3,37,47,37	2	52	four
+5	500,675,17,31,36,31	2	53	five
+6	500,683,17,38,11,38	2	54	six
+7	500,674,3,94,-19,66	2	55	seven
+8	500,683,17,34,24,34	2	56	eight
+9	500,683,17,41,23,41	2	57	nine
+:	250,452,17,36,12,36	0	58	colon
+;	250,452,164,47,83,47	0	59	semicolon
+<	606,517,21,2,1,2	0	60	less
+=	606,390,0,0,-1	0	61	equal
+>	606,517,21,1,2,1	0	62	greater
+?	444,695,17,56,-41,56	2	63	question
+@	833,681,12,0,-32	2	64	at
 at	"
-A	722,683,3,13,85,13	2	0101	-- A
-B	667,681,3,12,42,12	2	0102	-- B
-C	685,695,17,60,-19,60	2	0103	-- C
-D	778,682,3,19,50,19	2	0104	-- D
-E	611,681,3,45,39,45	2	0105	-- E
-F	556,681,3,87,56,66	2	0106	-- F
-G	778,695,17,22,-22,22	2	0107	-- G
-H	778,681,3,98,62,66	2	0110	-- H
-I	389,681,3,73,51,66	2	0111	-- I
-J	389,681,207,78,79,66	2	0112	-- J
-K	722,681,3,74,60,66	2	0113	-- K
-L	611,681,3,17,24,17	2	0114	-- L
-M	944,681,17,91,73,66	2	0115	-- M
-N	778,681,3,101,52,66	2	0116	-- N
-O	833,695,17,11,-26,11	2	0117	-- O
-P	667,681,3,56,39,56	2	0120	-- P
-Q	833,695,222,11,-26,11	2	0121	-- Q
-R	722,681,3,25,46,25	2	0122	-- R
-S	556,695,17,11,0,11	2	0123	-- S
-T	611,681,3,113,-6,66	2	0124	-- T
-U	778,681,17,97,-33,66	2	0125	-- U
-V	667,681,3,128,-17,66	2	0126	-- V
-W	1000,689,3,123,-17,66	2	0127	-- W
-X	722,681,3,100,59,66	2	0130	-- X
-Y	611,695,3,114,-4,66	2	0131	-- Y
-Z	667,681,3,59,49,59	2	0132	-- Z
-[	333,723,102,98,5,66	2	0133	-- bracketleft
+A	722,683,3,13,85,13	2	65	A
+B	667,681,3,12,42,12	2	66	B
+C	685,695,17,60,-19,60	2	67	C
+D	778,682,3,19,50,19	2	68	D
+E	611,681,3,45,39,45	2	69	E
+F	556,681,3,87,56,66	2	70	F
+G	778,695,17,22,-22,22	2	71	G
+H	778,681,3,98,62,66	2	72	H
+I	389,681,3,73,51,66	2	73	I
+J	389,681,207,78,79,66	2	74	J
+K	722,681,3,74,60,66	2	75	K
+L	611,681,3,17,24,17	2	76	L
+M	944,681,17,91,73,66	2	77	M
+N	778,681,3,101,52,66	2	78	N
+O	833,695,17,11,-26,11	2	79	O
+P	667,681,3,56,39,56	2	80	P
+Q	833,695,222,11,-26,11	2	81	Q
+R	722,681,3,25,46,25	2	82	R
+S	556,695,17,11,0,11	2	83	S
+T	611,681,3,113,-6,66	2	84	T
+U	778,681,17,97,-33,66	2	85	U
+V	667,681,3,128,-17,66	2	86	V
+W	1000,689,3,123,-17,66	2	87	W
+X	722,681,3,100,59,66	2	88	X
+Y	611,695,3,114,-4,66	2	89	Y
+Z	667,681,3,59,49,59	2	90	Z
+[	333,723,102,98,5,66	2	91	bracketleft
 lB	"
-\	606,720,0,0,-22	2	0134	-- backslash
+\	606,720,0,0,-22	2	92	backslash
 rs	"
-]	333,723,102,32,71,32	2	0135	-- bracketright
+]	333,723,102,32,71,32	2	93	bracketright
 rB	"
-a^	333,684,0,132,-38,66	2	0136	-- circumflex
+a^	333,684,0,132,-38,66	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	278,720,0,63,-15,63	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	278,720,0,63,-15,63	2	96	quoteleft
 oq	"
-a	556,470,17,13,6,13	0	0141	-- a
-b	537,726,17,7,6,7	2	0142	-- b
-c	444,469,17,42,18,42	0	0143	-- c
-d	556,726,17,44,12,44	2	0144	-- d
-e	444,469,17,24,22,24	0	0145	-- e
-f	333,726,271,166,180,66	3	0146	-- f
-g	500,469,271,79,100,66	1	0147	-- g
-h	556,726,17,16,28,16	2	0150	-- h
-i	333,695,17,29,24,29	2	0151	-- i
-j	333,695,271,40,114,40	3	0152	-- j
-k	556,726,17,22,16,22	2	0153	-- k
-l	333,726,17,35,-14,35	2	0154	-- l
-m	833,469,17,20,31,20	0	0155	-- m
-n	556,469,17,15,33,15	0	0156	-- n
-o	556,469,17,0,2	0	0157	-- o
-p	556,469,271,10,71,10	1	0160	-- p
-q	537,469,271,26,18,26	1	0161	-- q
-r	389,469,17,72,30,66	0	0162	-- r
-s	444,469,17,12,25,12	0	0163	-- s
-t	389,636,17,70,8,66	2	0164	-- t
-u	556,469,17,15,28,15	0	0165	-- u
-v	556,469,17,7,31,7	0	0166	-- v
-w	833,469,17,19,23,19	0	0167	-- w
-x	500,469,17,50,58,50	0	0170	-- x
-y	556,469,271,35,37,35	1	0171	-- y
-z	500,469,17,20,19,20	0	0172	-- z
-lC	333,720,105,51,32,51	2	0173	-- braceleft
+a	556,470,17,13,6,13	0	97	a
+b	537,726,17,7,6,7	2	98	b
+c	444,469,17,42,18,42	0	99	c
+d	556,726,17,44,12,44	2	100	d
+e	444,469,17,24,22,24	0	101	e
+f	333,726,271,166,180,66	3	102	f
+g	500,469,271,79,100,66	1	103	g
+h	556,726,17,16,28,16	2	104	h
+i	333,695,17,29,24,29	2	105	i
+j	333,695,271,40,114,40	3	106	j
+k	556,726,17,22,16,22	2	107	k
+l	333,726,17,35,-14,35	2	108	l
+m	833,469,17,20,31,20	0	109	m
+n	556,469,17,15,33,15	0	110	n
+o	556,469,17,0,2	0	111	o
+p	556,469,271,10,71,10	1	112	p
+q	537,469,271,26,18,26	1	113	q
+r	389,469,17,72,30,66	0	114	r
+s	444,469,17,12,25,12	0	115	s
+t	389,636,17,70,8,66	2	116	t
+u	556,469,17,15,28,15	0	117	u
+v	556,469,17,7,31,7	0	118	v
+w	833,469,17,19,23,19	0	119	w
+x	500,469,17,50,58,50	0	120	x
+y	556,469,271,35,37,35	1	121	y
+z	500,469,17,20,19,20	0	122	z
+lC	333,720,105,51,32,51	2	123	braceleft
 {	"
-ba	606,720,0,0,-209	2	0174	-- bar
+ba	606,720,0,0,-209	2	124	bar
 |	"
-rC	333,720,105,32,51,32	2	0175	-- braceright
+rC	333,720,105,32,51,32	2	125	braceright
 }	"
-a~	333,654,0,158,-32,66	2	0176	-- tilde
+a~	333,654,0,158,-32,66	2	126	tilde
 ~	"
-bq	250,145,144,20,53,20	0	0200	-- quotesinglbase
-Fo	500,446,0,8,15,8	0	0201	-- guillemotleft
-Fc	500,443,0,8,15,8	0	0202	-- guillemotright
-bu	606,516,0,0,-81	0	0203	-- bullet
-Fn	500,690,242,29,42,29	2	0204	-- florin
-f/	167,683,0,221,220,66	2	0205	-- fraction
-%0	1000,691,17,0,-15	2	0206	-- perthousand
-dg	556,685,3,0,-17	2	0207	-- dagger
-dd	556,693,153,31,17,31	2	0210	-- daggerdbl
-en	500,282,0,62,62,62	0	0211	-- endash
-em	1000,282,0,62,62,62	0	0212	-- emdash
-fi	611,726,271,27,180,27	3	0214	-- fi
-fl	611,726,271,70,180,66	3	0215	-- fl
-.i	333,469,17,10,24,10	0	0220	-- dotlessi
-ga	333,699,0,39,-60,39	2	0222	-- grave
-a"	333,699,0,126,78,66	2	0223	-- hungarumlaut
-a.	333,668,0,42,-152,42	2	0224	-- dotaccent
-ab	333,680,0,129,-46,66	2	0225	-- breve
-ah	333,684,0,162,-63,66	2	0226	-- caron
-ao	556,714,0,0,-227	2	0227	-- ring
-ho	333,0,206,0,18	0	0230	-- ogonek
-lq	500,720,0,61,-15,61	2	0231	-- quotedblleft
-rq	500,720,0,69,-23,66	2	0232	-- quotedblright
-oe	778,469,17,27,2,27	0	0233	-- oe
-/l	333,726,17,82,37,66	2	0234	-- lslash
-Bq	500,145,144,0,68	0	0235	-- quotedblbase
-OE	944,695,17,67,11,66	2	0236	-- OE
-/L	611,681,3,17,44,17	2	0237	-- Lslash
-r!	333,479,225,0,48	0	0241	-- exclamdown
-ct	500,547,105,6,-2,6	0	0242	-- cent
-Po	500,683,5,51,29,51	2	0243	-- sterling
-Cs	500,533,0,18,18,18	0	0244	-- currency
-Ye	500,695,3,88,39,66	2	0245	-- yen
-bb	606,720,0,0,-209	2	0246	-- brokenbar
-sc	556,695,151,0,3	2	0247	-- section
-ad	333,668,0,143,-40,66	2	0250	-- dieresis
-co	747,695,17,23,24,23	2	0251	-- copyright
-Of	333,684,0,72,3,66	2	0252	-- ordfeminine
-fo	333,446,0,9,-10,9	0	0253	-- guilsinglleft
-no	606,390,0,0,-1	0	0254	-- logicalnot
-\-	606,292,0,0,-1	0	0255	-- minus
-rg	747,695,17,23,24,23	2	0256	-- registered
-a-	333,608,0,135,-26,66	0	0257	-- macron
-de	400,683	2	0260	-- degree
-t+-	606,501	0	0261	-- plusminus
-S2	300,683,0,71,24,66	2	0262	-- twosuperior
-S3	300,683,0,60,27,60	2	0263	-- threesuperior
-aa	333,699,0,109,-103,66	2	0264	-- acute
-mc	556,469,232,15,65,15	0	0265	-- mu
-ps	556,681,204,123,36,66	2	0266	-- paragraph
-pc	250,324,0,6,-17,6	0	0267	-- periodcentered
-ac	333,5,218,0,38	0	0270	-- cedilla
-S1	300,680,0,48,9,48	2	0271	-- onesuperior
-Om	333,683,0,63,-1,63	2	0272	-- ordmasculine
-fc	333,443,0,0,15	0	0273	-- guilsinglright
-14	750,683,2,32,32,32	2	0274	-- onequarter
-12	750,683,2,36,36,36	2	0275	-- onehalf
-34	750,683,2,32,32,32	2	0276	-- threequarters
-r?	444,479,226,0,62	0	0277	-- questiondown
-`A	722,911,3,13,85,13	2	0300	-- Agrave
-'A	722,911,3,13,85,13	2	0301	-- Aacute
-^A	722,896,3,13,85,13	2	0302	-- Acircumflex
-~A	722,866,3,13,85,13	2	0303	-- Atilde
-:A	722,880,3,13,85,13	2	0304	-- Adieresis
-oA	722,926,3,13,85,13	2	0305	-- Aring
-AE	944,681,3,33,79,33	2	0306	-- AE
-,C	685,695,218,60,-19,60	2	0307	-- Ccedilla
-`E	611,911,3,45,39,45	2	0310	-- Egrave
-'E	611,911,3,45,39,45	2	0311	-- Eacute
-^E	611,896,3,45,39,45	2	0312	-- Ecircumflex
-:E	611,880,3,45,39,45	2	0313	-- Edieresis
-`I	389,911,3,73,51,66	2	0314	-- Igrave
-'I	389,911,3,81,51,66	2	0315	-- Iacute
-^I	389,896,3,104,51,66	2	0316	-- Icircumflex
-:I	389,880,3,115,51,66	2	0317	-- Idieresis
--D	778,682,3,19,50,19	2	0320	-- Eth
-~N	778,866,3,101,52,66	2	0321	-- Ntilde
-`O	833,911,17,11,-26,11	2	0322	-- Ograve
-'O	833,911,17,11,-26,11	2	0323	-- Oacute
-^O	833,896,17,11,-26,11	2	0324	-- Ocircumflex
-~O	833,866,17,11,-26,11	2	0325	-- Otilde
-:O	833,880,17,11,-26,11	2	0326	-- Odieresis
-tmu	606,479,0,0,-22	0	0327	-- multiply
-/O	833,730,54,14,-7,14	2	0330	-- Oslash
-`U	778,911,17,97,-33,66	2	0331	-- Ugrave
-'U	778,911,17,97,-33,66	2	0332	-- Uacute
-^U	778,896,17,97,-33,66	2	0333	-- Ucircumflex
-:U	778,880,17,97,-33,66	2	0334	-- Udieresis
-'Y	611,911,3,114,-4,66	2	0335	-- Yacute
-TP	667,681,3,27,39,27	2	0336	-- Thorn
-ss	556,726,271,43,181,43	3	0337	-- germandbls
-`a	556,719,17,13,6,13	2	0340	-- agrave
-'a	556,719,17,13,6,13	2	0341	-- aacute
-^a	556,704,17,21,6,21	2	0342	-- acircumflex
-~a	556,666,17,47,6,47	2	0343	-- atilde
-:a	556,688,17,32,6,32	2	0344	-- adieresis
-oa	556,714,17,13,6,13	2	0345	-- aring
-ae	738,469,17,23,6,23	0	0346	-- ae
-,c	444,469,218,42,18,42	0	0347	-- ccedilla
-`e	444,719,17,24,22,24	2	0350	-- egrave
-'e	444,719,17,54,22,54	2	0351	-- eacute
-^e	444,704,17,77,22,66	2	0352	-- ecircumflex
-:e	444,688,17,88,22,66	2	0353	-- edieresis
-`i	333,719,17,39,24,39	2	0354	-- igrave
-'i	333,719,17,109,24,66	2	0355	-- iacute
-^i	333,704,17,120,24,66	2	0356	-- icircumflex
-:i	333,688,17,143,24,66	2	0357	-- idieresis
-Sd	556,726,17,40,2,40	2	0360	-- eth
-~n	556,666,17,47,33,47	2	0361	-- ntilde
-`o	556,719,17,0,2	2	0362	-- ograve
-'o	556,719,17,0,2	2	0363	-- oacute
-^o	556,704,17,9,2,9	2	0364	-- ocircumflex
-~o	556,666,17,47,2,47	2	0365	-- otilde
-:o	556,688,17,32,2,32	2	0366	-- odieresis
-tdi	606,501,5	0	0367	-- divide
-/o	556,506,50,16,36,16	0	0370	-- oslash
-`u	556,719,17,15,28,15	2	0371	-- ugrave
-'u	556,719,17,15,28,15	2	0372	-- uacute
-^u	556,704,17,15,28,15	2	0373	-- ucircumflex
-:u	556,688,17,32,28,32	2	0374	-- udieresis
-'y	556,719,271,35,37,35	3	0375	-- yacute
-Tp	556,726,271,10,71,10	3	0376	-- thorn
-:y	556,688,271,35,37,35	3	0377	-- ydieresis
+bq	250,145,144,20,53,20	0	128	quotesinglbase
+Fo	500,446,0,8,15,8	0	129	guillemotleft
+Fc	500,443,0,8,15,8	0	130	guillemotright
+bu	606,516,0,0,-81	0	131	bullet
+Fn	500,690,242,29,42,29	2	132	florin
+f/	167,683,0,221,220,66	2	133	fraction
+%0	1000,691,17,0,-15	2	134	perthousand
+dg	556,685,3,0,-17	2	135	dagger
+dd	556,693,153,31,17,31	2	136	daggerdbl
+en	500,282,0,62,62,62	0	137	endash
+em	1000,282,0,62,62,62	0	138	emdash
+fi	611,726,271,27,180,27	3	140	fi
+fl	611,726,271,70,180,66	3	141	fl
+.i	333,469,17,10,24,10	0	144	dotlessi
+ga	333,699,0,39,-60,39	2	146	grave
+a"	333,699,0,126,78,66	2	147	hungarumlaut
+a.	333,668,0,42,-152,42	2	148	dotaccent
+ab	333,680,0,129,-46,66	2	149	breve
+ah	333,684,0,162,-63,66	2	150	caron
+ao	556,714,0,0,-227	2	151	ring
+ho	333,0,206,0,18	0	152	ogonek
+lq	500,720,0,61,-15,61	2	153	quotedblleft
+rq	500,720,0,69,-23,66	2	154	quotedblright
+oe	778,469,17,27,2,27	0	155	oe
+/l	333,726,17,82,37,66	2	156	lslash
+Bq	500,145,144,0,68	0	157	quotedblbase
+OE	944,695,17,67,11,66	2	158	OE
+/L	611,681,3,17,44,17	2	159	Lslash
+r!	333,479,225,0,48	0	161	exclamdown
+ct	500,547,105,6,-2,6	0	162	cent
+Po	500,683,5,51,29,51	2	163	sterling
+Cs	500,533,0,18,18,18	0	164	currency
+Ye	500,695,3,88,39,66	2	165	yen
+bb	606,720,0,0,-209	2	166	brokenbar
+sc	556,695,151,0,3	2	167	section
+ad	333,668,0,143,-40,66	2	168	dieresis
+co	747,695,17,23,24,23	2	169	copyright
+Of	333,684,0,72,3,66	2	170	ordfeminine
+fo	333,446,0,9,-10,9	0	171	guilsinglleft
+tno	606,390,0,0,-1	0	172	logicalnot
+\-	606,292,0,0,-1	0	173	minus
+rg	747,695,17,23,24,23	2	174	registered
+a-	333,608,0,135,-26,66	0	175	macron
+de	400,683	2	176	degree
+t+-	606,501	0	177	plusminus
+S2	300,683,0,71,24,66	2	178	twosuperior
+S3	300,683,0,60,27,60	2	179	threesuperior
+aa	333,699,0,109,-103,66	2	180	acute
+mc	556,469,232,15,65,15	0	181	mu
+ps	556,681,204,123,36,66	2	182	paragraph
+pc	250,324,0,6,-17,6	0	183	periodcentered
+ac	333,5,218,0,38	0	184	cedilla
+S1	300,680,0,48,9,48	2	185	onesuperior
+Om	333,683,0,63,-1,63	2	186	ordmasculine
+fc	333,443,0,0,15	0	187	guilsinglright
+14	750,683,2,32,32,32	2	188	onequarter
+12	750,683,2,36,36,36	2	189	onehalf
+34	750,683,2,32,32,32	2	190	threequarters
+r?	444,479,226,0,62	0	191	questiondown
+`A	722,911,3,13,85,13	2	192	Agrave
+'A	722,911,3,13,85,13	2	193	Aacute
+^A	722,896,3,13,85,13	2	194	Acircumflex
+~A	722,866,3,13,85,13	2	195	Atilde
+:A	722,880,3,13,85,13	2	196	Adieresis
+oA	722,926,3,13,85,13	2	197	Aring
+AE	944,681,3,33,79,33	2	198	AE
+,C	685,695,218,60,-19,60	2	199	Ccedilla
+`E	611,911,3,45,39,45	2	200	Egrave
+'E	611,911,3,45,39,45	2	201	Eacute
+^E	611,896,3,45,39,45	2	202	Ecircumflex
+:E	611,880,3,45,39,45	2	203	Edieresis
+`I	389,911,3,73,51,66	2	204	Igrave
+'I	389,911,3,81,51,66	2	205	Iacute
+^I	389,896,3,104,51,66	2	206	Icircumflex
+:I	389,880,3,115,51,66	2	207	Idieresis
+-D	778,682,3,19,50,19	2	208	Eth
+~N	778,866,3,101,52,66	2	209	Ntilde
+`O	833,911,17,11,-26,11	2	210	Ograve
+'O	833,911,17,11,-26,11	2	211	Oacute
+^O	833,896,17,11,-26,11	2	212	Ocircumflex
+~O	833,866,17,11,-26,11	2	213	Otilde
+:O	833,880,17,11,-26,11	2	214	Odieresis
+tmu	606,479,0,0,-22	0	215	multiply
+/O	833,730,54,14,-7,14	2	216	Oslash
+`U	778,911,17,97,-33,66	2	217	Ugrave
+'U	778,911,17,97,-33,66	2	218	Uacute
+^U	778,896,17,97,-33,66	2	219	Ucircumflex
+:U	778,880,17,97,-33,66	2	220	Udieresis
+'Y	611,911,3,114,-4,66	2	221	Yacute
+TP	667,681,3,27,39,27	2	222	Thorn
+ss	556,726,271,43,181,43	3	223	germandbls
+`a	556,719,17,13,6,13	2	224	agrave
+'a	556,719,17,13,6,13	2	225	aacute
+^a	556,704,17,21,6,21	2	226	acircumflex
+~a	556,666,17,47,6,47	2	227	atilde
+:a	556,688,17,32,6,32	2	228	adieresis
+oa	556,714,17,13,6,13	2	229	aring
+ae	738,469,17,23,6,23	0	230	ae
+,c	444,469,218,42,18,42	0	231	ccedilla
+`e	444,719,17,24,22,24	2	232	egrave
+'e	444,719,17,54,22,54	2	233	eacute
+^e	444,704,17,77,22,66	2	234	ecircumflex
+:e	444,688,17,88,22,66	2	235	edieresis
+`i	333,719,17,39,24,39	2	236	igrave
+'i	333,719,17,109,24,66	2	237	iacute
+^i	333,704,17,120,24,66	2	238	icircumflex
+:i	333,688,17,143,24,66	2	239	idieresis
+Sd	556,726,17,40,2,40	2	240	eth
+~n	556,666,17,47,33,47	2	241	ntilde
+`o	556,719,17,0,2	2	242	ograve
+'o	556,719,17,0,2	2	243	oacute
+^o	556,704,17,9,2,9	2	244	ocircumflex
+~o	556,666,17,47,2,47	2	245	otilde
+:o	556,688,17,32,2,32	2	246	odieresis
+tdi	606,501,5	0	247	divide
+/o	556,506,50,16,36,16	0	248	oslash
+`u	556,719,17,15,28,15	2	249	ugrave
+'u	556,719,17,15,28,15	2	250	uacute
+^u	556,704,17,15,28,15	2	251	ucircumflex
+:u	556,688,17,32,28,32	2	252	udieresis
+'y	556,719,271,35,37,35	3	253	yacute
+Tp	556,726,271,10,71,10	3	254	thorn
+:y	556,688,271,35,37,35	3	255	ydieresis
+u2026	1000,135,17,0,-41	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PI b/contrib/groff/font/devps/PI
index 602f47a..4942dc0 100644
--- a/contrib/groff/font/devps/PI
+++ b/contrib/groff/font/devps/PI
@@ -125,246 +125,247 @@ w , -55
 y . -37
 y , -37
 charset
-ha	606,689,0,0,-1	2	0000	-- asciicircum
-ti	606,339,0,0,-1	0	0001	-- asciitilde
-vS	556,907,18,33,8,33	2	0002	-- Scaron
-vZ	667,907,3,20,30,20	2	0003	-- Zcaron
-vs	389,687,11,80,41,68	2	0004	-- scaron
-vz	444,687,11,53,51,53	2	0005	-- zcaron
-:Y	667,847,3,58,-2,58	2	0006	-- Ydieresis
-tm	1000,689,0,1,-2,1	2	0007	-- trademark
-aq	333,733,0,5,-90,5	2	0010	-- quotesingle
-space	250	0	0040
-!	333,733,8,9,-26,9	2	0041	-- exclam
-"	500,733,0,5,-90,5	2	0042	-- quotedbl
+ha	606,689,0,0,-1	2	0	asciicircum
+ti	606,339,0,0,-1	0	1	asciitilde
+vS	556,907,18,33,8,33	2	2	Scaron
+vZ	667,907,3,20,30,20	2	3	Zcaron
+vs	389,687,11,80,41,68	2	4	scaron
+vz	444,687,11,53,51,53	2	5	zcaron
+:Y	667,847,3,58,-2,58	2	6	Ydieresis
+tm	1000,689,0,1,-2,1	2	7	trademark
+aq	333,733,0,5,-90,5	2	8	quotesingle
+space	250	0	32	space
+!	333,733,8,9,-26,9	2	33	exclam
+"	500,733,0,5,-90,5	2	34	quotedbl
 dq	"
-#	500,692,0,45,46,45	2	0043	-- numbersign
+#	500,692,0,45,46,45	2	35	numbersign
 sh	"
-$	500,733,113,2,35,2	2	0044	-- dollar
+$	500,733,113,2,35,2	2	36	dollar
 Do	"
-%	889,710,7,0,-24	2	0045	-- percent
-&	778,692,18,38,3,38	2	0046	-- ampersand
-'	278,733,0,30,-28,30	2	0047	-- quoteright
+%	889,710,7,0,-24	2	37	percent
+&	778,692,18,38,3,38	2	38	ampersand
+'	278,733,0,30,-28,30	2	39	quoteright
 cq	"
-(	333,733,106,48,-4,48	2	0050	-- parenleft
-)	333,733,106,0,48	2	0051	-- parenright
-*	389,706,0,61,-26,61	2	0052	-- asterisk
-+	606,504,0,0,-1	0	0053	-- plus
-,	250,123,143,3,42,3	0	0054	-- comma
--	333,281,0,21,31,21	0	0055	-- hyphen
+(	333,733,106,48,-4,48	2	40	parenleft
+)	333,733,106,0,48	2	41	parenright
+*	389,706,0,61,-26,61	2	42	asterisk
++	606,504,0,0,-1	0	43	plus
+,	250,123,143,3,42,3	0	44	comma
+-	333,281,0,21,31,21	0	45	hyphen
 hy	"
-.	250,112,5,0,-3	0	0056	-- period
-/	296,733,119,146,90,68	2	0057	-- slash
+.	250,112,5,0,-3	0	46	period
+/	296,733,119,146,90,68	2	47	slash
 sl	"
-0	500,699,11,30,14,30	2	0060	-- zero
-1	500,699,3,0,-4	2	0061	-- one
-2	500,699,3,0,38	2	0062	-- two
-3	500,699,11,0,28	2	0063	-- three
-4	500,699,3,28,35,28	2	0064	-- four
-5	500,693,11,41,36,41	2	0065	-- five
-6	500,699,11,19,1,19	2	0066	-- six
-7	500,692,3,52,-3,52	2	0067	-- seven
-8	500,699,11,19,14,19	2	0070	-- eight
-9	500,699,11,18,18,18	2	0071	-- nine
-:	250,458,5,7,6,7	0	0072	-- colon
-;	250,456,146,19,59,19	0	0073	-- semicolon
-<	606,516,6,0,-3	0	0074	-- less
-=	606,378,0,0,-1	0	0075	-- equal
->	606,516,6,0,-3	0	0076	-- greater
-?	500,706,8,0,-64	2	0077	-- question
-@	747,706,18,21,23,21	2	0100	-- at
+0	500,699,11,30,14,30	2	48	zero
+1	500,699,3,0,-4	2	49	one
+2	500,699,3,0,38	2	50	two
+3	500,699,11,0,28	2	51	three
+4	500,699,3,28,35,28	2	52	four
+5	500,693,11,41,36,41	2	53	five
+6	500,699,11,19,1,19	2	54	six
+7	500,692,3,52,-3,52	2	55	seven
+8	500,699,11,19,14,19	2	56	eight
+9	500,699,11,18,18,18	2	57	nine
+:	250,458,5,7,6,7	0	58	colon
+;	250,456,146,19,59,19	0	59	semicolon
+<	606,516,6,0,-3	0	60	less
+=	606,378,0,0,-1	0	61	equal
+>	606,516,6,0,-3	0	62	greater
+?	500,706,8,0,-64	2	63	question
+@	747,706,18,21,23,21	2	64	at
 at	"
-A	722,705,3,5,69,5	2	0101	-- A
-B	611,692,6,0,24	2	0102	-- B
-C	667,706,18,34,5,34	2	0103	-- C
-D	778,692,3,13,22,13	2	0104	-- D
-E	611,692,3,9,20,9	2	0105	-- E
-F	556,692,3,42,50,42	2	0106	-- F
-G	722,706,18,22,0,22	2	0107	-- G
-H	778,692,3,72,53,68	2	0110	-- H
-I	333,692,3,71,43,68	2	0111	-- I
-J	333,692,206,75,85,68	2	0112	-- J
-K	667,692,3,66,37,66	2	0113	-- K
-L	556,692,3,17,34,17	2	0114	-- L
-M	944,692,18,46,69,46	2	0115	-- M
-N	778,692,11,76,48,68	2	0116	-- N
-O	778,706,18,20,-3,20	2	0117	-- O
-P	611,692,3,33,41,33	2	0120	-- P
-Q	778,706,201,20,-3,20	2	0121	-- Q
-R	667,692,3,22,41,22	2	0122	-- R
-S	556,706,18,0,8	2	0123	-- S
-T	611,692,3,74,-3,68	2	0124	-- T
-U	778,692,18,70,-38,68	2	0125	-- U
-V	722,692,8,82,-25,68	2	0126	-- V
-W	944,700,8,86,-21,68	2	0127	-- W
-X	722,692,3,62,30,62	2	0130	-- X
-Y	667,705,3,58,-2,58	2	0131	-- Y
-Z	667,692,3,20,30,20	2	0132	-- Z
-[	333,733,100,43,32,43	2	0133	-- bracketleft
+A	722,705,3,5,69,5	2	65	A
+B	611,692,6,0,24	2	66	B
+C	667,706,18,34,5,34	2	67	C
+D	778,692,3,13,22,13	2	68	D
+E	611,692,3,9,20,9	2	69	E
+F	556,692,3,42,50,42	2	70	F
+G	722,706,18,22,0,22	2	71	G
+H	778,692,3,72,53,68	2	72	H
+I	333,692,3,71,43,68	2	73	I
+J	333,692,206,75,85,68	2	74	J
+K	667,692,3,66,37,66	2	75	K
+L	556,692,3,17,34,17	2	76	L
+M	944,692,18,46,69,46	2	77	M
+N	778,692,11,76,48,68	2	78	N
+O	778,706,18,20,-3,20	2	79	O
+P	611,692,3,33,41,33	2	80	P
+Q	778,706,201,20,-3,20	2	81	Q
+R	667,692,3,22,41,22	2	82	R
+S	556,706,18,0,8	2	83	S
+T	611,692,3,74,-3,68	2	84	T
+U	778,692,18,70,-38,68	2	85	U
+V	722,692,8,82,-25,68	2	86	V
+W	944,700,8,86,-21,68	2	87	W
+X	722,692,3,62,30,62	2	88	X
+Y	667,705,3,58,-2,58	2	89	Y
+Z	667,692,3,20,30,20	2	90	Z
+[	333,733,100,43,32,43	2	91	bracketleft
 lB	"
-\	606,733,0,0,-31	2	0134	-- backslash
+\	606,733,0,0,-31	2	92	backslash
 rs	"
-]	333,733,100,32,43,32	2	0135	-- bracketright
+]	333,733,100,32,43,32	2	93	bracketright
 rB	"
-a^	333,679,0,67,-6,67	2	0136	-- circumflex
+a^	333,679,0,67,-6,67	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	278,733,0,30,-28,30	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	278,733,0,30,-28,30	2	96	quoteleft
 oq	"
-a	444,482,11,12,46,12	0	0141	-- a
-b	463,733,11,20,13,20	2	0142	-- b
-c	407,482,11,32,25,32	0	0143	-- c
-d	500,733,11,33,33,33	2	0144	-- d
-e	389,482,11,35,35,35	0	0145	-- e
-f	278,733,276,185,212,68	3	0146	-- f
-g	500,482,276,48,87,48	1	0147	-- g
-h	500,733,9,21,40,21	2	0150	-- h
-i	278,712,9,36,16,36	2	0151	-- i
-j	278,712,276,37,120,37	3	0152	-- j
-k	444,733,9,55,42,55	2	0153	-- k
-l	278,733,9,23,14,23	2	0154	-- l
-m	778,482,9,12,26,12	0	0155	-- m
-n	556,482,9,8,26,8	0	0156	-- n
-o	444,482,11,17,33,17	0	0157	-- o
-p	500,482,276,15,57,15	1	0160	-- p
-q	463,482,276,19,26,19	1	0161	-- q
-r	389,482,9,45,24,45	0	0162	-- r
-s	389,482,11,6,41,6	0	0163	-- s
-t	333,646,9,27,9,27	2	0164	-- t
-u	556,482,11,6,18,6	0	0165	-- u
-v	500,482,11,27,29,27	0	0166	-- v
-w	722,482,11,27,29,27	0	0167	-- w
-x	500,482,11,34,41,34	0	0170	-- x
-y	500,482,276,40,58,40	1	0171	-- y
-z	444,482,11,22,51,22	0	0172	-- z
-lC	333,733,100,36,35,36	2	0173	-- braceleft
+a	444,482,11,12,46,12	0	97	a
+b	463,733,11,20,13,20	2	98	b
+c	407,482,11,32,25,32	0	99	c
+d	500,733,11,33,33,33	2	100	d
+e	389,482,11,35,35,35	0	101	e
+f	278,733,276,185,212,68	3	102	f
+g	500,482,276,48,87,48	1	103	g
+h	500,733,9,21,40,21	2	104	h
+i	278,712,9,36,16,36	2	105	i
+j	278,712,276,37,120,37	3	106	j
+k	444,733,9,55,42,55	2	107	k
+l	278,733,9,23,14,23	2	108	l
+m	778,482,9,12,26,12	0	109	m
+n	556,482,9,8,26,8	0	110	n
+o	444,482,11,17,33,17	0	111	o
+p	500,482,276,15,57,15	1	112	p
+q	463,482,276,19,26,19	1	113	q
+r	389,482,9,45,24,45	0	114	r
+s	389,482,11,6,41,6	0	115	s
+t	333,646,9,27,9,27	2	116	t
+u	556,482,11,6,18,6	0	117	u
+v	500,482,11,27,29,27	0	118	v
+w	722,482,11,27,29,27	0	119	w
+x	500,482,11,34,41,34	0	120	x
+y	500,482,276,40,58,40	1	121	y
+z	444,482,11,22,51,22	0	122	z
+lC	333,733,100,36,35,36	2	123	braceleft
 {	"
-ba	606,733,0,0,-225	2	0174	-- bar
+ba	606,733,0,0,-225	2	124	bar
 |	"
-rC	333,733,100,35,36,35	2	0175	-- braceright
+rC	333,733,100,35,36,35	2	125	braceright
 }	"
-a~	333,638,0,107,-13,68	0	0176	-- tilde
+a~	333,638,0,107,-13,68	0	126	tilde
 ~	"
-bq	278,120,122,0,23	0	0200	-- quotesinglbase
-Fo	500,440,0,0,-7	0	0201	-- guillemotleft
-Fc	500,440,0,0,-13	0	0202	-- guillemotright
-bu	500,526,0,0,-36	0	0203	-- bullet
-Fn	500,708,276,20,45,20	3	0204	-- florin
-f/	167,699,0,220,220,68	2	0205	-- fraction
-%0	1000,717,6,0,-22	2	0206	-- perthousand
-dg	500,692,0,19,2,19	2	0207	-- dagger
-dd	500,692,162,44,40,44	2	0210	-- daggerdbl
-en	500,278,0,60,60,60	0	0211	-- endash
-em	1000,278,0,60,60,60	0	0212	-- emdash
-fi	528,733,276,24,212,24	3	0214	-- fi
-fl	545,733,276,25,212,25	3	0215	-- fl
-.i	278,482,9,13,16,13	0	0220	-- dotlessi
-ga	333,687,0,27,-36,27	2	0222	-- grave
-a"	333,730,0,102,4,68	2	0223	-- hungarumlaut
-a.	333,645,0,0,-125	2	0224	-- dotaccent
-ab	333,677,0,110,-42,68	2	0225	-- breve
-ah	333,679,0,126,-54,68	2	0226	-- caron
-ao	333,708,0,76,-109,68	2	0227	-- ring
-ho	333,0,207,0,12	0	0230	-- ogonek
-lq	500,733,0,25,-48,25	2	0231	-- quotedblleft
-rq	500,733,0,25,-48,25	2	0232	-- quotedblright
-oe	669,482,11,35,33,35	0	0233	-- oe
-/l	278,733,9,74,60,68	2	0234	-- lslash
-Bq	500,120,122,0,7	0	0235	-- quotedblbase
-OE	1028,706,18,11,-6,11	2	0236	-- OE
-/L	556,692,3,17,66,17	2	0237	-- Lslash
-r!	333,467,276,0,35	1	0241	-- exclamdown
-ct	500,551,96,0,-6	0	0242	-- cent
-Po	500,708,18,29,48,29	2	0243	-- sterling
-Cs	500,577,0,36,36,36	0	0244	-- currency
-Ye	500,699,3,62,15,62	2	0245	-- yen
-bb	606,733,0,0,-225	2	0246	-- brokenbar
-sc	500,706,220,13,36,13	2	0247	-- section
-ad	333,637,0,95,-28,68	0	0250	-- dieresis
-co	747,706,18,39,39,39	2	0251	-- copyright
-Of	333,699,0,38,-10,38	2	0252	-- ordfeminine
-fo	333,440,0,0,-7	0	0253	-- guilsinglleft
-no	606,378,0,0,-1	0	0254	-- logicalnot
-\-	606,280,0,0,-1	0	0255	-- minus
-rg	747,706,18,39,39,39	2	0256	-- registered
-a-	333,589,0,103,-24,68	0	0257	-- macron
-de	400,689,0,40,-40,40	2	0260	-- degree
-t+-	606,504,0,0,-1	0	0261	-- plusminus
-S2	300,699,0,40,37,40	2	0262	-- twosuperior
-S3	300,699,0,54,22,54	2	0263	-- threesuperior
-aa	333,687,0,63,-72,63	2	0264	-- acute
-mc	556,482,226,6,35,6	0	0265	-- mu
-ps	500,692,224,161,17,68	2	0266	-- paragraph
-pc	250,312,0,0,-3	0	0267	-- periodcentered
-ac	333,0,216,0,59	0	0270	-- cedilla
-S1	300,699,0,35,-11,35	2	0271	-- onesuperior
-Om	333,699,0,39,-16,39	2	0272	-- ordmasculine
-fc	333,440,0,0,-13	0	0273	-- guilsinglright
-14	750,699,2,15,19,15	2	0274	-- onequarter
-12	750,699,2,21,19,21	2	0275	-- onehalf
-34	750,699,2,15,15,15	2	0276	-- threequarters
-r?	500,467,246,0,-7	0	0277	-- questiondown
-`A	722,897,3,5,69,5	2	0300	-- Agrave
-'A	722,897,3,5,69,5	2	0301	-- Aacute
-^A	722,889,3,5,69,5	2	0302	-- Acircumflex
-~A	722,866,3,5,69,5	2	0303	-- Atilde
-:A	722,847,3,5,69,5	2	0304	-- Adieresis
-oA	722,918,3,5,69,5	2	0305	-- Aring
-AE	941,692,3,11,54,11	2	0306	-- AE
-,C	667,706,216,34,5,34	2	0307	-- Ccedilla
-`E	611,897,3,9,20,9	2	0310	-- Egrave
-'E	611,897,3,9,20,9	2	0311	-- Eacute
-^E	611,889,3,9,20,9	2	0312	-- Ecircumflex
-:E	611,847,3,9,20,9	2	0313	-- Edieresis
-`I	333,897,3,71,43,68	2	0314	-- Igrave
-'I	333,897,3,123,43,68	2	0315	-- Iacute
-^I	333,889,3,107,43,68	2	0316	-- Icircumflex
-:I	333,847,3,135,43,68	2	0317	-- Idieresis
--D	778,692,3,13,31,13	2	0320	-- Eth
-~N	778,866,11,76,48,68	2	0321	-- Ntilde
-`O	778,897,18,20,-3,20	2	0322	-- Ograve
-'O	778,897,18,20,-3,20	2	0323	-- Oacute
-^O	778,889,18,20,-3,20	2	0324	-- Ocircumflex
-~O	778,866,18,20,-3,20	2	0325	-- Otilde
-:O	778,847,18,20,-3,20	2	0326	-- Odieresis
-tmu	606,474,0,0,-33	0	0327	-- multiply
-/O	778,721,39,34,18,34	2	0330	-- Oslash
-`U	778,897,18,70,-38,68	2	0331	-- Ugrave
-'U	778,897,18,70,-38,68	2	0332	-- Uacute
-^U	778,889,18,70,-38,68	2	0333	-- Ucircumflex
-:U	778,847,18,70,-38,68	2	0334	-- Udieresis
-'Y	667,897,3,58,-2,58	2	0335	-- Yacute
-TP	611,692,3,9,41,9	2	0336	-- Thorn
-ss	500,733,276,38,210,38	3	0337	-- germandbls
-`a	444,707,11,12,46,12	2	0340	-- agrave
-'a	444,707,11,20,46,20	2	0341	-- aacute
-^a	444,699,11,12,46,12	2	0342	-- acircumflex
-~a	444,650,11,52,46,52	2	0343	-- atilde
-:a	444,657,11,40,46,40	2	0344	-- adieresis
-oa	444,728,11,12,46,12	2	0345	-- aring
-ae	638,482,11,35,49,35	0	0346	-- ae
-,c	407,482,216,32,25,32	0	0347	-- ccedilla
-`e	389,707,11,35,35,35	2	0350	-- egrave
-'e	389,707,11,55,35,55	2	0351	-- eacute
-^e	389,699,11,59,35,59	2	0352	-- ecircumflex
-:e	389,657,11,67,35,67	2	0353	-- edieresis
-`i	278,707,9,43,16,43	2	0354	-- igrave
-'i	278,707,9,103,16,68	2	0355	-- iacute
-^i	278,699,9,95,21,68	2	0356	-- icircumflex
-:i	278,657,9,123,16,68	2	0357	-- idieresis
-Sd	444,733,11,84,33,68	2	0360	-- eth
-~n	556,650,9,8,26,8	2	0361	-- ntilde
-`o	444,707,11,17,33,17	2	0362	-- ograve
-'o	444,707,11,20,33,20	2	0363	-- oacute
-^o	444,699,11,17,33,17	2	0364	-- ocircumflex
-~o	444,650,11,52,33,52	2	0365	-- otilde
-:o	444,657,11,40,33,40	2	0366	-- odieresis
-tdi	606,504,0,0,-1	0	0367	-- divide
-/o	444,510,24,66,68,66	0	0370	-- oslash
-`u	556,707,11,6,18,6	2	0371	-- ugrave
-'u	556,707,11,6,18,6	2	0372	-- uacute
-^u	556,699,11,6,18,6	2	0373	-- ucircumflex
-:u	556,657,11,6,18,6	2	0374	-- udieresis
-'y	500,707,276,40,58,40	3	0375	-- yacute
-Tp	500,733,276,0,89	3	0376	-- thorn
-:y	500,657,276,40,58,40	3	0377	-- ydieresis
+bq	278,120,122,0,23	0	128	quotesinglbase
+Fo	500,440,0,0,-7	0	129	guillemotleft
+Fc	500,440,0,0,-13	0	130	guillemotright
+bu	500,526,0,0,-36	0	131	bullet
+Fn	500,708,276,20,45,20	3	132	florin
+f/	167,699,0,220,220,68	2	133	fraction
+%0	1000,717,6,0,-22	2	134	perthousand
+dg	500,692,0,19,2,19	2	135	dagger
+dd	500,692,162,44,40,44	2	136	daggerdbl
+en	500,278,0,60,60,60	0	137	endash
+em	1000,278,0,60,60,60	0	138	emdash
+fi	528,733,276,24,212,24	3	140	fi
+fl	545,733,276,25,212,25	3	141	fl
+.i	278,482,9,13,16,13	0	144	dotlessi
+ga	333,687,0,27,-36,27	2	146	grave
+a"	333,730,0,102,4,68	2	147	hungarumlaut
+a.	333,645,0,0,-125	2	148	dotaccent
+ab	333,677,0,110,-42,68	2	149	breve
+ah	333,679,0,126,-54,68	2	150	caron
+ao	333,708,0,76,-109,68	2	151	ring
+ho	333,0,207,0,12	0	152	ogonek
+lq	500,733,0,25,-48,25	2	153	quotedblleft
+rq	500,733,0,25,-48,25	2	154	quotedblright
+oe	669,482,11,35,33,35	0	155	oe
+/l	278,733,9,74,60,68	2	156	lslash
+Bq	500,120,122,0,7	0	157	quotedblbase
+OE	1028,706,18,11,-6,11	2	158	OE
+/L	556,692,3,17,66,17	2	159	Lslash
+r!	333,467,276,0,35	1	161	exclamdown
+ct	500,551,96,0,-6	0	162	cent
+Po	500,708,18,29,48,29	2	163	sterling
+Cs	500,577,0,36,36,36	0	164	currency
+Ye	500,699,3,62,15,62	2	165	yen
+bb	606,733,0,0,-225	2	166	brokenbar
+sc	500,706,220,13,36,13	2	167	section
+ad	333,637,0,95,-28,68	0	168	dieresis
+co	747,706,18,39,39,39	2	169	copyright
+Of	333,699,0,38,-10,38	2	170	ordfeminine
+fo	333,440,0,0,-7	0	171	guilsinglleft
+tno	606,378,0,0,-1	0	172	logicalnot
+\-	606,280,0,0,-1	0	173	minus
+rg	747,706,18,39,39,39	2	174	registered
+a-	333,589,0,103,-24,68	0	175	macron
+de	400,689,0,40,-40,40	2	176	degree
+t+-	606,504,0,0,-1	0	177	plusminus
+S2	300,699,0,40,37,40	2	178	twosuperior
+S3	300,699,0,54,22,54	2	179	threesuperior
+aa	333,687,0,63,-72,63	2	180	acute
+mc	556,482,226,6,35,6	0	181	mu
+ps	500,692,224,161,17,68	2	182	paragraph
+pc	250,312,0,0,-3	0	183	periodcentered
+ac	333,0,216,0,59	0	184	cedilla
+S1	300,699,0,35,-11,35	2	185	onesuperior
+Om	333,699,0,39,-16,39	2	186	ordmasculine
+fc	333,440,0,0,-13	0	187	guilsinglright
+14	750,699,2,15,19,15	2	188	onequarter
+12	750,699,2,21,19,21	2	189	onehalf
+34	750,699,2,15,15,15	2	190	threequarters
+r?	500,467,246,0,-7	0	191	questiondown
+`A	722,897,3,5,69,5	2	192	Agrave
+'A	722,897,3,5,69,5	2	193	Aacute
+^A	722,889,3,5,69,5	2	194	Acircumflex
+~A	722,866,3,5,69,5	2	195	Atilde
+:A	722,847,3,5,69,5	2	196	Adieresis
+oA	722,918,3,5,69,5	2	197	Aring
+AE	941,692,3,11,54,11	2	198	AE
+,C	667,706,216,34,5,34	2	199	Ccedilla
+`E	611,897,3,9,20,9	2	200	Egrave
+'E	611,897,3,9,20,9	2	201	Eacute
+^E	611,889,3,9,20,9	2	202	Ecircumflex
+:E	611,847,3,9,20,9	2	203	Edieresis
+`I	333,897,3,71,43,68	2	204	Igrave
+'I	333,897,3,123,43,68	2	205	Iacute
+^I	333,889,3,107,43,68	2	206	Icircumflex
+:I	333,847,3,135,43,68	2	207	Idieresis
+-D	778,692,3,13,31,13	2	208	Eth
+~N	778,866,11,76,48,68	2	209	Ntilde
+`O	778,897,18,20,-3,20	2	210	Ograve
+'O	778,897,18,20,-3,20	2	211	Oacute
+^O	778,889,18,20,-3,20	2	212	Ocircumflex
+~O	778,866,18,20,-3,20	2	213	Otilde
+:O	778,847,18,20,-3,20	2	214	Odieresis
+tmu	606,474,0,0,-33	0	215	multiply
+/O	778,721,39,34,18,34	2	216	Oslash
+`U	778,897,18,70,-38,68	2	217	Ugrave
+'U	778,897,18,70,-38,68	2	218	Uacute
+^U	778,889,18,70,-38,68	2	219	Ucircumflex
+:U	778,847,18,70,-38,68	2	220	Udieresis
+'Y	667,897,3,58,-2,58	2	221	Yacute
+TP	611,692,3,9,41,9	2	222	Thorn
+ss	500,733,276,38,210,38	3	223	germandbls
+`a	444,707,11,12,46,12	2	224	agrave
+'a	444,707,11,20,46,20	2	225	aacute
+^a	444,699,11,12,46,12	2	226	acircumflex
+~a	444,650,11,52,46,52	2	227	atilde
+:a	444,657,11,40,46,40	2	228	adieresis
+oa	444,728,11,12,46,12	2	229	aring
+ae	638,482,11,35,49,35	0	230	ae
+,c	407,482,216,32,25,32	0	231	ccedilla
+`e	389,707,11,35,35,35	2	232	egrave
+'e	389,707,11,55,35,55	2	233	eacute
+^e	389,699,11,59,35,59	2	234	ecircumflex
+:e	389,657,11,67,35,67	2	235	edieresis
+`i	278,707,9,43,16,43	2	236	igrave
+'i	278,707,9,103,16,68	2	237	iacute
+^i	278,699,9,95,21,68	2	238	icircumflex
+:i	278,657,9,123,16,68	2	239	idieresis
+Sd	444,733,11,84,33,68	2	240	eth
+~n	556,650,9,8,26,8	2	241	ntilde
+`o	444,707,11,17,33,17	2	242	ograve
+'o	444,707,11,20,33,20	2	243	oacute
+^o	444,699,11,17,33,17	2	244	ocircumflex
+~o	444,650,11,52,33,52	2	245	otilde
+:o	444,657,11,40,33,40	2	246	odieresis
+tdi	606,504,0,0,-1	0	247	divide
+/o	444,510,24,66,68,66	0	248	oslash
+`u	556,707,11,6,18,6	2	249	ugrave
+'u	556,707,11,6,18,6	2	250	uacute
+^u	556,699,11,6,18,6	2	251	ucircumflex
+:u	556,657,11,6,18,6	2	252	udieresis
+'y	500,707,276,40,58,40	3	253	yacute
+Tp	500,733,276,0,89	3	254	thorn
+:y	500,657,276,40,58,40	3	255	ydieresis
+u2026	1000,112,5,0,-52	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PR b/contrib/groff/font/devps/PR
index 5ba7578..a4e4447 100644
--- a/contrib/groff/font/devps/PR
+++ b/contrib/groff/font/devps/PR
@@ -125,246 +125,247 @@ w , -92
 y . -111
 y , -111
 charset
-ha	606,689,0,0,-51	2	0000	-- asciicircum
-ti	606,347,0,0,-51	0	0001	-- asciitilde
-vS	525,908,20,0,-24	2	0002	-- Scaron
-vZ	667,908,3,0,-15	2	0003	-- Zcaron
-vs	424,685,20,0,-30	2	0004	-- scaron
-vz	500,685,3,0,-16	2	0005	-- zcaron
-:Y	667,868,3,0,-9	2	0006	-- Ydieresis
-tm	979,689,0,0,-40	2	0007	-- trademark
-aq	208,709,0,0,-61	2	0010	-- quotesingle
-space	250	0	0040
-!	278,694,5,0,-81	2	0041	-- exclam
-"	371,709,0,0,-52	2	0042	-- quotedbl
+ha	606,689	2	0	asciicircum
+ti	606,347	0	1	asciitilde
+vS	525,908,20	2	2	Scaron
+vZ	667,908,3	2	3	Zcaron
+vs	424,685,20	2	4	scaron
+vz	500,685,3	2	5	zcaron
+:Y	667,868,3	2	6	Ydieresis
+tm	979,689	2	7	trademark
+aq	208,709	2	8	quotesingle
+space	250	0	32	space
+!	278,694,5	2	33	exclam
+"	371,709	2	34	quotedbl
 dq	"
-#	500,684,0,0,-4	2	0043	-- numbersign
+#	500,684	2	35	numbersign
 sh	"
-$	500,731,116,0,-30	2	0044	-- dollar
+$	500,731,116	2	36	dollar
 Do	"
-%	840,709,20,0,-39	2	0045	-- percent
-&	778,689,20,0,-43	2	0046	-- ampersand
-'	278,709,0,0,-45	2	0047	-- quoteright
+%	840,709,20	2	37	percent
+&	778,689,20	2	38	ampersand
+'	278,709	2	39	quoteright
 cq	"
-(	333,726,215,0,-60	2	0050	-- parenleft
-)	333,726,215,0,-32	2	0051	-- parenright
-*	389,689,0,0,-32	2	0052	-- asterisk
-+	606,512,0,0,-51	0	0053	-- plus
-,	250,123,155,0,-16	0	0054	-- comma
--	333,287,0,0,-17	0	0055	-- hyphen
+(	333,726,215	2	40	parenleft
+)	333,726,215	2	41	parenright
+*	389,689	2	42	asterisk
++	606,512	0	43	plus
+,	250,123,155	0	44	comma
+-	333,287	0	45	hyphen
 hy	"
-.	250,111,5,0,-67	0	0056	-- period
-/	606,726,119,0,-87	2	0057	-- slash
+.	250,111,5	0	46	period
+/	606,726,119	2	47	slash
 sl	"
-0	500,689,20,0,-29	2	0060	-- zero
-1	500,694,3,0,-60	2	0061	-- one
-2	500,689,3,0,-16	2	0062	-- two
-3	500,689,20,0,-15	2	0063	-- three
-4	500,694,3,0,-2	2	0064	-- four
-5	500,689,20,0,-13	2	0065	-- five
-6	500,689,20,0,-32	2	0066	-- six
-7	500,689,3,0,-44	2	0067	-- seven
-8	500,689,20,0,-30	2	0070	-- eight
-9	500,689,20,0,-20	2	0071	-- nine
-:	250,456,5,0,-66	0	0072	-- colon
-;	250,456,153,0,-16	0	0073	-- semicolon
-<	606,522,0,0,-57	0	0074	-- less
-=	606,386,0,0,-51	0	0075	-- equal
->	606,522,0,0,-48	0	0076	-- greater
-?	444,694,5,0,-43	2	0077	-- question
-@	747,694,20,0,-24	2	0100	-- at
+0	500,689,20	2	48	zero
+1	500,694,3	2	49	one
+2	500,689,3	2	50	two
+3	500,689,20	2	51	three
+4	500,694,3	2	52	four
+5	500,689,20	2	53	five
+6	500,689,20	2	54	six
+7	500,689,3	2	55	seven
+8	500,689,20	2	56	eight
+9	500,689,20	2	57	nine
+:	250,456,5	0	58	colon
+;	250,456,153	0	59	semicolon
+<	606,522	0	60	less
+=	606,386	0	61	equal
+>	606,522	0	62	greater
+?	444,694,5	2	63	question
+@	747,694,20	2	64	at
 at	"
-A	778,700,3,0,-15	2	0101	-- A
-B	611,692,3,0,-26	2	0102	-- B
-C	709,709,20,0,-22	2	0103	-- C
-D	774,692,3,0,-22	2	0104	-- D
-E	611,692,3,0,-22	2	0105	-- E
-F	556,692,3,0,-22	2	0106	-- F
-G	763,709,20,0,-22	2	0107	-- G
-H	832,692,3,0,-22	2	0110	-- H
-I	337,692,3,0,-22	2	0111	-- I
-J	333,692,194,0,15	2	0112	-- J
-K	726,692,3,0,-22	2	0113	-- K
-L	611,692,3,0,-22	2	0114	-- L
-M	946,692,13,0,-16	2	0115	-- M
-N	831,692,20,0,-17	2	0116	-- N
-O	786,709,20,0,-22	2	0117	-- O
-P	604,692,3,0,-22	2	0120	-- P
-Q	786,709,176,0,-22	2	0121	-- Q
-R	668,692,3,1,-22	2	0122	-- R
-S	525,709,20,0,-24	2	0123	-- S
-T	613,692,3,0,-18	2	0124	-- T
-U	778,692,20,0,-12	2	0125	-- U
-V	722,692,9,0,-8	2	0126	-- V
-W	1000,700,9,0,-8	2	0127	-- W
-X	667,700,3,0,-14	2	0130	-- X
-Y	667,704,3,0,-9	2	0131	-- Y
-Z	667,692,3,0,-15	2	0132	-- Z
-[	333,726,184,0,-79	2	0133	-- bracketleft
+A	778,700,3	2	65	A
+B	611,692,3	2	66	B
+C	709,709,20	2	67	C
+D	774,692,3	2	68	D
+E	611,692,3	2	69	E
+F	556,692,3	2	70	F
+G	763,709,20	2	71	G
+H	832,692,3	2	72	H
+I	337,692,3	2	73	I
+J	333,692,194,0,15	2	74	J
+K	726,692,3	2	75	K
+L	611,692,3	2	76	L
+M	946,692,13	2	77	M
+N	831,692,20	2	78	N
+O	786,709,20	2	79	O
+P	604,692,3	2	80	P
+Q	786,709,176	2	81	Q
+R	668,692,3,1	2	82	R
+S	525,709,20	2	83	S
+T	613,692,3	2	84	T
+U	778,692,20	2	85	U
+V	722,692,9	2	86	V
+W	1000,700,9	2	87	W
+X	667,700,3	2	88	X
+Y	667,704,3	2	89	Y
+Z	667,692,3	2	90	Z
+[	333,726,184	2	91	bracketleft
 lB	"
-\	606,726,0,0,-81	2	0134	-- backslash
+\	606,726	2	92	backslash
 rs	"
-]	333,726,184,0,-45	2	0135	-- bracketright
+]	333,726,184	2	93	bracketright
 rB	"
-a^	333,677,0,0,-11	2	0136	-- circumflex
+a^	333,677	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	278,709,0,0,-45	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	278,709	2	96	quoteleft
 oq	"
-a	500,469,12,0,-32	0	0141	-- a
-b	553,726,12,0,15	2	0142	-- b
-c	444,469,20,0,-26	0	0143	-- c
-d	611,726,12,0,-35	2	0144	-- d
-e	479,469,20,0,-26	0	0145	-- e
-f	333,728,3,8,-23	2	0146	-- f
-g	556,469,283,0,-32	1	0147	-- g
-h	582,726,3,0,-6	2	0150	-- h
-i	291,687,3,0,-21	2	0151	-- i
-j	234,688,283,0,40	3	0152	-- j
-k	556,726,12,0,-21	2	0153	-- k
-l	291,726,3,0,-21	2	0154	-- l
-m	883,469,3,0,-16	0	0155	-- m
-n	582,469,3,0,-6	0	0156	-- n
-o	546,469,20,0,-32	0	0157	-- o
-p	601,469,281,0,-8	1	0160	-- p
-q	560,469,281,0,-35	1	0161	-- q
-r	395,469,3,0,-21	0	0162	-- r
-s	424,469,20,0,-30	0	0163	-- s
-t	326,621,12,0,-22	2	0164	-- t
-u	603,469,12,0,-18	0	0165	-- u
-v	565,459,7,0,-6	0	0166	-- v
-w	834,469,7,0,-6	0	0167	-- w
-x	516,469,3,0,-20	0	0170	-- x
-y	556,459,283,0,-12	1	0171	-- y
-z	500,462,3,0,-16	0	0172	-- z
-lC	333,726,175,0,-58	2	0173	-- braceleft
+a	500,469,12	0	97	a
+b	553,726,12,0,15	2	98	b
+c	444,469,20	0	99	c
+d	611,726,12	2	100	d
+e	479,469,20	0	101	e
+f	333,728,3,8	2	102	f
+g	556,469,283	1	103	g
+h	582,726,3	2	104	h
+i	291,687,3	2	105	i
+j	234,688,283,0,40	3	106	j
+k	556,726,12	2	107	k
+l	291,726,3	2	108	l
+m	883,469,3	0	109	m
+n	582,469,3	0	110	n
+o	546,469,20	0	111	o
+p	601,469,281	1	112	p
+q	560,469,281	1	113	q
+r	395,469,3	0	114	r
+s	424,469,20	0	115	s
+t	326,621,12	2	116	t
+u	603,469,12	0	117	u
+v	565,459,7	0	118	v
+w	834,469,7	0	119	w
+x	516,469,3	0	120	x
+y	556,459,283	1	121	y
+z	500,462,3	0	122	z
+lC	333,726,175	2	123	braceleft
 {	"
-ba	606,726,0,0,-275	2	0174	-- bar
+ba	606,726	2	124	bar
 |	"
-rC	333,726,175,0,-44	2	0175	-- braceright
+rC	333,726,175	2	125	braceright
 }	"
-a~	333,640,0,0,-2	2	0176	-- tilde
+a~	333,640	2	126	tilde
 ~	"
-bq	278,110,153,0,-22	0	0200	-- quotesinglbase
-Fo	500,428,0,0,-50	0	0201	-- guillemotleft
-Fc	500,428,0,0,-50	0	0202	-- guillemotright
-bu	606,516,0,0,-131	0	0203	-- bullet
-Fn	500,706,262	2	0204	-- florin
-f/	167,689,0,170,166	2	0205	-- fraction
-%0	1144,709,20,0,-123	2	0206	-- perthousand
-dg	500,694,5,0,-34	2	0207	-- dagger
-dd	500,694,249,0,-34	2	0210	-- daggerdbl
-en	500,277	0	0211	-- endash
-em	1000,277	0	0212	-- emdash
-fi	605,728,3,0,-23	2	0214	-- fi
-fl	608,728,3,0,-23	2	0215	-- fl
-.i	287,469,3,0,-21	0	0220	-- dotlessi
-ga	333,677,0,0,-31	2	0222	-- grave
-a"	380,687,0,0,-3	2	0223	-- hungarumlaut
-a.	250,637,0,0,-75	2	0224	-- dotaccent
-ab	333,664,0,0,-26	2	0225	-- breve
-ah	333,677,0,0,-11	2	0226	-- caron
-ao	333,696,0,0,-67	2	0227	-- ring
-ho	313,0,165,0,-68	0	0230	-- ogonek
-lq	500,709,0,0,-51	2	0231	-- quotedblleft
-rq	500,709,0,0,-51	2	0232	-- quotedblright
-oe	827,469,20,0,-32	0	0233	-- oe
-/l	291,726,3,15,14	2	0234	-- lslash
-Bq	500,110,153,0,-51	0	0235	-- quotedblbase
-OE	998,709,20,0,-22	2	0236	-- OE
-/L	611,692,3,0,-6	2	0237	-- Lslash
-r!	278,469,225,0,-81	0	0241	-- exclamdown
-ct	500,562,101,0,-61	0	0242	-- cent
-Po	500,694,13,0,-12	2	0243	-- sterling
-Cs	500,531,0,0,-30	0	0244	-- currency
-Ye	500,701,3,0,-5	2	0245	-- yen
-bb	606,726,0,0,-275	2	0246	-- brokenbar
-sc	500,709,219,0,-26	2	0247	-- section
-ad	333,637,0,0,-17	2	0250	-- dieresis
-co	747,706,18,0,-11	2	0251	-- copyright
-Of	333,709,0,0,-24	2	0252	-- ordfeminine
-fo	331,428,0,0,-66	0	0253	-- guilsinglleft
-no	606,386,0,0,-51	0	0254	-- logicalnot
-\-	606,289,0,0,-51	0	0255	-- minus
-rg	747,706,18,0,-11	2	0256	-- registered
-a-	333,591,0,0,-11	0	0257	-- macron
-de	400,689,0,0,-50	2	0260	-- degree
-t+-	606,512,0,0,-51	0	0261	-- plusminus
-S2	300,689,0,1	2	0262	-- twosuperior
-S3	300,689,0,0,-1	2	0263	-- threesuperior
-aa	333,677,0,0,-78	2	0264	-- acute
-mc	603,469,236,0,-18	0	0265	-- mu
-ps	628,694,150,0,-39	2	0266	-- paragraph
-pc	250,319,0,0,-67	0	0267	-- periodcentered
-ac	333,0,225,0,-96	0	0270	-- cedilla
-S1	300,692,0,0,-31	2	0271	-- onesuperior
-Om	333,709,0,0,-10	2	0272	-- ordmasculine
-fc	331,428,0,0,-66	0	0273	-- guilsinglright
-14	750,692,3,0,-30	2	0274	-- onequarter
-12	750,692,3,0,-15	2	0275	-- onehalf
-34	750,689,3,0,-15	2	0276	-- threequarters
-r?	444,469,231,0,-43	0	0277	-- questiondown
-`A	778,908,3,0,-15	2	0300	-- Agrave
-'A	778,908,3,0,-15	2	0301	-- Aacute
-^A	778,908,3,0,-15	2	0302	-- Acircumflex
-~A	778,871,3,0,-15	2	0303	-- Atilde
-:A	778,868,3,0,-15	2	0304	-- Adieresis
-oA	778,927,3,0,-15	2	0305	-- Aring
-AE	944,692,3,0,10	2	0306	-- AE
-,C	709,709,225,0,-22	2	0307	-- Ccedilla
-`E	611,908,3,0,-22	2	0310	-- Egrave
-'E	611,908,3,0,-22	2	0311	-- Eacute
-^E	611,908,3,0,-22	2	0312	-- Ecircumflex
-:E	611,868,3,0,-22	2	0313	-- Edieresis
-`I	337,908,3,0,-22	2	0314	-- Igrave
-'I	337,908,3,0,-22	2	0315	-- Iacute
-^I	337,908,3,0,-13	2	0316	-- Icircumflex
-:I	337,868,3,0,-19	2	0317	-- Idieresis
--D	774,692,3,0,-14	2	0320	-- Eth
-~N	831,871,20,0,-17	2	0321	-- Ntilde
-`O	786,908,20,0,-22	2	0322	-- Ograve
-'O	786,908,20,0,-22	2	0323	-- Oacute
-^O	786,908,20,0,-22	2	0324	-- Ocircumflex
-~O	786,883,20,0,-22	2	0325	-- Otilde
-:O	786,868,20,0,-22	2	0326	-- Odieresis
-tmu	606,474,0,0,-83	0	0327	-- multiply
-/O	833,709,20,0,-30	2	0330	-- Oslash
-`U	778,908,20,0,-12	2	0331	-- Ugrave
-'U	778,908,20,0,-12	2	0332	-- Uacute
-^U	778,908,20,0,-12	2	0333	-- Ucircumflex
-:U	778,868,20,0,-12	2	0334	-- Udieresis
-'Y	667,908,3,0,-9	2	0335	-- Yacute
-TP	604,692,3,0,-32	2	0336	-- Thorn
-ss	556,731,9,0,-23	2	0337	-- germandbls
-`a	500,697,12,0,-32	2	0340	-- agrave
-'a	500,697,12,0,-32	2	0341	-- aacute
-^a	500,697,12,0,-32	2	0342	-- acircumflex
-~a	500,652,12,0,-32	2	0343	-- atilde
-:a	500,657,12,0,-32	2	0344	-- adieresis
-oa	500,716,12,0,-32	2	0345	-- aring
-ae	758,469,20,0,-30	0	0346	-- ae
-,c	444,469,225,0,-26	0	0347	-- ccedilla
-`e	479,697,20,0,-26	2	0350	-- egrave
-'e	479,697,20,0,-26	2	0351	-- eacute
-^e	479,697,20,0,-26	2	0352	-- ecircumflex
-:e	479,657,20,0,-26	2	0353	-- edieresis
-`i	287,697,3,0,-8	2	0354	-- igrave
-'i	287,697,3,0,-21	2	0355	-- iacute
-^i	287,697,3,13,12	2	0356	-- icircumflex
-:i	287,657,3,6,6	2	0357	-- idieresis
-Sd	546,728,20,0,-32	2	0360	-- eth
-~n	582,652,3,0,-6	2	0361	-- ntilde
-`o	546,697,20,0,-32	2	0362	-- ograve
-'o	546,697,20,0,-32	2	0363	-- oacute
-^o	546,697,20,0,-32	2	0364	-- ocircumflex
-~o	546,652,20,0,-32	2	0365	-- otilde
-:o	546,657,20,0,-32	2	0366	-- odieresis
-tdi	606,512,0,0,-51	0	0367	-- divide
-/o	556,474,23,0,-16	0	0370	-- oslash
-`u	603,697,12,0,-18	2	0371	-- ugrave
-'u	603,697,12,0,-18	2	0372	-- uacute
-^u	603,697,12,0,-18	2	0373	-- ucircumflex
-:u	603,657,12,0,-18	2	0374	-- udieresis
-'y	556,697,283,0,-12	3	0375	-- yacute
-Tp	601,726,281,0,2	3	0376	-- thorn
-:y	556,657,283,0,-12	3	0377	-- ydieresis
+bq	278,110,153	0	128	quotesinglbase
+Fo	500,428	0	129	guillemotleft
+Fc	500,428	0	130	guillemotright
+bu	606,516	0	131	bullet
+Fn	500,706,262	2	132	florin
+f/	167,689,0,170,166	2	133	fraction
+%0	1144,709,20	2	134	perthousand
+dg	500,694,5	2	135	dagger
+dd	500,694,249	2	136	daggerdbl
+en	500,277	0	137	endash
+em	1000,277	0	138	emdash
+fi	605,728,3	2	140	fi
+fl	608,728,3	2	141	fl
+.i	287,469,3	0	144	dotlessi
+ga	333,677	2	146	grave
+a"	380,687	2	147	hungarumlaut
+a.	250,637	2	148	dotaccent
+ab	333,664	2	149	breve
+ah	333,677	2	150	caron
+ao	333,696	2	151	ring
+ho	313,0,165	0	152	ogonek
+lq	500,709	2	153	quotedblleft
+rq	500,709	2	154	quotedblright
+oe	827,469,20	0	155	oe
+/l	291,726,3,15,14	2	156	lslash
+Bq	500,110,153	0	157	quotedblbase
+OE	998,709,20	2	158	OE
+/L	611,692,3	2	159	Lslash
+r!	278,469,225	0	161	exclamdown
+ct	500,562,101	0	162	cent
+Po	500,694,13	2	163	sterling
+Cs	500,531	0	164	currency
+Ye	500,701,3	2	165	yen
+bb	606,726	2	166	brokenbar
+sc	500,709,219	2	167	section
+ad	333,637	2	168	dieresis
+co	747,706,18	2	169	copyright
+Of	333,709	2	170	ordfeminine
+fo	331,428	0	171	guilsinglleft
+tno	606,386	0	172	logicalnot
+\-	606,289	0	173	minus
+rg	747,706,18	2	174	registered
+a-	333,591	0	175	macron
+de	400,689	2	176	degree
+t+-	606,512	0	177	plusminus
+S2	300,689,0,1	2	178	twosuperior
+S3	300,689	2	179	threesuperior
+aa	333,677	2	180	acute
+mc	603,469,236	0	181	mu
+ps	628,694,150	2	182	paragraph
+pc	250,319	0	183	periodcentered
+ac	333,0,225	0	184	cedilla
+S1	300,692	2	185	onesuperior
+Om	333,709	2	186	ordmasculine
+fc	331,428	0	187	guilsinglright
+14	750,692,3	2	188	onequarter
+12	750,692,3	2	189	onehalf
+34	750,689,3	2	190	threequarters
+r?	444,469,231	0	191	questiondown
+`A	778,908,3	2	192	Agrave
+'A	778,908,3	2	193	Aacute
+^A	778,908,3	2	194	Acircumflex
+~A	778,871,3	2	195	Atilde
+:A	778,868,3	2	196	Adieresis
+oA	778,927,3	2	197	Aring
+AE	944,692,3,0,10	2	198	AE
+,C	709,709,225	2	199	Ccedilla
+`E	611,908,3	2	200	Egrave
+'E	611,908,3	2	201	Eacute
+^E	611,908,3	2	202	Ecircumflex
+:E	611,868,3	2	203	Edieresis
+`I	337,908,3	2	204	Igrave
+'I	337,908,3	2	205	Iacute
+^I	337,908,3	2	206	Icircumflex
+:I	337,868,3	2	207	Idieresis
+-D	774,692,3	2	208	Eth
+~N	831,871,20	2	209	Ntilde
+`O	786,908,20	2	210	Ograve
+'O	786,908,20	2	211	Oacute
+^O	786,908,20	2	212	Ocircumflex
+~O	786,883,20	2	213	Otilde
+:O	786,868,20	2	214	Odieresis
+tmu	606,474	0	215	multiply
+/O	833,709,20	2	216	Oslash
+`U	778,908,20	2	217	Ugrave
+'U	778,908,20	2	218	Uacute
+^U	778,908,20	2	219	Ucircumflex
+:U	778,868,20	2	220	Udieresis
+'Y	667,908,3	2	221	Yacute
+TP	604,692,3	2	222	Thorn
+ss	556,731,9	2	223	germandbls
+`a	500,697,12	2	224	agrave
+'a	500,697,12	2	225	aacute
+^a	500,697,12	2	226	acircumflex
+~a	500,652,12	2	227	atilde
+:a	500,657,12	2	228	adieresis
+oa	500,716,12	2	229	aring
+ae	758,469,20	0	230	ae
+,c	444,469,225	0	231	ccedilla
+`e	479,697,20	2	232	egrave
+'e	479,697,20	2	233	eacute
+^e	479,697,20	2	234	ecircumflex
+:e	479,657,20	2	235	edieresis
+`i	287,697,3	2	236	igrave
+'i	287,697,3	2	237	iacute
+^i	287,697,3,13,12	2	238	icircumflex
+:i	287,657,3,6,6	2	239	idieresis
+Sd	546,728,20	2	240	eth
+~n	582,652,3	2	241	ntilde
+`o	546,697,20	2	242	ograve
+'o	546,697,20	2	243	oacute
+^o	546,697,20	2	244	ocircumflex
+~o	546,652,20	2	245	otilde
+:o	546,657,20	2	246	odieresis
+tdi	606,512	0	247	divide
+/o	556,474,23	0	248	oslash
+`u	603,697,12	2	249	ugrave
+'u	603,697,12	2	250	uacute
+^u	603,697,12	2	251	ucircumflex
+:u	603,657,12	2	252	udieresis
+'y	556,697,283	3	253	yacute
+Tp	601,726,281,0,2	3	254	thorn
+:y	556,657,283	3	255	ydieresis
+u2026	1000,111,5	0	256	ellipsis
diff --git a/contrib/groff/font/devps/S b/contrib/groff/font/devps/S
index 52d7fd6..527379f 100644
--- a/contrib/groff/font/devps/S
+++ b/contrib/groff/font/devps/S
@@ -3,223 +3,227 @@ internalname Symbol
 special
 spacewidth 250
 charset
-space	250	0	0040
-!	333,672,17,0,-128	3	0041	-- exclam
-fa	713,705,0,0,-31	3	0042	-- universal
-#	500,673,16,0,-20	3	0043	-- numbersign
+space	250	0	32	space
+!	333,672,17	3	33	exclam
+fa	713,705	3	34	universal
+#	500,673,16	3	35	numbersign
 sh	"
-te	549,707,0,0,-25	3	0044	-- existential
-%	833,655,36,0,-63	3	0045	-- percent
-&	778,661,18,0,-41	3	0046	-- ampersand
-st	439,500,17,0,-48	3	0047	-- suchthat
-(	333,673,191,0,-53	3	0050	-- parenleft
-)	333,673,191,0,-30	3	0051	-- parenright
-**	500,551,0,0,-65	3	0052	-- asteriskmath
-+	549,533,0,0,-10	3	0053	-- plus
+te	549,707	3	36	existential
+%	833,655,36	3	37	percent
+&	778,661,18	3	38	ampersand
+st	439,500,17	3	39	suchthat
+(	333,673,191	3	40	parenleft
+)	333,673,191	3	41	parenright
+**	500,551	3	42	asteriskmath
++	549,533	3	43	plus
 pl	"
-,	250,104,152,0,-56	3	0054	-- comma
-\-	549,288,0,0,-11	3	0055	-- minus
+,	250,104,152	3	44	comma
+\-	549,288	3	45	minus
 mi	"
-.	250,95,17,0,-69	3	0056	-- period
-/	278,646,18	3	0057	-- slash
+.	250,95,17	3	46	period
+/	278,646,18	3	47	slash
 sl	"
-0	500,685,17,0,-23	3	0060	-- zero
-1	500,673,0,0,-117	3	0061	-- one
-2	500,686,0,0,-25	3	0062	-- two
-3	500,685,17,0,-39	3	0063	-- three
-4	500,685,0,0,-16	3	0064	-- four
-5	500,685,17,0,-29	3	0065	-- five
-6	500,685,17,0,-36	3	0066	-- six
-7	500,673,16,0,-24	3	0067	-- seven
-8	500,685,18,0,-54	3	0070	-- eight
-9	500,685,18,0,-31	3	0071	-- nine
-:	278,460,17,0,-81	3	0072	-- colon
-;	278,460,152,0,-83	3	0073	-- semicolon
-<	549,522,0,0,-26	3	0074	-- less
-=	549,390,0,0,-11	3	0075	-- equal
+0	500,685,17	3	48	zero
+1	500,673	3	49	one
+2	500,686	3	50	two
+3	500,685,17	3	51	three
+4	500,685	3	52	four
+5	500,685,17	3	53	five
+6	500,685,17	3	54	six
+7	500,673,16	3	55	seven
+8	500,685,18	3	56	eight
+9	500,685,18	3	57	nine
+:	278,460,17	3	58	colon
+;	278,460,152	3	59	semicolon
+<	549,522	3	60	less
+=	549,390	3	61	equal
 eq	"
->	549,522,0,0,-26	3	0076	-- greater
-?	444,686,17,0,-70	3	0077	-- question
-=~	549,475,0,0,-11	3	0100	-- congruent
-*A	722,673,0,0,-4	3	0101	-- Alpha
-*B	667,673,0,0,-29	3	0102	-- Beta
-*X	722,673,0,0,9	3	0103	-- Chi
-*D	612,688,0,0,-6	3	0104	-- Delta
-*E	611,673,0,6,-32	3	0105	-- Epsilon
-*F	763,673,0,0,-26	3	0106	-- Phi
-*G	603,673,0,6,-24	3	0107	-- Gamma
-*Y	722,673,0,7,-39	3	0110	-- Eta
-*I	333,673,0,0,-32	3	0111	-- Iota
-+h	631,689,18,0,-18	3	0112	-- theta1
-*K	722,673,0,0,-35	3	0113	-- Kappa
-*L	686,688,0,0,-6	3	0114	-- Lambda
-*M	889,673,0,0,-28	3	0115	-- Mu
-*N	722,673,8,0,-29	3	0116	-- Nu
-*O	722,685,17,0,-41	3	0117	-- Omicron
-*P	768,673,0,0,-25	3	0120	-- Pi
-*H	741,685,17,0,-41	3	0121	-- Theta
-*R	556,673,0,7,-28	3	0122	-- Rho
-*S	592,673,0,0,-5	3	0123	-- Sigma
-*T	611,673,0,0,-33	3	0124	-- Tau
----	690,673,0,4,8	3	0125	-- Upsilon
-ts	439,500,233,0,-40	3	0126	-- sigma1
-*W	768,688,0,0,-34	3	0127	-- Omega
-*C	645,673,0,0,-40	3	0130	-- Xi
-*Q	795,684,0,0,-15	3	0131	-- Psi
-*Z	611,673,0,25,-44	3	0132	-- Zeta
-[	333,674,155,0,-86	3	0133	-- bracketleft
+>	549,522	3	62	greater
+?	444,686,17	3	63	question
+=~	549,475	3	64	congruent
+*A	722,673	3	65	Alpha
+*B	667,673	3	66	Beta
+*X	722,673,0,0,9	3	67	Chi
+*D	612,688	3	68	Delta
+*E	611,673,0,6	3	69	Epsilon
+*F	763,673	3	70	Phi
+*G	603,673,0,6	3	71	Gamma
+*Y	722,673,0,7	3	72	Eta
+*I	333,673	3	73	Iota
++h	631,689,18	3	74	theta1
+*K	722,673	3	75	Kappa
+*L	686,688	3	76	Lambda
+*M	889,673	3	77	Mu
+*N	722,673,8	3	78	Nu
+*O	722,685,17	3	79	Omicron
+*P	768,673	3	80	Pi
+*H	741,685,17	3	81	Theta
+*R	556,673,0,7	3	82	Rho
+*S	592,673	3	83	Sigma
+*T	611,673	3	84	Tau
+---	690,673,0,4,8	3	85	Upsilon
+ts	439,500,233	3	86	sigma1
+*W	768,688	3	87	Omega
+*C	645,673	3	88	Xi
+*Q	795,684	3	89	Psi
+*Z	611,673,0,25	3	90	Zeta
+[	333,674,155	3	91	bracketleft
 lB	"
-3d	863,478,0,0,-163	3	0134	-- therefore
+3d	863,478	3	92	therefore
 tf	"
-]	333,674,155,0,-33	3	0135	-- bracketright
+]	333,674,155	3	93	bracketright
 rB	"
-pp	658,674,0,0,-15	3	0136	-- perpendicular
-_	500,0,252,2,2	3	0137	-- underscore
-radicalex	500,917,0,590,-480	3	0140	-- radicalex
-*a	631,500,18,0,-41	3	0141	-- alpha
-*b	549,741,223,0,-61	3	0142	-- beta
-*x	549,499,231,0,-12	3	0143	-- chi
-*d	494,740,19,0,-40	3	0144	-- delta
-*e	439,502,19,0,-22	3	0145	-- epsilon
-*f	521,671,224,0,-27	3	0146	-- phi
-*g	411,499,225,73,-5	3	0147	-- gamma
-*y	603,514,202	3	0150	-- eta
-*i	329,503,17	3	0151	-- iota
-+f	603,499,224,0,-36	3	0152	-- phi1
-*k	549,501,0,9,-33	3	0153	-- kappa
-*l	549,739,17,0,-24	3	0154	-- lambda
-mc	576,500,223,0,-33	3	0155	-- mu
+pp	658,674	3	94	perpendicular
+_	500,0,252,2,2	3	95	underscore
+radicalex	500,917,0,590	3	96	radicalex
+*a	631,500,18	3	97	alpha
+*b	549,741,223	3	98	beta
+*x	549,499,231	3	99	chi
+*d	494,740,19	3	100	delta
+*e	439,502,19	3	101	epsilon
+*f	521,671,224	3	102	phi
+*g	411,499,225,73	3	103	gamma
+*y	603,514,202	3	104	eta
+*i	329,503,17	3	105	iota
++f	603,499,224	3	106	phi1
+*k	549,501,0,9	3	107	kappa
+*l	549,739,17	3	108	lambda
+mc	576,500,223	3	109	mu
 *m	"
-*n	521,507,16,0,9	3	0156	-- nu
-*o	549,499,19,0,-35	3	0157	-- omicron
-*p	549,487,19,0,-10	3	0160	-- pi
-*h	521,690,17,0,-43	3	0161	-- theta
-*r	549,499,230,0,-50	3	0162	-- rho
-*s	603,500,21,0,-30	3	0163	-- sigma
-*t	439,500,19,0,-10	3	0164	-- tau
-*u	576,507,18,0,-7	3	0165	-- upsilon
-+p	713,583,18,0,-12	3	0166	-- omega1
-*w	686,500,17,0,-42	3	0167	-- omega
-*c	493,766,224,0,-27	3	0170	-- xi
-*q	686,500,228,15,-12	3	0171	-- psi
-*z	494,756,225,0,-60	3	0172	-- zeta
-lC	480,673,183,0,-58	3	0173	-- braceleft
+*n	521,507,16,0,9	3	110	nu
+*o	549,499,19	3	111	omicron
+*p	549,487,19	3	112	pi
+*h	521,690,17	3	113	theta
+*r	549,499,230	3	114	rho
+*s	603,500,21	3	115	sigma
+*t	439,500,19	3	116	tau
+*u	576,507,18	3	117	upsilon
++p	713,583,18	3	118	omega1
+*w	686,500,17	3	119	omega
+*c	493,766,224	3	120	xi
+*q	686,500,228,15	3	121	psi
+*z	494,756,225	3	122	zeta
+lC	480,673,183	3	123	braceleft
 {	"
-ba	200,673,177,0,-65	3	0174	-- bar
+ba	200,673,177	3	124	bar
 |	"
-rC	480,673,183,0,-79	3	0175	-- braceright
+rC	480,673,183	3	125	braceright
 }	"
-ap	549,307,0,0,-17	3	0176	-- similar
-*U	620,685,0,0,2	3	0241	-- Upsilon1
-fm	247,735,0,0,-27	3	0242	-- minute
-<=	549,639,0,0,-29	3	0243	-- lessequal
-f/	167,677,12,173,180	3	0244	-- fraction
-if	713,404,0,0,-26	3	0245	-- infinity
-Fn	500,686,193,0,-2	3	0246	-- florin
-CL	753,533,26,0,-86	3	0247	-- club
-DI	753,550,36,0,-142	3	0250	-- diamond
-HE	753,532,33,0,-117	3	0251	-- heart
-SP	753,548,36,0,-113	3	0252	-- spade
-<>	1042,511,15,0,-24	3	0253	-- arrowboth
-<-	987,511,15,0,-32	3	0254	-- arrowleft
-ua	603,910,0,0,-45	3	0255	-- arrowup
+ap	549,307	3	126	similar
+*U	620,685,0,0,2	3	161	Upsilon1
+fm	247,735	3	162	minute
+<=	549,639	3	163	lessequal
+f/	167,677,12,173,180	3	164	fraction
+if	713,404	3	165	infinity
+Fn	500,686,193	3	166	florin
+CL	753,533,26	3	167	club
+DI	753,550,36	3	168	diamond
+HE	753,532,33	3	169	heart
+SP	753,548,36	3	170	spade
+<>	1042,511,15	3	171	arrowboth
+<-	987,511,15	3	172	arrowleft
+ua	603,910	3	173	arrowup
 arrowverttp	"
-->	987,511,15,0,-49	3	0256	-- arrowright
-da	603,888,22,0,-45	3	0257	-- arrowdown
+->	987,511,15	3	174	arrowright
+da	603,888,22	3	175	arrowdown
 arrowvertbt	"
-de	400,685,0,0,-50	3	0260	-- degree
-t+-	549,645,0,0,-10	3	0261	-- plusminus
+de	400,685	3	176	degree
+t+-	549,645	3	177	plusminus
 +-	"
-sd	411,737,0,2,-20	3	0262	-- second
->=	549,639,0,0,-29	3	0263	-- greaterequal
-tmu	549,524,0,0,-17	3	0264	-- multiply
+sd	411,737,0,2	3	178	second
+>=	549,639	3	179	greaterequal
+tmu	549,524	3	180	multiply
 mu	"
-pt	713,404,0,0,-27	3	0265	-- proportional
-pd	494,746,20,0,-26	3	0266	-- partialdiff
-bu	460,473,0,0,-50	3	0267	-- bullet
-tdi	549,456,0,0,-10	3	0270	-- divide
+pt	713,404	3	181	proportional
+pd	494,746,20	3	182	partialdiff
+bu	460,473	3	183	bullet
+tdi	549,456	3	184	divide
 di	"
-!=	549,549,25,0,-15	3	0271	-- notequal
-==	549,443,0,0,-14	3	0272	-- equivalence
-~~	549,394,0,0,-14	3	0273	-- approxequal
+!=	549,549,25	3	185	notequal
+==	549,443	3	186	equivalence
+~~	549,394	3	187	approxequal
 ~=	"
----	1000,95,17,0,-111	3	0274	-- ellipsis
-arrowvertex	603,1010,120,0,-280	3	0275	-- arrowvertex
-an	1000,276,0,50,60	3	0276	-- arrowhorizex
-CR	658,629,16,0,-15	3	0277	-- carriagereturn
-Ah	823,658,18,0,-175	3	0300	-- aleph
-Im	686,740,53,0,-10	3	0301	-- Ifraktur
-Re	795,734,15,0,-26	3	0302	-- Rfraktur
-wp	987,573,211,0,-159	3	0303	-- weierstrass
-c*	768,673,17,0,-43	3	0304	-- circlemultiply
-c+	768,675,15,0,-43	3	0305	-- circleplus
-es	823,719,24,0,-39	3	0306	-- emptyset
-ca	768,509,0,0,-40	3	0307	-- intersection
-cu	768,492,17,0,-40	3	0310	-- union
-sp	713,470,0,0,-20	3	0311	-- propersuperset
-ip	713,470,125,0,-20	3	0312	-- reflexsuperset
-nb	713,540,70,0,-36	3	0313	-- notsubset
-sb	713,470,0,0,-37	3	0314	-- propersubset
-ib	713,470,125,0,-37	3	0315	-- reflexsubset
-mo	713,468,0,0,-45	3	0316	-- element
-nm	713,555,58,0,-45	3	0317	-- notelement
-/_	768,673,0,0,-26	3	0320	-- angle
-gr	713,718,19,0,-36	3	0321	-- gradient
----	790,673,17,0,-50	3	0322	-- registerserif
----	790,675,15,0,-51	3	0323	-- copyrightserif
----	890,673,0,0,-18	3	0324	-- trademarkserif
-product	823,751,101,0,-25	3	0325	-- product
-sr	549,917,38,0,-10	3	0326	-- radical
-md	250,310,0,0,-69	3	0327	-- dotmath
-no	713,288,0,0,-15	3	0330	-- logicalnot
-AN	603,454,0,0,-23	3	0331	-- logicaland
-OR	603,477,0,0,-30	3	0332	-- logicalor
-hA	1042,510,20,0,-27	3	0333	-- arrowdblboth
-lA	987,513,15,0,-30	3	0334	-- arrowdblleft
-uA	603,911,0,0,-39	3	0335	-- arrowdblup
-rA	987,508,20,0,-45	3	0336	-- arrowdblright
-dA	603,890,19,0,-44	3	0337	-- arrowdbldown
-lz	494,745,0,0,-18	3	0340	-- lozenge
-la	329,746,198,0,-25	3	0341	-- angleleft
----	790,670,20,0,-50	3	0342	-- registersans
----	790,675,15,0,-49	3	0343	-- copyrightsans
----	786,673,0,0,-5	3	0344	-- trademarksans
-sum	713,752,108,0,-14	3	0345	-- summation
-parenlefttp	384,926,293,52,-40	3	0346	-- parenlefttp
-parenleftex	384,920,80,0,-40	3	0347	-- parenleftex
-parenleftbt	384,920,293,52,-40	3	0350	-- parenleftbt
-bracketlefttp	384,925,75	3	0351	-- bracketlefttp
+---	1000,95,17	3	188	ellipsis
+arrowvertex	603,1010,120	3	189	arrowvertex
+an	1000,276,0,50,60	3	190	arrowhorizex
+CR	658,629,16	3	191	carriagereturn
+Ah	823,658,18	3	192	aleph
+Im	686,740,53	3	193	Ifraktur
+Re	795,734,15	3	194	Rfraktur
+wp	987,573,211	3	195	weierstrass
+c*	768,673,17	3	196	circlemultiply
+c+	768,675,15	3	197	circleplus
+es	823,719,24	3	198	emptyset
+ca	768,509	3	199	intersection
+cu	768,492,17	3	200	union
+sp	713,470	3	201	propersuperset
+ip	713,470,125	3	202	reflexsuperset
+nb	713,540,70	3	203	notsubset
+sb	713,470	3	204	propersubset
+ib	713,470,125	3	205	reflexsubset
+mo	713,468	3	206	element
+nm	713,555,58	3	207	notelement
+/_	768,673	3	208	angle
+gr	713,718,19	3	209	gradient
+---	790,673,17	3	210	registerserif
+---	790,675,15	3	211	copyrightserif
+---	890,673	3	212	trademarkserif
+product	823,751,101	3	213	product
+sr	549,917,38	3	214	radical
+sqrt	"
+md	250,310	3	215	dotmath
+tno	713,288	3	216	logicalnot
+no	"
+AN	603,454	3	217	logicaland
+OR	603,477	3	218	logicalor
+hA	1042,510,20	3	219	arrowdblboth
+lA	987,513,15	3	220	arrowdblleft
+uA	603,911	3	221	arrowdblup
+rA	987,508,20	3	222	arrowdblright
+dA	603,890,19	3	223	arrowdbldown
+lz	494,745	3	224	lozenge
+la	329,746,198	3	225	angleleft
+---	790,670,20	3	226	registersans
+---	790,675,15	3	227	copyrightsans
+---	786,673	3	228	trademarksans
+sum	713,752,108	3	229	summation
+parenlefttp	384,926,293,52	3	230	parenlefttp
+parenleftex	384,920,80	3	231	parenleftex
+parenleftbt	384,920,293,52	3	232	parenleftbt
+bracketlefttp	384,925,75	3	233	bracketlefttp
 lc	"
-bracketleftex	384,925,75	3	0352	-- bracketleftex
-bracketleftbt	384,925,75	3	0353	-- bracketleftbt
+bracketleftex	384,925,75	3	234	bracketleftex
+bracketleftbt	384,925,75	3	235	bracketleftbt
 lf	"
-bracelefttp	494,925,75,0,-201	3	0354	-- bracelefttp
+bracelefttp	494,925,75	3	236	bracelefttp
 lt	"
-braceleftmid	494,925,75,0,-14	3	0355	-- braceleftmid
+braceleftmid	494,925,75	3	237	braceleftmid
 lk	"
-braceleftbt	494,925,75,0,-201	3	0356	-- braceleftbt
+braceleftbt	494,925,75	3	238	braceleftbt
 lb	"
-braceex	494,925,75,0,-201	3	0357	-- braceex
+braceex	494,925,75	3	239	braceex
 bracerightex	"
 braceleftex	"
 barex	"
 bv	"
-ra	329,746,198,0,-21	3	0361	-- angleright
-is	274,916,107,67,52,-10	3	0362	-- integral
----	686,921,83,29,-332	3	0363	-- integraltp
----	686,975,88,0,-332	3	0364	-- integralex
----	686,921,81,0,-39	3	0365	-- integralbt
-parenrighttp	384,926,293,66,-54	3	0366	-- parenrighttp
-parenrightex	384,920,80,66,-398	3	0367	-- parenrightex
-parenrightbt	384,920,293,66,-54	3	0370	-- parenrightbt
-bracketrighttp	384,925,75,0,-22	3	0371	-- bracketrighttp
+ra	329,746,198	3	241	angleright
+is	274,916,107,67,52,-10	3	242	integral
+integral	"
+---	686,921,83,29	3	243	integraltp
+---	686,975,88	3	244	integralex
+---	686,921,81	3	245	integralbt
+parenrighttp	384,926,293,66	3	246	parenrighttp
+parenrightex	384,920,80,66	3	247	parenrightex
+parenrightbt	384,920,293,66	3	248	parenrightbt
+bracketrighttp	384,925,75	3	249	bracketrighttp
 rc	"
-bracketrightex	384,925,75,0,-305	3	0372	-- bracketrightex
-bracketrightbt	384,925,75,0,-20	3	0373	-- bracketrightbt
+bracketrightex	384,925,75	3	250	bracketrightex
+bracketrightbt	384,925,75	3	251	bracketrightbt
 rf	"
-bracerighttp	494,925,75,0,-17	3	0374	-- bracerighttp
+bracerighttp	494,925,75	3	252	bracerighttp
 rt	"
-bracerightmid	494,925,75,0,-201	3	0375	-- bracerightmid
+bracerightmid	494,925,75	3	253	bracerightmid
 rk	"
-bracerightbt	494,925,75,0,-17	3	0376	-- bracerightbt
+bracerightbt	494,925,75	3	254	bracerightbt
 rb	"
+---	790,808,3	3	256	apple
diff --git a/contrib/groff/font/devps/SS b/contrib/groff/font/devps/SS
index 933eb1c..5eb6b9b 100644
--- a/contrib/groff/font/devps/SS
+++ b/contrib/groff/font/devps/SS
@@ -4,191 +4,192 @@ special
 slant 15.5
 spacewidth 223
 charset
-space	223	0	0040
----	296,599,15,137,-72,99	3	0041	-- exclam
----	635,627,0,216,-173,99	3	0042	-- universal
----	445,599,15,162,-21,99	3	0043	-- numbersign
----	489,629,0,183,28,99	3	0044	-- existential
----	741,583,32,75,-97,75	3	0045	-- percent
----	692,589,16,103,-18,99	3	0046	-- ampersand
----	391,444,15,109,6,99	3	0047	-- suchthat
----	296,599,170,203,-39,99	3	0050	-- parenleft
----	296,600,170,93,72,93	3	0051	-- parenright
----	445,490,0,105,-76,99	3	0052	-- asteriskmath
----	489,474,0,123,-26,99	3	0053	-- plus
----	223,93,136,10,41,10	3	0054	-- comma
----	489,256,0,117,-24,99	3	0055	-- minus
----	223,85,15,1,-20,1	3	0056	-- period
----	247,575,15,208,55,99	3	0057	-- slash
----	445,610,15,142,-40,99	3	0060	-- zero
----	445,599,0,56,-57,56	3	0061	-- one
----	445,611,0,129,28,99	3	0062	-- two
----	445,611,16,115,-6,99	3	0063	-- three
----	445,610,0,135,-8,99	3	0064	-- four
----	445,610,15,188,14,99	3	0065	-- five
----	445,610,16,193,-37,99	3	0066	-- six
----	445,599,15,190,-101,99	3	0067	-- seven
----	445,611,16,141,-32,99	3	0070	-- eight
----	445,609,15,140,-2,99	3	0071	-- nine
----	247,409,15,89,-31,89	3	0072	-- colon
----	247,409,136,99,17,99	3	0073	-- semicolon
----	489,464,0,171,-37,99	3	0074	-- less
----	489,347,0,147,1,99	3	0075	-- equal
----	489,464,0,108,27,99	3	0076	-- greater
----	395,610,15,172,-113,99	3	0077	-- question
----	489,423,0,158,40,99	3	0100	-- congruent
----	643,599,0,21,47,21	3	0101	-- Alpha
----	594,598,0,101,24,99	3	0102	-- Beta
----	643,599,0,205,58,99	3	0103	-- Chi
----	545,612,0,46,45,46	3	0104	-- Delta
----	544,599,0,194,22,99	3	0105	-- Epsilon
----	679,598,0,132,-55,99	3	0106	-- Phi
----	537,599,0,227,19,99	3	0107	-- Gamma
----	643,599,0,243,15,99	3	0110	-- Eta
----	296,599,0,222,22,99	3	0111	-- Iota
-+h	562,614,15,133,-58,99	3	0112	-- theta1
----	643,598,0,185,19,99	3	0113	-- Kappa
----	611,612,0,49,45,49	3	0114	-- Lambda
----	791,599,0,233,22,99	3	0115	-- Mu
----	643,599,7,234,24,99	3	0116	-- Nu
----	643,610,15,154,-62,99	3	0117	-- Omicron
----	684,599,0,213,28,99	3	0120	-- Pi
----	659,610,15,138,-62,99	3	0121	-- Theta
----	495,599,0,200,25,99	3	0122	-- Rho
----	527,599,0,186,45,99	3	0123	-- Sigma
----	544,599,0,229,-109,99	3	0124	-- Tau
----	614,599,0,240,-125,99	3	0125	-- Upsilon
-ts	391,445,208,151,-28,99	3	0126	-- sigma1
----	684,612,0,126,20,99	3	0127	-- Omega
----	574,598,0,176,14,99	3	0130	-- Xi
----	708,608,0,227,-138,99	3	0131	-- Psi
----	544,599,0,231,11,99	3	0132	-- Zeta
----	296,599,138,207,16,99	3	0133	-- bracketleft
----	768,426,0,0,-110	3	0134	-- therefore
----	296,599,138,159,64,99	3	0135	-- bracketright
----	586,600,0,60,37,60	3	0136	-- perpendicular
----	445,0,224,0,122	3	0137	-- underscore
----	445,816,0,829,-622,99	3	0140	-- radicalex
-*a	562,445,15,146,-34,99	3	0141	-- alpha
-*b	489,659,198,139,57,99	3	0142	-- beta
-*x	489,445,206,134,98,99	3	0143	-- chi
-*d	440,658,16,181,-33,99	3	0144	-- delta
-*e	391,447,17,127,1,99	3	0145	-- epsilon
-*f	464,596,200,103,-28,99	3	0146	-- phi
-*g	366,444,200,252,-42,99	3	0147	-- gamma
-*y	537,457,180,68,-50,68	3	0150	-- eta
-*i	293,448,16,53,-47,53	3	0151	-- iota
-+f	537,444,199,117,-42,99	3	0152	-- phi1
-*k	489,447,0,182,-56,99	3	0153	-- kappa
-*l	489,658,16,91,29,91	3	0154	-- lambda
-*m	513,445,198,70,68,70	3	0155	-- mu
-*n	464,451,15,134,-69,99	3	0156	-- nu
-*o	489,444,17,87,-36,87	3	0157	-- omicron
-*p	489,433,18,160,-8,99	3	0160	-- pi
-*h	464,614,16,140,-53,99	3	0161	-- theta
-*r	489,444,205,82,69,82	3	0162	-- rho
-*s	537,445,19,175,-37,99	3	0163	-- sigma
-*t	391,445,16,170,-45,99	3	0164	-- tau
-*u	513,451,15,95,-55,95	3	0165	-- upsilon
-+p	635,519,15,173,-28,99	3	0166	-- omega1
-*w	611,445,16,126,-35,99	3	0167	-- omega
-*c	439,681,200,126,-20,99	3	0170	-- xi
-*q	611,445,203,198,-91,99	3	0171	-- psi
-*z	440,673,200,190,-50,99	3	0172	-- zeta
----	427,599,163,163,-66,99	3	0173	-- braceleft
----	178,599,158,179,41,99	3	0174	-- bar
----	427,599,163,67,31,67	3	0175	-- braceright
----	489,273,0,110,-28,99	3	0176	-- similar
----	552,609,0,208,-84,99	3	0241	-- Upsilon1
----	220,654,0,223,-106,99	3	0242	-- minute
----	489,569,0,206,24,99	3	0243	-- lessequal
----	149,603,11,391,214,99	3	0244	-- fraction
----	635,360,0,107,-41,99	3	0245	-- infinity
----	445,612,172,219,86,99	3	0246	-- florin
----	670,474,23,25,-69,25	3	0247	-- club
----	670,490,32,0,-148	3	0250	-- diamond
----	670,473,29,59,-155,59	3	0251	-- heart
----	670,488,32,0,-82	3	0252	-- spade
----	927,455,13,103,-40,99	3	0253	-- arrowboth
----	878,455,13,87,-47,87	3	0254	-- arrowleft
----	537,810,0,204,-173,99	3	0255	-- arrowup
----	878,455,13,94,-55,94	3	0256	-- arrowright
----	537,790,20,85,-54,85	3	0257	-- arrowdown
----	356,609,0,160,-137,99	3	0260	-- degree
----	489,574,0,154,41,99	3	0261	-- plusminus
----	366,656,0,244,-100,99	3	0262	-- second
----	489,569,0,143,24,99	3	0263	-- greaterequal
----	489,466,0,170,22,99	3	0264	-- multiply
----	635,360,0,82,-40,82	3	0265	-- proportional
----	440,664,18,152,-12,99	3	0266	-- partialdiff
----	409,421,0,95,-68,95	3	0267	-- bullet
----	489,406,0,119,-24,99	3	0270	-- divide
----	489,489,22,148,-1,99	3	0271	-- notequal
----	489,394,0,163,15,99	3	0272	-- equivalence
----	489,351,0,133,-7,99	3	0273	-- approxequal
----	890,85,15,0,-57	3	0274	-- ellipsis
----	537,899,107,92,-166,92	3	0275	-- arrowvertex
----	890,246,0,171,42,99	3	0276	-- arrowhorizex
----	586,560,14,174,10,99	3	0277	-- carriagereturn
----	732,586,16,58,-109,58	3	0300	-- aleph
----	611,659,47,123,24,99	3	0301	-- Ifraktur
----	708,653,13,175,-21,99	3	0302	-- Rfraktur
----	878,510,188,50,-62,50	3	0303	-- weierstrass
----	684,599,15,124,-64,99	3	0304	-- circlemultiply
----	684,601,13,125,-65,99	3	0305	-- circleplus
----	732,640,21,202,12,99	3	0306	-- emptyset
----	684,453,0,80,14,80	3	0307	-- intersection
----	684,438,15,154,-60,99	3	0310	-- union
----	635,418,0,90,32,90	3	0311	-- propersuperset
----	635,418,111,89,67,89	3	0312	-- reflexsuperset
----	635,481,62,159,-37,99	3	0313	-- notsubset
----	635,418,0,159,-37,99	3	0314	-- propersubset
----	635,418,111,159,34,99	3	0315	-- reflexsubset
----	635,417,0,0,-43	3	0316	-- element
----	635,494,52,0,-24	3	0317	-- notelement
----	684,599,0,199,27,99	3	0320	-- angle
----	635,639,17,220,-181,99	3	0321	-- gradient
----	703,596,18,110,-70,99	3	0322	-- registerserif
----	703,601,13,113,-72,99	3	0323	-- copyrightserif
----	792,599,0,205,-119,99	3	0324	-- trademarkserif
----	732,668,90,238,56,99	3	0325	-- product
----	489,816,34,272,-84,99	3	0326	-- radical
----	223,276,0,52,-81,52	3	0327	-- dotmath
----	635,256,0,100,-28,99	3	0330	-- logicalnot
----	537,404,0,32,29,32	3	0331	-- logicaland
----	537,424,0,152,-101,99	3	0332	-- logicalor
----	927,454,18,101,-42,99	3	0333	-- arrowdblboth
----	878,457,13,114,-46,99	3	0334	-- arrowdblleft
----	537,811,0,201,-102,99	3	0335	-- arrowdblup
----	878,452,18,89,-21,89	3	0336	-- arrowdblright
----	537,792,17,152,-53,99	3	0337	-- arrowdbldown
----	440,663,0,129,-71,99	3	0340	-- lozenge
----	293,664,176,229,-48,99	3	0341	-- angleleft
----	703,596,18,110,-70,99	3	0342	-- registersans
----	703,601,13,111,-70,99	3	0343	-- copyrightsans
----	700,599,0,182,-129,99	3	0344	-- trademarksans
----	635,669,96,171,65,99	3	0345	-- summation
----	342,824,261,350,96,99	3	0346	-- parenlefttp
----	342,823,76,46,38,46	3	0347	-- parenleftex
----	342,824,261,47,-63,47	3	0350	-- parenleftbt
----	342,824,71,268,72,99	3	0351	-- bracketlefttp
----	342,823,70,13,72,13	3	0352	-- bracketleftex
----	342,824,71,14,72,14	3	0353	-- bracketleftbt
----	440,824,67,258,-108,99	3	0354	-- bracelefttp
----	440,832,76,96,-76,96	3	0355	-- braceleftmid
----	440,824,62,94,-169,94	3	0356	-- braceleftbt
----	440,832,71,96,-107,96	3	0357	-- braceex
----	293,664,176,102,79,99	3	0361	-- angleright
----	244,815,95,305,63,99	3	0362	-- integral
----	611,820,74,312,-222,99	3	0363	-- integraltp
----	611,868,78,79,-221,79	3	0364	-- integralex
----	611,820,72,64,20,64	3	0365	-- integralbt
----	342,824,261,206,-223,99	3	0366	-- parenrighttp
----	342,823,76,365,-281,99	3	0367	-- parenrightex
----	342,824,261,365,80,99	3	0370	-- parenrightbt
----	342,824,71,285,-199,99	3	0371	-- bracketrighttp
----	342,823,70,285,-200,99	3	0372	-- bracketrightex
----	342,824,71,285,54,99	3	0373	-- bracketrightbt
----	440,824,67,35,-108,35	3	0374	-- bracerighttp
----	440,832,76,127,-105,99	3	0375	-- bracerightmid
----	440,824,62,94,54,94	3	0376	-- bracerightbt
+space	223	0	32	space
+---	296,599,15,137,-72,99	3	33	exclam
+---	635,627,0,216,-173,99	3	34	universal
+---	445,599,15,162,-21,99	3	35	numbersign
+---	489,629,0,183,28,99	3	36	existential
+---	741,583,32,75,-97,75	3	37	percent
+---	692,589,16,103,-18,99	3	38	ampersand
+---	391,444,15,109,6,99	3	39	suchthat
+---	296,599,170,203,-39,99	3	40	parenleft
+---	296,600,170,93,72,93	3	41	parenright
+---	445,490,0,105,-76,99	3	42	asteriskmath
+---	489,474,0,123,-26,99	3	43	plus
+---	223,93,136,10,41,10	3	44	comma
+---	489,256,0,117,-24,99	3	45	minus
+---	223,85,15,1,-20,1	3	46	period
+---	247,575,15,208,55,99	3	47	slash
+---	445,610,15,142,-40,99	3	48	zero
+---	445,599,0,56,-57,56	3	49	one
+---	445,611,0,129,28,99	3	50	two
+---	445,611,16,115,-6,99	3	51	three
+---	445,610,0,135,-8,99	3	52	four
+---	445,610,15,188,14,99	3	53	five
+---	445,610,16,193,-37,99	3	54	six
+---	445,599,15,190,-101,99	3	55	seven
+---	445,611,16,141,-32,99	3	56	eight
+---	445,609,15,140,-2,99	3	57	nine
+---	247,409,15,89,-31,89	3	58	colon
+---	247,409,136,99,17,99	3	59	semicolon
+---	489,464,0,171,-37,99	3	60	less
+---	489,347,0,147,1,99	3	61	equal
+---	489,464,0,108,27,99	3	62	greater
+---	395,610,15,172,-113,99	3	63	question
+---	489,423,0,158,40,99	3	64	congruent
+---	643,599,0,21,47,21	3	65	Alpha
+---	594,598,0,101,24,99	3	66	Beta
+---	643,599,0,205,58,99	3	67	Chi
+---	545,612,0,46,45,46	3	68	Delta
+---	544,599,0,194,22,99	3	69	Epsilon
+---	679,598,0,132,-55,99	3	70	Phi
+---	537,599,0,227,19,99	3	71	Gamma
+---	643,599,0,243,15,99	3	72	Eta
+---	296,599,0,222,22,99	3	73	Iota
++h	562,614,15,133,-58,99	3	74	theta1
+---	643,598,0,185,19,99	3	75	Kappa
+---	611,612,0,49,45,49	3	76	Lambda
+---	791,599,0,233,22,99	3	77	Mu
+---	643,599,7,234,24,99	3	78	Nu
+---	643,610,15,154,-62,99	3	79	Omicron
+---	684,599,0,213,28,99	3	80	Pi
+---	659,610,15,138,-62,99	3	81	Theta
+---	495,599,0,200,25,99	3	82	Rho
+---	527,599,0,186,45,99	3	83	Sigma
+---	544,599,0,229,-109,99	3	84	Tau
+---	614,599,0,240,-125,99	3	85	Upsilon
+ts	391,445,208,151,-28,99	3	86	sigma1
+---	684,612,0,126,20,99	3	87	Omega
+---	574,598,0,176,14,99	3	88	Xi
+---	708,608,0,227,-138,99	3	89	Psi
+---	544,599,0,231,11,99	3	90	Zeta
+---	296,599,138,207,16,99	3	91	bracketleft
+---	768,426,0,0,-110	3	92	therefore
+---	296,599,138,159,64,99	3	93	bracketright
+---	586,600,0,60,37,60	3	94	perpendicular
+---	445,0,224,0,122	3	95	underscore
+---	445,816,0,829,-622,99	3	96	radicalex
+*a	562,445,15,146,-34,99	3	97	alpha
+*b	489,659,198,139,57,99	3	98	beta
+*x	489,445,206,134,98,99	3	99	chi
+*d	440,658,16,181,-33,99	3	100	delta
+*e	391,447,17,127,1,99	3	101	epsilon
+*f	464,596,200,103,-28,99	3	102	phi
+*g	366,444,200,252,-42,99	3	103	gamma
+*y	537,457,180,68,-50,68	3	104	eta
+*i	293,448,16,53,-47,53	3	105	iota
++f	537,444,199,117,-42,99	3	106	phi1
+*k	489,447,0,182,-56,99	3	107	kappa
+*l	489,658,16,91,29,91	3	108	lambda
+*m	513,445,198,70,68,70	3	109	mu
+*n	464,451,15,134,-69,99	3	110	nu
+*o	489,444,17,87,-36,87	3	111	omicron
+*p	489,433,18,160,-8,99	3	112	pi
+*h	464,614,16,140,-53,99	3	113	theta
+*r	489,444,205,82,69,82	3	114	rho
+*s	537,445,19,175,-37,99	3	115	sigma
+*t	391,445,16,170,-45,99	3	116	tau
+*u	513,451,15,95,-55,95	3	117	upsilon
++p	635,519,15,173,-28,99	3	118	omega1
+*w	611,445,16,126,-35,99	3	119	omega
+*c	439,681,200,126,-20,99	3	120	xi
+*q	611,445,203,198,-91,99	3	121	psi
+*z	440,673,200,190,-50,99	3	122	zeta
+---	427,599,163,163,-66,99	3	123	braceleft
+---	178,599,158,179,41,99	3	124	bar
+---	427,599,163,67,31,67	3	125	braceright
+---	489,273,0,110,-28,99	3	126	similar
+---	552,609,0,208,-84,99	3	161	Upsilon1
+---	220,654,0,223,-106,99	3	162	minute
+---	489,569,0,206,24,99	3	163	lessequal
+---	149,603,11,391,214,99	3	164	fraction
+---	635,360,0,107,-41,99	3	165	infinity
+---	445,612,172,219,86,99	3	166	florin
+---	670,474,23,25,-69,25	3	167	club
+---	670,490,32,0,-148	3	168	diamond
+---	670,473,29,59,-155,59	3	169	heart
+---	670,488,32,0,-82	3	170	spade
+---	927,455,13,103,-40,99	3	171	arrowboth
+---	878,455,13,87,-47,87	3	172	arrowleft
+---	537,810,0,204,-173,99	3	173	arrowup
+---	878,455,13,94,-55,94	3	174	arrowright
+---	537,790,20,85,-54,85	3	175	arrowdown
+---	356,609,0,160,-137,99	3	176	degree
+---	489,574,0,154,41,99	3	177	plusminus
+---	366,656,0,244,-100,99	3	178	second
+---	489,569,0,143,24,99	3	179	greaterequal
+---	489,466,0,170,22,99	3	180	multiply
+---	635,360,0,82,-40,82	3	181	proportional
+---	440,664,18,152,-12,99	3	182	partialdiff
+---	409,421,0,95,-68,95	3	183	bullet
+---	489,406,0,119,-24,99	3	184	divide
+---	489,489,22,148,-1,99	3	185	notequal
+---	489,394,0,163,15,99	3	186	equivalence
+---	489,351,0,133,-7,99	3	187	approxequal
+---	890,85,15,0,-57	3	188	ellipsis
+---	537,899,107,92,-166,92	3	189	arrowvertex
+---	890,246,0,171,42,99	3	190	arrowhorizex
+---	586,560,14,174,10,99	3	191	carriagereturn
+---	732,586,16,58,-109,58	3	192	aleph
+---	611,659,47,123,24,99	3	193	Ifraktur
+---	708,653,13,175,-21,99	3	194	Rfraktur
+---	878,510,188,50,-62,50	3	195	weierstrass
+---	684,599,15,124,-64,99	3	196	circlemultiply
+---	684,601,13,125,-65,99	3	197	circleplus
+---	732,640,21,202,12,99	3	198	emptyset
+---	684,453,0,80,14,80	3	199	intersection
+---	684,438,15,154,-60,99	3	200	union
+---	635,418,0,90,32,90	3	201	propersuperset
+---	635,418,111,89,67,89	3	202	reflexsuperset
+---	635,481,62,159,-37,99	3	203	notsubset
+---	635,418,0,159,-37,99	3	204	propersubset
+---	635,418,111,159,34,99	3	205	reflexsubset
+---	635,417,0,0,-43	3	206	element
+---	635,494,52,0,-24	3	207	notelement
+---	684,599,0,199,27,99	3	208	angle
+---	635,639,17,220,-181,99	3	209	gradient
+---	703,596,18,110,-70,99	3	210	registerserif
+---	703,601,13,113,-72,99	3	211	copyrightserif
+---	792,599,0,205,-119,99	3	212	trademarkserif
+---	732,668,90,238,56,99	3	213	product
+---	489,816,34,272,-84,99	3	214	radical
+---	223,276,0,52,-81,52	3	215	dotmath
+---	635,256,0,100,-28,99	3	216	logicalnot
+---	537,404,0,32,29,32	3	217	logicaland
+---	537,424,0,152,-101,99	3	218	logicalor
+---	927,454,18,101,-42,99	3	219	arrowdblboth
+---	878,457,13,114,-46,99	3	220	arrowdblleft
+---	537,811,0,201,-102,99	3	221	arrowdblup
+---	878,452,18,89,-21,89	3	222	arrowdblright
+---	537,792,17,152,-53,99	3	223	arrowdbldown
+---	440,663,0,129,-71,99	3	224	lozenge
+---	293,664,176,229,-48,99	3	225	angleleft
+---	703,596,18,110,-70,99	3	226	registersans
+---	703,601,13,111,-70,99	3	227	copyrightsans
+---	700,599,0,182,-129,99	3	228	trademarksans
+---	635,669,96,171,65,99	3	229	summation
+---	342,824,261,350,96,99	3	230	parenlefttp
+---	342,823,76,46,38,46	3	231	parenleftex
+---	342,824,261,47,-63,47	3	232	parenleftbt
+---	342,824,71,268,72,99	3	233	bracketlefttp
+---	342,823,70,13,72,13	3	234	bracketleftex
+---	342,824,71,14,72,14	3	235	bracketleftbt
+---	440,824,67,258,-108,99	3	236	bracelefttp
+---	440,832,76,96,-76,96	3	237	braceleftmid
+---	440,824,62,94,-169,94	3	238	braceleftbt
+---	440,832,71,96,-107,96	3	239	braceex
+---	293,664,176,102,79,99	3	241	angleright
+---	244,815,95,305,63,99	3	242	integral
+---	611,820,74,312,-222,99	3	243	integraltp
+---	611,868,78,79,-221,79	3	244	integralex
+---	611,820,72,64,20,64	3	245	integralbt
+---	342,824,261,206,-223,99	3	246	parenrighttp
+---	342,823,76,365,-281,99	3	247	parenrightex
+---	342,824,261,365,80,99	3	248	parenrightbt
+---	342,824,71,285,-199,99	3	249	bracketrighttp
+---	342,823,70,285,-200,99	3	250	bracketrightex
+---	342,824,71,285,54,99	3	251	bracketrightbt
+---	440,824,67,35,-108,35	3	252	bracerighttp
+---	440,832,76,127,-105,99	3	253	bracerightmid
+---	440,824,62,94,54,94	3	254	bracerightbt
+---	703,719,2,131,-86,99	3	256	apple
diff --git a/contrib/groff/font/devps/TB b/contrib/groff/font/devps/TB
index 69d2d52..fba840d 100644
--- a/contrib/groff/font/devps/TB
+++ b/contrib/groff/font/devps/TB
@@ -207,246 +207,247 @@ y o -25
 y e -10
 y , -55
 charset
-ha	581,676,0,0,-73	2	0000	-- asciicircum
-ti	520,333,0,0,-29	0	0001	-- asciitilde
-vS	556,914,19,0,-35	2	0002	-- Scaron
-vZ	667,914,0,0,-28	2	0003	-- Zcaron
-vs	389,704,14,0,-25	2	0004	-- scaron
-vz	444,704,0,0,-21	2	0005	-- zcaron
-:Y	722,877,0,0,-15	2	0006	-- Ydieresis
-tm	1000,676,0,0,-24	2	0007	-- trademark
-aq	278,691,0,0,-75	2	0010	-- quotesingle
-space	250	0	0040
-!	333,691,13,0,-81	2	0041	-- exclam
-"	555,691,0,0,-83	2	0042	-- quotedbl
+ha	581,676	2	0	asciicircum
+ti	520,333	0	1	asciitilde
+vS	556,914,19	2	2	Scaron
+vZ	667,914	2	3	Zcaron
+vs	389,704,14	2	4	scaron
+vz	444,704	2	5	zcaron
+:Y	722,877	2	6	Ydieresis
+tm	1000,676	2	7	trademark
+aq	278,691	2	8	quotesingle
+space	250	0	32	space
+!	333,691,13	2	33	exclam
+"	555,691	2	34	quotedbl
 dq	"
-#	500,700,0,0,-4	2	0043	-- numbersign
+#	500,700	2	35	numbersign
 sh	"
-$	500,750,99,0,-29	2	0044	-- dollar
+$	500,750,99	2	36	dollar
 Do	"
-%	1000,692,14,0,-124	2	0045	-- percent
-&	833,691,16,0,-62	2	0046	-- ampersand
-'	333,691,0,0,-79	2	0047	-- quoteright
+%	1000,692,14	2	37	percent
+&	833,691,16	2	38	ampersand
+'	333,691	2	39	quoteright
 cq	"
-(	333,694,168,0,-46	2	0050	-- parenleft
-)	333,694,168,0,-27	2	0051	-- parenright
-*	500,691,0,0,-56	2	0052	-- asterisk
-+	570,506,0,0,-33	0	0053	-- plus
-,	250,155,180,0,-39	0	0054	-- comma
--	333,287,0,0,-44	0	0055	-- hyphen
+(	333,694,168	2	40	parenleft
+)	333,694,168	2	41	parenright
+*	500,691	2	42	asterisk
++	570,506	0	43	plus
+,	250,155,180	0	44	comma
+-	333,287	0	45	hyphen
 hy	"
-.	250,156,13,0,-41	0	0056	-- period
-/	278,691,19,24,24	2	0057	-- slash
+.	250,156,13	0	46	period
+/	278,691,19,24,24	2	47	slash
 sl	"
-0	500,688,13,0,-24	2	0060	-- zero
-1	500,688,0,0,-65	2	0061	-- one
-2	500,688,0,0,-17	2	0062	-- two
-3	500,688,14,0,-16	2	0063	-- three
-4	500,688,0,0,-19	2	0064	-- four
-5	500,676,8,0,-22	2	0065	-- five
-6	500,688,13,0,-28	2	0066	-- six
-7	500,676,0,0,-17	2	0067	-- seven
-8	500,688,13,0,-28	2	0070	-- eight
-9	500,688,13,0,-26	2	0071	-- nine
-:	333,472,13,0,-82	0	0072	-- colon
-;	333,472,180,0,-82	0	0073	-- semicolon
-<	570,514,8,0,-31	0	0074	-- less
-=	570,399,0,0,-33	0	0075	-- equal
->	570,514,8,0,-31	0	0076	-- greater
-?	500,689,13,0,-57	2	0077	-- question
-@	930,691,19,0,-108	2	0100	-- at
+0	500,688,13	2	48	zero
+1	500,688	2	49	one
+2	500,688	2	50	two
+3	500,688,14	2	51	three
+4	500,688	2	52	four
+5	500,676,8	2	53	five
+6	500,688,13	2	54	six
+7	500,676	2	55	seven
+8	500,688,13	2	56	eight
+9	500,688,13	2	57	nine
+:	333,472,13	0	58	colon
+;	333,472,180	0	59	semicolon
+<	570,514,8	0	60	less
+=	570,399	0	61	equal
+>	570,514,8	0	62	greater
+?	500,689,13	2	63	question
+@	930,691,19	2	64	at
 at	"
-A	722,690,0,0,-9	2	0101	-- A
-B	667,676,0,0,-16	2	0102	-- B
-C	722,691,19,0,-49	2	0103	-- C
-D	722,676,0,0,-14	2	0104	-- D
-E	667,676,0,0,-16	2	0105	-- E
-F	611,676,0,0,-16	2	0106	-- F
-G	778,691,19,0,-37	2	0107	-- G
-H	778,676,0,0,-21	2	0110	-- H
-I	389,676,0,0,-20	2	0111	-- I
-J	500,676,96,0,-3	2	0112	-- J
-K	778,676,0,0,-30	2	0113	-- K
-L	667,676,0,0,-19	2	0114	-- L
-M	944,676,0,0,-14	2	0115	-- M
-N	722,676,18,0,-16	2	0116	-- N
-O	778,691,19,0,-35	2	0117	-- O
-P	611,676,0,0,-16	2	0120	-- P
-Q	778,691,176,0,-35	2	0121	-- Q
-R	722,676,0,0,-26	2	0122	-- R
-S	556,692,19,0,-35	2	0123	-- S
-T	667,676,0,0,-31	2	0124	-- T
-U	722,676,19,0,-16	2	0125	-- U
-V	722,676,18,0,-16	2	0126	-- V
-W	1000,676,15,0,-19	2	0127	-- W
-X	722,676,0,0,-16	2	0130	-- X
-Y	722,676,0,0,-15	2	0131	-- Y
-Z	667,676,0,0,-28	2	0132	-- Z
-[	333,678,149,0,-67	2	0133	-- bracketleft
+A	722,690	2	65	A
+B	667,676	2	66	B
+C	722,691,19	2	67	C
+D	722,676	2	68	D
+E	667,676	2	69	E
+F	611,676	2	70	F
+G	778,691,19	2	71	G
+H	778,676	2	72	H
+I	389,676	2	73	I
+J	500,676,96	2	74	J
+K	778,676	2	75	K
+L	667,676	2	76	L
+M	944,676	2	77	M
+N	722,676,18	2	78	N
+O	778,691,19	2	79	O
+P	611,676	2	80	P
+Q	778,691,176	2	81	Q
+R	722,676	2	82	R
+S	556,692,19	2	83	S
+T	667,676	2	84	T
+U	722,676,19	2	85	U
+V	722,676,18	2	86	V
+W	1000,676,15	2	87	W
+X	722,676	2	88	X
+Y	722,676	2	89	Y
+Z	667,676	2	90	Z
+[	333,678,149	2	91	bracketleft
 lB	"
-\	278,691,19,25,25	2	0134	-- backslash
+\	278,691,19,25,25	2	92	backslash
 rs	"
-]	333,678,149,0,-32	2	0135	-- bracketright
+]	333,678,149	2	93	bracketright
 rB	"
-a^	333,704,0,2,2	2	0136	-- circumflex
+a^	333,704,0,2,2	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	333,691,0,0,-70	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	333,691	2	96	quoteleft
 oq	"
-a	500,473,14,0,-25	0	0141	-- a
-b	556,676,14,0,-17	2	0142	-- b
-c	444,473,14,0,-25	0	0143	-- c
-d	556,676,14,0,-25	2	0144	-- d
-e	444,473,14,0,-25	0	0145	-- e
-f	333,691,0,56,-14	2	0146	-- f
-g	500,473,206,0,-28	1	0147	-- g
-h	556,676,0,0,-16	2	0150	-- h
-i	278,691,0,0,-16	2	0151	-- i
-j	333,691,203,0,57	3	0152	-- j
-k	556,676,0,0,-22	2	0153	-- k
-l	278,676,0,0,-16	2	0154	-- l
-m	833,473,0,0,-16	0	0155	-- m
-n	556,473,0,0,-21	0	0156	-- n
-o	500,473,14,0,-25	0	0157	-- o
-p	556,473,205,0,-19	1	0160	-- p
-q	556,473,205,0,-34	1	0161	-- q
-r	444,473,0,0,-29	0	0162	-- r
-s	389,473,14,0,-25	0	0163	-- s
-t	333,630,12,0,-20	2	0164	-- t
-u	556,461,14,0,-16	0	0165	-- u
-v	500,461,14,0,-21	0	0166	-- v
-w	722,461,14,0,-23	0	0167	-- w
-x	500,461,0,0,-12	0	0170	-- x
-y	500,461,205,0,-16	1	0171	-- y
-z	444,461,0,0,-21	0	0172	-- z
-lC	394,698,175,0,-22	2	0173	-- braceleft
+a	500,473,14	0	97	a
+b	556,676,14	2	98	b
+c	444,473,14	0	99	c
+d	556,676,14	2	100	d
+e	444,473,14	0	101	e
+f	333,691,0,56	2	102	f
+g	500,473,206	1	103	g
+h	556,676	2	104	h
+i	278,691	2	105	i
+j	333,691,203,0,57	3	106	j
+k	556,676	2	107	k
+l	278,676	2	108	l
+m	833,473	0	109	m
+n	556,473	0	110	n
+o	500,473,14	0	111	o
+p	556,473,205	1	112	p
+q	556,473,205	1	113	q
+r	444,473	0	114	r
+s	389,473,14	0	115	s
+t	333,630,12	2	116	t
+u	556,461,14	0	117	u
+v	500,461,14	0	118	v
+w	722,461,14	0	119	w
+x	500,461	0	120	x
+y	500,461,205	1	121	y
+z	444,461	0	122	z
+lC	394,698,175	2	123	braceleft
 {	"
-ba	220,691,19,0,-66	2	0174	-- bar
+ba	220,691,19	2	124	bar
 |	"
-rC	394,698,175,0,-54	2	0175	-- braceright
+rC	394,698,175	2	125	braceright
 }	"
-a~	333,674,0,16,16	2	0176	-- tilde
+a~	333,674,0,16,16	2	126	tilde
 ~	"
-bq	333,155,180,0,-79	0	0200	-- quotesinglbase
-Fo	500,415,0,0,-23	0	0201	-- guillemotleft
-Fc	500,415,0,0,-27	0	0202	-- guillemotright
-bu	350,478,0,0,-35	0	0203	-- bullet
-Fn	500,706,155	2	0204	-- florin
-f/	167,688,12,162,168	2	0205	-- fraction
-%0	1000,706,29,0,-7	2	0206	-- perthousand
-dg	500,691,134,0,-47	2	0207	-- dagger
-dd	500,691,132,0,-45	2	0210	-- daggerdbl
-en	500,271	0	0211	-- endash
-em	1000,271	0	0212	-- emdash
-fi	556,691,0,0,-14	2	0214	-- fi
-fl	556,691,0,0,-14	2	0215	-- fl
-.i	278,461,0,0,-16	0	0220	-- dotlessi
-ga	333,713,0,0,-8	2	0222	-- grave
-a"	333,713,0,92,13	2	0223	-- hungarumlaut
-a.	333,667,0,0,-103	2	0224	-- dotaccent
-ab	333,691,0,0,-15	2	0225	-- breve
-ah	333,704,0,2,2	2	0226	-- caron
-ao	333,740,0,0,-60	2	0227	-- ring
-ho	333,44,173,0,-90	0	0230	-- ogonek
-lq	500,691,0,0,-32	2	0231	-- quotedblleft
-rq	500,691,0,0,-14	2	0232	-- quotedblright
-oe	722,473,14,0,-22	0	0233	-- oe
-/l	278,676,0,25,22	2	0234	-- lslash
-Bq	500,155,180,0,-14	0	0235	-- quotedblbase
-OE	1000,684,5,0,-22	2	0236	-- OE
-/L	667,676,0,0,-19	2	0237	-- Lslash
-r!	333,501,203,0,-82	1	0241	-- exclamdown
-ct	500,588,140,0,-53	0	0242	-- cent
-Po	500,684,14,0,-21	2	0243	-- sterling
-Cs	500,613,0,26,26	0	0244	-- currency
-Ye	500,676,0,47,64	2	0245	-- yen
-bb	220,691,19,0,-66	2	0246	-- brokenbar
-sc	500,691,132,0,-57	2	0247	-- section
-ad	333,667,0,2,2	2	0250	-- dieresis
-co	747,691,19,0,-26	2	0251	-- copyright
-Of	300,688,0,1,1	2	0252	-- ordfeminine
-fo	333,415,0,0,-51	0	0253	-- guilsinglleft
-no	570,399,0,0,-33	0	0254	-- logicalnot
-\-	570,297,0,0,-33	0	0255	-- minus
-rg	747,691,19,0,-26	2	0256	-- registered
-a-	333,637,0,0,-1	2	0257	-- macron
-de	400,688,0,0,-57	2	0260	-- degree
-t+-	570,506,0,0,-33	0	0261	-- plusminus
-S2	300,688	2	0262	-- twosuperior
-S3	300,688,0,0,-3	2	0263	-- threesuperior
-aa	333,713,0,0,-86	2	0264	-- acute
-mc	556,461,206,0,-33	1	0265	-- mu
-ps	540,676,186	2	0266	-- paragraph
-pc	250,417,0,0,-41	0	0267	-- periodcentered
-ac	333,0,218,0,-68	1	0270	-- cedilla
-S1	300,688,0,0,-28	2	0271	-- onesuperior
-Om	330,688,0,0,-18	2	0272	-- ordmasculine
-fc	333,415,0,0,-28	0	0273	-- guilsinglright
-14	750,688,12,0,-28	2	0274	-- onequarter
-12	750,688,12,25,7	2	0275	-- onehalf
-34	750,688,12,0,-23	2	0276	-- threequarters
-r?	500,501,201,0,-55	0	0277	-- questiondown
-`A	722,923,0,0,-9	2	0300	-- Agrave
-'A	722,923,0,0,-9	2	0301	-- Aacute
-^A	722,914,0,0,-9	2	0302	-- Acircumflex
-~A	722,884,0,0,-9	2	0303	-- Atilde
-:A	722,877,0,0,-9	2	0304	-- Adieresis
-oA	722,935,0,0,-9	2	0305	-- Aring
-AE	1000,676,0,0,-4	2	0306	-- AE
-,C	722,691,218,0,-49	3	0307	-- Ccedilla
-`E	667,923,0,0,-16	2	0310	-- Egrave
-'E	667,923,0,0,-16	2	0311	-- Eacute
-^E	667,914,0,0,-16	2	0312	-- Ecircumflex
-:E	667,877,0,0,-16	2	0313	-- Edieresis
-`I	389,923,0,0,-20	2	0314	-- Igrave
-'I	389,923,0,0,-20	2	0315	-- Iacute
-^I	389,914,0,0,-20	2	0316	-- Icircumflex
-:I	389,877,0,0,-20	2	0317	-- Idieresis
--D	722,676,0,0,-6	2	0320	-- Eth
-~N	722,884,18,0,-16	2	0321	-- Ntilde
-`O	778,923,19,0,-35	2	0322	-- Ograve
-'O	778,923,19,0,-35	2	0323	-- Oacute
-^O	778,914,19,0,-35	2	0324	-- Ocircumflex
-~O	778,884,19,0,-35	2	0325	-- Otilde
-:O	778,877,19,0,-35	2	0326	-- Odieresis
-tmu	570,490,0,0,-48	0	0327	-- multiply
-/O	778,737,74,0,-35	2	0330	-- Oslash
-`U	722,923,19,0,-16	2	0331	-- Ugrave
-'U	722,923,19,0,-16	2	0332	-- Uacute
-^U	722,914,19,0,-16	2	0333	-- Ucircumflex
-:U	722,877,19,0,-16	2	0334	-- Udieresis
-'Y	722,928,0,0,-15	2	0335	-- Yacute
-TP	611,676,0,0,-16	2	0336	-- Thorn
-ss	556,691,12,0,-19	2	0337	-- germandbls
-`a	500,713,14,0,-25	2	0340	-- agrave
-'a	500,713,14,0,-25	2	0341	-- aacute
-^a	500,704,14,0,-25	2	0342	-- acircumflex
-~a	500,674,14,0,-25	2	0343	-- atilde
-:a	500,667,14,0,-25	2	0344	-- adieresis
-oa	500,740,14,0,-25	2	0345	-- aring
-ae	722,473,14,0,-33	0	0346	-- ae
-,c	444,473,218,0,-25	1	0347	-- ccedilla
-`e	444,713,14,0,-25	2	0350	-- egrave
-'e	444,713,14,0,-25	2	0351	-- eacute
-^e	444,704,14,0,-25	2	0352	-- ecircumflex
-:e	444,667,14,0,-25	2	0353	-- edieresis
-`i	278,713,0,0,26	2	0354	-- igrave
-'i	278,713,0,12,-16	2	0355	-- iacute
-^i	278,704,0,23,36	2	0356	-- icircumflex
-:i	278,667,0,23,36	2	0357	-- idieresis
-Sd	500,691,14,0,-25	2	0360	-- eth
-~n	556,674,0,0,-21	2	0361	-- ntilde
-`o	500,713,14,0,-25	2	0362	-- ograve
-'o	500,713,14,0,-25	2	0363	-- oacute
-^o	500,704,14,0,-25	2	0364	-- ocircumflex
-~o	500,674,14,0,-25	2	0365	-- otilde
-:o	500,667,14,0,-25	2	0366	-- odieresis
-tdi	570,537,31,0,-33	0	0367	-- divide
-/o	500,549,92,0,-25	0	0370	-- oslash
-`u	556,713,14,0,-16	2	0371	-- ugrave
-'u	556,713,14,0,-16	2	0372	-- uacute
-^u	556,704,14,0,-16	2	0373	-- ucircumflex
-:u	556,667,14,0,-16	2	0374	-- udieresis
-'y	500,713,205,0,-16	3	0375	-- yacute
-Tp	556,676,205,0,-19	3	0376	-- thorn
-:y	500,667,205,0,-16	3	0377	-- ydieresis
+bq	333,155,180	0	128	quotesinglbase
+Fo	500,415	0	129	guillemotleft
+Fc	500,415	0	130	guillemotright
+bu	350,478	0	131	bullet
+Fn	500,706,155	2	132	florin
+f/	167,688,12,162,168	2	133	fraction
+%0	1000,706,29	2	134	perthousand
+dg	500,691,134	2	135	dagger
+dd	500,691,132	2	136	daggerdbl
+en	500,271	0	137	endash
+em	1000,271	0	138	emdash
+fi	556,691	2	140	fi
+fl	556,691	2	141	fl
+.i	278,461	0	144	dotlessi
+ga	333,713	2	146	grave
+a"	333,713,0,92,13	2	147	hungarumlaut
+a.	333,667	2	148	dotaccent
+ab	333,691	2	149	breve
+ah	333,704,0,2,2	2	150	caron
+ao	333,740	2	151	ring
+ho	333,44,173	0	152	ogonek
+lq	500,691	2	153	quotedblleft
+rq	500,691	2	154	quotedblright
+oe	722,473,14	0	155	oe
+/l	278,676,0,25,22	2	156	lslash
+Bq	500,155,180	0	157	quotedblbase
+OE	1000,684,5	2	158	OE
+/L	667,676	2	159	Lslash
+r!	333,501,203	1	161	exclamdown
+ct	500,588,140	0	162	cent
+Po	500,684,14	2	163	sterling
+Cs	500,613,0,26,26	0	164	currency
+Ye	500,676,0,47,64	2	165	yen
+bb	220,691,19	2	166	brokenbar
+sc	500,691,132	2	167	section
+ad	333,667,0,2,2	2	168	dieresis
+co	747,691,19	2	169	copyright
+Of	300,688,0,1,1	2	170	ordfeminine
+fo	333,415	0	171	guilsinglleft
+tno	570,399	0	172	logicalnot
+\-	570,297	0	173	minus
+rg	747,691,19	2	174	registered
+a-	333,637	2	175	macron
+de	400,688	2	176	degree
+t+-	570,506	0	177	plusminus
+S2	300,688	2	178	twosuperior
+S3	300,688	2	179	threesuperior
+aa	333,713	2	180	acute
+mc	556,461,206	1	181	mu
+ps	540,676,186	2	182	paragraph
+pc	250,417	0	183	periodcentered
+ac	333,0,218	1	184	cedilla
+S1	300,688	2	185	onesuperior
+Om	330,688	2	186	ordmasculine
+fc	333,415	0	187	guilsinglright
+14	750,688,12	2	188	onequarter
+12	750,688,12,25,7	2	189	onehalf
+34	750,688,12	2	190	threequarters
+r?	500,501,201	0	191	questiondown
+`A	722,923	2	192	Agrave
+'A	722,923	2	193	Aacute
+^A	722,914	2	194	Acircumflex
+~A	722,884	2	195	Atilde
+:A	722,877	2	196	Adieresis
+oA	722,935	2	197	Aring
+AE	1000,676	2	198	AE
+,C	722,691,218	3	199	Ccedilla
+`E	667,923	2	200	Egrave
+'E	667,923	2	201	Eacute
+^E	667,914	2	202	Ecircumflex
+:E	667,877	2	203	Edieresis
+`I	389,923	2	204	Igrave
+'I	389,923	2	205	Iacute
+^I	389,914	2	206	Icircumflex
+:I	389,877	2	207	Idieresis
+-D	722,676	2	208	Eth
+~N	722,884,18	2	209	Ntilde
+`O	778,923,19	2	210	Ograve
+'O	778,923,19	2	211	Oacute
+^O	778,914,19	2	212	Ocircumflex
+~O	778,884,19	2	213	Otilde
+:O	778,877,19	2	214	Odieresis
+tmu	570,490	0	215	multiply
+/O	778,737,74	2	216	Oslash
+`U	722,923,19	2	217	Ugrave
+'U	722,923,19	2	218	Uacute
+^U	722,914,19	2	219	Ucircumflex
+:U	722,877,19	2	220	Udieresis
+'Y	722,928	2	221	Yacute
+TP	611,676	2	222	Thorn
+ss	556,691,12	2	223	germandbls
+`a	500,713,14	2	224	agrave
+'a	500,713,14	2	225	aacute
+^a	500,704,14	2	226	acircumflex
+~a	500,674,14	2	227	atilde
+:a	500,667,14	2	228	adieresis
+oa	500,740,14	2	229	aring
+ae	722,473,14	0	230	ae
+,c	444,473,218	1	231	ccedilla
+`e	444,713,14	2	232	egrave
+'e	444,713,14	2	233	eacute
+^e	444,704,14	2	234	ecircumflex
+:e	444,667,14	2	235	edieresis
+`i	278,713,0,0,26	2	236	igrave
+'i	278,713,0,12	2	237	iacute
+^i	278,704,0,23,36	2	238	icircumflex
+:i	278,667,0,23,36	2	239	idieresis
+Sd	500,691,14	2	240	eth
+~n	556,674	2	241	ntilde
+`o	500,713,14	2	242	ograve
+'o	500,713,14	2	243	oacute
+^o	500,704,14	2	244	ocircumflex
+~o	500,674,14	2	245	otilde
+:o	500,667,14	2	246	odieresis
+tdi	570,537,31	0	247	divide
+/o	500,549,92	0	248	oslash
+`u	556,713,14	2	249	ugrave
+'u	556,713,14	2	250	uacute
+^u	556,704,14	2	251	ucircumflex
+:u	556,667,14	2	252	udieresis
+'y	500,713,205	3	253	yacute
+Tp	556,676,205	3	254	thorn
+:y	500,667,205	3	255	ydieresis
+u2026	1000,156,13	0	256	ellipsis
diff --git a/contrib/groff/font/devps/TBI b/contrib/groff/font/devps/TBI
index 1b07ee3..0f883d9 100644
--- a/contrib/groff/font/devps/TBI
+++ b/contrib/groff/font/devps/TBI
@@ -191,246 +191,247 @@ x e -10
 y . -37
 y , -37
 charset
-ha	570,669,0,0,-17	2	0000	-- asciicircum
-ti	570,333,0,0,-4	0	0001	-- asciitilde
-vS	556,897,18,20,48,20	2	0002	-- Scaron
-vZ	611,897,0,29,61,29	2	0003	-- Zcaron
-vs	389,690,13,100,69,99	2	0004	-- scaron
-vz	389,690,78,85,93,85	2	0005	-- zcaron
-:Y	611,862,0,98,-23,98	2	0006	-- Ydieresis
-tm	1000,669,0,18,18,18	2	0007	-- trademark
-aq	278,685,0,40,-78,40	2	0010	-- quotesingle
-space	250	0	0040
-!	389,684,13,31,-17,31	2	0041	-- exclam
-"	555,685,0,31,-86,31	2	0042	-- quotedbl
+ha	570,669,0,0,-17	2	0	asciicircum
+ti	570,333,0,0,-4	0	1	asciitilde
+vS	556,897,18,20,48,20	2	2	Scaron
+vZ	611,897,0,29,61,29	2	3	Zcaron
+vs	389,690,13,100,69,99	2	4	scaron
+vz	389,690,78,85,93,85	2	5	zcaron
+:Y	611,862,0,98,-23,98	2	6	Ydieresis
+tm	1000,669,0,18,18,18	2	7	trademark
+aq	278,685,0,40,-78,40	2	8	quotesingle
+space	250	0	32	space
+!	389,684,13,31,-17,31	2	33	exclam
+"	555,685,0,31,-86,31	2	34	quotedbl
 dq	"
-#	500,700,0,83,83,83	2	0043	-- numbersign
+#	500,700,0,83,83,83	2	35	numbersign
 sh	"
-$	500,733,100,47,70,47	2	0044	-- dollar
+$	500,733,100,47,70,47	2	36	dollar
 Do	"
-%	833,692,10,10,11,10	2	0045	-- percent
-&	778,682,19,0,45	2	0046	-- ampersand
-'	333,685,0,19,-48,19	2	0047	-- quoteright
+%	833,692,10,10,11,10	2	37	percent
+&	778,682,19,0,45	2	38	ampersand
+'	333,685,0,19,-48,19	2	39	quoteright
 cq	"
-(	333,685,179,61,22,61	2	0050	-- parenleft
-)	333,685,179,0,94	2	0051	-- parenright
-*	500,685,0,6,-15,6	2	0052	-- asterisk
-+	570,506,0,17,17,17	0	0053	-- plus
-,	250,134,182,0,110	0	0054	-- comma
--	333,282,0,0,48	0	0055	-- hyphen
+(	333,685,179,61,22,61	2	40	parenleft
+)	333,685,179,0,94	2	41	parenright
+*	500,685,0,6,-15,6	2	42	asterisk
++	570,506,0,17,17,17	0	43	plus
+,	250,134,182,0,110	0	44	comma
+-	333,282,0,0,48	0	45	hyphen
 hy	"
-.	250,135,13,0,59	0	0056	-- period
-/	278,685,18,114,114,99	2	0057	-- slash
+.	250,135,13,0,59	0	46	period
+/	278,685,18,114,114,99	2	47	slash
 sl	"
-0	500,683,14,27,33,27	2	0060	-- zero
-1	500,683,0,0,45	2	0061	-- one
-2	500,683,0,0,77	2	0062	-- two
-3	500,683,13,0,65	2	0063	-- three
-4	500,683,0,53,65,53	2	0064	-- four
-5	500,669,13,37,61,37	2	0065	-- five
-6	500,679,15,59,27,59	2	0066	-- six
-7	500,669,0,75,-2,75	2	0067	-- seven
-8	500,683,13,26,47,26	2	0070	-- eight
-9	500,683,10,25,62,25	2	0071	-- nine
-:	333,459,13,0,27	0	0072	-- colon
-;	333,459,183,0,75	0	0073	-- semicolon
-<	570,514,8,19,19,19	0	0074	-- less
-=	570,399,0,17,17,17	0	0075	-- equal
->	570,514,8,19,19,19	0	0076	-- greater
-?	500,684,13,20,-29,20	2	0077	-- question
-@	832,685,18,0,-13	2	0100	-- at
+0	500,683,14,27,33,27	2	48	zero
+1	500,683,0,0,45	2	49	one
+2	500,683,0,0,77	2	50	two
+3	500,683,13,0,65	2	51	three
+4	500,683,0,53,65,53	2	52	four
+5	500,669,13,37,61,37	2	53	five
+6	500,679,15,59,27,59	2	54	six
+7	500,669,0,75,-2,75	2	55	seven
+8	500,683,13,26,47,26	2	56	eight
+9	500,683,10,25,62,25	2	57	nine
+:	333,459,13,0,27	0	58	colon
+;	333,459,183,0,75	0	59	semicolon
+<	570,514,8,19,19,19	0	60	less
+=	570,399,0,17,17,17	0	61	equal
+>	570,514,8,19,19,19	0	62	greater
+?	500,684,13,20,-29,20	2	63	question
+@	832,685,18,0,-13	2	64	at
 at	"
-A	667,683,0,0,117	2	0101	-- A
-B	667,669,0,7,74,7	2	0102	-- B
-C	667,685,18,60,18,60	2	0103	-- C
-D	722,669,0,13,96,13	2	0104	-- D
-E	667,669,0,36,77,36	2	0105	-- E
-F	667,669,0,43,63,43	2	0106	-- F
-G	722,685,18,34,29,34	2	0107	-- G
-H	778,669,0,71,74,71	2	0110	-- H
-I	389,669,0,67,82,67	2	0111	-- I
-J	500,669,99,74,96,74	2	0112	-- J
-K	667,669,0,85,71,85	2	0113	-- K
-L	611,669,0,29,72,29	2	0114	-- L
-M	889,669,12,78,79,78	2	0115	-- M
-N	722,669,15,76,77,76	2	0116	-- N
-O	722,685,18,19,23,19	2	0117	-- O
-P	611,669,0,52,77,52	2	0120	-- P
-Q	722,685,208,19,23,19	3	0121	-- Q
-R	667,669,0,6,79,6	2	0122	-- R
-S	556,685,18,20,48,20	2	0123	-- S
-T	611,669,0,89,0,89	2	0124	-- T
-U	722,669,18,72,-17,72	2	0125	-- U
-V	667,669,18,98,-15,98	2	0126	-- V
-W	889,669,18,101,-15,99	2	0127	-- W
-X	667,669,0,77,74,77	2	0130	-- X
-Y	611,669,0,98,-23,98	2	0131	-- Y
-Z	611,669,0,29,61,29	2	0132	-- Z
-[	333,674,159,79,87,79	2	0133	-- bracketleft
+A	667,683,0,0,117	2	65	A
+B	667,669,0,7,74,7	2	66	B
+C	667,685,18,60,18,60	2	67	C
+D	722,669,0,13,96,13	2	68	D
+E	667,669,0,36,77,36	2	69	E
+F	667,669,0,43,63,43	2	70	F
+G	722,685,18,34,29,34	2	71	G
+H	778,669,0,71,74,71	2	72	H
+I	389,669,0,67,82,67	2	73	I
+J	500,669,99,74,96,74	2	74	J
+K	667,669,0,85,71,85	2	75	K
+L	611,669,0,29,72,29	2	76	L
+M	889,669,12,78,79,78	2	77	M
+N	722,669,15,76,77,76	2	78	N
+O	722,685,18,19,23,19	2	79	O
+P	611,669,0,52,77,52	2	80	P
+Q	722,685,208,19,23,19	3	81	Q
+R	667,669,0,6,79,6	2	82	R
+S	556,685,18,20,48,20	2	83	S
+T	611,669,0,89,0,89	2	84	T
+U	722,669,18,72,-17,72	2	85	U
+V	667,669,18,98,-15,98	2	86	V
+W	889,669,18,101,-15,99	2	87	W
+X	667,669,0,77,74,77	2	88	X
+Y	611,669,0,98,-23,98	2	89	Y
+Z	611,669,0,29,61,29	2	90	Z
+[	333,674,159,79,87,79	2	91	bracketleft
 lB	"
-\	278,685,18,51,51,51	2	0134	-- backslash
+\	278,685,18,51,51,51	2	92	backslash
 rs	"
-]	333,674,157,60,106,60	2	0135	-- bracketright
+]	333,674,157,60,106,60	2	93	bracketright
 rB	"
-a^	333,690,0,84,10,84	2	0136	-- circumflex
+a^	333,690,0,84,10,84	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	333,685,0,49,-78,49	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	333,685,0,49,-78,49	2	96	quoteleft
 oq	"
-a	500,462,14,5,71,5	0	0141	-- a
-b	500,699,13,0,64	2	0142	-- b
-c	444,462,13,0,55	0	0143	-- c
-d	500,699,13,67,71,67	2	0144	-- d
-e	444,462,13,4,45,4	0	0145	-- e
-f	333,698,205,163,219,99	3	0146	-- f
-g	500,462,203,28,102,28	1	0147	-- g
-h	556,699,9,0,63	2	0150	-- h
-i	278,684,9,35,48,35	2	0151	-- i
-j	278,684,207,51,239,51	3	0152	-- j
-k	500,699,8,33,73,33	2	0153	-- k
-l	278,699,9,62,48,62	2	0154	-- l
-m	778,462,9,0,64	0	0155	-- m
-n	556,462,9,0,56	0	0156	-- n
-o	500,462,13,0,53	0	0157	-- o
-p	500,462,205,0,170	1	0160	-- p
-q	500,462,205,21,49,21	1	0161	-- q
-r	389,462,0,50,71,50	0	0162	-- r
-s	389,462,13,0,69	0	0163	-- s
-t	278,594,9,53,61,53	2	0164	-- t
-u	556,462,9,0,35	0	0165	-- u
-v	444,462,13,7,34,7	0	0166	-- v
-w	667,462,13,0,34	0	0167	-- w
-x	500,462,13,19,96,19	0	0170	-- x
-y	444,462,205,0,144	1	0171	-- y
-z	389,449,78,29,93,29	0	0172	-- z
-lC	348,686,187,138,45,99	2	0173	-- braceleft
+a	500,462,14,5,71,5	0	97	a
+b	500,699,13,0,64	2	98	b
+c	444,462,13,0,55	0	99	c
+d	500,699,13,67,71,67	2	100	d
+e	444,462,13,4,45,4	0	101	e
+f	333,698,205,163,219,99	3	102	f
+g	500,462,203,28,102,28	1	103	g
+h	556,699,9,0,63	2	104	h
+i	278,684,9,35,48,35	2	105	i
+j	278,684,207,51,239,51	3	106	j
+k	500,699,8,33,73,33	2	107	k
+l	278,699,9,62,48,62	2	108	l
+m	778,462,9,0,64	0	109	m
+n	556,462,9,0,56	0	110	n
+o	500,462,13,0,53	0	111	o
+p	500,462,205,0,170	1	112	p
+q	500,462,205,21,49,21	1	113	q
+r	389,462,0,50,71,50	0	114	r
+s	389,462,13,0,69	0	115	s
+t	278,594,9,53,61,53	2	116	t
+u	556,462,9,0,35	0	117	u
+v	444,462,13,7,34,7	0	118	v
+w	667,462,13,0,34	0	119	w
+x	500,462,13,19,96,19	0	120	x
+y	444,462,205,0,144	1	121	y
+z	389,449,78,29,93,29	0	122	z
+lC	348,686,187,138,45,99	2	123	braceleft
 {	"
-ba	220,685,18,0,-16	2	0174	-- bar
+ba	220,685,18,0,-16	2	124	bar
 |	"
-rC	348,686,187,4,179,4	2	0175	-- braceright
+rC	348,686,187,4,179,4	2	125	braceright
 }	"
-a~	333,655,0,124,2,99	2	0176	-- tilde
+a~	333,655,0,124,2,99	2	126	tilde
 ~	"
-bq	333,134,182,0,55	0	0200	-- quotesinglbase
-Fo	500,415,0,18,38,18	0	0201	-- guillemotleft
-Fc	500,415,0,18,38,18	0	0202	-- guillemotright
-bu	350,525,0,50,50,50	0	0203	-- bullet
-Fn	500,707,156,87,137,87	2	0204	-- florin
-f/	167,683,14,207,219,99	2	0205	-- fraction
-%0	1000,706,29,46,43,46	2	0206	-- perthousand
-dg	500,685,145,44,-41,44	2	0207	-- dagger
-dd	500,685,139,43,40,43	2	0210	-- daggerdbl
-en	500,269,0,27,90,27	0	0211	-- endash
-em	1000,269,0,27,90,27	0	0212	-- emdash
-fi	556,703,205,8,238,8	3	0214	-- fi
-fl	556,704,205,47,236,47	3	0215	-- fl
-.i	278,462,9,10,48,10	0	0220	-- dotlessi
-ga	333,697,0,14,-35,14	2	0222	-- grave
-a"	333,697,0,215,-19,99	2	0223	-- hungarumlaut
-a.	333,655,0,10,-113,10	2	0224	-- dotaccent
-ab	333,678,0,104,-21,99	2	0225	-- breve
-ah	333,690,0,128,-29,99	2	0226	-- caron
-ao	333,729,0,57,-77,57	2	0227	-- ring
-ho	333,44,173,0,90	0	0230	-- ogonek
-lq	500,685,0,63,-3,63	2	0231	-- quotedblleft
-rq	500,685,0,63,-3,63	2	0232	-- quotedblright
-oe	722,462,13,2,44,2	0	0233	-- oe
-/l	278,699,9,73,63,73	2	0234	-- lslash
-Bq	500,134,182,0,107	0	0235	-- quotedblbase
-OE	944,677,8,52,27,52	2	0236	-- OE
-/L	611,669,0,29,72,29	2	0237	-- Lslash
-r!	389,492,205,0,31	1	0241	-- exclamdown
-ct	500,576,143,0,8	0	0242	-- cent
-Po	500,683,12,60,82,60	2	0243	-- sterling
-Cs	500,586,0,76,76,76	0	0244	-- currency
-Ye	500,669,0,178,17,99	2	0245	-- yen
-bb	220,685,18,0,-16	2	0246	-- brokenbar
-sc	500,685,143,9,14,9	2	0247	-- section
-ad	333,655,0,114,-5,99	2	0250	-- dieresis
-co	747,685,18,21,20,21	2	0251	-- copyright
-Of	266,685,0,114,34,99	2	0252	-- ordfeminine
-fo	333,415,0,20,18,20	0	0253	-- guilsinglleft
-no	606,399,0,0,-1	0	0254	-- logicalnot
-\-	606,297,0,0,-1	0	0255	-- minus
-rg	747,685,18,21,20,21	2	0256	-- registered
-a-	333,623,0,110,-1,99	2	0257	-- macron
-de	400,683,0,19,-33,19	2	0260	-- degree
-t+-	570,506,0,17,17,17	0	0261	-- plusminus
-S2	300,683,0,63,48,63	2	0262	-- twosuperior
-S3	300,683,0,71,33,71	2	0263	-- threesuperior
-aa	333,697,0,96,-89,96	2	0264	-- acute
-mc	576,449,207,0,110	1	0265	-- mu
-ps	500,669,193,112,107,99	2	0266	-- paragraph
-pc	250,405,0,0,-1	0	0267	-- periodcentered
-ac	333,5,218,0,130	1	0270	-- cedilla
-S1	300,683,0,51,20,51	2	0271	-- onesuperior
-Om	300,685,0,97,-6,97	2	0272	-- ordmasculine
-fc	333,415,0,0,40	0	0273	-- guilsinglright
-14	750,683,14,21,43,21	2	0274	-- onequarter
-12	750,683,14,23,59,23	2	0275	-- onehalf
-34	750,683,14,26,43,26	2	0276	-- threequarters
-r?	500,492,205,0,20	1	0277	-- questiondown
-`A	667,904,0,0,117	2	0300	-- Agrave
-'A	667,904,0,0,117	2	0301	-- Aacute
-^A	667,897,0,0,117	2	0302	-- Acircumflex
-~A	667,862,0,0,117	2	0303	-- Atilde
-:A	667,862,0,0,117	2	0304	-- Adieresis
-oA	667,921,0,0,117	2	0305	-- Aring
-AE	944,669,0,24,114,24	2	0306	-- AE
-,C	667,685,218,60,18,60	3	0307	-- Ccedilla
-`E	667,904,0,36,77,36	2	0310	-- Egrave
-'E	667,904,0,36,77,36	2	0311	-- Eacute
-^E	667,897,0,36,77,36	2	0312	-- Ecircumflex
-:E	667,862,0,36,77,36	2	0313	-- Edieresis
-`I	389,904,0,67,82,67	2	0314	-- Igrave
-'I	389,904,0,73,82,73	2	0315	-- Iacute
-^I	389,897,0,81,82,81	2	0316	-- Icircumflex
-:I	389,862,0,106,82,99	2	0317	-- Idieresis
--D	722,669,0,28,81,28	2	0320	-- Eth
-~N	722,862,15,76,77,76	2	0321	-- Ntilde
-`O	722,904,18,19,23,19	2	0322	-- Ograve
-'O	722,904,18,19,23,19	2	0323	-- Oacute
-^O	722,897,18,19,23,19	2	0324	-- Ocircumflex
-~O	722,862,18,19,23,19	2	0325	-- Otilde
-:O	722,862,18,19,23,19	2	0326	-- Odieresis
-tmu	570,490,0,2,2,2	0	0327	-- multiply
-/O	722,764,125,19,23,19	2	0330	-- Oslash
-`U	722,904,18,72,-17,72	2	0331	-- Ugrave
-'U	722,904,18,72,-17,72	2	0332	-- Uacute
-^U	722,897,18,72,-17,72	2	0333	-- Ucircumflex
-:U	722,862,18,72,-17,72	2	0334	-- Udieresis
-'Y	611,904,0,98,-23,98	2	0335	-- Yacute
-TP	611,669,0,12,77,12	2	0336	-- Thorn
-ss	500,705,200,23,250,23	2	0337	-- germandbls
-`a	500,697,14,5,71,5	2	0340	-- agrave
-'a	500,697,14,13,71,13	2	0341	-- aacute
-^a	500,690,14,5,71,5	2	0342	-- acircumflex
-~a	500,655,14,41,71,41	2	0343	-- atilde
-:a	500,655,14,21,71,21	2	0344	-- adieresis
-oa	500,729,14,5,71,5	2	0345	-- aring
-ae	722,462,13,1,55,1	0	0346	-- ae
-,c	444,462,218,0,74	1	0347	-- ccedilla
-`e	444,697,13,4,45,4	2	0350	-- egrave
-'e	444,697,13,41,45,41	2	0351	-- eacute
-^e	444,690,13,29,45,29	2	0352	-- ecircumflex
-:e	444,655,13,49,45,49	2	0353	-- edieresis
-`i	278,697,9,32,48,32	2	0354	-- igrave
-'i	278,697,9,124,48,99	2	0355	-- iacute
-^i	278,690,9,97,52,97	2	0356	-- icircumflex
-:i	278,655,9,132,48,99	2	0357	-- idieresis
-Sd	500,699,13,4,53,4	2	0360	-- eth
-~n	556,655,9,0,56	2	0361	-- ntilde
-`o	500,697,13,0,53	2	0362	-- ograve
-'o	500,697,13,13,53,13	2	0363	-- oacute
-^o	500,690,13,1,53,1	2	0364	-- ocircumflex
-~o	500,655,13,41,53,41	2	0365	-- otilde
-:o	500,655,13,16,53,16	2	0366	-- odieresis
-tdi	570,535,29,17,17,17	0	0367	-- divide
-/o	500,560,119,0,53	0	0370	-- oslash
-`u	556,697,9,0,35	2	0371	-- ugrave
-'u	556,697,9,0,35	2	0372	-- uacute
-^u	556,690,9,0,35	2	0373	-- ucircumflex
-:u	556,655,9,0,35	2	0374	-- udieresis
-'y	444,697,205,41,144,41	3	0375	-- yacute
-Tp	500,699,205,0,170	3	0376	-- thorn
-:y	444,655,205,44,144,44	3	0377	-- ydieresis
+bq	333,134,182,0,55	0	128	quotesinglbase
+Fo	500,415,0,18,38,18	0	129	guillemotleft
+Fc	500,415,0,18,38,18	0	130	guillemotright
+bu	350,525,0,50,50,50	0	131	bullet
+Fn	500,707,156,87,137,87	2	132	florin
+f/	167,683,14,207,219,99	2	133	fraction
+%0	1000,706,29,46,43,46	2	134	perthousand
+dg	500,685,145,44,-41,44	2	135	dagger
+dd	500,685,139,43,40,43	2	136	daggerdbl
+en	500,269,0,27,90,27	0	137	endash
+em	1000,269,0,27,90,27	0	138	emdash
+fi	556,703,205,8,238,8	3	140	fi
+fl	556,704,205,47,236,47	3	141	fl
+.i	278,462,9,10,48,10	0	144	dotlessi
+ga	333,697,0,14,-35,14	2	146	grave
+a"	333,697,0,215,-19,99	2	147	hungarumlaut
+a.	333,655,0,10,-113,10	2	148	dotaccent
+ab	333,678,0,104,-21,99	2	149	breve
+ah	333,690,0,128,-29,99	2	150	caron
+ao	333,729,0,57,-77,57	2	151	ring
+ho	333,44,173,0,90	0	152	ogonek
+lq	500,685,0,63,-3,63	2	153	quotedblleft
+rq	500,685,0,63,-3,63	2	154	quotedblright
+oe	722,462,13,2,44,2	0	155	oe
+/l	278,699,9,73,63,73	2	156	lslash
+Bq	500,134,182,0,107	0	157	quotedblbase
+OE	944,677,8,52,27,52	2	158	OE
+/L	611,669,0,29,72,29	2	159	Lslash
+r!	389,492,205,0,31	1	161	exclamdown
+ct	500,576,143,0,8	0	162	cent
+Po	500,683,12,60,82,60	2	163	sterling
+Cs	500,586,0,76,76,76	0	164	currency
+Ye	500,669,0,178,17,99	2	165	yen
+bb	220,685,18,0,-16	2	166	brokenbar
+sc	500,685,143,9,14,9	2	167	section
+ad	333,655,0,114,-5,99	2	168	dieresis
+co	747,685,18,21,20,21	2	169	copyright
+Of	266,685,0,114,34,99	2	170	ordfeminine
+fo	333,415,0,20,18,20	0	171	guilsinglleft
+tno	606,399,0,0,-1	0	172	logicalnot
+\-	606,297,0,0,-1	0	173	minus
+rg	747,685,18,21,20,21	2	174	registered
+a-	333,623,0,110,-1,99	2	175	macron
+de	400,683,0,19,-33,19	2	176	degree
+t+-	570,506,0,17,17,17	0	177	plusminus
+S2	300,683,0,63,48,63	2	178	twosuperior
+S3	300,683,0,71,33,71	2	179	threesuperior
+aa	333,697,0,96,-89,96	2	180	acute
+mc	576,449,207,0,110	1	181	mu
+ps	500,669,193,112,107,99	2	182	paragraph
+pc	250,405,0,0,-1	0	183	periodcentered
+ac	333,5,218,0,130	1	184	cedilla
+S1	300,683,0,51,20,51	2	185	onesuperior
+Om	300,685,0,97,-6,97	2	186	ordmasculine
+fc	333,415,0,0,40	0	187	guilsinglright
+14	750,683,14,21,43,21	2	188	onequarter
+12	750,683,14,23,59,23	2	189	onehalf
+34	750,683,14,26,43,26	2	190	threequarters
+r?	500,492,205,0,20	1	191	questiondown
+`A	667,904,0,0,117	2	192	Agrave
+'A	667,904,0,0,117	2	193	Aacute
+^A	667,897,0,0,117	2	194	Acircumflex
+~A	667,862,0,0,117	2	195	Atilde
+:A	667,862,0,0,117	2	196	Adieresis
+oA	667,921,0,0,117	2	197	Aring
+AE	944,669,0,24,114,24	2	198	AE
+,C	667,685,218,60,18,60	3	199	Ccedilla
+`E	667,904,0,36,77,36	2	200	Egrave
+'E	667,904,0,36,77,36	2	201	Eacute
+^E	667,897,0,36,77,36	2	202	Ecircumflex
+:E	667,862,0,36,77,36	2	203	Edieresis
+`I	389,904,0,67,82,67	2	204	Igrave
+'I	389,904,0,73,82,73	2	205	Iacute
+^I	389,897,0,81,82,81	2	206	Icircumflex
+:I	389,862,0,106,82,99	2	207	Idieresis
+-D	722,669,0,28,81,28	2	208	Eth
+~N	722,862,15,76,77,76	2	209	Ntilde
+`O	722,904,18,19,23,19	2	210	Ograve
+'O	722,904,18,19,23,19	2	211	Oacute
+^O	722,897,18,19,23,19	2	212	Ocircumflex
+~O	722,862,18,19,23,19	2	213	Otilde
+:O	722,862,18,19,23,19	2	214	Odieresis
+tmu	570,490,0,2,2,2	0	215	multiply
+/O	722,764,125,19,23,19	2	216	Oslash
+`U	722,904,18,72,-17,72	2	217	Ugrave
+'U	722,904,18,72,-17,72	2	218	Uacute
+^U	722,897,18,72,-17,72	2	219	Ucircumflex
+:U	722,862,18,72,-17,72	2	220	Udieresis
+'Y	611,904,0,98,-23,98	2	221	Yacute
+TP	611,669,0,12,77,12	2	222	Thorn
+ss	500,705,200,23,250,23	2	223	germandbls
+`a	500,697,14,5,71,5	2	224	agrave
+'a	500,697,14,13,71,13	2	225	aacute
+^a	500,690,14,5,71,5	2	226	acircumflex
+~a	500,655,14,41,71,41	2	227	atilde
+:a	500,655,14,21,71,21	2	228	adieresis
+oa	500,729,14,5,71,5	2	229	aring
+ae	722,462,13,1,55,1	0	230	ae
+,c	444,462,218,0,74	1	231	ccedilla
+`e	444,697,13,4,45,4	2	232	egrave
+'e	444,697,13,41,45,41	2	233	eacute
+^e	444,690,13,29,45,29	2	234	ecircumflex
+:e	444,655,13,49,45,49	2	235	edieresis
+`i	278,697,9,32,48,32	2	236	igrave
+'i	278,697,9,124,48,99	2	237	iacute
+^i	278,690,9,97,52,97	2	238	icircumflex
+:i	278,655,9,132,48,99	2	239	idieresis
+Sd	500,699,13,4,53,4	2	240	eth
+~n	556,655,9,0,56	2	241	ntilde
+`o	500,697,13,0,53	2	242	ograve
+'o	500,697,13,13,53,13	2	243	oacute
+^o	500,690,13,1,53,1	2	244	ocircumflex
+~o	500,655,13,41,53,41	2	245	otilde
+:o	500,655,13,16,53,16	2	246	odieresis
+tdi	570,535,29,17,17,17	0	247	divide
+/o	500,560,119,0,53	0	248	oslash
+`u	556,697,9,0,35	2	249	ugrave
+'u	556,697,9,0,35	2	250	uacute
+^u	556,690,9,0,35	2	251	ucircumflex
+:u	556,655,9,0,35	2	252	udieresis
+'y	444,697,205,41,144,41	3	253	yacute
+Tp	500,699,205,0,170	3	254	thorn
+:y	444,655,205,44,144,44	3	255	ydieresis
+u2026	1000,135,13,0,10	0	256	ellipsis
diff --git a/contrib/groff/font/devps/TI b/contrib/groff/font/devps/TI
index 5e2bebb..471d88d 100644
--- a/contrib/groff/font/devps/TI
+++ b/contrib/groff/font/devps/TI
@@ -203,246 +203,247 @@ w , -74
 y . -55
 y , -55
 charset
-ha	422,666,0,50,50,43	2	0000	-- asciicircum
-ti	541,323,0,11,10,11	0	0001	-- asciitilde
-vS	500,873,18,70,33,43	2	0002	-- Scaron
-vZ	556,873,0,100,56,43	2	0003	-- Zcaron
-vs	389,661,13,115,34,43	2	0004	-- scaron
-vz	389,661,81,95,52,43	2	0005	-- zcaron
-:Y	556,818,0,127,-28,43	2	0006	-- Ydieresis
-tm	980,653,0,27,20,27	2	0007	-- trademark
-aq	214,666,0,77,-82,43	2	0010	-- quotesingle
-space	250	0	0040
-!	333,667,11,19,11,19	2	0041	-- exclam
-"	420,666,0,62,-94,43	2	0042	-- quotedbl
+ha	422,666,0,50,50,43	2	0	asciicircum
+ti	541,323,0,11,10,11	0	1	asciitilde
+vS	500,873,18,70,33,43	2	2	Scaron
+vZ	556,873,0,100,56,43	2	3	Zcaron
+vs	389,661,13,115,34,43	2	4	scaron
+vz	389,661,81,95,52,43	2	5	zcaron
+:Y	556,818,0,127,-28,43	2	6	Ydieresis
+tm	980,653,0,27,20,27	2	7	trademark
+aq	214,666,0,77,-82,43	2	8	quotesingle
+space	250	0	32	space
+!	333,667,11,19,11,19	2	33	exclam
+"	420,666,0,62,-94,43	2	34	quotedbl
 dq	"
-#	500,676,0,90,48,43	2	0043	-- numbersign
+#	500,676,0,90,48,43	2	35	numbersign
 sh	"
-$	500,731,89,47,19,43	2	0044	-- dollar
+$	500,731,89,47,19,43	2	36	dollar
 Do	"
-%	833,676,13,7,-29,7	2	0045	-- percent
-&	778,666,18,0,-26	2	0046	-- ampersand
-'	333,666,0,7,-101,7	2	0047	-- quoteright
+%	833,676,13,7,-29,7	2	37	percent
+&	778,666,18,0,-26	2	38	ampersand
+'	333,666,0,7,-101,7	2	39	quoteright
 cq	"
-(	333,669,181,32,8,32	2	0050	-- parenleft
-)	333,669,180,6,34,6	2	0051	-- parenright
-*	500,666,0,42,-78,42	2	0052	-- asterisk
-+	675,506,0,0,-36	0	0053	-- plus
-,	250,101,129,0,54	0	0054	-- comma
--	333,255,0,0,1	0	0055	-- hyphen
+(	333,669,181,32,8,32	2	40	parenleft
+)	333,669,180,6,34,6	2	41	parenright
+*	500,666,0,42,-78,42	2	42	asterisk
++	675,506,0,0,-36	0	43	plus
+,	250,101,129,0,54	0	44	comma
+-	333,255,0,0,1	0	45	hyphen
 hy	"
-.	250,100,11,0,23	0	0056	-- period
-/	278,666,18,158,115,43	2	0057	-- slash
+.	250,100,11,0,23	0	46	period
+/	278,666,18,158,115,43	2	47	slash
 sl	"
-0	500,676,7,47,18,43	2	0060	-- zero
-1	500,676,0,0,1	2	0061	-- one
-2	500,676,0,2,38,2	2	0062	-- two
-3	500,676,7,15,35,15	2	0063	-- three
-4	500,676,0,29,49,29	2	0064	-- four
-5	500,666,7,41,35,41	2	0065	-- five
-6	500,686,7,71,20,43	2	0066	-- six
-7	500,666,8,87,-25,43	2	0067	-- seven
-8	500,676,7,43,20,43	2	0070	-- eight
-9	500,676,17,42,27,42	2	0071	-- nine
-:	333,441,11	0	0072	-- colon
-;	333,441,129,0,23	0	0073	-- semicolon
-<	675,514,8,0,-34	0	0074	-- less
-=	675,386,0,0,-36	0	0075	-- equal
->	675,514,8,0,-34	0	0076	-- greater
-?	500,664,12,22,-82,22	2	0077	-- question
-@	920,666,18,0,-68	2	0100	-- at
+0	500,676,7,47,18,43	2	48	zero
+1	500,676,0,0,1	2	49	one
+2	500,676,0,2,38,2	2	50	two
+3	500,676,7,15,35,15	2	51	three
+4	500,676,0,29,49,29	2	52	four
+5	500,666,7,41,35,41	2	53	five
+6	500,686,7,71,20,43	2	54	six
+7	500,666,8,87,-25,43	2	55	seven
+8	500,676,7,43,20,43	2	56	eight
+9	500,676,17,42,27,42	2	57	nine
+:	333,441,11	0	58	colon
+;	333,441,129,0,23	0	59	semicolon
+<	675,514,8,0,-34	0	60	less
+=	675,386,0,0,-36	0	61	equal
+>	675,514,8,0,-34	0	62	greater
+?	500,664,12,22,-82,22	2	63	question
+@	920,666,18,0,-68	2	64	at
 at	"
-A	611,668,0,3,101,3	2	0101	-- A
-B	611,653,0,27,58,27	2	0102	-- B
-C	667,666,18,72,-16,43	2	0103	-- C
-D	722,653,0,28,58,28	2	0104	-- D
-E	611,653,0,73,51,43	2	0105	-- E
-F	611,653,0,84,42,43	2	0106	-- F
-G	722,666,18,50,-2,43	2	0107	-- G
-H	722,653,0,95,58,43	2	0110	-- H
-I	333,653,0,101,58,43	2	0111	-- I
-J	444,653,18,97,56,43	2	0112	-- J
-K	667,653,0,105,43,43	2	0113	-- K
-L	556,653,0,53,58,43	2	0114	-- L
-M	833,653,0,90,68,43	2	0115	-- M
-N	667,653,15,110,70,43	2	0116	-- N
-O	722,666,18,27,-10,27	2	0117	-- O
-P	611,653,0,44,50,43	2	0120	-- P
-Q	722,666,182,27,-9,27	2	0121	-- Q
-R	611,653,0,27,63,27	2	0122	-- R
-S	500,667,18,58,33,43	2	0123	-- S
-T	556,653,0,127,-9,43	2	0124	-- T
-U	722,653,18,93,-52,43	2	0125	-- U
-V	611,653,18,127,-26,43	2	0126	-- V
-W	833,653,18,123,-21,43	2	0127	-- W
-X	611,653,0,94,79,43	2	0130	-- X
-Y	556,653,0,127,-28,43	2	0131	-- Y
-Z	556,653,0,100,56,43	2	0132	-- Z
-[	389,663,153,52,29,43	2	0133	-- bracketleft
+A	611,668,0,3,101,3	2	65	A
+B	611,653,0,27,58,27	2	66	B
+C	667,666,18,72,-16,43	2	67	C
+D	722,653,0,28,58,28	2	68	D
+E	611,653,0,73,51,43	2	69	E
+F	611,653,0,84,42,43	2	70	F
+G	722,666,18,50,-2,43	2	71	G
+H	722,653,0,95,58,43	2	72	H
+I	333,653,0,101,58,43	2	73	I
+J	444,653,18,97,56,43	2	74	J
+K	667,653,0,105,43,43	2	75	K
+L	556,653,0,53,58,43	2	76	L
+M	833,653,0,90,68,43	2	77	M
+N	667,653,15,110,70,43	2	78	N
+O	722,666,18,27,-10,27	2	79	O
+P	611,653,0,44,50,43	2	80	P
+Q	722,666,182,27,-9,27	2	81	Q
+R	611,653,0,27,63,27	2	82	R
+S	500,667,18,58,33,43	2	83	S
+T	556,653,0,127,-9,43	2	84	T
+U	722,653,18,93,-52,43	2	85	U
+V	611,653,18,127,-26,43	2	86	V
+W	833,653,18,123,-21,43	2	87	W
+X	611,653,0,94,79,43	2	88	X
+Y	556,653,0,127,-28,43	2	89	Y
+Z	556,653,0,100,56,43	2	90	Z
+[	389,663,153,52,29,43	2	91	bracketleft
 lB	"
-\	278,666,18,91,91,43	2	0134	-- backslash
+\	278,666,18,91,91,43	2	92	backslash
 rs	"
-]	389,663,153,43,38,43	2	0135	-- bracketright
+]	389,663,153,43,38,43	2	93	bracketright
 rB	"
-a^	333,661,0,102,-41,43	2	0136	-- circumflex
+a^	333,661,0,102,-41,43	2	94	circumflex
 ^	"
-_	500,0,125,50,50,43	0	0137	-- underscore
-`	333,666,0,27,-121,27	2	0140	-- quoteleft
+_	500,0,125,50,50,43	0	95	underscore
+`	333,666,0,27,-121,27	2	96	quoteleft
 oq	"
-a	500,441,11,26,33,26	0	0141	-- a
-b	500,683,11,23,27,23	2	0142	-- b
-c	444,441,11,31,20,31	0	0143	-- c
-d	500,683,13,77,35,43	2	0144	-- d
-e	444,441,11,18,19,18	0	0145	-- e
-f	278,678,207,196,197,43	3	0146	-- f
-g	500,441,206,22,42,22	1	0147	-- g
-h	500,683,9,28,31,28	2	0150	-- h
-i	278,654,11,36,1,36	2	0151	-- i
-j	278,654,207,48,174,43	3	0152	-- j
-k	444,683,11,67,36,43	2	0153	-- k
-l	278,683,11,51,9,43	2	0154	-- l
-m	722,441,9,32,38,32	0	0155	-- m
-n	500,441,9,24,36,24	0	0156	-- n
-o	500,441,11,18,23,18	0	0157	-- o
-p	500,441,205,19,125,19	1	0160	-- p
-q	500,441,209,33,25,33	1	0161	-- q
-r	389,441,0,73,5,43	0	0162	-- r
-s	389,442,13,27,34,27	0	0163	-- s
-t	278,546,11,68,13,43	2	0164	-- t
-u	500,441,11,25,8,25	0	0165	-- u
-v	444,441,18,32,29,32	0	0166	-- v
-w	667,441,18,31,34,31	0	0167	-- w
-x	444,441,11,53,77,43	0	0170	-- x
-y	444,441,206,32,74,32	1	0171	-- y
-z	389,428,81,41,52,41	0	0172	-- z
-lC	400,687,177,57,-1,43	2	0173	-- braceleft
+a	500,441,11,26,33,26	0	97	a
+b	500,683,11,23,27,23	2	98	b
+c	444,441,11,31,20,31	0	99	c
+d	500,683,13,77,35,43	2	100	d
+e	444,441,11,18,19,18	0	101	e
+f	278,678,207,196,197,43	3	102	f
+g	500,441,206,22,42,22	1	103	g
+h	500,683,9,28,31,28	2	104	h
+i	278,654,11,36,1,36	2	105	i
+j	278,654,207,48,174,43	3	106	j
+k	444,683,11,67,36,43	2	107	k
+l	278,683,11,51,9,43	2	108	l
+m	722,441,9,32,38,32	0	109	m
+n	500,441,9,24,36,24	0	110	n
+o	500,441,11,18,23,18	0	111	o
+p	500,441,205,19,125,19	1	112	p
+q	500,441,209,33,25,33	1	113	q
+r	389,441,0,73,5,43	0	114	r
+s	389,442,13,27,34,27	0	115	s
+t	278,546,11,68,13,43	2	116	t
+u	500,441,11,25,8,25	0	117	u
+v	444,441,18,32,29,32	0	118	v
+w	667,441,18,31,34,31	0	119	w
+x	444,441,11,53,77,43	0	120	x
+y	444,441,206,32,74,32	1	121	y
+z	389,428,81,41,52,41	0	122	z
+lC	400,687,177,57,-1,43	2	123	braceleft
 {	"
-ba	275,666,18,0,-55	2	0174	-- bar
+ba	275,666,18,0,-55	2	124	bar
 |	"
-rC	400,687,177,0,57	2	0175	-- braceright
+rC	400,687,177,0,57	2	125	braceright
 }	"
-a~	333,624,0,144,-50,43	2	0176	-- tilde
+a~	333,624,0,144,-50,43	2	126	tilde
 ~	"
-bq	333,101,129,0,6	0	0200	-- quotesinglbase
-Fo	500,403,0,0,-3	0	0201	-- guillemotleft
-Fc	500,403,0,0,-5	0	0202	-- guillemotright
-bu	350,461,0,10,10,10	0	0203	-- bullet
-Fn	500,682,182,57,25,43	2	0204	-- florin
-f/	167,676,10,220,219,43	2	0205	-- fraction
-%0	1000,706,19,60,25,43	2	0206	-- perthousand
-dg	500,666,159,38,-51,38	2	0207	-- dagger
-dd	500,666,143,41,28,41	2	0210	-- daggerdbl
-en	500,243,0,55,56,43	0	0211	-- endash
-em	889,243,0,55,56,43	0	0212	-- emdash
-fi	500,681,207,31,191,31	3	0214	-- fi
-fl	500,682,204,68,191,43	3	0215	-- fl
-.i	278,441,11,7,1,7	0	0220	-- dotlessi
-ga	333,664,0,28,-71,28	2	0222	-- grave
-a"	333,664,0,203,-43,43	2	0223	-- hungarumlaut
-a.	333,606,0,22,-157,22	2	0224	-- dotaccent
-ab	333,650,0,135,-67,43	2	0225	-- breve
-ah	333,661,0,143,-71,43	2	0226	-- caron
-ao	333,691,0,72,-105,43	2	0227	-- ring
-ho	333,40,169,0,70	0	0230	-- ogonek
-lq	556,666,0,8,-116,8	2	0231	-- quotedblleft
-rq	556,666,0,0,-101	2	0232	-- quotedblright
-oe	667,441,12,29,30,29	0	0233	-- oe
-/l	278,683,11,79,13,43	2	0234	-- lslash
-Bq	556,101,129,0,-7	0	0235	-- quotedblbase
-OE	944,666,8,70,1,43	2	0236	-- OE
-/L	556,653,0,53,58,43	2	0237	-- Lslash
-r!	389,473,205,0,-9	1	0241	-- exclamdown
-ct	500,560,143,22,-27,22	2	0242	-- cent
-Po	500,670,6,67,40,43	2	0243	-- sterling
-Cs	500,597,0,72,72,43	2	0244	-- currency
-Ye	500,653,0,153,23,43	2	0245	-- yen
-bb	275,666,18,0,-55	2	0246	-- brokenbar
-sc	500,666,162,11,-3,11	2	0247	-- section
-ad	333,606,0,122,-57,43	2	0250	-- dieresis
-co	760,666,18,9,9,9	2	0251	-- copyright
-Of	276,676,0,126,8,43	2	0252	-- ordfeminine
-fo	333,403,0,0,-1	0	0253	-- guilsinglleft
-no	675,386,0,0,-36	0	0254	-- logicalnot
-\-	675,286,0,0,-36	0	0255	-- minus
-rg	760,666,18,9,9,9	2	0256	-- registered
-a-	333,583,0,128,-49,43	2	0257	-- macron
-de	400,676,0,37,-51,37	2	0260	-- degree
-t+-	675,506,0,0,-36	0	0261	-- plusminus
-S2	300,676,0,74,17,43	2	0262	-- twosuperior
-S3	300,676,0,89,7,43	2	0263	-- threesuperior
-aa	333,664,0,120,-130,43	2	0264	-- acute
-mc	500,428,209,47,80,43	1	0265	-- mu
-ps	523,653,123,143,-5,43	2	0266	-- paragraph
-pc	250,310,0,0,-20	0	0267	-- periodcentered
-ac	333,0,217,0,80	1	0270	-- cedilla
-S1	300,676,0,34,7,34	2	0271	-- onesuperior
-Om	310,676,0,102,-17,43	2	0272	-- ordmasculine
-fc	333,403,0,0,-2	0	0273	-- guilsinglright
-14	750,676,10,36,17,36	2	0274	-- onequarter
-12	750,676,10,49,16,43	2	0275	-- onehalf
-34	750,676,10,36,27,36	2	0276	-- threequarters
-r?	500,471,205,0,22	1	0277	-- questiondown
-`A	611,876,0,3,101,3	2	0300	-- Agrave
-'A	611,876,0,3,101,3	2	0301	-- Aacute
-^A	611,873,0,3,101,3	2	0302	-- Acircumflex
-~A	611,836,0,5,101,5	2	0303	-- Atilde
-:A	611,818,0,3,101,3	2	0304	-- Adieresis
-oA	611,883,0,3,101,3	2	0305	-- Aring
-AE	889,653,0,72,77,43	2	0306	-- AE
-,C	667,666,217,72,-16,43	3	0307	-- Ccedilla
-`E	611,876,0,73,51,43	2	0310	-- Egrave
-'E	611,876,0,73,51,43	2	0311	-- Eacute
-^E	611,873,0,73,51,43	2	0312	-- Ecircumflex
-:E	611,818,0,73,51,43	2	0313	-- Edieresis
-`I	333,876,0,101,58,43	2	0314	-- Igrave
-'I	333,876,0,130,58,43	2	0315	-- Iacute
-^I	333,873,0,142,58,43	2	0316	-- Icircumflex
-:I	333,818,0,152,58,43	2	0317	-- Idieresis
--D	722,653,0,28,58,28	2	0320	-- Eth
-~N	667,836,15,110,70,43	2	0321	-- Ntilde
-`O	722,876,18,27,-10,27	2	0322	-- Ograve
-'O	722,876,18,27,-10,27	2	0323	-- Oacute
-^O	722,873,18,27,-10,27	2	0324	-- Ocircumflex
-~O	722,836,18,27,-10,27	2	0325	-- Otilde
-:O	722,818,18,27,-10,27	2	0326	-- Odieresis
-tmu	675,497,0,0,-43	0	0327	-- multiply
-/O	722,722,105,27,-10,27	2	0330	-- Oslash
-`U	722,876,18,93,-52,43	2	0331	-- Ugrave
-'U	722,876,18,93,-52,43	2	0332	-- Uacute
-^U	722,873,18,93,-52,43	2	0333	-- Ucircumflex
-:U	722,818,18,93,-52,43	2	0334	-- Udieresis
-'Y	556,876,0,127,-28,43	2	0335	-- Yacute
-TP	611,653,0,8,50,8	2	0336	-- Thorn
-ss	500,679,207,43,218,43	3	0337	-- germandbls
-`a	500,664,11,26,33,26	2	0340	-- agrave
-'a	500,664,11,37,33,37	2	0341	-- aacute
-^a	500,661,11,26,33,26	2	0342	-- acircumflex
-~a	500,624,11,61,33,43	2	0343	-- atilde
-:a	500,606,11,39,33,39	2	0344	-- adieresis
-oa	500,691,11,26,33,26	2	0345	-- aring
-ae	667,441,11,23,27,23	0	0346	-- ae
-,c	444,441,217,31,24,31	1	0347	-- ccedilla
-`e	444,664,11,18,19,18	2	0350	-- egrave
-'e	444,664,11,65,19,43	2	0351	-- eacute
-^e	444,661,11,47,19,43	2	0352	-- ecircumflex
-:e	444,606,11,57,19,43	2	0353	-- edieresis
-`i	278,664,11,56,1,43	2	0354	-- igrave
-'i	278,664,11,128,1,43	2	0355	-- iacute
-^i	278,661,11,100,16,43	2	0356	-- icircumflex
-:i	278,606,11,125,1,43	2	0357	-- idieresis
-Sd	500,683,11,32,23,32	2	0360	-- eth
-~n	500,624,9,26,36,26	2	0361	-- ntilde
-`o	500,664,11,18,23,18	2	0362	-- ograve
-'o	500,664,11,37,23,37	2	0363	-- oacute
-^o	500,661,11,18,23,18	2	0364	-- ocircumflex
-~o	500,624,11,46,23,43	2	0365	-- otilde
-:o	500,606,11,39,23,39	2	0366	-- odieresis
-tdi	675,517,11,0,-36	0	0367	-- divide
-/o	500,554,135,19,22,19	2	0370	-- oslash
-`u	500,664,11,25,8,25	2	0371	-- ugrave
-'u	500,664,11,27,8,27	2	0372	-- uacute
-^u	500,661,11,25,8,25	2	0373	-- ucircumflex
-:u	500,606,11,29,8,29	2	0374	-- udieresis
-'y	444,664,206,65,74,43	3	0375	-- yacute
-Tp	500,683,205,19,125,19	3	0376	-- thorn
-:y	444,606,206,47,74,43	3	0377	-- ydieresis
+bq	333,101,129,0,6	0	128	quotesinglbase
+Fo	500,403,0,0,-3	0	129	guillemotleft
+Fc	500,403,0,0,-5	0	130	guillemotright
+bu	350,461,0,10,10,10	0	131	bullet
+Fn	500,682,182,57,25,43	2	132	florin
+f/	167,676,10,220,219,43	2	133	fraction
+%0	1000,706,19,60,25,43	2	134	perthousand
+dg	500,666,159,38,-51,38	2	135	dagger
+dd	500,666,143,41,28,41	2	136	daggerdbl
+en	500,243,0,55,56,43	0	137	endash
+em	889,243,0,55,56,43	0	138	emdash
+fi	500,681,207,31,191,31	3	140	fi
+fl	500,682,204,68,191,43	3	141	fl
+.i	278,441,11,7,1,7	0	144	dotlessi
+ga	333,664,0,28,-71,28	2	146	grave
+a"	333,664,0,203,-43,43	2	147	hungarumlaut
+a.	333,606,0,22,-157,22	2	148	dotaccent
+ab	333,650,0,135,-67,43	2	149	breve
+ah	333,661,0,143,-71,43	2	150	caron
+ao	333,691,0,72,-105,43	2	151	ring
+ho	333,40,169,0,70	0	152	ogonek
+lq	556,666,0,8,-116,8	2	153	quotedblleft
+rq	556,666,0,0,-101	2	154	quotedblright
+oe	667,441,12,29,30,29	0	155	oe
+/l	278,683,11,79,13,43	2	156	lslash
+Bq	556,101,129,0,-7	0	157	quotedblbase
+OE	944,666,8,70,1,43	2	158	OE
+/L	556,653,0,53,58,43	2	159	Lslash
+r!	389,473,205,0,-9	1	161	exclamdown
+ct	500,560,143,22,-27,22	2	162	cent
+Po	500,670,6,67,40,43	2	163	sterling
+Cs	500,597,0,72,72,43	2	164	currency
+Ye	500,653,0,153,23,43	2	165	yen
+bb	275,666,18,0,-55	2	166	brokenbar
+sc	500,666,162,11,-3,11	2	167	section
+ad	333,606,0,122,-57,43	2	168	dieresis
+co	760,666,18,9,9,9	2	169	copyright
+Of	276,676,0,126,8,43	2	170	ordfeminine
+fo	333,403,0,0,-1	0	171	guilsinglleft
+tno	675,386,0,0,-36	0	172	logicalnot
+\-	675,286,0,0,-36	0	173	minus
+rg	760,666,18,9,9,9	2	174	registered
+a-	333,583,0,128,-49,43	2	175	macron
+de	400,676,0,37,-51,37	2	176	degree
+t+-	675,506,0,0,-36	0	177	plusminus
+S2	300,676,0,74,17,43	2	178	twosuperior
+S3	300,676,0,89,7,43	2	179	threesuperior
+aa	333,664,0,120,-130,43	2	180	acute
+mc	500,428,209,47,80,43	1	181	mu
+ps	523,653,123,143,-5,43	2	182	paragraph
+pc	250,310,0,0,-20	0	183	periodcentered
+ac	333,0,217,0,80	1	184	cedilla
+S1	300,676,0,34,7,34	2	185	onesuperior
+Om	310,676,0,102,-17,43	2	186	ordmasculine
+fc	333,403,0,0,-2	0	187	guilsinglright
+14	750,676,10,36,17,36	2	188	onequarter
+12	750,676,10,49,16,43	2	189	onehalf
+34	750,676,10,36,27,36	2	190	threequarters
+r?	500,471,205,0,22	1	191	questiondown
+`A	611,876,0,3,101,3	2	192	Agrave
+'A	611,876,0,3,101,3	2	193	Aacute
+^A	611,873,0,3,101,3	2	194	Acircumflex
+~A	611,836,0,5,101,5	2	195	Atilde
+:A	611,818,0,3,101,3	2	196	Adieresis
+oA	611,883,0,3,101,3	2	197	Aring
+AE	889,653,0,72,77,43	2	198	AE
+,C	667,666,217,72,-16,43	3	199	Ccedilla
+`E	611,876,0,73,51,43	2	200	Egrave
+'E	611,876,0,73,51,43	2	201	Eacute
+^E	611,873,0,73,51,43	2	202	Ecircumflex
+:E	611,818,0,73,51,43	2	203	Edieresis
+`I	333,876,0,101,58,43	2	204	Igrave
+'I	333,876,0,130,58,43	2	205	Iacute
+^I	333,873,0,142,58,43	2	206	Icircumflex
+:I	333,818,0,152,58,43	2	207	Idieresis
+-D	722,653,0,28,58,28	2	208	Eth
+~N	667,836,15,110,70,43	2	209	Ntilde
+`O	722,876,18,27,-10,27	2	210	Ograve
+'O	722,876,18,27,-10,27	2	211	Oacute
+^O	722,873,18,27,-10,27	2	212	Ocircumflex
+~O	722,836,18,27,-10,27	2	213	Otilde
+:O	722,818,18,27,-10,27	2	214	Odieresis
+tmu	675,497,0,0,-43	0	215	multiply
+/O	722,722,105,27,-10,27	2	216	Oslash
+`U	722,876,18,93,-52,43	2	217	Ugrave
+'U	722,876,18,93,-52,43	2	218	Uacute
+^U	722,873,18,93,-52,43	2	219	Ucircumflex
+:U	722,818,18,93,-52,43	2	220	Udieresis
+'Y	556,876,0,127,-28,43	2	221	Yacute
+TP	611,653,0,8,50,8	2	222	Thorn
+ss	500,679,207,43,218,43	3	223	germandbls
+`a	500,664,11,26,33,26	2	224	agrave
+'a	500,664,11,37,33,37	2	225	aacute
+^a	500,661,11,26,33,26	2	226	acircumflex
+~a	500,624,11,61,33,43	2	227	atilde
+:a	500,606,11,39,33,39	2	228	adieresis
+oa	500,691,11,26,33,26	2	229	aring
+ae	667,441,11,23,27,23	0	230	ae
+,c	444,441,217,31,24,31	1	231	ccedilla
+`e	444,664,11,18,19,18	2	232	egrave
+'e	444,664,11,65,19,43	2	233	eacute
+^e	444,661,11,47,19,43	2	234	ecircumflex
+:e	444,606,11,57,19,43	2	235	edieresis
+`i	278,664,11,56,1,43	2	236	igrave
+'i	278,664,11,128,1,43	2	237	iacute
+^i	278,661,11,100,16,43	2	238	icircumflex
+:i	278,606,11,125,1,43	2	239	idieresis
+Sd	500,683,11,32,23,32	2	240	eth
+~n	500,624,9,26,36,26	2	241	ntilde
+`o	500,664,11,18,23,18	2	242	ograve
+'o	500,664,11,37,23,37	2	243	oacute
+^o	500,661,11,18,23,18	2	244	ocircumflex
+~o	500,624,11,46,23,43	2	245	otilde
+:o	500,606,11,39,23,39	2	246	odieresis
+tdi	675,517,11,0,-36	0	247	divide
+/o	500,554,135,19,22,19	2	248	oslash
+`u	500,664,11,25,8,25	2	249	ugrave
+'u	500,664,11,27,8,27	2	250	uacute
+^u	500,661,11,25,8,25	2	251	ucircumflex
+:u	500,606,11,29,8,29	2	252	udieresis
+'y	444,664,206,65,74,43	3	253	yacute
+Tp	500,683,205,19,125,19	3	254	thorn
+:y	444,606,206,47,74,43	3	255	ydieresis
+u2026	889,100,11,0,-7	0	256	ellipsis
diff --git a/contrib/groff/font/devps/TR b/contrib/groff/font/devps/TR
index 913e8d4..ecea19c 100644
--- a/contrib/groff/font/devps/TR
+++ b/contrib/groff/font/devps/TR
@@ -195,246 +195,247 @@ x e -15
 y . -65
 y , -65
 charset
-ha	469,662,0,0,-24	2	0000	-- asciicircum
-ti	541,323,0,0,-40	0	0001	-- asciitilde
-vS	556,886,14,0,-42	2	0002	-- Scaron
-vZ	611,886,0,0,-9	2	0003	-- Zcaron
-vs	389,674,10,0,-39	2	0004	-- scaron
-vz	444,674,0,0,-27	2	0005	-- zcaron
-:Y	722,835,0,0,-22	2	0006	-- Ydieresis
-tm	980,662,0,0,-30	2	0007	-- trademark
-aq	180,676,0,0,-48	2	0010	-- quotesingle
-space	250	0	0040
-!	333,676,9,0,-130	2	0041	-- exclam
-"	408,676,0,0,-77	2	0042	-- quotedbl
+ha	469,662	2	0	asciicircum
+ti	541,323	0	1	asciitilde
+vS	556,886,14	2	2	Scaron
+vZ	611,886	2	3	Zcaron
+vs	389,674,10	2	4	scaron
+vz	444,674	2	5	zcaron
+:Y	722,835	2	6	Ydieresis
+tm	980,662	2	7	trademark
+aq	180,676	2	8	quotesingle
+space	250	0	32	space
+!	333,676,9	2	33	exclam
+"	408,676	2	34	quotedbl
 dq	"
-#	500,662,0,0,-5	2	0043	-- numbersign
+#	500,662	2	35	numbersign
 sh	"
-$	500,727,87,0,-44	2	0044	-- dollar
+$	500,727,87	2	36	dollar
 Do	"
-%	833,676,13,0,-61	2	0045	-- percent
-&	778,676,13,0,-42	2	0046	-- ampersand
-'	333,676,0,0,-79	2	0047	-- quoteright
+%	833,676,13	2	37	percent
+&	778,676,13	2	38	ampersand
+'	333,676	2	39	quoteright
 cq	"
-(	333,676,177,0,-48	2	0050	-- parenleft
-)	333,676,177,0,-29	2	0051	-- parenright
-*	500,676,0,0,-69	2	0052	-- asterisk
-+	564,506,0,0,-30	0	0053	-- plus
-,	250,102,141,0,-56	0	0054	-- comma
--	333,257,0,0,-39	0	0055	-- hyphen
+(	333,676,177	2	40	parenleft
+)	333,676,177	2	41	parenright
+*	500,676	2	42	asterisk
++	564,506	0	43	plus
+,	250,102,141	0	44	comma
+-	333,257	0	45	hyphen
 hy	"
-.	250,100,11,0,-70	0	0056	-- period
-/	278,676,14,9,9	2	0057	-- slash
+.	250,100,11	0	46	period
+/	278,676,14,9,9	2	47	slash
 sl	"
-0	500,676,14,0,-24	2	0060	-- zero
-1	500,676,0,0,-111	2	0061	-- one
-2	500,676,0,0,-30	2	0062	-- two
-3	500,676,14,0,-43	2	0063	-- three
-4	500,676,0,0,-12	2	0064	-- four
-5	500,688,14,0,-32	2	0065	-- five
-6	500,684,14,0,-34	2	0066	-- six
-7	500,662,8,0,-20	2	0067	-- seven
-8	500,676,14,0,-56	2	0070	-- eight
-9	500,676,22,0,-30	2	0071	-- nine
-:	278,459,11,0,-81	0	0072	-- colon
-;	278,459,141,0,-80	0	0073	-- semicolon
-<	564,514,8,0,-28	0	0074	-- less
-=	564,386,0,0,-30	0	0075	-- equal
->	564,514,8,0,-28	0	0076	-- greater
-?	444,676,8,0,-68	2	0077	-- question
-@	921,676,14,0,-116	2	0100	-- at
+0	500,676,14	2	48	zero
+1	500,676	2	49	one
+2	500,676	2	50	two
+3	500,676,14	2	51	three
+4	500,676	2	52	four
+5	500,688,14	2	53	five
+6	500,684,14	2	54	six
+7	500,662,8	2	55	seven
+8	500,676,14	2	56	eight
+9	500,676,22	2	57	nine
+:	278,459,11	0	58	colon
+;	278,459,141	0	59	semicolon
+<	564,514,8	0	60	less
+=	564,386	0	61	equal
+>	564,514,8	0	62	greater
+?	444,676,8	2	63	question
+@	921,676,14	2	64	at
 at	"
-A	722,674,0,0,-15	2	0101	-- A
-B	667,662,0,0,-17	2	0102	-- B
-C	667,676,14,0,-28	2	0103	-- C
-D	722,662,0,0,-16	2	0104	-- D
-E	611,662,0,0,-12	2	0105	-- E
-F	556,662,0,0,-12	2	0106	-- F
-G	722,676,14,0,-32	2	0107	-- G
-H	722,662,0,0,-19	2	0110	-- H
-I	333,662,0,0,-18	2	0111	-- I
-J	389,662,14,0,-10	2	0112	-- J
-K	722,662,0,1,-34	2	0113	-- K
-L	611,662,0,0,-12	2	0114	-- L
-M	889,662,0,0,-12	2	0115	-- M
-N	722,662,11,0,-12	2	0116	-- N
-O	722,676,14,0,-34	2	0117	-- O
-P	556,662,0,0,-16	2	0120	-- P
-Q	722,676,178,0,-34	2	0121	-- Q
-R	667,662,0,0,-17	2	0122	-- R
-S	556,676,14,0,-42	2	0123	-- S
-T	611,662,0,0,-17	2	0124	-- T
-U	722,662,14,0,-14	2	0125	-- U
-V	722,662,11,0,-16	2	0126	-- V
-W	944,662,11,0,-5	2	0127	-- W
-X	722,662,0,0,-10	2	0130	-- X
-Y	722,662,0,0,-22	2	0131	-- Y
-Z	611,662,0,0,-9	2	0132	-- Z
-[	333,662,156,0,-88	2	0133	-- bracketleft
+A	722,674	2	65	A
+B	667,662	2	66	B
+C	667,676,14	2	67	C
+D	722,662	2	68	D
+E	611,662	2	69	E
+F	556,662	2	70	F
+G	722,676,14	2	71	G
+H	722,662	2	72	H
+I	333,662	2	73	I
+J	389,662,14	2	74	J
+K	722,662,0,1	2	75	K
+L	611,662	2	76	L
+M	889,662	2	77	M
+N	722,662,11	2	78	N
+O	722,676,14	2	79	O
+P	556,662	2	80	P
+Q	722,676,178	2	81	Q
+R	667,662	2	82	R
+S	556,676,14	2	83	S
+T	611,662	2	84	T
+U	722,662,14	2	85	U
+V	722,662,11	2	86	V
+W	944,662,11	2	87	W
+X	722,662	2	88	X
+Y	722,662	2	89	Y
+Z	611,662	2	90	Z
+[	333,662,156	2	91	bracketleft
 lB	"
-\	278,676,14,9,9	2	0134	-- backslash
+\	278,676,14,9,9	2	92	backslash
 rs	"
-]	333,662,156,0,-34	2	0135	-- bracketright
+]	333,662,156	2	93	bracketright
 rB	"
-a^	333,674,0,0,-11	2	0136	-- circumflex
+a^	333,674	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	333,676,0,0,-115	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	333,676	2	96	quoteleft
 oq	"
-a	444,460,10,0,-37	0	0141	-- a
-b	500,683,10,0,-3	2	0142	-- b
-c	444,460,10,0,-25	0	0143	-- c
-d	500,683,10,0,-27	2	0144	-- d
-e	444,460,10,0,-25	0	0145	-- e
-f	333,683,0,50,-20	2	0146	-- f
-g	500,460,218,0,-28	1	0147	-- g
-h	500,683,0,0,-9	2	0150	-- h
-i	278,683,0,0,-16	2	0151	-- i
-j	278,683,218,0,70	3	0152	-- j
-k	500,683,0,5,-7	2	0153	-- k
-l	278,683,0,0,-19	2	0154	-- l
-m	778,460,0,0,-16	0	0155	-- m
-n	500,460,0,0,-16	0	0156	-- n
-o	500,460,10,0,-29	0	0157	-- o
-p	500,460,217,0,-5	1	0160	-- p
-q	500,460,217,0,-24	1	0161	-- q
-r	333,460,0,2,-5	0	0162	-- r
-s	389,460,10,0,-51	0	0163	-- s
-t	278,579,10,1,-13	2	0164	-- t
-u	500,450,10,0,-9	0	0165	-- u
-v	500,450,14,0,-19	0	0166	-- v
-w	722,450,14,0,-21	0	0167	-- w
-x	500,450,0,0,-17	0	0170	-- x
-y	500,450,218,0,-14	1	0171	-- y
-z	444,450,0,0,-27	0	0172	-- z
-lC	480,680,181,0,-100	2	0173	-- braceleft
+a	444,460,10	0	97	a
+b	500,683,10	2	98	b
+c	444,460,10	0	99	c
+d	500,683,10	2	100	d
+e	444,460,10	0	101	e
+f	333,683,0,50	2	102	f
+g	500,460,218	1	103	g
+h	500,683	2	104	h
+i	278,683	2	105	i
+j	278,683,218,0,70	3	106	j
+k	500,683,0,5	2	107	k
+l	278,683	2	108	l
+m	778,460	0	109	m
+n	500,460	0	110	n
+o	500,460,10	0	111	o
+p	500,460,217	1	112	p
+q	500,460,217	1	113	q
+r	333,460,0,2	0	114	r
+s	389,460,10	0	115	s
+t	278,579,10,1	2	116	t
+u	500,450,10	0	117	u
+v	500,450,14	0	118	v
+w	722,450,14	0	119	w
+x	500,450	0	120	x
+y	500,450,218	1	121	y
+z	444,450	0	122	z
+lC	480,680,181	2	123	braceleft
 {	"
-ba	200,676,14,0,-67	2	0174	-- bar
+ba	200,676,14	2	124	bar
 |	"
-rC	480,680,181,0,-130	2	0175	-- braceright
+rC	480,680,181	2	125	braceright
 }	"
-a~	333,638,0,0,-1	2	0176	-- tilde
+a~	333,638	2	126	tilde
 ~	"
-bq	333,102,141,0,-79	0	0200	-- quotesinglbase
-Fo	500,416,0,0,-42	0	0201	-- guillemotleft
-Fc	500,416,0,0,-44	0	0202	-- guillemotright
-bu	350,466,0,0,-40	0	0203	-- bullet
-Fn	500,676,189,0,-7	2	0204	-- florin
-f/	167,676,14,164,168	2	0205	-- fraction
-%0	1000,706,19,0,-7	2	0206	-- perthousand
-dg	500,676,149,0,-59	2	0207	-- dagger
-dd	500,676,153,0,-58	2	0210	-- daggerdbl
-en	500,250	0	0211	-- endash
-em	1000,250	0	0212	-- emdash
-fi	556,683,0,0,-31	2	0214	-- fi
-fl	556,683,0,0,-32	2	0215	-- fl
-.i	278,460,0,0,-16	0	0220	-- dotlessi
-ga	333,678,0,0,-19	2	0222	-- grave
-a"	333,678,0,44,3	2	0223	-- hungarumlaut
-a.	333,623,0,0,-118	2	0224	-- dotaccent
-ab	333,664,0,0,-26	2	0225	-- breve
-ah	333,674,0,0,-11	2	0226	-- caron
-ao	333,711,0,0,-67	2	0227	-- ring
-ho	333,0,165,0,-64	0	0230	-- ogonek
-lq	444,676,0,0,-43	2	0231	-- quotedblleft
-rq	444,676,0,0,-30	2	0232	-- quotedblright
-oe	722,460,10,0,-30	0	0233	-- oe
-/l	278,683,0,0,-19	2	0234	-- lslash
-Bq	444,102,141,0,-45	0	0235	-- quotedblbase
-OE	889,668,6,0,-30	2	0236	-- OE
-/L	611,662,0,0,-12	2	0237	-- Lslash
-r!	333,467,218,0,-97	1	0241	-- exclamdown
-ct	500,579,138,0,-53	2	0242	-- cent
-Po	500,676,8,0,-12	2	0243	-- sterling
-Cs	500,602,0,22,22	2	0244	-- currency
-Ye	500,662,0,12,53	2	0245	-- yen
-bb	200,676,14,0,-67	2	0246	-- brokenbar
-sc	500,676,148,0,-70	2	0247	-- section
-ad	333,623,0,0,-18	2	0250	-- dieresis
-co	760,676,14,0,-38	2	0251	-- copyright
-Of	276,676,0,0,-4	2	0252	-- ordfeminine
-fo	333,416,0,0,-63	0	0253	-- guilsinglleft
-no	564,386,0,0,-30	0	0254	-- logicalnot
-\-	564,286,0,0,-30	0	0255	-- minus
-rg	760,676,14,0,-38	2	0256	-- registered
-a-	333,601,0,0,-11	2	0257	-- macron
-de	400,676,0,0,-57	2	0260	-- degree
-t+-	564,506,0,0,-30	0	0261	-- plusminus
-S2	300,676,0,0,-1	2	0262	-- twosuperior
-S3	300,676,0,0,-15	2	0263	-- threesuperior
-aa	333,678,0,0,-93	2	0264	-- acute
-mc	500,450,218,12,-36	1	0265	-- mu
-ps	453,662,154,0,22	2	0266	-- paragraph
-pc	250,310,0,0,-70	0	0267	-- periodcentered
-ac	333,0,215,0,-52	0	0270	-- cedilla
-S1	300,676,0,0,-57	2	0271	-- onesuperior
-Om	310,676,0,0,-6	2	0272	-- ordmasculine
-fc	333,416,0,0,-48	0	0273	-- guilsinglright
-14	750,676,14,0,-37	2	0274	-- onequarter
-12	750,676,14,0,-31	2	0275	-- onehalf
-34	750,676,14,0,-15	2	0276	-- threequarters
-r?	444,466,218,0,-30	1	0277	-- questiondown
-`A	722,890,0,0,-15	2	0300	-- Agrave
-'A	722,890,0,0,-15	2	0301	-- Aacute
-^A	722,886,0,0,-15	2	0302	-- Acircumflex
-~A	722,850,0,0,-15	2	0303	-- Atilde
-:A	722,835,0,0,-15	2	0304	-- Adieresis
-oA	722,898,0,0,-15	2	0305	-- Aring
-AE	889,662	2	0306	-- AE
-,C	667,676,215,0,-28	2	0307	-- Ccedilla
-`E	611,890,0,0,-12	2	0310	-- Egrave
-'E	611,890,0,0,-12	2	0311	-- Eacute
-^E	611,886,0,0,-12	2	0312	-- Ecircumflex
-:E	611,835,0,0,-12	2	0313	-- Edieresis
-`I	333,890,0,0,-18	2	0314	-- Igrave
-'I	333,890,0,0,-18	2	0315	-- Iacute
-^I	333,886,0,0,-11	2	0316	-- Icircumflex
-:I	333,835,0,0,-18	2	0317	-- Idieresis
--D	722,662,0,0,-16	2	0320	-- Eth
-~N	722,850,11,0,-12	2	0321	-- Ntilde
-`O	722,890,14,0,-34	2	0322	-- Ograve
-'O	722,890,14,0,-34	2	0323	-- Oacute
-^O	722,886,14,0,-34	2	0324	-- Ocircumflex
-~O	722,850,14,0,-34	2	0325	-- Otilde
-:O	722,835,14,0,-34	2	0326	-- Odieresis
-tmu	564,497,0,0,-38	0	0327	-- multiply
-/O	722,734,80,0,-34	2	0330	-- Oslash
-`U	722,890,14,0,-14	2	0331	-- Ugrave
-'U	722,890,14,0,-14	2	0332	-- Uacute
-^U	722,886,14,0,-14	2	0333	-- Ucircumflex
-:U	722,835,14,0,-14	2	0334	-- Udieresis
-'Y	722,890,0,0,-22	2	0335	-- Yacute
-TP	556,662,0,0,-16	2	0336	-- Thorn
-ss	500,683,9,0,-12	2	0337	-- germandbls
-`a	444,678,10,0,-37	2	0340	-- agrave
-'a	444,678,10,0,-37	2	0341	-- aacute
-^a	444,674,10,0,-37	2	0342	-- acircumflex
-~a	444,638,10,0,-37	2	0343	-- atilde
-:a	444,623,10,0,-37	2	0344	-- adieresis
-oa	444,711,10,0,-37	2	0345	-- aring
-ae	667,460,10,0,-38	0	0346	-- ae
-,c	444,460,215,0,-25	0	0347	-- ccedilla
-`e	444,678,10,0,-25	2	0350	-- egrave
-'e	444,678,10,0,-25	2	0351	-- eacute
-^e	444,674,10,0,-25	2	0352	-- ecircumflex
-:e	444,623,10,0,-25	2	0353	-- edieresis
-`i	278,678,0,0,8	2	0354	-- igrave
-'i	278,678,0,12,-16	2	0355	-- iacute
-^i	278,674,0,17,16	2	0356	-- icircumflex
-:i	278,623,0,10,9	2	0357	-- idieresis
-Sd	500,686,10,0,-29	2	0360	-- eth
-~n	500,638,0,0,-16	2	0361	-- ntilde
-`o	500,678,10,0,-29	2	0362	-- ograve
-'o	500,678,10,0,-29	2	0363	-- oacute
-^o	500,674,10,0,-29	2	0364	-- ocircumflex
-~o	500,638,10,0,-29	2	0365	-- otilde
-:o	500,623,10,0,-29	2	0366	-- odieresis
-tdi	564,516,10,0,-30	0	0367	-- divide
-/o	500,551,112,0,-29	0	0370	-- oslash
-`u	500,678,10,0,-9	2	0371	-- ugrave
-'u	500,678,10,0,-9	2	0372	-- uacute
-^u	500,674,10,0,-9	2	0373	-- ucircumflex
-:u	500,623,10,0,-9	2	0374	-- udieresis
-'y	500,678,218,0,-14	3	0375	-- yacute
-Tp	500,683,217,0,-5	3	0376	-- thorn
-:y	500,623,218,0,-14	3	0377	-- ydieresis
+bq	333,102,141	0	128	quotesinglbase
+Fo	500,416	0	129	guillemotleft
+Fc	500,416	0	130	guillemotright
+bu	350,466	0	131	bullet
+Fn	500,676,189	2	132	florin
+f/	167,676,14,164,168	2	133	fraction
+%0	1000,706,19	2	134	perthousand
+dg	500,676,149	2	135	dagger
+dd	500,676,153	2	136	daggerdbl
+en	500,250	0	137	endash
+em	1000,250	0	138	emdash
+fi	556,683	2	140	fi
+fl	556,683	2	141	fl
+.i	278,460	0	144	dotlessi
+ga	333,678	2	146	grave
+a"	333,678,0,44,3	2	147	hungarumlaut
+a.	333,623	2	148	dotaccent
+ab	333,664	2	149	breve
+ah	333,674	2	150	caron
+ao	333,711	2	151	ring
+ho	333,0,165	0	152	ogonek
+lq	444,676	2	153	quotedblleft
+rq	444,676	2	154	quotedblright
+oe	722,460,10	0	155	oe
+/l	278,683	2	156	lslash
+Bq	444,102,141	0	157	quotedblbase
+OE	889,668,6	2	158	OE
+/L	611,662	2	159	Lslash
+r!	333,467,218	1	161	exclamdown
+ct	500,579,138	2	162	cent
+Po	500,676,8	2	163	sterling
+Cs	500,602,0,22,22	2	164	currency
+Ye	500,662,0,12,53	2	165	yen
+bb	200,676,14	2	166	brokenbar
+sc	500,676,148	2	167	section
+ad	333,623	2	168	dieresis
+co	760,676,14	2	169	copyright
+Of	276,676	2	170	ordfeminine
+fo	333,416	0	171	guilsinglleft
+tno	564,386	0	172	logicalnot
+\-	564,286	0	173	minus
+rg	760,676,14	2	174	registered
+a-	333,601	2	175	macron
+de	400,676	2	176	degree
+t+-	564,506	0	177	plusminus
+S2	300,676	2	178	twosuperior
+S3	300,676	2	179	threesuperior
+aa	333,678	2	180	acute
+mc	500,450,218,12	1	181	mu
+ps	453,662,154,0,22	2	182	paragraph
+pc	250,310	0	183	periodcentered
+ac	333,0,215	0	184	cedilla
+S1	300,676	2	185	onesuperior
+Om	310,676	2	186	ordmasculine
+fc	333,416	0	187	guilsinglright
+14	750,676,14	2	188	onequarter
+12	750,676,14	2	189	onehalf
+34	750,676,14	2	190	threequarters
+r?	444,466,218	1	191	questiondown
+`A	722,890	2	192	Agrave
+'A	722,890	2	193	Aacute
+^A	722,886	2	194	Acircumflex
+~A	722,850	2	195	Atilde
+:A	722,835	2	196	Adieresis
+oA	722,898	2	197	Aring
+AE	889,662	2	198	AE
+,C	667,676,215	2	199	Ccedilla
+`E	611,890	2	200	Egrave
+'E	611,890	2	201	Eacute
+^E	611,886	2	202	Ecircumflex
+:E	611,835	2	203	Edieresis
+`I	333,890	2	204	Igrave
+'I	333,890	2	205	Iacute
+^I	333,886	2	206	Icircumflex
+:I	333,835	2	207	Idieresis
+-D	722,662	2	208	Eth
+~N	722,850,11	2	209	Ntilde
+`O	722,890,14	2	210	Ograve
+'O	722,890,14	2	211	Oacute
+^O	722,886,14	2	212	Ocircumflex
+~O	722,850,14	2	213	Otilde
+:O	722,835,14	2	214	Odieresis
+tmu	564,497	0	215	multiply
+/O	722,734,80	2	216	Oslash
+`U	722,890,14	2	217	Ugrave
+'U	722,890,14	2	218	Uacute
+^U	722,886,14	2	219	Ucircumflex
+:U	722,835,14	2	220	Udieresis
+'Y	722,890	2	221	Yacute
+TP	556,662	2	222	Thorn
+ss	500,683,9	2	223	germandbls
+`a	444,678,10	2	224	agrave
+'a	444,678,10	2	225	aacute
+^a	444,674,10	2	226	acircumflex
+~a	444,638,10	2	227	atilde
+:a	444,623,10	2	228	adieresis
+oa	444,711,10	2	229	aring
+ae	667,460,10	0	230	ae
+,c	444,460,215	0	231	ccedilla
+`e	444,678,10	2	232	egrave
+'e	444,678,10	2	233	eacute
+^e	444,674,10	2	234	ecircumflex
+:e	444,623,10	2	235	edieresis
+`i	278,678,0,0,8	2	236	igrave
+'i	278,678,0,12	2	237	iacute
+^i	278,674,0,17,16	2	238	icircumflex
+:i	278,623,0,10,9	2	239	idieresis
+Sd	500,686,10	2	240	eth
+~n	500,638	2	241	ntilde
+`o	500,678,10	2	242	ograve
+'o	500,678,10	2	243	oacute
+^o	500,674,10	2	244	ocircumflex
+~o	500,638,10	2	245	otilde
+:o	500,623,10	2	246	odieresis
+tdi	564,516,10	0	247	divide
+/o	500,551,112	0	248	oslash
+`u	500,678,10	2	249	ugrave
+'u	500,678,10	2	250	uacute
+^u	500,674,10	2	251	ucircumflex
+:u	500,623,10	2	252	udieresis
+'y	500,678,218	3	253	yacute
+Tp	500,683,217	3	254	thorn
+:y	500,623,218	3	255	ydieresis
+u2026	1000,100,11	0	256	ellipsis
diff --git a/contrib/groff/font/devps/ZCMI b/contrib/groff/font/devps/ZCMI
index 1d574ad..b73175a 100644
--- a/contrib/groff/font/devps/ZCMI
+++ b/contrib/groff/font/devps/ZCMI
@@ -157,246 +157,247 @@ w o 10
 w h 20
 w , -20
 charset
-ha	520,594,0,62,-82,62	2	0000	-- asciicircum
-ti	520,320,0,69,-73,69	0	0001	-- asciitilde
-vS	460,831,81,184,5,87	2	0002	-- Scaron
-vZ	620,831,19,99,8,87	2	0003	-- Zcaron
-vs	320,659,14,194,4,87	2	0004	-- scaron
-vz	440,659,14,124,24,87	2	0005	-- zcaron
-:Y	560,762,168,264,9,87	2	0006	-- Ydieresis
-tm	1000,594,0,96,-77,87	2	0007	-- trademark
-aq	160,610,0,105,-95,87	2	0010	-- quotesingle
-space	220	0	0040
-!	280,610,14,123,-69,87	2	0041	-- exclam
-"	220,610,0,163,-70,87	2	0042	-- quotedbl
+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	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
+space	220	0	32	space
+!	280,610,14,123,-69,87	2	33	exclam
+"	220,610,0,163,-70,87	2	34	quotedbl
 dq	"
-#	440,594,0,131,-33,87	2	0043	-- numbersign
+#	440,594,0,131,-33,87	2	35	numbersign
 sh	"
-$	440,709,144,118,-10,87	2	0044	-- dollar
+$	440,709,144,118,-10,87	2	36	dollar
 Do	"
-%	680,700,160,80,-82,80	2	0045	-- percent
-&	780,610,16,185,-76,87	2	0046	-- ampersand
-'	240,610,0,148,-118,87	2	0047	-- quoteright
+%	680,700,160,80,-82,80	2	37	percent
+&	780,610,16,185,-76,87	2	38	ampersand
+'	240,610,0,148,-118,87	2	39	quoteright
 cq	"
-(	260,664,216,201,-46,87	2	0050	-- parenleft
-)	220,664,216,132,63,87	2	0051	-- parenright
-*	420,610,0,109,-89,87	2	0052	-- asterisk
-+	520,426,0,73,-67,73	0	0053	-- plus
-,	220,148,140,43,25,43	0	0054	-- comma
--	280,248,0,104,-19,87	0	0055	-- hyphen
+(	260,664,216,201,-46,87	2	40	parenleft
+)	220,664,216,132,63,87	2	41	parenright
+*	420,610,0,109,-89,87	2	42	asterisk
++	520,426,0,73,-67,73	0	43	plus
+,	220,148,140,43,25,43	0	44	comma
+-	280,248,0,104,-19,87	0	45	hyphen
 hy	"
-.	220,128,14,58,-52,58	0	0056	-- period
-/	340,610,16,168,-24,87	2	0057	-- slash
+.	220,128,14,58,-52,58	0	46	period
+/	340,610,16,168,-24,87	2	47	slash
 sl	"
-0	440,610,16,148,-29,87	2	0060	-- zero
-1	440,610,0,38,9,38	2	0061	-- one
-2	440,610,16,95,33,87	2	0062	-- two
-3	440,610,16,95,49,87	2	0063	-- three
-4	440,610,35,109,-27,87	2	0064	-- four
-5	440,679,16,205,-10,87	2	0065	-- five
-6	440,610,16,166,-40,87	2	0066	-- six
-7	440,645,33,171,-107,87	2	0067	-- seven
-8	440,610,16,139,-15,87	2	0070	-- eight
-9	440,610,16,127,18,87	2	0071	-- nine
-:	260,438,14,86,-48,86	0	0072	-- colon
-;	240,438,140,109,21,87	0	0073	-- semicolon
-<	520,468,0,57,-89,57	0	0074	-- less
-=	520,340,0,73,-67,73	0	0075	-- equal
->	520,468,0,57,-89,57	0	0076	-- greater
-?	380,610,14,125,-100,87	2	0077	-- question
-@	700,610,16,103,-77,87	2	0100	-- at
+0	440,610,16,148,-29,87	2	48	zero
+1	440,610,0,38,9,38	2	49	one
+2	440,610,16,95,33,87	2	50	two
+3	440,610,16,95,49,87	2	51	three
+4	440,610,35,109,-27,87	2	52	four
+5	440,679,16,205,-10,87	2	53	five
+6	440,610,16,166,-40,87	2	54	six
+7	440,645,33,171,-107,87	2	55	seven
+8	440,610,16,139,-15,87	2	56	eight
+9	440,610,16,127,18,87	2	57	nine
+:	260,438,14,86,-48,86	0	58	colon
+;	240,438,140,109,21,87	0	59	semicolon
+<	520,468,0,57,-89,57	0	60	less
+=	520,340,0,73,-67,73	0	61	equal
+>	520,468,0,57,-89,57	0	62	greater
+?	380,610,14,125,-100,87	2	63	question
+@	700,610,16,103,-77,87	2	64	at
 at	"
-A	620,632,16,127,37,87	2	0101	-- A
-B	600,640,6,124,-35,87	2	0102	-- B
-C	520,610,16,161,-43,87	2	0103	-- C
-D	700,640,6,118,-36,87	2	0104	-- D
-E	620,618,12,139,-41,87	2	0105	-- E
-F	580,629,118,263,-70,87	2	0106	-- F
-G	620,610,242,139,-98,87	2	0107	-- G
-H	680,708,16,248,32,87	2	0110	-- H
-I	380,594,0,174,-49,87	2	0111	-- I
-J	400,594,147,188,64,87	2	0112	-- J
-K	660,610,153,234,-3,87	2	0113	-- K
-L	580,610,16,127,-3,87	2	0114	-- L
-M	840,722,16,230,-8,87	2	0115	-- M
-N	700,708,168,265,-35,87	2	0116	-- N
-O	600,610,16,110,-44,87	2	0117	-- O
-P	540,628,0,168,8,87	2	0120	-- P
-Q	600,610,177,225,-34,87	2	0121	-- Q
-R	600,640,168,255,-8,87	2	0122	-- R
-S	460,610,81,148,5,87	2	0123	-- S
-T	500,667,0,294,-13,87	2	0124	-- T
-U	740,617,16,102,-76,87	2	0125	-- U
-V	640,714,16,220,-74,87	2	0126	-- V
-W	880,723,16,216,-44,87	2	0127	-- W
-X	560,610,16,189,80,87	2	0130	-- X
-Y	560,647,168,264,9,87	2	0131	-- Y
-Z	620,624,19,99,8,87	2	0132	-- Z
-[	240,655,207,215,63,87	2	0133	-- bracketleft
+A	620,632,16,127,37,87	2	65	A
+B	600,640,6,124,-35,87	2	66	B
+C	520,610,16,161,-43,87	2	67	C
+D	700,640,6,118,-36,87	2	68	D
+E	620,618,12,139,-41,87	2	69	E
+F	580,629,118,263,-70,87	2	70	F
+G	620,610,242,139,-98,87	2	71	G
+H	680,708,16,248,32,87	2	72	H
+I	380,594,0,174,-49,87	2	73	I
+J	400,594,147,188,64,87	2	74	J
+K	660,610,153,234,-3,87	2	75	K
+L	580,610,16,127,-3,87	2	76	L
+M	840,722,16,230,-8,87	2	77	M
+N	700,708,168,265,-35,87	2	78	N
+O	600,610,16,110,-44,87	2	79	O
+P	540,628,0,168,8,87	2	80	P
+Q	600,610,177,225,-34,87	2	81	Q
+R	600,640,168,255,-8,87	2	82	R
+S	460,610,81,148,5,87	2	83	S
+T	500,667,0,294,-13,87	2	84	T
+U	740,617,16,102,-76,87	2	85	U
+V	640,714,16,220,-74,87	2	86	V
+W	880,723,16,216,-44,87	2	87	W
+X	560,610,16,189,80,87	2	88	X
+Y	560,647,168,264,9,87	2	89	Y
+Z	620,624,19,99,8,87	2	90	Z
+[	240,655,207,215,63,87	2	91	bracketleft
 lB	"
-\	480,610,16,94,-90,87	2	0134	-- backslash
+\	480,610,16,94,-90,87	2	92	backslash
 rs	"
-]	320,655,207,121,77,87	2	0135	-- bracketright
+]	320,655,207,121,77,87	2	93	bracketright
 rB	"
-a^	340,649,0,153,-173,87	2	0136	-- circumflex
+a^	340,649,0,153,-173,87	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	240,610,0,149,-119,87	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	240,610,0,149,-119,87	2	96	quoteleft
 oq	"
-a	420,438,15,115,-42,87	0	0141	-- a
-b	420,714,23,122,-32,87	2	0142	-- b
-c	340,438,14,116,-37,87	0	0143	-- c
-d	440,714,14,261,-52,87	2	0144	-- d
-e	340,438,14,113,-37,87	0	0145	-- e
-f	320,714,314,277,169,87	3	0146	-- f
-g	400,438,314,153,158,87	1	0147	-- g
-h	440,714,14,134,-5,87	2	0150	-- h
-i	240,635,14,151,-50,87	2	0151	-- i
-j	220,635,314,162,162,87	3	0152	-- j
-k	440,714,184,238,-37,87	2	0153	-- k
-l	240,714,14,290,-52,87	2	0154	-- l
-m	620,438,14,134,-36,87	0	0155	-- m
-n	460,438,14,134,-51,87	0	0156	-- n
-o	400,438,14,99,-37,87	0	0157	-- o
-p	440,432,314,94,73,87	1	0160	-- p
-q	400,510,300,140,-37,87	1	0161	-- q
-r	300,438,14,174,-51,87	0	0162	-- r
-s	320,438,14,133,4,87	0	0163	-- s
-t	320,539,14,156,-56,87	2	0164	-- t
-u	460,438,14,118,-52,87	0	0165	-- u
-v	440,488,14,143,-37,87	0	0166	-- v
-w	680,488,14,152,-37,87	0	0167	-- w
-x	420,438,195,219,-20,87	0	0170	-- x
-y	400,438,314,133,74,87	1	0171	-- y
-z	440,445,14,118,24,87	0	0172	-- z
-lC	240,655,207,193,-5,87	2	0173	-- braceleft
+a	420,438,15,115,-42,87	0	97	a
+b	420,714,23,122,-32,87	2	98	b
+c	340,438,14,116,-37,87	0	99	c
+d	440,714,14,261,-52,87	2	100	d
+e	340,438,14,113,-37,87	0	101	e
+f	320,714,314,277,169,87	3	102	f
+g	400,438,314,153,158,87	1	103	g
+h	440,714,14,134,-5,87	2	104	h
+i	240,635,14,151,-50,87	2	105	i
+j	220,635,314,162,162,87	3	106	j
+k	440,714,184,238,-37,87	2	107	k
+l	240,714,14,290,-52,87	2	108	l
+m	620,438,14,134,-36,87	0	109	m
+n	460,438,14,134,-51,87	0	110	n
+o	400,438,14,99,-37,87	0	111	o
+p	440,432,314,94,73,87	1	112	p
+q	400,510,300,140,-37,87	1	113	q
+r	300,438,14,174,-51,87	0	114	r
+s	320,438,14,133,4,87	0	115	s
+t	320,539,14,156,-56,87	2	116	t
+u	460,438,14,118,-52,87	0	117	u
+v	440,488,14,143,-37,87	0	118	v
+w	680,488,14,152,-37,87	0	119	w
+x	420,438,195,219,-20,87	0	120	x
+y	400,438,314,133,74,87	1	121	y
+z	440,445,14,118,24,87	0	122	z
+lC	240,655,207,193,-5,87	2	123	braceleft
 {	"
-ba	520,714,16,0,-270	2	0174	-- bar
+ba	520,714,16,0,-270	2	124	bar
 |	"
-rC	240,655,207,128,60,87	2	0175	-- braceright
+rC	240,655,207,128,60,87	2	125	braceright
 }	"
-a~	440,619,0,132,-193,87	2	0176	-- tilde
+a~	440,619,0,132,-193,87	2	126	tilde
 ~	"
-bq	180,146,121,61,29,61	0	0200	-- quotesinglbase
-Fo	340,414,0,66,-48,66	0	0201	-- guillemotleft
-Fc	380,414,0,45,-67,45	0	0202	-- guillemotright
-bu	600,445,0,0,-178	0	0203	-- bullet
-Fn	440,610,314,192,114,87	3	0204	-- florin
-f/	60,610,16,310,231,87	2	0205	-- fraction
-%0	960,700,160,95,-62,87	2	0206	-- perthousand
-dg	460,610,37,158,-88,87	2	0207	-- dagger
-dd	480,610,59,103,-88,87	2	0210	-- daggerdbl
-en	500,239,0,115,-1,87	0	0211	-- endash
-em	1000,239,0,115,-1,87	0	0212	-- emdash
-fi	520,714,314,135,174,87	3	0214	-- fi
-fl	520,714,314,200,174,87	3	0215	-- fl
-.i	240,438,14,116,-50,87	0	0220	-- dotlessi
-ga	220,659,0,169,-143,87	2	0222	-- grave
-a"	400,659,0,145,-158,87	2	0223	-- hungarumlaut
-a.	220,610,0,158,-186,87	2	0224	-- dotaccent
-ab	440,631,0,111,-203,87	2	0225	-- breve
-ah	340,659,0,184,-204,87	2	0226	-- caron
-ao	300,659,0,166,-190,87	2	0227	-- ring
-ho	280,6,191,3,12,3	0	0230	-- ogonek
-lq	340,610,0,174,-119,87	2	0231	-- quotedblleft
-rq	360,610,0,143,-108,87	2	0232	-- quotedblright
-oe	560,438,14,118,-28,87	0	0233	-- oe
-/l	300,714,14,265,-71,87	2	0234	-- lslash
-Bq	280,146,121,51,64,51	0	0235	-- quotedblbase
-OE	820,610,16,139,-13,87	2	0236	-- OE
-/L	580,610,16,127,1,87	2	0237	-- Lslash
-r!	280,438,186,76,-22,76	0	0241	-- exclamdown
-ct	440,543,134,86,-72,86	2	0242	-- cent
-Po	440,610,52,116,66,87	2	0243	-- sterling
-Cs	440,509,0,84,0,84	0	0244	-- currency
-Ye	440,647,168,223,51,87	2	0245	-- yen
-bb	520,714,16,0,-270	2	0246	-- brokenbar
-sc	420,610,215,144,-3,87	2	0247	-- section
-ad	360,610,0,159,-193,87	2	0250	-- dieresis
-co	740,610,16,73,-87,73	2	0251	-- copyright
-Of	260,610,0,176,-61,87	2	0252	-- ordfeminine
-fo	240,414,0,68,-48,68	0	0253	-- guilsinglleft
-no	520,340,0,73,-67,73	0	0254	-- logicalnot
-\-	520,242,0,73,-67,73	0	0255	-- minus
-rg	740,610,16,73,-87,73	2	0256	-- registered
-a-	440,578,0,75,-172,75	2	0257	-- macron
-de	400,610,0,107,-121,87	2	0260	-- degree
-t+-	520,436,0,73,-67,73	0	0261	-- plusminus
-S2	264,610,0,140,-22,87	2	0262	-- twosuperior
-S3	264,610,0,134,-9,87	2	0263	-- threesuperior
-aa	300,659,0,172,-215,87	2	0264	-- acute
-mc	460,438,314,113,43,87	1	0265	-- mu
-ps	500,594,199,188,-55,87	2	0266	-- paragraph
-pc	220,310,0,71,-89,71	0	0267	-- periodcentered
-ac	300,6,191,0,38	0	0270	-- cedilla
-S1	264,610,0,97,-33,87	2	0271	-- onesuperior
-Om	260,610,0,163,-78,87	2	0272	-- ordmasculine
-fc	260,414,0,56,-56,56	0	0273	-- guilsinglright
-14	660,610,16,92,-6,87	2	0274	-- onequarter
-12	660,610,16,92,-6,87	2	0275	-- onehalf
-34	660,610,16,96,11,87	2	0276	-- threequarters
-r?	400,438,186,37,-32,37	0	0277	-- questiondown
-`A	620,821,16,127,37,87	2	0300	-- Agrave
-'A	620,821,16,132,37,87	2	0301	-- Aacute
-^A	620,821,16,127,37,87	2	0302	-- Acircumflex
-~A	620,771,16,132,37,87	2	0303	-- Atilde
-:A	620,762,16,139,37,87	2	0304	-- Adieresis
-oA	620,831,16,127,37,87	2	0305	-- Aring
-AE	740,594,16,109,71,87	2	0306	-- AE
-,C	520,610,191,161,-43,87	2	0307	-- Ccedilla
-`E	620,821,12,139,-41,87	2	0310	-- Egrave
-'E	620,821,12,139,-41,87	2	0311	-- Eacute
-^E	620,821,12,139,-41,87	2	0312	-- Ecircumflex
-:E	620,762,12,139,-41,87	2	0313	-- Edieresis
-`I	380,821,0,174,-49,87	2	0314	-- Igrave
-'I	380,821,0,202,-49,87	2	0315	-- Iacute
-^I	380,821,0,174,-49,87	2	0316	-- Icircumflex
-:I	380,762,0,189,-49,87	2	0317	-- Idieresis
--D	700,640,6,118,-36,87	2	0320	-- Eth
-~N	700,761,168,265,-35,87	2	0321	-- Ntilde
-`O	600,821,16,110,-44,87	2	0322	-- Ograve
-'O	600,821,16,110,-44,87	2	0323	-- Oacute
-^O	600,821,16,110,-44,87	2	0324	-- Ocircumflex
-~O	600,761,16,110,-44,87	2	0325	-- Otilde
-:O	600,762,16,110,-44,87	2	0326	-- Odieresis
-tmu	520,410,0,57,-83,57	0	0327	-- multiply
-/O	660,672,78,141,-33,87	2	0330	-- Oslash
-`U	740,821,16,102,-76,87	2	0331	-- Ugrave
-'U	740,821,16,102,-76,87	2	0332	-- Uacute
-^U	740,821,16,102,-76,87	2	0333	-- Ucircumflex
-:U	740,762,16,102,-76,87	2	0334	-- Udieresis
-'Y	560,821,168,264,9,87	2	0335	-- Yacute
-TP	540,623,0,157,-2,87	2	0336	-- Thorn
-ss	420,714,314,172,177,87	3	0337	-- germandbls
-`a	420,659,15,115,-42,87	2	0340	-- agrave
-'a	420,659,15,122,-42,87	2	0341	-- aacute
-^a	420,649,15,115,-42,87	2	0342	-- acircumflex
-~a	420,619,15,152,-42,87	2	0343	-- atilde
-:a	420,610,15,115,-42,87	2	0344	-- adieresis
-oa	420,659,15,115,-42,87	2	0345	-- aring
-ae	540,468,14,134,-17,87	0	0346	-- ae
-,c	340,438,191,116,-12,87	0	0347	-- ccedilla
-`e	340,659,14,113,-37,87	2	0350	-- egrave
-'e	340,659,14,172,-37,87	2	0351	-- eacute
-^e	340,649,14,143,-37,87	2	0352	-- ecircumflex
-:e	340,610,14,159,-37,87	2	0353	-- edieresis
-`i	240,659,14,116,-50,87	2	0354	-- igrave
-'i	240,659,14,202,-50,87	2	0355	-- iacute
-^i	240,649,14,173,-50,87	2	0356	-- icircumflex
-:i	240,610,14,179,-50,87	2	0357	-- idieresis
-Sd	400,714,14,172,-37,87	2	0360	-- eth
-~n	460,619,14,134,-51,87	2	0361	-- ntilde
-`o	400,659,14,99,-37,87	2	0362	-- ograve
-'o	400,659,14,132,-37,87	2	0363	-- oacute
-^o	400,649,14,103,-37,87	2	0364	-- ocircumflex
-~o	400,619,14,152,-37,87	2	0365	-- otilde
-:o	400,610,14,129,-37,87	2	0366	-- odieresis
-tdi	520,440,14,73,-67,73	0	0367	-- divide
-/o	440,488,64,150,4,87	0	0370	-- oslash
-`u	460,659,14,118,-52,87	2	0371	-- ugrave
-'u	460,659,14,118,-52,87	2	0372	-- uacute
-^u	460,649,14,118,-52,87	2	0373	-- ucircumflex
-:u	460,610,14,118,-52,87	2	0374	-- udieresis
-'y	400,659,314,133,74,87	3	0375	-- yacute
-Tp	440,714,314,115,88,87	3	0376	-- thorn
-:y	400,610,314,133,74,87	3	0377	-- ydieresis
+bq	180,146,121,61,29,61	0	128	quotesinglbase
+Fo	340,414,0,66,-48,66	0	129	guillemotleft
+Fc	380,414,0,45,-67,45	0	130	guillemotright
+bu	600,445,0,0,-178	0	131	bullet
+Fn	440,610,314,192,114,87	3	132	florin
+f/	60,610,16,310,231,87	2	133	fraction
+%0	960,700,160,95,-62,87	2	134	perthousand
+dg	460,610,37,158,-88,87	2	135	dagger
+dd	480,610,59,103,-88,87	2	136	daggerdbl
+en	500,239,0,115,-1,87	0	137	endash
+em	1000,239,0,115,-1,87	0	138	emdash
+fi	520,714,314,135,174,87	3	140	fi
+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
+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
+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
+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
+r!	280,438,186,76,-22,76	0	161	exclamdown
+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
+sc	420,610,215,144,-3,87	2	167	section
+ad	360,610,0,159,-193,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
+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
+mc	460,438,314,113,43,87	1	181	mu
+ps	500,594,199,188,-55,87	2	182	paragraph
+pc	220,310,0,71,-89,71	0	183	periodcentered
+ac	300,6,191,0,38	0	184	cedilla
+S1	264,610,0,97,-33,87	2	185	onesuperior
+Om	260,610,0,163,-78,87	2	186	ordmasculine
+fc	260,414,0,56,-56,56	0	187	guilsinglright
+14	660,610,16,92,-6,87	2	188	onequarter
+12	660,610,16,92,-6,87	2	189	onehalf
+34	660,610,16,96,11,87	2	190	threequarters
+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
+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
+`E	620,821,12,139,-41,87	2	200	Egrave
+'E	620,821,12,139,-41,87	2	201	Eacute
+^E	620,821,12,139,-41,87	2	202	Ecircumflex
+:E	620,762,12,139,-41,87	2	203	Edieresis
+`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
+-D	700,640,6,118,-36,87	2	208	Eth
+~N	700,761,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,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
+`U	740,821,16,102,-76,87	2	217	Ugrave
+'U	740,821,16,102,-76,87	2	218	Uacute
+^U	740,821,16,102,-76,87	2	219	Ucircumflex
+:U	740,762,16,102,-76,87	2	220	Udieresis
+'Y	560,821,168,264,9,87	2	221	Yacute
+TP	540,623,0,157,-2,87	2	222	Thorn
+ss	420,714,314,172,177,87	3	223	germandbls
+`a	420,659,15,115,-42,87	2	224	agrave
+'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
+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
+`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
+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
+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
+'u	460,659,14,118,-52,87	2	250	uacute
+^u	460,649,14,118,-52,87	2	251	ucircumflex
+: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
+u2026	1000,128,14,0,-74	0	256	ellipsis
diff --git a/contrib/groff/font/devps/ZD b/contrib/groff/font/devps/ZD
index b1d6152..83f30d7 100644
--- a/contrib/groff/font/devps/ZD
+++ b/contrib/groff/font/devps/ZD
@@ -3,191 +3,205 @@ internalname ZapfDingbats
 special
 spacewidth 278
 charset
-space	278	0	0040
----	974,621,0,0,-35	3	0041	-- a1
----	961,611,0,0,-35	3	0042	-- a2
----	974,621,0,0,-35	3	0043	-- a202
----	980,692,0,0,-35	3	0044	-- a3
----	719,566,0,0,-34	3	0045	-- a4
----	789,705,14,0,-35	3	0046	-- a5
----	790,705,14,0,-35	3	0047	-- a119
----	791,705,13,0,-35	3	0050	-- a118
----	690,553,0,0,-35	3	0051	-- a117
----	960,568,0,0,-35	3	0052	-- a11
-rh	939,559,0,0,-35	3	0053	-- a12
----	549,705,11,0,-29	3	0054	-- a13
----	855,632,0,0,-34	3	0055	-- a14
----	911,642,0,0,-35	3	0056	-- a15
----	933,550,0,0,-35	3	0057	-- a16
----	911,642,0,0,-35	3	0060	-- a105
----	945,553,0,0,-35	3	0061	-- a17
----	974,587,0,0,-35	3	0062	-- a18
-OK	755,705,13,0,-34	3	0063	-- a19
----	846,705,14,0,-36	3	0064	-- a20
----	762,692,0,0,-35	3	0065	-- a21
----	761,692,0,0,-35	3	0066	-- a22
----	571,661,68,0,1	3	0067	-- a23
----	677,705,13,0,-36	3	0070	-- a24
----	763,692,0,0,-35	3	0071	-- a25
----	760,692,0,0,-35	3	0072	-- a26
----	759,692,0,0,-35	3	0073	-- a27
----	754,692,0,0,-35	3	0074	-- a28
----	494,692,0,0,-35	3	0075	-- a6
----	552,692,0,0,-35	3	0076	-- a7
----	537,692,0,0,-35	3	0077	-- a8
----	577,596,0,0,-35	3	0100	-- a9
----	692,705,14,0,-35	3	0101	-- a10
----	786,705,14,0,-35	3	0102	-- a29
----	788,705,14,0,-35	3	0103	-- a30
----	788,705,14,0,-35	3	0104	-- a31
----	790,705,14,0,-35	3	0105	-- a32
----	793,705,13,0,-35	3	0106	-- a33
----	794,705,13,0,-35	3	0107	-- a34
----	816,705,14,0,-35	3	0110	-- a35
----	823,705,14,0,-35	3	0111	-- a36
----	789,705,14,0,-35	3	0112	-- a37
----	841,705,14,0,-35	3	0113	-- a38
----	823,705,14,0,-35	3	0114	-- a39
----	833,705,14,0,-35	3	0115	-- a40
----	816,705,13,0,-35	3	0116	-- a41
----	831,705,14,0,-35	3	0117	-- a42
----	923,705,14,0,-35	3	0120	-- a43
----	744,692,0,0,-35	3	0121	-- a44
----	723,692,0,0,-35	3	0122	-- a45
----	749,692,0,0,-35	3	0123	-- a46
----	790,705,14,0,-34	3	0124	-- a47
----	792,705,14,0,-35	3	0125	-- a48
----	695,706,14,0,-35	3	0126	-- a49
----	776,699,6,0,-35	3	0127	-- a50
----	768,699,7,0,-35	3	0130	-- a51
----	792,705,14,0,-35	3	0131	-- a52
----	759,692,0,0,-35	3	0132	-- a53
----	707,704,13,0,-35	3	0133	-- a54
----	708,705,14,0,-35	3	0134	-- a55
----	682,705,14,0,-35	3	0135	-- a56
----	701,705,14,0,-35	3	0136	-- a57
----	826,705,14,0,-35	3	0137	-- a58
----	815,705,14,0,-35	3	0140	-- a59
----	789,705,14,0,-35	3	0141	-- a60
----	789,705,14,0,-35	3	0142	-- a61
----	707,705,14,0,-34	3	0143	-- a62
----	687,692,0,0,-36	3	0144	-- a63
----	696,691,0,0,-35	3	0145	-- a64
----	689,692,0,0,-35	3	0146	-- a65
----	786,705,14,0,-34	3	0147	-- a66
----	787,705,14,0,-35	3	0150	-- a67
----	713,705,14,0,-35	3	0151	-- a68
----	791,705,14,0,-35	3	0152	-- a69
----	785,705,14,0,-36	3	0153	-- a70
----	791,705,14,0,-35	3	0154	-- a71
----	873,705,14,0,-35	3	0155	-- a72
----	761,692,0,0,-35	3	0156	-- a73
----	762,692,0,0,-35	3	0157	-- a74
----	762,692,0,0,-35	3	0160	-- a203
----	759,692,0,0,-35	3	0161	-- a75
----	759,692,0,0,-35	3	0162	-- a204
----	892,705,0,0,-35	3	0163	-- a76
----	892,692,14,0,-35	3	0164	-- a77
----	788,705,14,0,-35	3	0165	-- a78
----	784,705,14,0,-35	3	0166	-- a79
----	438,705,14,0,-35	3	0167	-- a81
----	138,692,0,0,-35	3	0170	-- a82
----	277,692,0,0,-35	3	0171	-- a83
----	415,692,0,0,-35	3	0172	-- a84
----	392,705,0,0,-35	3	0173	-- a97
----	392,705,0,0,-34	3	0174	-- a98
----	668,705,0,0,-35	3	0175	-- a99
----	668,705,0,0,-36	3	0176	-- a100
----	732,806,143,0,-35	3	0241	-- a101
----	544,706,14,0,-56	3	0242	-- a102
----	544,705,14,0,-34	3	0243	-- a103
----	910,651,0,0,-35	3	0244	-- a104
----	667,705,14,0,-35	3	0245	-- a106
----	760,705,14,0,-35	3	0246	-- a107
----	760,569	3	0247	-- a108
----	776,705,0,0,-35	3	0250	-- a112
----	595,705,14,0,-34	3	0251	-- a111
----	694,705,14,0,-35	3	0252	-- a110
----	626,705,0,0,-34	3	0253	-- a109
----	788,705,14,0,-35	3	0254	-- a120
----	788,705,14,0,-35	3	0255	-- a121
----	788,705,14,0,-35	3	0256	-- a122
----	788,705,14,0,-35	3	0257	-- a123
----	788,705,14,0,-35	3	0260	-- a124
----	788,705,14,0,-35	3	0261	-- a125
----	788,705,14,0,-35	3	0262	-- a126
----	788,705,14,0,-35	3	0263	-- a127
----	788,705,14,0,-35	3	0264	-- a128
----	788,705,14,0,-35	3	0265	-- a129
----	788,705,14,0,-35	3	0266	-- a130
----	788,705,14,0,-35	3	0267	-- a131
----	788,705,14,0,-35	3	0270	-- a132
----	788,705,14,0,-35	3	0271	-- a133
----	788,705,14,0,-35	3	0272	-- a134
----	788,705,14,0,-35	3	0273	-- a135
----	788,705,14,0,-35	3	0274	-- a136
----	788,705,14,0,-35	3	0275	-- a137
----	788,705,14,0,-35	3	0276	-- a138
----	788,705,14,0,-35	3	0277	-- a139
----	788,705,14,0,-35	3	0300	-- a140
----	788,705,14,0,-35	3	0301	-- a141
----	788,705,14,0,-35	3	0302	-- a142
----	788,705,14,0,-35	3	0303	-- a143
----	788,705,14,0,-35	3	0304	-- a144
----	788,705,14,0,-35	3	0305	-- a145
----	788,705,14,0,-35	3	0306	-- a146
----	788,705,14,0,-35	3	0307	-- a147
----	788,705,14,0,-35	3	0310	-- a148
----	788,705,14,0,-35	3	0311	-- a149
----	788,705,14,0,-35	3	0312	-- a150
----	788,705,14,0,-35	3	0313	-- a151
----	788,705,14,0,-35	3	0314	-- a152
----	788,705,14,0,-35	3	0315	-- a153
----	788,705,14,0,-35	3	0316	-- a154
----	788,705,14,0,-35	3	0317	-- a155
----	788,705,14,0,-35	3	0320	-- a156
----	788,705,14,0,-35	3	0321	-- a157
----	788,705,14,0,-35	3	0322	-- a158
----	788,705,14,0,-35	3	0323	-- a159
----	894,634,0,0,-35	3	0324	-- a160
----	838,540,0,0,-35	3	0325	-- a161
----	1016,540,0,0,-34	3	0326	-- a163
----	458,820,127,0,-35	3	0327	-- a164
----	748,597,0,0,-35	3	0330	-- a196
----	924,552,0,0,-35	3	0331	-- a165
----	748,597,0,0,-35	3	0332	-- a192
----	918,526,0,0,-35	3	0333	-- a166
----	927,660,0,0,-35	3	0334	-- a167
----	928,562,0,0,-35	3	0335	-- a168
----	928,563,0,0,-35	3	0336	-- a169
----	834,537,0,0,-35	3	0337	-- a170
----	873,599,0,0,-35	3	0340	-- a171
----	828,588,0,0,-35	3	0341	-- a172
----	924,594,0,0,-35	3	0342	-- a173
----	924,594,0,0,-35	3	0343	-- a162
----	917,692,0,0,-35	3	0344	-- a174
----	930,608,0,0,-35	3	0345	-- a175
----	931,608,0,0,-35	3	0346	-- a176
----	463,791,99,0,-35	3	0347	-- a177
----	883,623,0,0,-35	3	0350	-- a178
----	836,648,0,0,-35	3	0351	-- a179
----	836,648,0,0,-35	3	0352	-- a193
----	867,591,0,0,-35	3	0353	-- a180
----	867,591,0,0,-35	3	0354	-- a199
----	696,648,0,0,-35	3	0355	-- a181
----	696,648,0,0,-35	3	0356	-- a200
----	874,619,0,0,-35	3	0357	-- a182
----	874,615,0,0,-35	3	0361	-- a201
----	760,692,0,0,-35	3	0362	-- a183
----	946,533,0,0,-35	3	0363	-- a184
----	771,655,0,0,-34	3	0364	-- a197
----	865,481,0,0,-35	3	0365	-- a185
----	771,655,0,0,-34	3	0366	-- a194
----	888,712,19,0,-34	3	0367	-- a198
----	967,568,0,0,-35	3	0370	-- a186
----	888,712,19,0,-34	3	0371	-- a195
----	831,579,0,0,-35	3	0372	-- a187
----	873,578,0,0,-36	3	0373	-- a188
----	927,542,0,0,-35	3	0374	-- a189
----	970,616,0,0,-35	3	0375	-- a190
----	918,593,0,0,-34	3	0376	-- a191
+space	278	0	32	space
+---	974,621	3	33	a1
+---	961,611	3	34	a2
+---	974,621	3	35	a202
+---	980,692	3	36	a3
+---	719,566	3	37	a4
+---	789,705,14	3	38	a5
+---	790,705,14	3	39	a119
+---	791,705,13	3	40	a118
+---	690,553	3	41	a117
+---	960,568	3	42	a11
+rh	939,559	3	43	a12
+---	549,705,11	3	44	a13
+---	855,632	3	45	a14
+---	911,642	3	46	a15
+---	933,550	3	47	a16
+---	911,642	3	48	a105
+---	945,553	3	49	a17
+---	974,587	3	50	a18
+OK	755,705,13	3	51	a19
+---	846,705,14	3	52	a20
+---	762,692	3	53	a21
+---	761,692	3	54	a22
+---	571,661,68,0,1	3	55	a23
+---	677,705,13	3	56	a24
+---	763,692	3	57	a25
+---	760,692	3	58	a26
+---	759,692	3	59	a27
+---	754,692	3	60	a28
+---	494,692	3	61	a6
+---	552,692	3	62	a7
+---	537,692	3	63	a8
+---	577,596	3	64	a9
+---	692,705,14	3	65	a10
+---	786,705,14	3	66	a29
+---	788,705,14	3	67	a30
+---	788,705,14	3	68	a31
+---	790,705,14	3	69	a32
+---	793,705,13	3	70	a33
+---	794,705,13	3	71	a34
+---	816,705,14	3	72	a35
+---	823,705,14	3	73	a36
+---	789,705,14	3	74	a37
+---	841,705,14	3	75	a38
+---	823,705,14	3	76	a39
+---	833,705,14	3	77	a40
+---	816,705,13	3	78	a41
+---	831,705,14	3	79	a42
+---	923,705,14	3	80	a43
+---	744,692	3	81	a44
+---	723,692	3	82	a45
+---	749,692	3	83	a46
+---	790,705,14	3	84	a47
+---	792,705,14	3	85	a48
+---	695,706,14	3	86	a49
+---	776,699,6	3	87	a50
+---	768,699,7	3	88	a51
+---	792,705,14	3	89	a52
+---	759,692	3	90	a53
+---	707,704,13	3	91	a54
+---	708,705,14	3	92	a55
+---	682,705,14	3	93	a56
+---	701,705,14	3	94	a57
+---	826,705,14	3	95	a58
+---	815,705,14	3	96	a59
+---	789,705,14	3	97	a60
+---	789,705,14	3	98	a61
+---	707,705,14	3	99	a62
+---	687,692	3	100	a63
+---	696,691	3	101	a64
+---	689,692	3	102	a65
+---	786,705,14	3	103	a66
+---	787,705,14	3	104	a67
+---	713,705,14	3	105	a68
+---	791,705,14	3	106	a69
+---	785,705,14	3	107	a70
+---	791,705,14	3	108	a71
+---	873,705,14	3	109	a72
+---	761,692	3	110	a73
+---	762,692	3	111	a74
+---	762,692	3	112	a203
+---	759,692	3	113	a75
+---	759,692	3	114	a204
+---	892,705	3	115	a76
+---	892,692,14	3	116	a77
+---	788,705,14	3	117	a78
+---	784,705,14	3	118	a79
+---	438,705,14	3	119	a81
+---	138,692	3	120	a82
+---	277,692	3	121	a83
+---	415,692	3	122	a84
+---	392,705	3	123	a97
+---	392,705	3	124	a98
+---	668,705	3	125	a99
+---	668,705	3	126	a100
+---	732,806,143	3	161	a101
+---	544,706,14	3	162	a102
+---	544,705,14	3	163	a103
+---	910,651	3	164	a104
+---	667,705,14	3	165	a106
+---	760,705,14	3	166	a107
+---	760,569	3	167	a108
+---	776,705	3	168	a112
+---	595,705,14	3	169	a111
+---	694,705,14	3	170	a110
+---	626,705	3	171	a109
+---	788,705,14	3	172	a120
+---	788,705,14	3	173	a121
+---	788,705,14	3	174	a122
+---	788,705,14	3	175	a123
+---	788,705,14	3	176	a124
+---	788,705,14	3	177	a125
+---	788,705,14	3	178	a126
+---	788,705,14	3	179	a127
+---	788,705,14	3	180	a128
+---	788,705,14	3	181	a129
+---	788,705,14	3	182	a130
+---	788,705,14	3	183	a131
+---	788,705,14	3	184	a132
+---	788,705,14	3	185	a133
+---	788,705,14	3	186	a134
+---	788,705,14	3	187	a135
+---	788,705,14	3	188	a136
+---	788,705,14	3	189	a137
+---	788,705,14	3	190	a138
+---	788,705,14	3	191	a139
+---	788,705,14	3	192	a140
+---	788,705,14	3	193	a141
+---	788,705,14	3	194	a142
+---	788,705,14	3	195	a143
+---	788,705,14	3	196	a144
+---	788,705,14	3	197	a145
+---	788,705,14	3	198	a146
+---	788,705,14	3	199	a147
+---	788,705,14	3	200	a148
+---	788,705,14	3	201	a149
+---	788,705,14	3	202	a150
+---	788,705,14	3	203	a151
+---	788,705,14	3	204	a152
+---	788,705,14	3	205	a153
+---	788,705,14	3	206	a154
+---	788,705,14	3	207	a155
+---	788,705,14	3	208	a156
+---	788,705,14	3	209	a157
+---	788,705,14	3	210	a158
+---	788,705,14	3	211	a159
+---	894,634	3	212	a160
+---	838,540	3	213	a161
+---	1016,540	3	214	a163
+---	458,820,127	3	215	a164
+---	748,597	3	216	a196
+---	924,552	3	217	a165
+---	748,597	3	218	a192
+---	918,526	3	219	a166
+---	927,660	3	220	a167
+---	928,562	3	221	a168
+---	928,563	3	222	a169
+---	834,537	3	223	a170
+---	873,599	3	224	a171
+---	828,588	3	225	a172
+---	924,594	3	226	a173
+---	924,594	3	227	a162
+---	917,692	3	228	a174
+---	930,608	3	229	a175
+---	931,608	3	230	a176
+---	463,791,99	3	231	a177
+---	883,623	3	232	a178
+---	836,648	3	233	a179
+---	836,648	3	234	a193
+---	867,591	3	235	a180
+---	867,591	3	236	a199
+---	696,648	3	237	a181
+---	696,648	3	238	a200
+---	874,619	3	239	a182
+---	874,615	3	241	a201
+---	760,692	3	242	a183
+---	946,533	3	243	a184
+---	771,655	3	244	a197
+---	865,481	3	245	a185
+---	771,655	3	246	a194
+---	888,712,19	3	247	a198
+---	967,568	3	248	a186
+---	888,712,19	3	249	a195
+---	831,579	3	250	a187
+---	873,578	3	251	a188
+---	927,542	3	252	a189
+---	970,616	3	253	a190
+---	918,593	3	254	a191
+---	509,692	3	256	a85
+---	410,692	3	257	a86
+---	234,705,14	3	258	a87
+---	234,705,14	3	259	a88
+---	390,705,14	3	260	a89
+---	509,692	3	261	a205
+---	410,692	3	262	a206
+---	390,705,14	3	263	a90
+---	276,692	3	264	a91
+---	276,692	3	265	a92
+---	317,692	3	266	a93
+---	317,692	3	267	a94
+---	334,692	3	268	a95
+---	334,692	3	269	a96
diff --git a/contrib/groff/font/devps/ZDR b/contrib/groff/font/devps/ZDR
index a6ca5fe..ef2ae44 100644
--- a/contrib/groff/font/devps/ZDR
+++ b/contrib/groff/font/devps/ZDR
@@ -3,191 +3,205 @@ internalname ZapfDingbats-Reverse
 special
 spacewidth 278
 charset
-space	278	0	0040
----	974,621,0,0,-35	3	0041	-- a1
----	961,611,0,0,-35	3	0042	-- a2
----	974,621,0,0,-35	3	0043	-- a202
----	980,692,0,0,-35	3	0044	-- a3
----	719,566,0,0,-34	3	0045	-- a4
----	789,705,14,0,-35	3	0046	-- a5
----	790,705,14,0,-35	3	0047	-- a119
----	791,705,13,0,-35	3	0050	-- a118
----	690,553,0,0,-35	3	0051	-- a117
----	960,568,0,0,-35	3	0052	-- a11
-lh	939,559,0,0,-35	3	0053	-- a12
----	549,705,11,0,-29	3	0054	-- a13
----	855,632,0,0,-34	3	0055	-- a14
----	911,642,0,0,-35	3	0056	-- a15
----	933,550,0,0,-35	3	0057	-- a16
----	911,642,0,0,-35	3	0060	-- a105
----	945,553,0,0,-35	3	0061	-- a17
----	974,587,0,0,-35	3	0062	-- a18
----	755,705,13,0,-34	3	0063	-- a19
----	846,705,14,0,-36	3	0064	-- a20
----	762,692,0,0,-35	3	0065	-- a21
----	761,692,0,0,-35	3	0066	-- a22
----	571,661,68,0,1	3	0067	-- a23
----	677,705,13,0,-36	3	0070	-- a24
----	763,692,0,0,-35	3	0071	-- a25
----	760,692,0,0,-35	3	0072	-- a26
----	759,692,0,0,-35	3	0073	-- a27
----	754,692,0,0,-35	3	0074	-- a28
----	494,692,0,0,-35	3	0075	-- a6
----	552,692,0,0,-35	3	0076	-- a7
----	537,692,0,0,-35	3	0077	-- a8
----	577,596,0,0,-35	3	0100	-- a9
----	692,705,14,0,-35	3	0101	-- a10
----	786,705,14,0,-35	3	0102	-- a29
----	788,705,14,0,-35	3	0103	-- a30
----	788,705,14,0,-35	3	0104	-- a31
----	790,705,14,0,-35	3	0105	-- a32
----	793,705,13,0,-35	3	0106	-- a33
----	794,705,13,0,-35	3	0107	-- a34
----	816,705,14,0,-35	3	0110	-- a35
----	823,705,14,0,-35	3	0111	-- a36
----	789,705,14,0,-35	3	0112	-- a37
----	841,705,14,0,-35	3	0113	-- a38
----	823,705,14,0,-35	3	0114	-- a39
----	833,705,14,0,-35	3	0115	-- a40
----	816,705,13,0,-35	3	0116	-- a41
----	831,705,14,0,-35	3	0117	-- a42
----	923,705,14,0,-35	3	0120	-- a43
----	744,692,0,0,-35	3	0121	-- a44
----	723,692,0,0,-35	3	0122	-- a45
----	749,692,0,0,-35	3	0123	-- a46
----	790,705,14,0,-34	3	0124	-- a47
----	792,705,14,0,-35	3	0125	-- a48
----	695,706,14,0,-35	3	0126	-- a49
----	776,699,6,0,-35	3	0127	-- a50
----	768,699,7,0,-35	3	0130	-- a51
----	792,705,14,0,-35	3	0131	-- a52
----	759,692,0,0,-35	3	0132	-- a53
----	707,704,13,0,-35	3	0133	-- a54
----	708,705,14,0,-35	3	0134	-- a55
----	682,705,14,0,-35	3	0135	-- a56
----	701,705,14,0,-35	3	0136	-- a57
----	826,705,14,0,-35	3	0137	-- a58
----	815,705,14,0,-35	3	0140	-- a59
----	789,705,14,0,-35	3	0141	-- a60
----	789,705,14,0,-35	3	0142	-- a61
----	707,705,14,0,-34	3	0143	-- a62
----	687,692,0,0,-36	3	0144	-- a63
----	696,691,0,0,-35	3	0145	-- a64
----	689,692,0,0,-35	3	0146	-- a65
----	786,705,14,0,-34	3	0147	-- a66
----	787,705,14,0,-35	3	0150	-- a67
----	713,705,14,0,-35	3	0151	-- a68
----	791,705,14,0,-35	3	0152	-- a69
----	785,705,14,0,-36	3	0153	-- a70
----	791,705,14,0,-35	3	0154	-- a71
----	873,705,14,0,-35	3	0155	-- a72
----	761,692,0,0,-35	3	0156	-- a73
----	762,692,0,0,-35	3	0157	-- a74
----	762,692,0,0,-35	3	0160	-- a203
----	759,692,0,0,-35	3	0161	-- a75
----	759,692,0,0,-35	3	0162	-- a204
----	892,705,0,0,-35	3	0163	-- a76
----	892,692,14,0,-35	3	0164	-- a77
----	788,705,14,0,-35	3	0165	-- a78
----	784,705,14,0,-35	3	0166	-- a79
----	438,705,14,0,-35	3	0167	-- a81
----	138,692,0,0,-35	3	0170	-- a82
----	277,692,0,0,-35	3	0171	-- a83
----	415,692,0,0,-35	3	0172	-- a84
----	392,705,0,0,-35	3	0173	-- a97
----	392,705,0,0,-34	3	0174	-- a98
----	668,705,0,0,-35	3	0175	-- a99
----	668,705,0,0,-36	3	0176	-- a100
----	732,806,143,0,-35	3	0241	-- a101
----	544,706,14,0,-56	3	0242	-- a102
----	544,705,14,0,-34	3	0243	-- a103
----	910,651,0,0,-35	3	0244	-- a104
----	667,705,14,0,-35	3	0245	-- a106
----	760,705,14,0,-35	3	0246	-- a107
----	760,569	3	0247	-- a108
----	776,705,0,0,-35	3	0250	-- a112
----	595,705,14,0,-34	3	0251	-- a111
----	694,705,14,0,-35	3	0252	-- a110
----	626,705,0,0,-34	3	0253	-- a109
----	788,705,14,0,-35	3	0254	-- a120
----	788,705,14,0,-35	3	0255	-- a121
----	788,705,14,0,-35	3	0256	-- a122
----	788,705,14,0,-35	3	0257	-- a123
----	788,705,14,0,-35	3	0260	-- a124
----	788,705,14,0,-35	3	0261	-- a125
----	788,705,14,0,-35	3	0262	-- a126
----	788,705,14,0,-35	3	0263	-- a127
----	788,705,14,0,-35	3	0264	-- a128
----	788,705,14,0,-35	3	0265	-- a129
----	788,705,14,0,-35	3	0266	-- a130
----	788,705,14,0,-35	3	0267	-- a131
----	788,705,14,0,-35	3	0270	-- a132
----	788,705,14,0,-35	3	0271	-- a133
----	788,705,14,0,-35	3	0272	-- a134
----	788,705,14,0,-35	3	0273	-- a135
----	788,705,14,0,-35	3	0274	-- a136
----	788,705,14,0,-35	3	0275	-- a137
----	788,705,14,0,-35	3	0276	-- a138
----	788,705,14,0,-35	3	0277	-- a139
----	788,705,14,0,-35	3	0300	-- a140
----	788,705,14,0,-35	3	0301	-- a141
----	788,705,14,0,-35	3	0302	-- a142
----	788,705,14,0,-35	3	0303	-- a143
----	788,705,14,0,-35	3	0304	-- a144
----	788,705,14,0,-35	3	0305	-- a145
----	788,705,14,0,-35	3	0306	-- a146
----	788,705,14,0,-35	3	0307	-- a147
----	788,705,14,0,-35	3	0310	-- a148
----	788,705,14,0,-35	3	0311	-- a149
----	788,705,14,0,-35	3	0312	-- a150
----	788,705,14,0,-35	3	0313	-- a151
----	788,705,14,0,-35	3	0314	-- a152
----	788,705,14,0,-35	3	0315	-- a153
----	788,705,14,0,-35	3	0316	-- a154
----	788,705,14,0,-35	3	0317	-- a155
----	788,705,14,0,-35	3	0320	-- a156
----	788,705,14,0,-35	3	0321	-- a157
----	788,705,14,0,-35	3	0322	-- a158
----	788,705,14,0,-35	3	0323	-- a159
----	894,634,0,0,-35	3	0324	-- a160
----	838,540,0,0,-35	3	0325	-- a161
----	1016,540,0,0,-34	3	0326	-- a163
----	458,820,127,0,-35	3	0327	-- a164
----	748,597,0,0,-35	3	0330	-- a196
----	924,552,0,0,-35	3	0331	-- a165
----	748,597,0,0,-35	3	0332	-- a192
----	918,526,0,0,-35	3	0333	-- a166
----	927,660,0,0,-35	3	0334	-- a167
----	928,562,0,0,-35	3	0335	-- a168
----	928,563,0,0,-35	3	0336	-- a169
----	834,537,0,0,-35	3	0337	-- a170
----	873,599,0,0,-35	3	0340	-- a171
----	828,588,0,0,-35	3	0341	-- a172
----	924,594,0,0,-35	3	0342	-- a173
----	924,594,0,0,-35	3	0343	-- a162
----	917,692,0,0,-35	3	0344	-- a174
----	930,608,0,0,-35	3	0345	-- a175
----	931,608,0,0,-35	3	0346	-- a176
----	463,791,99,0,-35	3	0347	-- a177
----	883,623,0,0,-35	3	0350	-- a178
----	836,648,0,0,-35	3	0351	-- a179
----	836,648,0,0,-35	3	0352	-- a193
----	867,591,0,0,-35	3	0353	-- a180
----	867,591,0,0,-35	3	0354	-- a199
----	696,648,0,0,-35	3	0355	-- a181
----	696,648,0,0,-35	3	0356	-- a200
----	874,619,0,0,-35	3	0357	-- a182
----	874,615,0,0,-35	3	0361	-- a201
----	760,692,0,0,-35	3	0362	-- a183
----	946,533,0,0,-35	3	0363	-- a184
----	771,655,0,0,-34	3	0364	-- a197
----	865,481,0,0,-35	3	0365	-- a185
----	771,655,0,0,-34	3	0366	-- a194
----	888,712,19,0,-34	3	0367	-- a198
----	967,568,0,0,-35	3	0370	-- a186
----	888,712,19,0,-34	3	0371	-- a195
----	831,579,0,0,-35	3	0372	-- a187
----	873,578,0,0,-36	3	0373	-- a188
----	927,542,0,0,-35	3	0374	-- a189
----	970,616,0,0,-35	3	0375	-- a190
----	918,593,0,0,-34	3	0376	-- a191
+space	278	0	32	space
+---	974,621	3	33	a1
+---	961,611	3	34	a2
+---	974,621	3	35	a202
+---	980,692	3	36	a3
+---	719,566	3	37	a4
+---	789,705,14	3	38	a5
+---	790,705,14	3	39	a119
+---	791,705,13	3	40	a118
+---	690,553	3	41	a117
+---	960,568	3	42	a11
+lh	939,559	3	43	a12
+---	549,705,11	3	44	a13
+---	855,632	3	45	a14
+---	911,642	3	46	a15
+---	933,550	3	47	a16
+---	911,642	3	48	a105
+---	945,553	3	49	a17
+---	974,587	3	50	a18
+---	755,705,13	3	51	a19
+---	846,705,14	3	52	a20
+---	762,692	3	53	a21
+---	761,692	3	54	a22
+---	571,661,68,0,1	3	55	a23
+---	677,705,13	3	56	a24
+---	763,692	3	57	a25
+---	760,692	3	58	a26
+---	759,692	3	59	a27
+---	754,692	3	60	a28
+---	494,692	3	61	a6
+---	552,692	3	62	a7
+---	537,692	3	63	a8
+---	577,596	3	64	a9
+---	692,705,14	3	65	a10
+---	786,705,14	3	66	a29
+---	788,705,14	3	67	a30
+---	788,705,14	3	68	a31
+---	790,705,14	3	69	a32
+---	793,705,13	3	70	a33
+---	794,705,13	3	71	a34
+---	816,705,14	3	72	a35
+---	823,705,14	3	73	a36
+---	789,705,14	3	74	a37
+---	841,705,14	3	75	a38
+---	823,705,14	3	76	a39
+---	833,705,14	3	77	a40
+---	816,705,13	3	78	a41
+---	831,705,14	3	79	a42
+---	923,705,14	3	80	a43
+---	744,692	3	81	a44
+---	723,692	3	82	a45
+---	749,692	3	83	a46
+---	790,705,14	3	84	a47
+---	792,705,14	3	85	a48
+---	695,706,14	3	86	a49
+---	776,699,6	3	87	a50
+---	768,699,7	3	88	a51
+---	792,705,14	3	89	a52
+---	759,692	3	90	a53
+---	707,704,13	3	91	a54
+---	708,705,14	3	92	a55
+---	682,705,14	3	93	a56
+---	701,705,14	3	94	a57
+---	826,705,14	3	95	a58
+---	815,705,14	3	96	a59
+---	789,705,14	3	97	a60
+---	789,705,14	3	98	a61
+---	707,705,14	3	99	a62
+---	687,692	3	100	a63
+---	696,691	3	101	a64
+---	689,692	3	102	a65
+---	786,705,14	3	103	a66
+---	787,705,14	3	104	a67
+---	713,705,14	3	105	a68
+---	791,705,14	3	106	a69
+---	785,705,14	3	107	a70
+---	791,705,14	3	108	a71
+---	873,705,14	3	109	a72
+---	761,692	3	110	a73
+---	762,692	3	111	a74
+---	762,692	3	112	a203
+---	759,692	3	113	a75
+---	759,692	3	114	a204
+---	892,705	3	115	a76
+---	892,692,14	3	116	a77
+---	788,705,14	3	117	a78
+---	784,705,14	3	118	a79
+---	438,705,14	3	119	a81
+---	138,692	3	120	a82
+---	277,692	3	121	a83
+---	415,692	3	122	a84
+---	392,705	3	123	a97
+---	392,705	3	124	a98
+---	668,705	3	125	a99
+---	668,705	3	126	a100
+---	732,806,143	3	161	a101
+---	544,706,14	3	162	a102
+---	544,705,14	3	163	a103
+---	910,651	3	164	a104
+---	667,705,14	3	165	a106
+---	760,705,14	3	166	a107
+---	760,569	3	167	a108
+---	776,705	3	168	a112
+---	595,705,14	3	169	a111
+---	694,705,14	3	170	a110
+---	626,705	3	171	a109
+---	788,705,14	3	172	a120
+---	788,705,14	3	173	a121
+---	788,705,14	3	174	a122
+---	788,705,14	3	175	a123
+---	788,705,14	3	176	a124
+---	788,705,14	3	177	a125
+---	788,705,14	3	178	a126
+---	788,705,14	3	179	a127
+---	788,705,14	3	180	a128
+---	788,705,14	3	181	a129
+---	788,705,14	3	182	a130
+---	788,705,14	3	183	a131
+---	788,705,14	3	184	a132
+---	788,705,14	3	185	a133
+---	788,705,14	3	186	a134
+---	788,705,14	3	187	a135
+---	788,705,14	3	188	a136
+---	788,705,14	3	189	a137
+---	788,705,14	3	190	a138
+---	788,705,14	3	191	a139
+---	788,705,14	3	192	a140
+---	788,705,14	3	193	a141
+---	788,705,14	3	194	a142
+---	788,705,14	3	195	a143
+---	788,705,14	3	196	a144
+---	788,705,14	3	197	a145
+---	788,705,14	3	198	a146
+---	788,705,14	3	199	a147
+---	788,705,14	3	200	a148
+---	788,705,14	3	201	a149
+---	788,705,14	3	202	a150
+---	788,705,14	3	203	a151
+---	788,705,14	3	204	a152
+---	788,705,14	3	205	a153
+---	788,705,14	3	206	a154
+---	788,705,14	3	207	a155
+---	788,705,14	3	208	a156
+---	788,705,14	3	209	a157
+---	788,705,14	3	210	a158
+---	788,705,14	3	211	a159
+---	894,634	3	212	a160
+---	838,540	3	213	a161
+---	1016,540	3	214	a163
+---	458,820,127	3	215	a164
+---	748,597	3	216	a196
+---	924,552	3	217	a165
+---	748,597	3	218	a192
+---	918,526	3	219	a166
+---	927,660	3	220	a167
+---	928,562	3	221	a168
+---	928,563	3	222	a169
+---	834,537	3	223	a170
+---	873,599	3	224	a171
+---	828,588	3	225	a172
+---	924,594	3	226	a173
+---	924,594	3	227	a162
+---	917,692	3	228	a174
+---	930,608	3	229	a175
+---	931,608	3	230	a176
+---	463,791,99	3	231	a177
+---	883,623	3	232	a178
+---	836,648	3	233	a179
+---	836,648	3	234	a193
+---	867,591	3	235	a180
+---	867,591	3	236	a199
+---	696,648	3	237	a181
+---	696,648	3	238	a200
+---	874,619	3	239	a182
+---	874,615	3	241	a201
+---	760,692	3	242	a183
+---	946,533	3	243	a184
+---	771,655	3	244	a197
+---	865,481	3	245	a185
+---	771,655	3	246	a194
+---	888,712,19	3	247	a198
+---	967,568	3	248	a186
+---	888,712,19	3	249	a195
+---	831,579	3	250	a187
+---	873,578	3	251	a188
+---	927,542	3	252	a189
+---	970,616	3	253	a190
+---	918,593	3	254	a191
+---	509,692	3	256	a85
+---	410,692	3	257	a86
+---	234,705,14	3	258	a87
+---	234,705,14	3	259	a88
+---	390,705,14	3	260	a89
+---	509,692	3	261	a205
+---	410,692	3	262	a206
+---	390,705,14	3	263	a90
+---	276,692	3	264	a91
+---	276,692	3	265	a92
+---	317,692	3	266	a93
+---	317,692	3	267	a94
+---	334,692	3	268	a95
+---	334,692	3	269	a96
diff --git a/contrib/groff/font/devps/download b/contrib/groff/font/devps/download
index b98885c..3f77716 100644
--- a/contrib/groff/font/devps/download
+++ b/contrib/groff/font/devps/download
@@ -3,3 +3,4 @@
 
 Symbol-Slanted		symbolsl.pfa
 ZapfDingbats-Reverse	zapfdr.pfa
+FreeEuro		freeeuro.pfa
diff --git a/contrib/groff/font/devps/freeeuro.afm b/contrib/groff/font/devps/freeeuro.afm
new file mode 100644
index 0000000..1893308
--- /dev/null
+++ b/contrib/groff/font/devps/freeeuro.afm
@@ -0,0 +1,34 @@
+StartFontMetrics 2.0
+Comment Generated by pfaedit
+Comment Creation Date: Sat Dec  7 00:17:28 2002
+FontName FreeEuro
+FullName FreeEuro
+FamilyName FreeEuro
+Weight Medium
+Notice (Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); the serif shapes are based on the Omega fonts created by Yannis Haralambous.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox 4 -23 903 710
+StartCharMetrics 16
+C 0 ; WX 750 ; N Euro.symbol ; B 32 -12 718 685 ;
+C 1 ; WX 750 ; N Euro.symbol.bold ; B 26 -12 724 685 ;
+C 2 ; WX 750 ; N Euro.symbol.slanted ; B 85 -12 842 685 ;
+C 3 ; WX 750 ; N Euro.symbol.bold.slanted ; B 73 -12 850 685 ;
+C 4 ; WX 741 ; N Euro.serif ; B 34 -14 707 676 ;
+C 5 ; WX 800 ; N Euro.serif.bold ; B 45 -19 767 691 ;
+C 6 ; WX 734 ; N Euro.serif.italic ; B 66 -18 745 666 ;
+C 7 ; WX 800 ; N Euro.serif.bold.italic ; B 17 -19 808 691 ;
+C 8 ; WX 756 ; N Euro.sansserif ; B 38 -23 731 709 ;
+C 9 ; WX 796 ; N Euro.sansserif.bold ; B 36 -22 763 710 ;
+C 10 ; WX 756 ; N Euro.sansserif.slanted ; B 86 -23 862 709 ;
+C 11 ; WX 796 ; N Euro.sansserif.bold.slanted ; B 82 -22 903 710 ;
+C 12 ; WX 600 ; N Euro.mono ; B 11 -16 534 576 ;
+C 13 ; WX 600 ; N Euro.mono.bold ; B 4 -14 539 597 ;
+C 14 ; WX 600 ; N Euro.mono.slanted ; B 61 -16 631 576 ;
+C 15 ; WX 600 ; N Euro.mono.bold.slanted ; B 54 -14 643 597 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/contrib/groff/font/devps/freeeuro.pfa b/contrib/groff/font/devps/freeeuro.pfa
new file mode 100644
index 0000000..1891d4f
--- /dev/null
+++ b/contrib/groff/font/devps/freeeuro.pfa
@@ -0,0 +1,316 @@
+%!PS-AdobeFont-1.0: FreeEuro 001.000
+%%Title: FreeEuro
+%%CreationDate: Sat Dec  7 00:17:28 2002
+%%Creator: cjk
+%%DocumentSuppliedResources: font FreeEuro
+% Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); th
+% Generated by PfaEdit 1.0 (http://pfaedit.sf.net/)
+%%EndComments
+FontDirectory/FreeEuro known{/FreeEuro findfont dup/UniqueID known{dup
+/UniqueID get 4214375 eq exch/FontType get 1 eq and}{pop false}ifelse
+{save true}{false}ifelse}{false}ifelse
+11 dict begin
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def
+/FontName /FreeEuro def
+/FontBBox [4 -23 903 710 ]readonly def
+/UniqueID 4214375 def
+/PaintType 0 def
+/FontInfo 10 dict dup begin
+ /version (001.000) readonly def
+ /Notice (Created by Werner Lemberg with PfaEdit 1.0 \050http://pfaedit.sf.net\051; the serif shapes are based on the Omega fonts created by Yannis Haralambous.) readonly def
+ /FullName (FreeEuro) readonly def
+ /FamilyName (FreeEuro) readonly def
+ /Weight (Medium) readonly def
+ /FSType 12 def
+ /ItalicAngle 0 def
+ /isFixedPitch false def
+ /UnderlinePosition -100 def
+ /UnderlineThickness 50 def
+end readonly def
+/Encoding 256 array
+ 0 1 255 { 1 index exch /.notdef put} for
+dup 0/Euro.symbol put
+dup 1/Euro.symbol.bold put
+dup 2/Euro.symbol.slanted put
+dup 3/Euro.symbol.bold.slanted put
+dup 4/Euro.serif put
+dup 5/Euro.serif.bold put
+dup 6/Euro.serif.italic put
+dup 7/Euro.serif.bold.italic put
+dup 8/Euro.sansserif put
+dup 9/Euro.sansserif.bold put
+dup 10/Euro.sansserif.slanted put
+dup 11/Euro.sansserif.bold.slanted put
+dup 12/Euro.mono put
+dup 13/Euro.mono.bold put
+dup 14/Euro.mono.slanted put
+dup 15/Euro.mono.bold.slanted put
+readonly def
+currentdict end
+currentfile eexec
+743F8413F3636CA85A9FFEFB50B4BB27302A5F6C876586CCC1670A7EF5521E6ADE15AAB4
+DD2DDDB83735311FC63DB80D2C96AECFA05BB67F865EA35934B4B79A203A8DD489B09C79
+FF6EB9DBCFD889C3E73F8C94BC342AF671D6F688870A62EE1A0DF216E150FFEC64A8C2B7
+509AD05C011599C1AD84E6C4B668E07EA219BD72663D8AF4CA8EC8E23AA90DE90BE940C6
+6DB849CEDB3B64961365A7CCE47F4FC9E30FDEE4B14B90C2E0D8C344EBC974EABF417B3D
+28251A78ACEE2BFC4212B1E3E9C7EBC3262821EE98E538713C64DF0BC13C19337B63F916
+071CB6A5AC8BFC2DC3788EFE6757CBCB8F6C6B0964E5B8B64E298260DCF69D22544C4C9A
+AAB2694F2BC33A988936E3419205B0776C4F4C10DA085BB58EDB9040578A7C542326FA48
+21346944DDE5011ED6C593867701528ADFAC1A81310F107E53D7E80D380AB29406EC81A6
+B1E3AB7A256AB446730F845C2AE0A9E5BC7D1B95E98239326BEE43352A8CBAA2938ABC8F
+CA71A312A4CA623CE886F872E8BB8DEC0FE2DD61157735BE411D22655E7F6B32B7F17F06
+3F9D197C0A6DC6D751E75EC06CF908DD78ABDCDC462D74FB774644B8C65A3652BE990BEA
+3DCA0E713CF0F97262C55AF252E7A5CEB5F8F1614565FF088A38106F7AC63CE031F3D290
+DC08D216C170295D553776062AC3801F18D2F1D5F5CBD4A70659E299DE13D4D9A12F39BA
+F4A51643F0677019235AC25DC2B29169D38308F2170A1AA0FDCC59EA2DE35ECB2E59AEF4
+26712D65FC6E009D511502BAB674960650F7E863E287FC366F03EA9FBCC7E725239D121A
+A8E7049E59D220D39D790DC7AD4C38E1738DD4D7DDA27071E79360B636071004FE9DD730
+A07E015588BAF90E19ADB3601854DB4F1E60D1739C7012FBA34FFB67C2E46A0BA81897B9
+52B9B58EBF3316F6CDA6F86B9229B6D097AF9F9D4A721CE75AED8898DD2A42E1776EDDAB
+466F2587F72BCC3BE89B1D130C9E7CA61CA17BF0C2C3F83DD310DC3C56955D9ADE4956A6
+CFB4DBCEE8FA354C27EE57ACF334C0E91BF7952EB7E3D4E452880C5F2BF9ACF9BB58FA39
+9F0F0AE89DEBC053B6EEBD52A6330BC1F0BE0CFD13E1EB04803407CE40EF22585405F487
+C2BE46742F3224F33103A0B171F1677174E7A8E655F0CA9B111C69433F5DBDB36948C7FE
+0D9099AD8FBFDEB70AAF63ABE825A828B29E7166B23359730147748F9B6F38F29503D9F8
+DA5AABDEE13F5E4DE80BCCD9200FC2207C26E99BDF0A3F8200C0FAE266D7F136B673B0BB
+93C6E76EEA685EA6383F3E62BF3F55FE3DB8180EA998FC892856D82B86AE02E44D1938E8
+1D4F2E63716B311DEB6E1D3DD2049A3EE6D68965EDCC4FF457A92F2E47C432608A1161D9
+7AD9008EBC54787C6E5163D49019CCA728B50ED47B576B733936DD31311B5734B98A3F92
+8B79D6EA5F2C0228D14A087491CBA8C0DD37C92FB93B545239D8A776664B74D081E15BAD
+3F44B162DC2ABCF7D44656E67BB00AF2D7FA83D8C94F636D4ABC7F722B84D6B31D5E1AA5
+8B565C02C041873F155C1C0F4CEEE19D9B9D129FCF4A6D530AEC02EE8A003E529CB72865
+5352A44F12DB9108A413C974535D645719357AA5B40B092C237C758DB720DBC2CA88614C
+4B78209A7917C2409C7F6754D0FC14B3FF2EA76340158F8CE8AB6B6BC084BDAB16D75442
+0F879F39C072EDCA91AB38113E3E5E5587750D1EE53342924203890EA97A6081894BBC01
+BB8331687ED0FD1D0AECE0833B7C8ED7C502AFA836130061A6580673E2B2D2AD5427033E
+FF14BF2118EDE74F495358571A69778502693C47F5361EEE27958AF7DC1B8193A1CE5DD0
+6F98F56A7DBB0786DBD6DDF121B6328C97E48AA189FC5AF35D9809A1D4E859F3C2C36DF6
+CE2E3A5D1E07BDC25F95BE1E8E4351D14BE6BEC66004FFD619CAAD555330C0853DEA3E47
+5D346A924D14F4F2964CF56D1520BF4B49DD1AB6629BD1CAAA43AC18CA12E420863C4F02
+29AAF36D75DCBBBA34AAF0D802098F411CCBF9527EFD06B42DB0D7A33B7CA8AB95A11F93
+56A1A905E4740572CAB4CF683522B62224A251964B1DD39EC873B0F79138414B3B1429F4
+B89618B94C0651F6CAA8017EB3407C8D2CBF2F01C75081CC580D3C6821351B4BE90213CD
+0010D0D66050F98D5365E34E6B2ED87AFBE756B98D470D2DF72E5CA7D8FA5AC997A27472
+CF1D2F9B00124CE73F4118811A33158A53ABA3F9A50BE3BE4D99E771EEABC64299780F7D
+F716A28E356A707F6D356093E82BAF0F7B48029A264FF00FD9CA6BE5FC5567E0E165726F
+0CEF4D14BF7A3C06C41035CC24D2BB27D910595080CD1FD7E188CF3B5725CF2418C55F42
+050C24F59F845A2AE8A774AA2DE18C7D46A148FB94512E85EEF1B17FFBF7419337D4F839
+4C7DFF5AA3A9C15A0D4CC3057B01F76DA752C2D1D504EE2EFB864ABDFC20EDAB64CDE513
+40166400E4A234DF428B83BB3EC5047BA10412905C0F4460496B763C22C79131C3267B6C
+39C009CF01853FC39C8C350E86279F116F00E40E1A4016004B904B7462BE236336D197E9
+8E93C9890F942433398E541A32EAC543620BDD57D39BBF6869E0E30B02E871A6ECBC2FBE
+1668ADC19FFD974B9282E96F55EA3C2E57D8758CB55469B67C5E3D1EB2FCD97B014DD592
+A5FF102CC98BDB42AD0A8D151D816C621C32459E74C422C39FDC7F5BF261804DEDAA856C
+8768DEB3FFF8B6970B6175A5BEB048FAA910650E865E16FF6672ADE59FB29D16EB104B90
+3F912AF4107F4BD9076B90D21B1E11A940BAD3A99C66D78F3CE377940DBCBB646B4E320E
+C2F9CAFA016708BCFDCEED11F528B4641A0C38FD220A9A991D198542CD7287671DBC7764
+DEAD19E775E1B88F13B9935A022ADD244F080CC29C6C6238E60BDF7FD339D97CEEA33A3C
+DA86A2DB8D2A02C1A6330F28759BB47E41916295EC645275A9736BD4BC738839B3EB13FC
+3E8E085DA24F6DC3B5DBC270D2AF741AD70690172FAE865C252AA7A131D196DA287755EB
+5A1E0E8AAE93EB40B84AD249FF8F7C947ABE3B3A7D7DB21AAB547EAFF14DF357C95E24BF
+72922C80ECE27FB6BC2E6A355A4EE321FD3C72C57D89779D81EA394E4C2050FB173A12B5
+02140F8CDC659EC2B5A6D14E604A4D4002218BAEE8FF000CB4E9BA22B0A2871AED1D46B6
+FC72054ACE8AF56297F688AB383BBDC7A90F4466D44F35A58D21913B1560E8B7DF6CD686
+38D872330412E04014B081CF280A64DB4888538B401FDC739457482B83CFE87DF74336D8
+535B124F600EBB34BE727C3BC5E289D141716BAF510A6551E5EA6BA43E770211B80853CB
+0435C0F67E8A857788EEBAF47394F62328A493D44B4B2DC33BB8C748EE82F6866C424DFD
+93D62BA22A8F4D30E976FB9FAE45F0D7F93FDFF41232BA60CAC314097FC7DCE9627CE249
+57E783A9ED3F496A45B17D815B326A415976B122A7238247D38CAFED1018A951FF9B1941
+7E305D3698B38BAEA4C15D57E7A9BA26568ACDD0CD723C16CE3914D52566E04764FE810A
+6AF84AA2F0DB871946A400FB9BA23A579830A50528C786EF0CE14583761FA58702E45EBF
+0B72CDFB6F1DAED7A551D0E43CD23DF336560A87915F101EFB11B2F136CA998488907950
+ECEDC2F737BCB90824F0490EFB2A50BDF21B35C381EF73ACA08D20505B15469459C00261
+0AD4DF6ADD5E31B877EEA14D2884C0D31476B97CFA80A63ED8115300B03A0B8E8F02B8E6
+F56609D0CEEF1279A1D37DD713A6AC2372430C056E0D31ACA80202E2C71829CBE1A9A417
+69F8C1C19FB96F19518A69207BF35F38CBCF76FB89D9C8CEBDCA13FCD79320898C541CC5
+1376AF391ABADE82346FE51F3B365D042380F2A059A25D078FB3022CE752EC9E20EDE640
+28BE9853A159786462E59701EBB5F9AFDE1D84F5682B82B7198647E5B189CEB1A7B0FB55
+337C67CC4DB08D48E843A8FBCB6A8B967D9D225CFE66C81B8E87C3EAA6AB16C36A376FA4
+2641CAA75A77407CCF25CC112CBB9FECF1C8878E84623BCD03003AEC832A80FFCD39A246
+8195A4F8740AF2499AA2FBFB2A48BA3D95D42E10FF6D72004D878D9E8BE5AF08151EAB6F
+3E1343ED64D18B07F7AF6E575D75B1F0E3E72041B2D7A21E400F2173AABA5AC981A2D132
+327EEA3CD7B434355B43669FFC74EC7B04AC48EED15EE1A6466398CB246FD54A5E072487
+0CF731812341144511F777FDD08EB4FCE0A5FCFF6FD37A8053CF993FE5276BFD1DB17D3F
+10CE419F10C975351148F108FE9FEBB9DEC326EA7CC30066920BA941B7191E852B91ADD0
+9A1F6539E74DC949DF7F23E54DAADF018E86B158439C8BBD9E4628F4ADC9F6BF776CB6B6
+888E5E0752FE92A53E0F3D8738A3ACBD58B7748FDCBC9EFADC49C1D5853C41A582D07E2B
+8DCF8D3F8E7ECD79C1D7C44981FF8D6DB49FE7F976C6F9B448D0CFD0448A631D874C69C0
+408828257777A6D9CCB32395139AB20962323C1D38F5A81903E6389E784D560E5F72221B
+AE4AAE68C29FCCBD8E4D7739E8C1489301D80D2F8CBAA951CA9EBA8BB2B7AAA80A30B7C4
+C9D2356DD2E6B1E5A66E3652243DC521A77CFE0E8260E3814F4197C1407866ACB9A799F4
+D2B7B6BAFCAC660AD28452B1175C808815144F01F99DDB7F7A19CCFDD522E89A1CF4EF9F
+E986CEB8F80011C4763F29DE90C76ECE678D42783B4C9402B7CB270AB0B8681469FA5C2C
+DB3651C61F1AFBC441F456533B2C0F4FBAE9A7571F2A90FFDF33587C480DA43FCF29CEBA
+FCFA080B5A44F2BABDA2044212588001E47EFE55D91ABA7EAA7C261D02027301EA28AC65
+687B3681CEBF7CB08C0D2EBA3167075B61EF0C7791A5C818028AB0CB08E56FBC45B027C7
+416FF0E6EAA615963408C5EA295BE0673C493E9903D95CFB010FCFD094F03192A9538FCA
+259B48347D79F40F3023731DE72ADA10E9038A79B9F7E2A93041AAC1F268F9439DD0BA6C
+77559ECB955103085C3900C11A926B889D8E8275D96BE1E74ADC3C95E50D9CBC9E3925F2
+3FBDF75C7117DF74F2A56F173AAB79A5B38D4E17508D85FB4E1238CCCCE2AC989009C633
+B00EA1A69DB9A9A2E7B7A97BD9E9CF7E6E1F314DAED20648034C47A0F75722072EF97745
+924A16A58D4CA4B928F334200C2B2FE463C798F1CD657F2A53B9F13B9D7B9A207F9CD12A
+A1CE977533FBAD9B2C6DFEBE1141B96786DD79169C4AD3D27B49D96F1A5ACABADE98346B
+F663DDE31A38AFB1CA50BAC527DB023DE87E06FCCB71B28106D25AF54D20897BDBC78727
+C904C638B060085637BEB4B891FC150DE1B03BF1D857C4F987E8C26941673C55D37BB64C
+9F9B1D1E66A830C33179EDAD3780AAC1A2974C240FF753E8E59B99B0B2606CF03B364317
+562C705F9107FDD892DFF9EBB3844C2E3C919B641DBAC0E2F89ACC57CB38A341CD643BB2
+47863FD8504FE8216E21F78F88B110F88BE618AB8F4D4ECB62710B811214B5906A62E385
+CD5BFB483F856560E99FEC2C962A8615FD30A9BF24E719C36FA39E6B5149BAA33E9DEC5F
+BAE0A930C2D6A1AAF801C7B7117CFC33F16DA58DCD1040C0C30B6B3C54552DB2252E2759
+7C0D86E017ECCE5E37E45FA9581C886DF5417B6DF5CC143E71C7B9ED6379A717330D763F
+4D817D66956D321B0418482C10AFA32125F79D0B57E90E54CDAC58F808D38276949007CD
+A0D8717CB3B6B1C382CE1ADCC33174EF75BFD861D568E11FDFC5A738B3CB2703A1487A23
+D662B9BB3931E8232FB3A8CAEAC02D2CFB3196357FD7692BB8A9ADAC4EFC62E55567C77F
+78D085BBB1A509506F7750791EC5AE9F21F4BE17DAECFE19CC3FE46DD8F66AB8565CC43C
+4AA4EC4D2571C238777D81F910E9E6EF9FC45482489C657591DD9727887C6B03393D095B
+914374FBFB365471B160B8C9BA13190BCE16A610D8465F6D4DAFE8866CC1611B0617550C
+D3A2209CA2D66EB64DB1098ED0080DC64D6357404EEF153A9B7592C4D25ACCBEF7A2CA34
+9CEF81963C7BAA1F24B1AC2E17D70CA2A57551216E4CC533E615D36B2E15B3400B15D29B
+89DF7881DB682DD3E4CC8C2D83FB8AE43845185C18938C4643EA356A9B9C2769094382F8
+3E1672BD0247897FD8896ECB5E850789C03840DEBBAA59F6B7D5B828D81AAE78F18711D0
+1A51F7B51BEC544C3BE6E42C3EE6CAB4008BD375319F19307760DEFDA659C11E1D0937BD
+528468C0AF9221C165616AC7C2F59551593ACEBC6D7E2EB7619AC3F34A1C704E5371EAAD
+1C0ED311416677FCED438F764C8065468F2E75C14100345766170E46CC4C82D774B3DA7B
+D1AF304235966183ECF184D2A808C2E01A79EB89C11033D5ACB3012195EE1FA6F040619F
+620045DC68049F0488B30EC6CA4193E6146FC06477960701646737690EB5F9D613548AF5
+3FB99A11560AF27C50DE034DDA6517C449953608D326A35DDBA2707C2603BE5CD32E8C23
+AB80B9A25B97DADAF3F6C3A31B3F7300D37AABF812FD3F7D07FD41DB3EFB7B4EA062F68D
+D6EAE9FCE68AB4B4890F8A65F62FB3ADFA6F9A8BE6F99542CF9C1A0C79FFC320BC992590
+E912BA10918F218A8A50E1415E8946596BC2282AA9D2549F06E4E915633CE6DABA8E5726
+99F96A04AC9C350BA4554DCE7497FA0242AA1F0A5F66978D852EE175D35D38BD89C99D59
+4150198769AF67B2E2A9E7BA5CB0E685EC0E5B9532C9338249142C7D51CBBC6D0A0C2314
+869F61B162BC7B0783831B7EB1104A3DEFB7E6304D8E77A69CADC48005E1DB0A9A8E0D63
+DF98831D291A045831A6F95820C130957011A209625C270430EF9A4D54033F97B0EBB0A6
+B2D3D7B64D02764A8D4DDFDAC7598A3E5FF505D150F074C52A927851C37C1DEE34217D23
+F59DCEC4F863556EB6C62E0236AE398C5F27F2926CBC38463FE7D3DBDAD0A8113FD9B0F4
+D93ADD64162451778D570ABFC58ABDF8FEE553E014233B11E1E30CBAAA4AAE1900F02BD6
+F3431C0E843CA6285E4AD421D71D8EB69CEA07F23D727EF5FBF7BCCD6D8598FE68A873F0
+6399306A375F9A449056BCE40B4A5756D71883F2EF7FD916C7A886F244A2C0348AA95E73
+AFDDE842E885FB89B303B7F7BE4FFC96E94D449566F199B6405C85A3F0B7F9F1514CC3A4
+40CFCB2BB97EB08AF617BC6777ECD3593C8AF65F24A7F79D438EA4996E0443E542A45115
+AB0A23A6AD9B3397C2165F9F752A57A6DA58A59396087D3ED59673B1A2FAEAAA4AAED5DE
+68FC0F75CBC05789880D1318E1DEAB239873C10495E8A861299ED082D1968A51295B3ECE
+4079D775106352FE27F00130BA4B9BED34AC5056CD1111C3BFE982DDAFA872559EAAF186
+FD3F717373EE463EB56A3A2A17653723EB24DC7E74DDF22F0EBC93BEBD7A19938D51C04D
+FF8E4F8E2539CC784840FEF56DE6B041BF8DA3617E2AECFAECEEDFC0FC7F45E18D549511
+A18E93400E5F874E54E43DDB16DC53D546AED588C8004ECDDFC88E2948CB467F88025571
+2C5ABA26CE47AC4877AAE9429300A19B4C0EB2FCC918B3DE7CDB3C38A45F2486C6B0A57B
+34F5CC21CDB809217C1577E85D8D40BAD0864A12A934E818975307AC3C6AD91B80A3BE19
+A888B6DA3910024BB94FFE3BD371887B6AF40FDF3B3A77925D16CEEA259F1C99330D5201
+80CB5ED33876C0057A160B9CA16E9401046154FD92F85F6386036067D9ECA976A504CA7D
+4278765BEE4E5D08A8832A45D3DEA2CF21AB2BEEEB74DE3263ACD8915700E10C9CD72C9E
+AB0A5DA11EF61413B33652AAA3ED73B445FD3A517F4C3FC537021726A949D70F522B3987
+938DB3D02B7029E5AE1B506FB08E73E08C09AEAD5106368D0F93C4E2551F1D792AA318A0
+F01B5891334DE63C4B63DE11A30BA6976F13CF99211438E9C1F87A857E09AD944172D38A
+DBA4247D402879D27461E5740E2DD7FECD3FB1C17911034895D24367FEAB97FCD335BAE5
+78E606D3DDBE223348EC816C29ACEA1172E7AEEEC705A0172D108D49FCD5BFA64EE7E107
+808F8EB78D4ACE4CC6121344F96EA46F9AE4289399D1C0C3274C1602CCA6E9AB0C6CF045
+DD18C4F66FA3F87D4B2F34F0B24EB4DD38D3B4088AFB1C4378C886E53F1B297A7351413A
+7D6B6023D12799BDD6E80FD9C6FBE8A8A313DDA621A4F3BD5706F28BCACE60380DFCAD8D
+818DFEB230FE4FCCDE10B8278492227826287342E3C2D8F5B4ED0F29A336562B6679E79A
+7171C5B77C576A272B008D04BFB626A5F7DDDC74DD72BAF2B735B45EA9AC33C26E33FB0C
+C87EF1743927DA31893D690E9DFBFE84D245B520D15726BCB913898C5AA7DECA2A274492
+033C03543B00DA691383798A4B5537387CAD74BB91CF1BCFDE0E315F7F661437C3E7395D
+D3DA366932BE297F25C6B2BBE0F76CEB16E107D109BA27B5FABEEDF05D1A5255DF61A325
+BEEE633F564797639EDB22D84A2ABE85B7BC3AFA1B38559DAB8ABC54F6829A16B2FE24CF
+EB4568BF63B57FD44C032DA5CF2D36717A857D99B0A8A2421BB2B20312808C4F2F049E06
+050CE4C54DE5DD872A035725AE7292824975265018D65EED0EAD72495C50506D38AD29D8
+9D379215F3A4D74F5E2C9002C4CC09F6CB1DAD731C229656977FD22CF7CCE89B325D1CF9
+344BE186517AEFC7CC0FF762AF7634C96433A846BF9493D8A2C660E78763DAE28D52F42A
+041026E22EF60CE1FFE3CB29CC5E6A39B9EEAB0B165C71705CE9C4B50D7EBBCD6C0CF1BB
+0E52F1CD1A72A63983F905458F54425A74D6389C877D252E749D7D8A9C31531D28EFBE15
+BA50F4B5085D365ECEF98A867B6D282AC4E522AA657C7607E57F71B9A8C8C309B4DFE8AF
+E949CC09A56BE3998DF780F4660AA71224EF405A644B463FBF571F0E5DFAAE229C4C8005
+E8651C7348120EE658BF6BBC236AC9439BF11852E11E066D1BA8DFD7076DB128CA90A0B0
+C9DBB9CC88E469F890E93875F21822D26A953D01E2FA00E5657A242CE0A92963E4ECA460
+784CB43806238C72280433BB5CF797A99AFDAAA022FA421A344E93CEECCA58FF39A1E856
+E9BCB2583016696484B071A1B199FFDEB29BCF6855101C4EA271A39750F368E54533089F
+EFA0EFC81B0A79DA70408E5AEE18F793BE39791C541BEC63023069CC70D9CDF618ED29F4
+2037393F69668A7358EFA69D2A7AC8722BF1FF999CA768BBF08EE757E133B01E63D5D809
+519B97CDCE80701790E558737C6F8B00B0E1341633987A842C0907979D24AA41428267D2
+2C692A1D93A0686307D79563D6264E5BD5A40F6EEEA9B91E0D98F868D2A6D43A6C909D9E
+514500C10ADCD062528AC54B4CDAD6DDB466B655EE8EC4314A16880BF009C7E4A9FBEA5F
+63AAB8A17016250D80308FCF8AD5E5BAA53F17ED902872FF01A6FD6651B7B343A73777D7
+2090F1B08554422EAE4DAB73B22F714A9E236AC2329D092400FA031883BA9E118FC2397E
+8773D8CDF7EDFEDD7BB716419C7D95A7EF9BD2E44BE071014335866A7B273252F694D0A8
+644764303EE238F0369DC9A47EC3523A48986FA44ED642FA4109FE1E87984E994C3F0D5F
+3E9B0764A8D25FAF6318CE48203A0049CA2DB950DEB8B493F66247FC9B36D80D995756A6
+8014E98A00CB1EECBCFDFA4C3E9A0A2A5B831E0B4B823542D4B4CD70630CEAAEFDF5862E
+6D09F1D0EFDD1CC7CCC1F8EF7E5619B5F5C24D0F6F65458D62354E8E2C7ACB617F275D8C
+F8048980BEEE183BDCC404443726C9309FB58D1739D57D046906CB0A8A358AEF8793CE5E
+5710BA4BD661A25C345706013E51622631217D4A5E8D0E0D349C52D1D85DD3AE715D8710
+FC51D4780572E07543A0A9E5C3C538247079B16F5FC764CA72C5B3297CB032CC9E3F3999
+AB6A1C135EA731B57219B8B32C2461F116C0402786012C6DBC39C20E3E764DA41378B602
+CE5D9E0F68B4FD5936DEF0D6271E47CB14BD2C730C9F330CEF26D141144519AEF903EE52
+8739E1FD8D338AC74F43B4B7FFC0D62FB5055610C553BC056B67C4B79BF8CB5244F1D585
+2DECFDA75EA2CAA71DACCB893BB498B22AB3E1DF96D7BBD102367DFBFF02C135C42040D0
+155BD95DA0C4AA8F0D4F5F60F2A035829B6134CDD9CBEC37DAC58568BC58756177662F43
+5DD3EEA732A8A6448CBC6D4CACCA4444E9B2ABF1C54A1E30DAA5DA323B48250B70699479
+6DFA8BD2160AC41E82B3AD3A8E592DC3246B50AF4589BE7994D06F50A93C31BEF0608DB1
+4E2E138355A23BAB7796FCEF61A2495868B1D388F211514C73F639A1ECEC450E2CD0ECE4
+2687DFF5D25965E5B727306FAB8580465A74D81E5590F27C76FA05DC7C6DFAAAE841B99D
+3CA11A614EDDCA91410C90421E5BA23092E4563BE97153F2385ABD2C37672688028FAA55
+1168C9EDDF69E1B8FA511A56BA6DB831538B3E0B59148E6EF69CC65A243FCD643906ED3B
+07FB3AFCD850688D4CA8FD6CACCE1D4B55ABCD16680387251999F558327C57AE761B0CBB
+AB668E8D555ADA713699DC39F3FA0E68D7FB005FF628342C36A1BC0E9A5EFA6896DF4D58
+E547FCEE7ED610FC5D32C8C72C24B6FA766A14BDF23F5AC9321C6908EE3B9376425E7298
+00B731FF0FBB3E5EE589F0C8037CDADB72D10C2124A14FB45D45C94C8F5EF2A40B81538C
+538BC7DEC4823B3537BB9DA406345A80EF9B132455935C90D54E1C9D35B2C25DA45B00C6
+914FE04EF91C874325D8DBC10D1F30A7BD4E9CC5E70A3519CD6CC94F52433CE636E46F62
+0083A91FDD6FECF6CCE1D9FE0546741EDC4FF0C34C79C7114C1812DC389FE9DA6E4F5F43
+F166CBB4845DD1644DB6E2243277C029AEB6336392427E1793339ECDB8BD4C156C49CAD3
+9E1231153C35503CFA86E23CFD81BBABFF24D9DB287F63D110969F71D737747013D3EA59
+7792927261F837E5F4467843297B61D754E9617B1D2EAB47BAA5D4E205E777130D625841
+8902DC1259D91624CC7DA37CE6AB44B8A951346EB2EA4AE1AAFEA05CB873E68F2C38752E
+B01B2DA0823E7BBCCE05BA73E4A01D9BB4F0A93387E4B8CF71A72F4D677072EC92714848
+A658C4FC971E3EE4958E1A7C6765A9FC7AA63793A1D371F35A9CAFFD5AFE891E8CD4B38A
+9369E3C96B2EC604AA83E8DD9C0374C4F417AE3301FF8EF9DD08D5CFBFB7718339047C1A
+88227B978D0D91AB3D20C465FD2E35634B8A36F4FBCA67207EB3018D05C7A6E68B73DC9E
+C1D3C88599DD0B11988E6AD73F39C5607CA9DD96FF81B6709F76C11683E7149572F97E67
+D2D23332B11205CBEEDDF904048334FC859F8B7A204B65E39B09C55CDDC86B8D359BDA2C
+89483BF30BACE74F95B981E37EB0065A3C1A3583B25E78498E98DD181E08E6017B72C9CC
+B471867010D3564561DC5CE90286163783F1FC3C5FD75845457BCDA205E992ED1F7BCF9D
+21252FFE5C2A90ECC12E907CC686D9AF3C57F3DBEC3D1E08C417A0811181E1D33821DC6F
+1E7F68AC0613D55289C1A94D7F1308BB27E93D7CD952E3831AA55D76DB69891C0FA49DA2
+8C237CC650E1023BB18F4E96A66B6A9EAF7D074D9BD22B9713A61C659159564DB7FBADB0
+6F15A7E107989F27482C41A96F67950EFF8012C9FC287D6AE31E87BCD8E59FDA8439F691
+12A0F0637227B92FC4EA69B84A8D923B763E445308485B5C32C18F6604B6B30FED2775B6
+88B3089B0B681B6DB87EB4EE386E9D514C3BBA853EA767ED1223BB4AFFFC648918111932
+288547788BDE5CDBB17EC628321C24E0C013DDA78F24381B2A984BA655791FC791BE162F
+60D87530E3DAB5C150E048BDA24DA97126676B948D1879FEECB2A2E304475A078CFC27B9
+E14D4A0060F1254CBE65E4864BDD242A0339B1ACC4717DB134E7764433C03F916B9F4CDA
+0A1FF1EB33F1E0FFC667594FD23EB58288AC827C247C4AE6F8F3CAA30C7D0E9DB9F23BF0
+9C81580C20B4B367B7BE85E2F48557C00353756669FE34E543FED5438C52B2F132840140
+E548F948CF9AD2B734D895539F7D4CBE52A221614F5666FFB110A1BF0B8B3A9F478BF056
+FB1080C94005310175607A3E2AB73B9A810B50838F31481707C0B2CAC918086AB06ABDF0
+A7200AD28E443E23B34B61649B19D0F834ADDC3B18937807B43C2C258532AEBD615DD853
+38394F3581E6B8A98E86057F5288FCDE9DB3107126858CB9863A19C3B765E345C816E795
+053645E472FB47304CB57B536C683EA8E74DB0E8A286363DE7456BDFBC1C75FE6943DD01
+7F62A61F0C0DF19C1C5F53C483D82647023D9043ADB1B5247A532281BFE7B3C42BBAF6AE
+883EA3CE43CF5CE4CF51FEB90575CA233084C5A2BF4498A6EFDC9C8DBA1B3992C61DA729
+2E64D1214C28D0FFCF644BFFF1BB5F61852F04AEA89C1A888AF5B45F8E2F86B362EDD544
+7AAB5338207EEBE69461DE06538E63FF050DD92DAF297FB6365234306D1910D1D7D43F55
+38116B5634F5885F98343E5D6559298CE4D7F91FF569A1D0B34CCA2A8229A98A400F23B3
+8519190109BE258672BDEF4C1038FC0621D5003588C697ECACEF2A287D5BA465D95D330F
+050119D5273DE92A6C9F324E59579BA2A5A39FC845DA4F38CEF1A47DD185CBB82D559D14
+913F16D99D3086A733A48E5056667BB858F821609D27DB01A4BBD3D1B2959B679B4D1536
+B4A2E989FD94FD94DF7A401BB241EEA7E4F83FB6BEAAF4135A836D5A3D01D0A36D0C907D
+B9B8E57F11F22D1EEE3C041BFFC4DF6D004B1554FDA6CD542CF19F8F2E082AE2C0C1DCE6
+B0648C6759895783BA7C81550E94308A8E504963D76E56673FC2597077361F9545FB2537
+66737079EFFB2F30E8E62602E7E37F7048D3E391C18E3D44394351B235985E6EF2AF267C
+B92BCE81ED8EC8DB2E2D6A56BA310F01575482366A032B003EEB72B22F677AAD0EB9E2A9
+6EB9017ABAF963F8FD8EAE59EF0283DD7733052680E42AB23BD98D10682B29869E7EFC15
+C9D6570A610D0248D548AA7DA39FDE4A19B7B5D6131FF06AC674B622725BBA0A8E9B257E
+986EEB3773A57BBE0A96C2C7C899509292775680F72BF1A084123F6172D7C210F53C385D
+644A139333B4767CD6E3347572AD
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+{restore}if
\ No newline at end of file
diff --git a/contrib/groff/font/devps/generate/Makefile b/contrib/groff/font/devps/generate/Makefile
index 5916e6a..223ce2f 100644
--- a/contrib/groff/font/devps/generate/Makefile
+++ b/contrib/groff/font/devps/generate/Makefile
@@ -37,12 +37,12 @@ GREEKFONTS=SS
 TEXTFONTS=AB ABI AI AR BMB BMBI BMI BMR CB CBI CI CR HB HBI HI HR HNB HNBI \
   HNI HNR NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
 
-FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS)
+FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS) EURO
 
 DESC=$(srcdir)/../DESC
 AFMTODIT=afmtodit -d$(DESC)
 IFLAG=-i 50
-RFLAG=-i 0
+RFLAG=-i 0 -m
 NOLIGFLAG=-n
 TEXTENC=$(srcdir)/../text.enc
 EFLAG=-e $(TEXTENC)
@@ -196,6 +196,13 @@ S: symbol.afm
 ZDR: zapfdr.afm
 	$(AFMTODIT) -s $(RFLAG) zapfdr.afm $(srcdir)/dingbats.rmap $@
 
+# the map is just a dummy
+EURO: freeeuro.afm
+	$(AFMTODIT) $(RFLAG) freeeuro.afm symbolmap $@
+
+freeeuro.afm freeeuro.pfa: generate/freeeuro.sfd
+	pfaedit -script generate/sfdtopfa.pe generate/freeeuro.sfd
+
 symbol.afm: $(srcdir)/symbol.sed
 	-rm -f $@
 	sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` >$@
diff --git a/contrib/groff/font/devps/generate/freeeuro.sfd b/contrib/groff/font/devps/generate/freeeuro.sfd
new file mode 100644
index 0000000..d40e684
--- /dev/null
+++ b/contrib/groff/font/devps/generate/freeeuro.sfd
@@ -0,0 +1,610 @@
+SplineFontDB: 1.0
+FontName: FreeEuro
+FullName: FreeEuro
+FamilyName: FreeEuro
+Weight: Medium
+Copyright: Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); the serif shapes are based on the Omega fonts created by Yannis Haralambous.
+Version: 001.000
+ItalicAngle: 0
+UnderlinePosition: -100
+UnderlineWidth: 50
+Ascent: 800
+Descent: 200
+NeedsXUIDChange: 1
+FSType: 12
+PfmFamily: 65
+TTFWeight: 500
+TTFWidth: 5
+Panose: 3 0 6 3 0 0 0 0 0 0
+LineGap: 90
+VLineGap: 0
+
+Encoding: custom
+DisplaySize: -96
+AntiAlias: 1
+BeginChars: 256 16
+StartChar: Euro.symbol
+Encoding: 0 8364
+Width: 750
+Flags: MW
+HStem: -12 58<447 497> 250 57<55 124 195 580> 366 57<55 124 195 628> 627 58<447 497>
+Fore
+134 250 m 9
+ 32 250 l 17
+ 56 307 l 1
+ 125 307 l 1
+ 124 317 124 327 124 337 c 0
+ 124 346 124 356 125 366 c 1
+ 32 366 l 1
+ 56 423 l 1
+ 134 423 l 17
+ 165 555 294 685 473 685 c 0
+ 614 685 701 601 718 582 c 9
+ 694 523 l 17
+ 644 581 567 627 472 627 c 1
+ 334 627 230 534 195 423 c 1
+ 652 423 l 9
+ 628 366 l 25
+ 183 366 l 17
+ 182 356 182 346 182 337 c 0
+ 182 327 182 317 183 307 c 1
+ 604 307 l 9
+ 580 250 l 25
+ 195 250 l 17
+ 234 124 350 46 471 46 c 1
+ 568 46 641 90 694 150 c 9
+ 694 68 l 17
+ 639 23 562 -12 472 -12 c 1
+ 325 -12 177 83 134 250 c 9
+EndSplineSet
+MinimumDistance: x16,-1 
+EndChar
+StartChar: Euro.symbol.bold
+Encoding: 1 8364
+Width: 750
+Flags: MW
+HStem: -12 87<473 507> 220 87<59 141 254 578> 366 87<59 141 254 634> 598 87<473 507>
+Fore
+254 220 m 9
+ 578 220 l 25
+ 612 307 l 17
+ 230 307 l 1
+ 228 316 228 325 228 334 c 0
+ 228 345 228 356 230 366 c 9
+ 634 366 l 25
+ 670 453 l 17
+ 254 453 l 1
+ 304 552 402 598 488 598 c 0
+ 596 598 662 535 688 504 c 9
+ 724 594 l 17
+ 640 668 552 685 488 685 c 0
+ 320 685 198 566 160 453 c 9
+ 60 453 l 25
+ 26 366 l 1
+ 142 366 l 1
+ 142 356 140 346 140 337 c 0
+ 140 327 142 317 142 307 c 1
+ 60 307 l 1
+ 26 220 l 1
+ 160 220 l 17
+ 206 100 316 -12 496 -12 c 1
+ 564 -12 640 17 688 52 c 9
+ 688 169 l 17
+ 642 116 576 75 490 75 c 0
+ 414 75 312 110 254 220 c 9
+EndSplineSet
+MinimumDistance: x4,-1 
+EndChar
+StartChar: Euro.symbol.slanted
+Encoding: 2 8364
+Width: 750
+Flags: HW
+HStem: -12 58<467 486> 250 57<120 187 248 633> 366 57<145 203 285 706> 627 58<596 621>
+Fore
+187 250 m 9
+ 85 250 l 17
+ 121 307 l 1
+ 190 307 l 1
+ 193 327 198 346 203 366 c 1
+ 110 366 l 1
+ 146 423 l 5
+ 224 423 l 17
+ 283 555 440 685 619 685 c 0
+ 760 685 829 601 842 582 c 9
+ 805 523 l 17
+ 767 581 700 627 605 627 c 1
+ 467 627 344 534 285 423 c 1
+ 742 423 l 9
+ 706 366 l 25
+ 261 366 l 17
+ 256 346 251 328 248 307 c 1
+ 669 307 l 9
+ 633 250 l 25
+ 248 250 l 17
+ 260 124 360 46 481 46 c 1
+ 578 46 660 90 726 150 c 9
+ 708 68 l 17
+ 644 23 559 -12 469 -12 c 1
+ 322 -12 195 83 187 250 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.symbol.bold.slanted
+Encoding: 3 8364
+Width: 750
+Flags: W
+HStem: -12 87<488 507> 220 87<125 207 301 625> 366 87<156 218 351 712> 598 87<614 636>
+Fore
+301 220 m 9
+ 625 220 l 25
+ 678 307 l 17
+ 295 307 l 1
+ 296 329 301 349 307 366 c 9
+ 712 366 l 25
+ 766 453 l 17
+ 351 453 l 1
+ 422 552 529 598 616 598 c 0
+ 724 598 776 535 796 504 c 9
+ 850 594 l 17
+ 782 668 698 685 634 685 c 0
+ 466 685 319 566 257 453 c 9
+ 157 453 l 25
+ 104 366 l 1
+ 219 366 l 1
+ 214 346 210 328 207 307 c 1
+ 126 307 l 1
+ 73 220 l 1
+ 207 220 l 17
+ 227 100 314 -12 494 -12 c 1
+ 561 -12 644 17 700 52 c 9
+ 724 169 l 17
+ 667 116 592 75 505 75 c 0
+ 430 75 335 110 301 220 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.serif
+Encoding: 4 8364
+Width: 741
+Flags: MW
+HStem: -14 44<435 463> 253 46<53 102 224 568> 369 46<53 104 224 618> 636 40<433 467>
+Fore
+224 253 m 1
+ 245 130 319 30 463 30 c 0
+ 555 30 625 68 689 131 c 1
+ 707 113 l 1
+ 651 30 532 -14 436 -14 c 0
+ 257 -14 138 91 109 253 c 1
+ 34 253 l 1
+ 54 299 l 1
+ 103 299 l 1
+ 102 308 102 319 102 331 c 0
+ 102 344 103 357 104 369 c 1
+ 34 369 l 1
+ 54 415 l 1
+ 111 415 l 1
+ 145 569 272 676 442 676 c 0
+ 537 676 653 631 707 549 c 1
+ 689 531 l 1
+ 624 594 543 636 451 636 c 0
+ 394 636 342 613 301 575 c 0
+ 256 534 234 476 224 415 c 1
+ 638 415 l 1
+ 618 369 l 1
+ 219 369 l 1
+ 218 356 218 342 218 329 c 0
+ 218 319 218 309 219 299 c 1
+ 588 299 l 1
+ 568 253 l 1
+ 224 253 l 1
+EndSplineSet
+MinimumDistance: x22,-1 
+EndChar
+StartChar: Euro.serif.bold
+Encoding: 5 8364
+Width: 800
+Flags: MW
+HStem: -19 48<486 510> 231 69<72 129 313 612> 368 69<72 131 312 669> 649 42<476 510>
+Fore
+142 231 m 1
+ 45 231 l 1
+ 73 300 l 1
+ 130 300 l 1
+ 129 310 129 321 129 332 c 0
+ 129 344 130 356 131 368 c 1
+ 45 368 l 1
+ 73 437 l 1
+ 143 437 l 1
+ 183 586 310 691 483 691 c 0
+ 611 691 689 628 762 545 c 1
+ 732 520 l 1
+ 649 613 572 649 494 649 c 0
+ 377 649 328 560 312 437 c 1
+ 697 437 l 1
+ 669 368 l 1
+ 307 368 l 1
+ 306 359 306 348 306 336 c 0
+ 306 325 306 312 307 300 c 1
+ 640 300 l 1
+ 612 231 l 1
+ 313 231 l 1
+ 319 190 330 149 349 116 c 0
+ 391 44 470 29 501 29 c 0
+ 579 29 654 59 737 152 c 1
+ 767 127 l 1
+ 694 44 616 -19 488 -19 c 0
+ 300 -19 181 89 142 231 c 1
+EndSplineSet
+MinimumDistance: x16,-1 
+EndChar
+StartChar: Euro.serif.italic
+Encoding: 6 8364
+Width: 734
+Flags: W
+HStem: -18 45<403 426> 253 46<85 140 257 565> 369 46<117 161 289 636> 630 36<544 567>
+Fore
+143 299 m 1
+ 147 322 152 346 161 369 c 1
+ 98 369 l 1
+ 118 415 l 1
+ 179 415 l 1
+ 243 551 380 666 546 666 c 0
+ 694 666 734 560 745 516 c 1
+ 720 502 l 1
+ 700 549 668 630 554 630 c 0
+ 425 630 336 528 289 415 c 1
+ 656 415 l 1
+ 636 369 l 1
+ 272 369 l 1
+ 266 347 261 323 257 299 c 1
+ 585 299 l 1
+ 565 253 l 1
+ 252 253 l 1
+ 248 118 301 27 426 27 c 0
+ 539 27 609 98 657 145 c 1
+ 674 131 l 1
+ 637 87 548 -18 402 -18 c 0
+ 286 -18 140 52 140 253 c 1
+ 66 253 l 1
+ 86 299 l 1
+ 143 299 l 1
+EndSplineSet
+EndChar
+StartChar: Euro.serif.bold.italic
+Encoding: 7 8364
+Width: 800
+Flags: W
+HStem: -19 48<400 427> 231 69<60 114 295 584> 368 69<92 135 332 673> 649 42<544 586>
+Fore
+114 231 m 1
+ 17 231 l 1
+ 61 300 l 1
+ 118 300 l 1
+ 121 324 128 347 135 368 c 1
+ 49 368 l 1
+ 93 437 l 1
+ 163 437 l 1
+ 239 586 390 691 563 691 c 0
+ 691 691 754 628 808 545 c 1
+ 772 520 l 1
+ 711 613 642 649 564 649 c 0
+ 447 649 377 560 332 437 c 1
+ 717 437 l 1
+ 673 368 l 1
+ 311 368 l 1
+ 305 349 299 323 295 300 c 1
+ 628 300 l 1
+ 584 231 l 1
+ 285 231 l 1
+ 281 190 282 149 293 116 c 0
+ 318 44 394 29 425 29 c 0
+ 503 29 585 59 690 152 c 1
+ 714 127 l 1
+ 621 44 529 -19 401 -19 c 0
+ 213 -19 119 89 114 231 c 1
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif
+Encoding: 8 8364
+Width: 756
+Flags: MW
+HStem: -23 79<485 519> 225 84<68 156 263 585> 378 84<68 156 264 643> 630 79<469 503>
+Fore
+263 225 m 9
+ 585 225 l 25
+ 617 309 l 17
+ 246 309 l 1
+ 245 320 245 332 245 344 c 0
+ 245 356 245 369 246 378 c 9
+ 643 378 l 25
+ 675 462 l 17
+ 264 462 l 1
+ 299 565 386 630 488 630 c 0
+ 598 630 659 578 696 520 c 9
+ 731 614 l 17
+ 655 692 560 709 494 709 c 0
+ 296 709 199 573 172 462 c 9
+ 69 462 l 25
+ 38 378 l 1
+ 157 378 l 1
+ 156 371 156 360 156 350 c 0
+ 156 335 156 321 157 309 c 1
+ 69 309 l 1
+ 38 225 l 1
+ 171 225 l 17
+ 207 90 318 -23 492 -23 c 1
+ 560 -23 631 -12 697 33 c 9
+ 697 136 l 17
+ 620 72 579 56 494 56 c 0
+ 389 56 300 118 263 225 c 9
+EndSplineSet
+MinimumDistance: x3,-1 
+EndChar
+StartChar: Euro.sansserif.bold
+Encoding: 9 8364
+Width: 796
+Flags: MW
+HStem: -22 123<531 565> 218 100<67 141 310 619> 372 98<68 141 310 669> 587 123<515 565>
+Fore
+724 540 m 1
+ 665 577 617 587 537 587 c 0
+ 489 587 364 571 310 470 c 1
+ 701 470 l 9
+ 669 372 l 25
+ 284 372 l 17
+ 284 362 283 354 283 345 c 0
+ 283 337 284 329 284 318 c 1
+ 651 318 l 9
+ 619 218 l 25
+ 310 218 l 17
+ 336 168 422 101 543 101 c 0
+ 646 101 686 125 716 144 c 9
+ 716 6 l 17
+ 682 -7 623 -22 540 -22 c 1
+ 332 -22 206 86 161 218 c 9
+ 36 218 l 1
+ 68 318 l 1
+ 141 318 l 1
+ 140 329 139 338 139 348 c 0
+ 139 355 140 363 141 372 c 1
+ 36 372 l 1
+ 69 470 l 25
+ 161 470 l 17
+ 192 555 283 710 544 710 c 0
+ 630 710 703 692 763 660 c 0
+ 724 540 l 1
+EndSplineSet
+MinimumDistance: x5,-1 
+EndChar
+StartChar: Euro.sansserif.slanted
+Encoding: 10 8364
+Width: 756
+Flags: WO
+HStem: -23 79<485 519> 225 84<134 219 312 633> 378 84<166 237 362 723> 630 79<620 647>
+Fore
+311 225 m 9
+ 633 225 l 25
+ 683 309 l 17
+ 312 309 l 1
+ 315 331 321 359 326 378 c 13
+ 723 378 l 25
+ 773 462 l 17
+ 362 462 l 1
+ 419 565 520 630 622 630 c 0
+ 732 630 782 578 807 520 c 9
+ 862 614 l 17
+ 802 692 711 709 645 709 c 0
+ 447 709 321 573 270 462 c 9
+ 167 462 l 25
+ 118 378 l 1
+ 237 378 l 1
+ 233 360 225 329 223 309 c 1
+ 135 309 l 1
+ 86 225 l 1
+ 219 225 l 17
+ 226 90 313 -23 487 -23 c 1
+ 555 -23 628 -12 704 33 c 9
+ 726 136 l 17
+ 635 72 591 56 506 56 c 0
+ 401 56 325 118 311 225 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif.bold.slanted
+Encoding: 11 8364
+Width: 796
+Flags: HW
+HStem: -22 123<534 567> 218 100<135 207 356 666> 372 98<168 220 410 749> 587 123<660 697>
+Fore
+839 540 m 1
+ 788 577 742 587 662 587 c 0
+ 614 587 485 571 410 470 c 1
+ 801 470 l 9
+ 748 372 l 25
+ 363 372 l 17
+ 358 353 355 341 352 318 c 1
+ 719 318 l 9
+ 665 218 l 25
+ 356 218 l 17
+ 372 168 443 101 564 101 c 0
+ 667 101 713 125 747 144 c 9
+ 717 6 l 17
+ 681 -7 618 -22 535 -22 c 1
+ 327 -22 224 86 207 218 c 9
+ 82 218 l 1
+ 136 318 l 1
+ 209 318 l 1
+ 211 339 213 354 220 372 c 1
+ 115 372 l 1
+ 169 470 l 25
+ 261 470 l 17
+ 310 555 434 710 695 710 c 0
+ 781 710 850 692 903 660 c 0
+ 839 540 l 1
+EndSplineSet
+EndChar
+StartChar: Euro.mono
+Encoding: 12 8364
+Width: 600
+Flags: MW
+HStem: -16 41<314 332> 217 37<26 63 106 385> 314 37<26 63 106 430> 535 41<314 332>
+Fore
+322 576 m 0
+ 196 576 80 480 65 351 c 1
+ 33 351 l 2
+ 16 351 11 346 11 333 c 0
+ 11 319 17 314 33 314 c 2
+ 63 314 l 1
+ 63 254 l 1
+ 33 254 l 2
+ 17 254 11 249 11 236 c 0
+ 11 222 17 217 33 217 c 2
+ 65 217 l 1
+ 80 89 196 -16 322 -16 c 0
+ 386 -16 446 9 496 55 c 0
+ 522 79 534 96 534 106 c 0
+ 534 117 526 125 514 125 c 0
+ 507 125 503 123 496 115 c 0
+ 442 51 391 25 322 25 c 0
+ 216 25 124 107 106 217 c 1
+ 383 217 l 2
+ 398 217 404 222 404 236 c 0
+ 404 249 399 254 383 254 c 2
+ 104 254 l 1
+ 104 314 l 1
+ 428 314 l 2
+ 444 314 450 319 450 333 c 0
+ 450 346 444 351 428 351 c 2
+ 106 351 l 1
+ 124 460 216 535 322 535 c 0
+ 391 535 442 509 496 445 c 0
+ 503 437 507 435 514 435 c 0
+ 526 435 534 443 534 454 c 0
+ 534 464 522 481 496 505 c 0
+ 446 551 386 576 322 576 c 0
+EndSplineSet
+MinimumDistance: x23,-1 x22,25 x22,23 x21,18 x21,20 x6,9 x6,7 x5,2 x5,4 
+EndChar
+StartChar: Euro.mono.bold
+Encoding: 13 8364
+Width: 600
+Flags: W
+HStem: -14 100<307.635 341> 205 56<22.3275 59 174 388> 303 56<22.3275 59 173 426> 497 100<323 341>
+Fore
+173 359 m 1
+ 424 359 l 2
+ 442 359 452 349 452 331 c 0
+ 452 313 442 303 424 303 c 2
+ 169 303 l 1
+ 169 261 l 1
+ 386 261 l 2
+ 404 261 414 251 414 233 c 0
+ 414 215 404 205 386 205 c 2
+ 174 205 l 1
+ 190 130 247 86 329 86 c 0
+ 382 86 429 98 461 143 c 0
+ 469 154 481 159 492 159 c 0
+ 517 159 538 136 538 109 c 0
+ 538 86 521 60 490 36 c 0
+ 451 5 389 -14 325 -14 c 0
+ 187 -14 84 72 62 205 c 1
+ 31 205 l 2
+ 14 205 4 215 4 233 c 0
+ 4 251 13 261 31 261 c 2
+ 59 261 l 1
+ 59 303 l 1
+ 31 303 l 2
+ 14 303 4 313 4 331 c 0
+ 4 349 13 359 31 359 c 2
+ 62 359 l 1
+ 78 498 187 597 325 597 c 0
+ 389 597 451 582 490 551 c 1
+ 521 527 539 505 539 478 c 0
+ 539 455 517 426 492 426 c 1
+ 481 426 469 431 461 442 c 0
+ 431 482 394 497 329 497 c 0
+ 247 497 188 444 173 359 c 1
+EndSplineSet
+EndChar
+StartChar: Euro.mono.slanted
+Encoding: 14 8364
+Width: 600
+Flags: MW
+HStem: -16 41<316 334> 217 37<78 112 158 438> 314 37<98 130 181 504> 535 41<428 457>
+Fore
+541 125 m 0
+ 534 125 530 123 521 115 c 0
+ 453 51 397 25 328 25 c 0
+ 210 25 148 121 153 217 c 1
+ 430 217 l 2
+ 445 217 455 225 455 241 c 0
+ 455 250 451 254 437 254 c 2
+ 158 254 l 1
+ 171 314 l 1
+ 496 314 l 2
+ 520 314 522 333 522 339 c 0
+ 522 348 518 351 504 351 c 2
+ 181 351 l 1
+ 222 460 330 535 436 535 c 0
+ 505 535 551 509 591 445 c 0
+ 596 437 600 435 607 435 c 0
+ 619 435 631 443 631 457 c 0
+ 631 467 623 483 604 505 c 0
+ 564 551 509 576 445 576 c 0
+ 319 576 183 480 140 351 c 1
+ 108 351 l 2
+ 84 351 81 335 81 329 c 0
+ 81 317 85 314 100 314 c 2
+ 130 314 l 1
+ 117 254 l 1
+ 87 254 l 2
+ 63 254 61 238 61 232 c 0
+ 61 220 65 217 80 217 c 2
+ 112 217 l 1
+ 99 84 198 -16 319 -16 c 0
+ 383 -16 448 9 508 55 c 0
+ 538 78 557 96 557 108 c 0
+ 557 123 547 125 541 125 c 0
+EndSplineSet
+MinimumDistance: x8,-1 
+EndChar
+StartChar: Euro.mono.bold.slanted
+Encoding: 15 8364
+Width: 600
+Flags: W
+HStem: -14 100<322 348> 205 56<85 107 226 438> 303 56<101 124 250 495> 497 100<429 455>
+Fore
+250 359 m 1
+ 501 359 l 2
+ 516 359 524 352 524 339 c 0
+ 524 317 509 303 489 303 c 2
+ 234 303 l 1
+ 226 261 l 1
+ 443 261 l 2
+ 458 261 465 254 465 242 c 0
+ 465 219 450 205 431 205 c 2
+ 219 205 l 1
+ 219 130 266 86 348 86 c 0
+ 403 86 457 103 492 143 c 0
+ 501 153 516 159 527 159 c 0
+ 548 159 563 142 563 120 c 0
+ 563 89 536 61 499 36 c 0
+ 453 5 387 -14 323 -14 c 0
+ 176 -14 100 80 107 205 c 1
+ 76 205 l 2
+ 62 205 54 212 54 225 c 0
+ 54 247 68 261 88 261 c 2
+ 116 261 l 1
+ 124 303 l 1
+ 96 303 l 2
+ 82 303 74 310 74 323 c 0
+ 74 346 89 359 108 359 c 2
+ 139 359 l 1
+ 185 498 315 597 453 597 c 0
+ 517 597 576 582 608 551 c 1
+ 630 530 643 511 643 489 c 0
+ 643 459 612 426 584 426 c 1
+ 573 426 560 433 556 442 c 0
+ 535 484 497 497 436 497 c 0
+ 354 497 283 444 250 359 c 1
+EndSplineSet
+EndChar
+EndChars
+EndSplineFont
diff --git a/contrib/groff/font/devps/generate/sfdtopfa.pe b/contrib/groff/font/devps/generate/sfdtopfa.pe
new file mode 100644
index 0000000..b495458
--- /dev/null
+++ b/contrib/groff/font/devps/generate/sfdtopfa.pe
@@ -0,0 +1,9 @@
+# sfdtopfa.pe
+#
+# This script generates a PFA file from the master SFD using pfaedit.
+#
+# The argument is the name of the SFD without extension;
+# the PFA file is created in the current directory.
+
+Open($1:r + ".sfd");
+Generate(($1:t):r + ".pfa");
diff --git a/contrib/groff/font/devps/generate/symbolchars b/contrib/groff/font/devps/generate/symbolchars
index 418cced..e43bb2c 100644
--- a/contrib/groff/font/devps/generate/symbolchars
+++ b/contrib/groff/font/devps/generate/symbolchars
@@ -7,6 +7,7 @@ plusminus +-
 equal eq
 divide di
 multiply mu
+logicalnot no
 arrowup arrowverttp
 arrowdown arrowvertbt
 Alpha *A
@@ -38,6 +39,7 @@ beta *b
 chi *x
 delta *d
 epsilon *e
+uni03F5 +e
 eta *y
 gamma *g
 iota *i
diff --git a/contrib/groff/font/devps/generate/textmap b/contrib/groff/font/devps/generate/textmap
index 4fdd08b..70d322f 100644
--- a/contrib/groff/font/devps/generate/textmap
+++ b/contrib/groff/font/devps/generate/textmap
@@ -93,6 +93,7 @@ Ugrave `U
 Yacute 'Y
 Ydieresis :Y
 Zcaron vZ
+a14 rh
 aacute 'a
 acircumflex ^a
 acute aa
@@ -128,7 +129,6 @@ backslash \
 backslash rs
 bar ba
 bar |
-bell bs
 braceleft lC
 braceleft {
 braceright rC
@@ -176,7 +176,6 @@ emdash em
 emptyset es
 endash en
 equal =
-equalmath eq
 equivalence ==
 eth Sd
 exclam !
@@ -187,6 +186,7 @@ ffi Fi
 ffl Fl
 fi fi
 five 5
+fiveeighths 58
 fl fl
 florin Fn
 four 4
@@ -199,9 +199,6 @@ guillemotleft Fo
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
-handleft lh
-handright rh
-hbar -h
 hungarumlaut a"
 hyphen -
 hyphen hy
@@ -212,24 +209,22 @@ igrave `i
 ij ij
 infinity if
 integral is
+integral integral
 intersection ca
 less <
 lessequal <=
 logicaland AN
-logicalnot no
+logicalnot tno
 logicalor OR
 lozenge lz
 lslash /l
 macron a-
 minus \-
-minusplus -+
 minute fm
 mu mc
 nine 9
 notelement nm
 notequal !=
-notequivalence ne
-notpropersuperset nc
 notsubset nb
 ntilde ~n
 numbersign #
@@ -241,6 +236,7 @@ oe oe
 ogonek ho
 ograve `o
 one 1
+oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
@@ -258,7 +254,6 @@ periodcentered pc
 perthousand %0
 perpendicular pp
 plus +
-plusmath pl
 propersubset sb
 propersuperset sp
 proportional pt
@@ -284,17 +279,17 @@ second sd
 section sc
 semicolon ;
 seven 7
+seveneighths 78
 similar ap
-similarequal ~=
 six 6
 slash /
 slash sl
-square sq
 sterling Po
 therefore 3d
 therefore tf
 thorn Tp
 three 3
+threeeighths 38
 threequarters 34
 threesuperior S3
 tilde a~
@@ -307,6 +302,14 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni210F -h
+uni210F hbar
+uni2213 -+
+uni2243 |=
+uni2262 ne
+uni2285 nc
+uni25A1 sq
+uni261C lh
 union cu
 universal fa
 weierstrass wp
@@ -345,6 +348,7 @@ bracketrighttp bracketrighttp
 bracketrightbt bracketrightbt
 bracketrightex bracketrightex
 radical sr
+radical sqrt
 radicalex radicalex
 approxequal ~=
 bracketlefttp lc
diff --git a/contrib/groff/font/devps/prologue.ps b/contrib/groff/font/devps/prologue.ps
index 41adab2..a0cdb60 100644
--- a/contrib/groff/font/devps/prologue.ps
+++ b/contrib/groff/font/devps/prologue.ps
@@ -156,9 +156,12 @@
 
 % c m y k Fk -
 
-/Fk {
-	setcmykcolor fill
-} bind def
+/setcmykcolor where {
+	pop
+	/Fk {
+		setcmykcolor fill
+	} bind def
+} if
 
 % g Fg -
 
@@ -173,7 +176,10 @@
 /LW /setlinewidth load def
 
 /Cr /setrgbcolor load def
-/Ck /setcmykcolor load def
+/setcmykcolor where {
+	pop
+	/Ck /setcmykcolor load def
+} if
 /Cg /setgray load def
 
 % new_font_name encoding_vector old_font_name RE -
@@ -229,6 +235,11 @@
 	/CNT countdictstack def
 	userdict begin
 	/showpage {} def
+	%
+	%  Any included setpagedevice should be ignored.
+	%  See: http://www.w-beer.de/doc/ps/.
+	%
+	/setpagedevice {} def
 } bind def
 
 /PEND {
diff --git a/contrib/groff/font/devps/symbolmap b/contrib/groff/font/devps/symbolmap
index 6988c72..f3b2831 100644
--- a/contrib/groff/font/devps/symbolmap
+++ b/contrib/groff/font/devps/symbolmap
@@ -96,6 +96,7 @@ Ugrave `U
 Yacute 'Y
 Ydieresis :Y
 Zcaron vZ
+a14 rh
 aacute 'a
 acircumflex ^a
 acute aa
@@ -131,7 +132,6 @@ backslash \
 backslash rs
 bar ba
 bar |
-bell bs
 braceleft lC
 braceleft {
 braceright rC
@@ -179,7 +179,6 @@ emdash em
 emptyset es
 endash en
 equal =
-equalmath eq
 equivalence ==
 eth Sd
 exclam !
@@ -190,6 +189,7 @@ ffi Fi
 ffl Fl
 fi fi
 five 5
+fiveeighths 58
 fl fl
 florin Fn
 four 4
@@ -202,9 +202,6 @@ guillemotleft Fo
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
-handleft lh
-handright rh
-hbar -h
 hungarumlaut a"
 hyphen -
 hyphen hy
@@ -215,24 +212,22 @@ igrave `i
 ij ij
 infinity if
 integral is
+integral integral
 intersection ca
 less <
 lessequal <=
 logicaland AN
-logicalnot no
+logicalnot tno
 logicalor OR
 lozenge lz
 lslash /l
 macron a-
 minus \-
-minusplus -+
 minute fm
 mu mc
 nine 9
 notelement nm
 notequal !=
-notequivalence ne
-notpropersuperset nc
 notsubset nb
 ntilde ~n
 numbersign #
@@ -244,6 +239,7 @@ oe oe
 ogonek ho
 ograve `o
 one 1
+oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
@@ -261,7 +257,6 @@ periodcentered pc
 perthousand %0
 perpendicular pp
 plus +
-plusmath pl
 propersubset sb
 propersuperset sp
 proportional pt
@@ -287,17 +282,17 @@ second sd
 section sc
 semicolon ;
 seven 7
+seveneighths 78
 similar ap
-similarequal ~=
 six 6
 slash /
 slash sl
-square sq
 sterling Po
 therefore 3d
 therefore tf
 thorn Tp
 three 3
+threeeighths 38
 threequarters 34
 threesuperior S3
 tilde a~
@@ -310,6 +305,14 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni210F -h
+uni210F hbar
+uni2213 -+
+uni2243 |=
+uni2262 ne
+uni2285 nc
+uni25A1 sq
+uni261C lh
 union cu
 universal fa
 weierstrass wp
@@ -348,6 +351,7 @@ bracketrighttp bracketrighttp
 bracketrightbt bracketrightbt
 bracketrightex bracketrightex
 radical sr
+radical sqrt
 radicalex radicalex
 approxequal ~=
 bracketlefttp lc
@@ -377,6 +381,7 @@ plusminus +-
 equal eq
 divide di
 multiply mu
+logicalnot no
 arrowup arrowverttp
 arrowdown arrowvertbt
 Alpha *A
@@ -408,6 +413,7 @@ beta *b
 chi *x
 delta *d
 epsilon *e
+uni03F5 +e
 eta *y
 gamma *g
 iota *i