This commit was generated by cvs2svn to compensate for changes in r69626,

which included commits to RCS files with non-trunk default branches.

1 files changed, 239 insertions, 226 deletions

diff --git a/contrib/groff/devps/HNR b/contrib/groff/devps/HNR
index ecd9115..e4f30ee 100644
--- a/contrib/groff/devps/HNR
+++ b/contrib/groff/devps/HNR
@@ -47,6 +47,7 @@ K e -32
 K O -40
 L y -24
 L ' -130
+L cq -130
 L rq -114
 L Y -114
 L W -56
@@ -147,6 +148,7 @@ b b -7
 c k -15
 c , -11
 , ' -81
+, cq -81
 , rq -81
 e y -15
 e x -24
@@ -155,6 +157,7 @@ e v -24
 e . -11
 e , -11
 f ' 41
+f cq 41
 f rq 49
 f . -24
 f o -24
@@ -237,15 +240,22 @@ p y -24
 p . -28
 p , -28
 . ' -81
+. cq -81
 . rq -81
 ` ` -46
 ` oq -46
 oq ` -46
 oq oq -46
 ' s -40
+cq s -40
 ' r -40
+cq r -40
 ' ' -46
+' cq -46
+cq ' -46
+cq cq -46
 ' d -40
+cq d -40
 r y 25
 r v 25
 r u 12
@@ -283,334 +293,337 @@ y a -15
 z o -11
 z e -11
 charset
-ha	385,688	2	0000	asciicircum
-ti	479,326	0	0001	asciitilde
-vS	547,929,19	2	0002	Scaron
-vZ	501,929	2	0003	Zcaron
-vs	410,734,15	2	0004	scaron
-vz	410,734	2	0005	zcaron
-:Y	547,901	2	0006	Ydieresis
-tm	820,718	2	0007	trademark
-aq	157,718	2	0010	quotesingle
+ha	385,688	2	0000	-- asciicircum
+ti	479,326	0	0001	-- asciitilde
+vS	547,929,19	2	0002	-- Scaron
+vZ	501,929	2	0003	-- Zcaron
+vs	410,734,15	2	0004	-- scaron
+vz	410,734	2	0005	-- zcaron
+:Y	547,901	2	0006	-- Ydieresis
+tm	820,718	2	0007	-- trademark
+aq	157,718	2	0010	-- quotesingle
 space	228	0	0040
-!	228,718	2	0041	exclam
-"	291,718	2	0042	quotedbl
-#	456,688	2	0043	numbersign
+!	228,718	2	0041	-- exclam
+"	291,718	2	0042	-- quotedbl
+dq	"
+#	456,688	2	0043	-- numbersign
 sh	"
-$	456,775,115	2	0044	dollar
+$	456,775,115	2	0044	-- dollar
 Do	"
-%	729,703,19	2	0045	percent
-&	547,718,15	2	0046	ampersand
-'	182,718	2	0047	quoteright
-(	273,733,207	3	0050	parenleft
-)	273,733,207	3	0051	parenright
-*	319,718	2	0052	asterisk
-+	479,505	0	0053	plus
-,	228,106,147	0	0054	comma
--	273,322	0	0055	hyphen
+%	729,703,19	2	0045	-- percent
+&	547,718,15	2	0046	-- ampersand
+'	182,718	2	0047	-- quoteright
+cq	"
+(	273,733,207	3	0050	-- parenleft
+)	273,733,207	3	0051	-- parenright
+*	319,718	2	0052	-- asterisk
++	479,505	0	0053	-- plus
+,	228,106,147	0	0054	-- comma
+-	273,322	0	0055	-- hyphen
 hy	"
 char173	"
-.	228,106	0	0056	period
-/	228,737,19	2	0057	slash
+.	228,106	0	0056	-- period
+/	228,737,19	2	0057	-- slash
 sl	"
-0	456,703,19	2	0060	zero
-1	456,703	2	0061	one
-2	456,703	2	0062	two
-3	456,703,19	2	0063	three
-4	456,703	2	0064	four
-5	456,688,19	2	0065	five
-6	456,703,19	2	0066	six
-7	456,688	2	0067	seven
-8	456,703,19	2	0070	eight
-9	456,703,19	2	0071	nine
-:	228,516	0	0072	colon
-;	228,516,147	0	0073	semicolon
-<	479,495	0	0074	less
-=	479,390	0	0075	equal
->	479,495	0	0076	greater
-?	456,727	2	0077	question
-@	832,737,19	2	0100	at
+0	456,703,19	2	0060	-- zero
+1	456,703	2	0061	-- one
+2	456,703	2	0062	-- two
+3	456,703,19	2	0063	-- three
+4	456,703	2	0064	-- four
+5	456,688,19	2	0065	-- five
+6	456,703,19	2	0066	-- six
+7	456,688	2	0067	-- seven
+8	456,703,19	2	0070	-- eight
+9	456,703,19	2	0071	-- nine
+:	228,516	0	0072	-- colon
+;	228,516,147	0	0073	-- semicolon
+<	479,495	0	0074	-- less
+=	479,390	0	0075	-- equal
+>	479,495	0	0076	-- greater
+?	456,727	2	0077	-- question
+@	832,737,19	2	0100	-- at
 at	"
-A	547,718	2	0101	A
-B	547,718	2	0102	B
-C	592,737,19	2	0103	C
-D	592,718	2	0104	D
-E	547,718	2	0105	E
-F	501,718	2	0106	F
-G	638,737,19	2	0107	G
-H	592,718	2	0110	H
-I	228,718	2	0111	I
-J	410,718,19	2	0112	J
-K	547,718	2	0113	K
-L	456,718	2	0114	L
-M	683,718	2	0115	M
-N	592,718	2	0116	N
-O	638,737,19	2	0117	O
-P	547,718	2	0120	P
-Q	638,737,56	2	0121	Q
-R	592,718	2	0122	R
-S	547,737,19	2	0123	S
-T	501,718	2	0124	T
-U	592,718,19	2	0125	U
-V	547,718	2	0126	V
-W	774,718	2	0127	W
-X	547,718	2	0130	X
-Y	547,718	2	0131	Y
-Z	501,718	2	0132	Z
-[	228,722,196	2	0133	bracketleft
+A	547,718	2	0101	-- A
+B	547,718	2	0102	-- B
+C	592,737,19	2	0103	-- C
+D	592,718	2	0104	-- D
+E	547,718	2	0105	-- E
+F	501,718	2	0106	-- F
+G	638,737,19	2	0107	-- G
+H	592,718	2	0110	-- H
+I	228,718	2	0111	-- I
+J	410,718,19	2	0112	-- J
+K	547,718	2	0113	-- K
+L	456,718	2	0114	-- L
+M	683,718	2	0115	-- M
+N	592,718	2	0116	-- N
+O	638,737,19	2	0117	-- O
+P	547,718	2	0120	-- P
+Q	638,737,56	2	0121	-- Q
+R	592,718	2	0122	-- R
+S	547,737,19	2	0123	-- S
+T	501,718	2	0124	-- T
+U	592,718,19	2	0125	-- U
+V	547,718	2	0126	-- V
+W	774,718	2	0127	-- W
+X	547,718	2	0130	-- X
+Y	547,718	2	0131	-- Y
+Z	501,718	2	0132	-- Z
+[	228,722,196	2	0133	-- bracketleft
 lB	"
-\	228,737,19	2	0134	backslash
+\	228,737,19	2	0134	-- backslash
 rs	"
-]	228,722,196	2	0135	bracketright
+]	228,722,196	2	0135	-- bracketright
 rB	"
-a^	273,734	2	0136	circumflex
+a^	273,734	2	0136	-- circumflex
 ^	"
-_	456,0,125	0	0137	underscore
-`	182,725	2	0140	quoteleft
+_	456,0,125	0	0137	-- underscore
+`	182,725	2	0140	-- quoteleft
 oq	"
-a	456,538,15	0	0141	a
-b	456,718,15	2	0142	b
-c	410,538,15	0	0143	c
-d	456,718,15	2	0144	d
-e	456,538,15	0	0145	e
-f	228,728	2	0146	f
-g	456,538,220	1	0147	g
-h	456,718	2	0150	h
-i	182,718	2	0151	i
-j	182,718,210	3	0152	j
-k	410,718	2	0153	k
-l	182,718	2	0154	l
-m	683,538	0	0155	m
-n	456,538	0	0156	n
-o	456,538,14	0	0157	o
-p	456,538,207	1	0160	p
-q	456,538,207	1	0161	q
-r	273,538	0	0162	r
-s	410,538,15	0	0163	s
-t	228,669,7	2	0164	t
-u	456,523,15	0	0165	u
-v	410,523	0	0166	v
-w	592,523	0	0167	w
-x	410,523	0	0170	x
-y	410,523,214	1	0171	y
-z	410,523	0	0172	z
-lC	274,722,196	2	0173	braceleft
+a	456,538,15	0	0141	-- a
+b	456,718,15	2	0142	-- b
+c	410,538,15	0	0143	-- c
+d	456,718,15	2	0144	-- d
+e	456,538,15	0	0145	-- e
+f	228,728	2	0146	-- f
+g	456,538,220	1	0147	-- g
+h	456,718	2	0150	-- h
+i	182,718	2	0151	-- i
+j	182,718,210	3	0152	-- j
+k	410,718	2	0153	-- k
+l	182,718	2	0154	-- l
+m	683,538	0	0155	-- m
+n	456,538	0	0156	-- n
+o	456,538,14	0	0157	-- o
+p	456,538,207	1	0160	-- p
+q	456,538,207	1	0161	-- q
+r	273,538	0	0162	-- r
+s	410,538,15	0	0163	-- s
+t	228,669,7	2	0164	-- t
+u	456,523,15	0	0165	-- u
+v	410,523	0	0166	-- v
+w	592,523	0	0167	-- w
+x	410,523	0	0170	-- x
+y	410,523,214	1	0171	-- y
+z	410,523	0	0172	-- z
+lC	274,722,196	2	0173	-- braceleft
 {	"
-ba	213,737,19	2	0174	bar
+ba	213,737,19	2	0174	-- bar
 |	"
-rC	274,722,196	2	0175	braceright
+rC	274,722,196	2	0175	-- braceright
 }	"
-a~	273,722	2	0176	tilde
+a~	273,722	2	0176	-- tilde
 ~	"
-bq	182,106,149	0	0200	quotesinglbase
-Fo	456,446	0	0201	guillemotleft
+bq	182,106,149	0	0200	-- quotesinglbase
+Fo	456,446	0	0201	-- guillemotleft
 char171	"
-Fc	456,446	0	0202	guillemotright
+Fc	456,446	0	0202	-- guillemotright
 char187	"
-bu	287,517	0	0203	bullet
-Fn	456,737,207	3	0204	florin
-f/	137,703,19	2	0205	fraction
-%0	820,703,19	2	0206	perthousand
-dg	456,718,159	2	0207	dagger
-dd	456,718,159	2	0210	daggerdbl
-en	456,313	0	0211	endash
-em	820,313	0	0212	emdash
-fi	410,728	2	0214	fi
-fl	410,728	2	0215	fl
-.i	228,523	0	0220	dotlessi
-ga	273,734	2	0222	grave
-a"	273,734	2	0223	hungarumlaut
-a.	273,706	2	0224	dotaccent
-ab	273,731	2	0225	breve
-ah	273,734	2	0226	caron
-ao	273,756	2	0227	ring
-ho	273,0,225	1	0230	ogonek
-lq	273,725	2	0231	quotedblleft
-rq	273,718	2	0232	quotedblright
-oe	774,538,15	0	0233	oe
-/l	182,718	2	0234	lslash
-Bq	273,106,149	0	0235	quotedblbase
-OE	820,737,19	2	0236	OE
-/L	456,718	2	0237	Lslash
-r!	273,523,195	0	0241	exclamdown
+bu	287,517	0	0203	-- bullet
+Fn	456,737,207	3	0204	-- florin
+f/	137,703,19	2	0205	-- fraction
+%0	820,703,19	2	0206	-- perthousand
+dg	456,718,159	2	0207	-- dagger
+dd	456,718,159	2	0210	-- daggerdbl
+en	456,313	0	0211	-- endash
+em	820,313	0	0212	-- emdash
+fi	410,728	2	0214	-- fi
+fl	410,728	2	0215	-- fl
+.i	228,523	0	0220	-- dotlessi
+ga	273,734	2	0222	-- grave
+a"	273,734	2	0223	-- hungarumlaut
+a.	273,706	2	0224	-- dotaccent
+ab	273,731	2	0225	-- breve
+ah	273,734	2	0226	-- caron
+ao	273,756	2	0227	-- ring
+ho	273,0,225	1	0230	-- ogonek
+lq	273,725	2	0231	-- quotedblleft
+rq	273,718	2	0232	-- quotedblright
+oe	774,538,15	0	0233	-- oe
+/l	182,718	2	0234	-- lslash
+Bq	273,106,149	0	0235	-- quotedblbase
+OE	820,737,19	2	0236	-- OE
+/L	456,718	2	0237	-- Lslash
+r!	273,523,195	0	0241	-- exclamdown
 char161	"
-ct	456,623,115	0	0242	cent
+ct	456,623,115	0	0242	-- cent
 char162	"
-Po	456,718,16	2	0243	sterling
+Po	456,718,16	2	0243	-- sterling
 char163	"
-Cs	456,603	0	0244	currency
+Cs	456,603	0	0244	-- currency
 char164	"
-Ye	456,688	2	0245	yen
+Ye	456,688	2	0245	-- yen
 char165	"
-bb	213,737,19	2	0246	brokenbar
+bb	213,737,19	2	0246	-- brokenbar
 char166	"
-sc	456,737,191	2	0247	section
+sc	456,737,191	2	0247	-- section
 char167	"
-ad	273,706	2	0250	dieresis
+ad	273,706	2	0250	-- dieresis
 char168	"
-co	604,737,19	2	0251	copyright
+co	604,737,19	2	0251	-- copyright
 char169	"
-Of	303,737	2	0252	ordfeminine
+Of	303,737	2	0252	-- ordfeminine
 char170	"
-fo	273,446	0	0253	guilsinglleft
-no	479,390	0	0254	logicalnot
+fo	273,446	0	0253	-- guilsinglleft
+no	479,390	0	0254	-- logicalnot
 char172	"
-\-	479,289	0	0255	minus
-rg	604,737,19	2	0256	registered
+\-	479,289	0	0255	-- minus
+rg	604,737,19	2	0256	-- registered
 char174	"
-a-	273,684	2	0257	macron
+a-	273,684	2	0257	-- macron
 char175	"
-de	328,703	2	0260	degree
+de	328,703	2	0260	-- degree
 char176	"
-char177	479,506	0	0261	plusminus
-S2	273,703	2	0262	twosuperior
+char177	479,506	0	0261	-- plusminus
+S2	273,703	2	0262	-- twosuperior
 char178	"
-S3	273,703	2	0263	threesuperior
+S3	273,703	2	0263	-- threesuperior
 char179	"
-aa	273,734	2	0264	acute
+aa	273,734	2	0264	-- acute
 char180	"
-char181	456,523,207	1	0265	mu
-ps	440,718,173	2	0266	paragraph
+char181	456,523,207	1	0265	-- mu
+ps	440,718,173	2	0266	-- paragraph
 char182	"
-char183	228,315	0	0267	periodcentered
-ac	273,0,225	1	0270	cedilla
+pc	228,315	0	0267	-- periodcentered
+char183	"
+ac	273,0,225	1	0270	-- cedilla
 char184	"
-S1	273,703	2	0271	onesuperior
+S1	273,703	2	0271	-- onesuperior
 char185	"
-Om	299,737	2	0272	ordmasculine
+Om	299,737	2	0272	-- ordmasculine
 char186	"
-fc	273,446	0	0273	guilsinglright
-14	684,703,19	2	0274	onequarter
+fc	273,446	0	0273	-- guilsinglright
+14	684,703,19	2	0274	-- onequarter
 char188	"
-12	684,703,19	2	0275	onehalf
+12	684,703,19	2	0275	-- onehalf
 char189	"
-34	684,703,19	2	0276	threequarters
+34	684,703,19	2	0276	-- threequarters
 char190	"
-r?	501,525,201	0	0277	questiondown
+r?	501,525,201	0	0277	-- questiondown
 char191	"
-`A	547,929	2	0300	Agrave
+`A	547,929	2	0300	-- Agrave
 char192	"
-'A	547,929	2	0301	Aacute
+'A	547,929	2	0301	-- Aacute
 char193	"
-^A	547,929	2	0302	Acircumflex
+^A	547,929	2	0302	-- Acircumflex
 char194	"
-~A	547,917	2	0303	Atilde
+~A	547,917	2	0303	-- Atilde
 char195	"
-:A	547,901	2	0304	Adieresis
+:A	547,901	2	0304	-- Adieresis
 char196	"
-oA	547,931	2	0305	Aring
+oA	547,931	2	0305	-- Aring
 char197	"
-AE	820,718	2	0306	AE
+AE	820,718	2	0306	-- AE
 char198	"
-,C	592,737,225	3	0307	Ccedilla
+,C	592,737,225	3	0307	-- Ccedilla
 char199	"
-`E	547,929	2	0310	Egrave
+`E	547,929	2	0310	-- Egrave
 char200	"
-'E	547,929	2	0311	Eacute
+'E	547,929	2	0311	-- Eacute
 char201	"
-^E	547,929	2	0312	Ecircumflex
+^E	547,929	2	0312	-- Ecircumflex
 char202	"
-:E	547,901	2	0313	Edieresis
+:E	547,901	2	0313	-- Edieresis
 char203	"
-`I	228,929	2	0314	Igrave
+`I	228,929	2	0314	-- Igrave
 char204	"
-'I	228,929	2	0315	Iacute
+'I	228,929	2	0315	-- Iacute
 char205	"
-^I	228,929	2	0316	Icircumflex
+^I	228,929	2	0316	-- Icircumflex
 char206	"
-:I	228,901	2	0317	Idieresis
+:I	228,901	2	0317	-- Idieresis
 char207	"
--D	592,718	2	0320	Eth
+-D	592,718	2	0320	-- Eth
 char208	"
-~N	592,917	2	0321	Ntilde
+~N	592,917	2	0321	-- Ntilde
 char209	"
-`O	638,929,19	2	0322	Ograve
+`O	638,929,19	2	0322	-- Ograve
 char210	"
-'O	638,929,19	2	0323	Oacute
+'O	638,929,19	2	0323	-- Oacute
 char211	"
-^O	638,929,19	2	0324	Ocircumflex
+^O	638,929,19	2	0324	-- Ocircumflex
 char212	"
-~O	638,917,19	2	0325	Otilde
+~O	638,917,19	2	0325	-- Otilde
 char213	"
-:O	638,901,19	2	0326	Odieresis
+:O	638,901,19	2	0326	-- Odieresis
 char214	"
-char215	479,506	0	0327	multiply
-/O	638,737,19	2	0330	Oslash
+char215	479,506	0	0327	-- multiply
+/O	638,737,19	2	0330	-- Oslash
 char216	"
-`U	592,929,19	2	0331	Ugrave
+`U	592,929,19	2	0331	-- Ugrave
 char217	"
-'U	592,929,19	2	0332	Uacute
+'U	592,929,19	2	0332	-- Uacute
 char218	"
-^U	592,929,19	2	0333	Ucircumflex
+^U	592,929,19	2	0333	-- Ucircumflex
 char219	"
-:U	592,901,19	2	0334	Udieresis
+:U	592,901,19	2	0334	-- Udieresis
 char220	"
-'Y	547,929	2	0335	Yacute
+'Y	547,929	2	0335	-- Yacute
 char221	"
-TP	547,718	2	0336	Thorn
+TP	547,718	2	0336	-- Thorn
 char222	"
-ss	501,728,15	2	0337	germandbls
+ss	501,728,15	2	0337	-- germandbls
 char223	"
-`a	456,734,15	2	0340	agrave
+`a	456,734,15	2	0340	-- agrave
 char224	"
-'a	456,734,15	2	0341	aacute
+'a	456,734,15	2	0341	-- aacute
 char225	"
-^a	456,734,15	2	0342	acircumflex
+^a	456,734,15	2	0342	-- acircumflex
 char226	"
-~a	456,722,15	2	0343	atilde
+~a	456,722,15	2	0343	-- atilde
 char227	"
-:a	456,706,15	2	0344	adieresis
+:a	456,706,15	2	0344	-- adieresis
 char228	"
-oa	456,756,15	2	0345	aring
+oa	456,756,15	2	0345	-- aring
 char229	"
-ae	729,538,15	0	0346	ae
+ae	729,538,15	0	0346	-- ae
 char230	"
-,c	410,538,225	1	0347	ccedilla
+,c	410,538,225	1	0347	-- ccedilla
 char231	"
-`e	456,734,15	2	0350	egrave
+`e	456,734,15	2	0350	-- egrave
 char232	"
-'e	456,734,15	2	0351	eacute
+'e	456,734,15	2	0351	-- eacute
 char233	"
-^e	456,734,15	2	0352	ecircumflex
+^e	456,734,15	2	0352	-- ecircumflex
 char234	"
-:e	456,706,15	2	0353	edieresis
+:e	456,706,15	2	0353	-- edieresis
 char235	"
-`i	228,734	2	0354	igrave
+`i	228,734	2	0354	-- igrave
 char236	"
-'i	228,734	2	0355	iacute
+'i	228,734	2	0355	-- iacute
 char237	"
-^i	228,734	2	0356	icircumflex
+^i	228,734	2	0356	-- icircumflex
 char238	"
-:i	228,706	2	0357	idieresis
+:i	228,706	2	0357	-- idieresis
 char239	"
-Sd	456,737,15	2	0360	eth
+Sd	456,737,15	2	0360	-- eth
 char240	"
-~n	456,722	2	0361	ntilde
+~n	456,722	2	0361	-- ntilde
 char241	"
-`o	456,734,14	2	0362	ograve
+`o	456,734,14	2	0362	-- ograve
 char242	"
-'o	456,734,14	2	0363	oacute
+'o	456,734,14	2	0363	-- oacute
 char243	"
-^o	456,734,14	2	0364	ocircumflex
+^o	456,734,14	2	0364	-- ocircumflex
 char244	"
-~o	456,722,14	2	0365	otilde
+~o	456,722,14	2	0365	-- otilde
 char245	"
-:o	456,706,14	2	0366	odieresis
+:o	456,706,14	2	0366	-- odieresis
 char246	"
-char247	479,524,19	0	0367	divide
-/o	501,545,22	0	0370	oslash
+char247	479,524,19	0	0367	-- divide
+/o	501,545,22	0	0370	-- oslash
 char248	"
-`u	456,734,15	2	0371	ugrave
+`u	456,734,15	2	0371	-- ugrave
 char249	"
-'u	456,734,15	2	0372	uacute
+'u	456,734,15	2	0372	-- uacute
 char250	"
-^u	456,734,15	2	0373	ucircumflex
+^u	456,734,15	2	0373	-- ucircumflex
 char251	"
-:u	456,706,15	2	0374	udieresis
+:u	456,706,15	2	0374	-- udieresis
 char252	"
-'y	410,734,214	3	0375	yacute
+'y	410,734,214	3	0375	-- yacute
 char253	"
-Tp	456,718,207	3	0376	thorn
+Tp	456,718,207	3	0376	-- thorn
 char254	"
-:y	410,706,214	3	0377	ydieresis
+:y	410,706,214	3	0377	-- ydieresis
 char255	"