From MAILER-DAEMON Mon Jan 01 08:50:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H1NYB-0002Yv-KN
	for mharc-groff-commit@gnu.org; Mon, 01 Jan 2007 08:50:03 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H1NY8-0002V6-K2
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:50:00 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H1NY5-0002Si-P2
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:49:59 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H1NY5-0002SP-IY
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:49:57 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H1NY4-0007Bw-Ku
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:49:57 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H1NY4-0001J0-8X
	for groff-commit@gnu.org; Mon, 01 Jan 2007 13:49:56 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H1NY3-0001Ix-RG
	for groff-commit@gnu.org; Mon, 01 Jan 2007 13:49:56 +0000
To: groff-commit@gnu.org
Message-Id: <E1H1NY3-0001Ix-RG@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 01 Jan 2007 13:49:55 +0000
Subject: [Groff-commit] groff ChangeLog font/devps/AB font/devps/ABI fo...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jan 2007 13:50:01 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/01 13:49:55

Modified files:
	.              : ChangeLog 
	font/devps     : AB ABI AI AR BMB BMBI BMI BMR CB CBI CI CR EURO 
	                 HB HBI HI HNB HNBI HNI HNR HR NB NBI NI NR PB 
	                 PBI PI PR S SS TB TBI TI TR ZCMI ZD ZDR 
	man            : groff_font.man 
	src/utils/afmtodit: afmtodit.pl 

Log message:
	* man/groff_font.man: Document empty lines.
	
	* src/utils/afmtodit/afmtodit.pl: Always print a header comment at
	the very beginning of the output.
	[!$opt_x]: Fix typo.
	
	* font/devps/*: Regenerate font definition files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1015&r2=1.1016
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/AB?cvsroot=groff&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/ABI?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/AI?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/AR?cvsroot=groff&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/BMB?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/BMBI?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/BMI?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/BMR?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/CB?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/CBI?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/CI?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/CR?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/EURO?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HB?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HBI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HNB?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HNBI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HNI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HNR?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/HR?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/NB?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/NBI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/NI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/NR?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/PB?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/PBI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/PI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/PR?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/S?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/SS?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/TB?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/TBI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/TI?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/TR?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/ZCMI?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/ZD?cvsroot=groff&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/ZDR?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_font.man?cvsroot=groff&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/groff/src/utils/afmtodit/afmtodit.pl?cvsroot=groff&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -b -r1.1015 -r1.1016
--- ChangeLog	1 Jan 2007 00:11:00 -0000	1.1015
+++ ChangeLog	1 Jan 2007 13:49:54 -0000	1.1016
@@ -1,5 +1,15 @@
 2007-01-01  Werner LEMBERG  <wl@gnu.org>
 
+	* man/groff_font.man: Document empty lines.
+
+	* src/utils/afmtodit/afmtodit.pl: Always print a header comment at
+	the very beginning of the output.
+	[!$opt_x]: Fix typo.
+
+	* font/devps/*: Regenerate font definition files.
+
+2007-01-01  Werner LEMBERG  <wl@gnu.org>
+
 	* font/devps/generate/Makefile (AFMTODIT): Use -c flag.
 
 	* font/devps/*: Regenerate font definition files.

Index: font/devps/AB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/AB,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- font/devps/AB	1 Jan 2007 00:11:00 -0000	1.14
+++ font/devps/AB	1 Jan 2007 13:49:55 -0000	1.15
@@ -1,16 +1,23 @@
-name AB
-internalname AvantGarde-Demi
-spacewidth 280
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Avant Garde Gothic Demi
 # Version 001.007
 # FamilyName ITC Avant Garde Gothic
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Mar  4 13:46:34 1991
 # Comment UniqueID 34370
 # Comment VMusage 24954 31846
+
+name AB
+internalname AvantGarde-Demi
+spacewidth 280
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y -50
 A w -65
@@ -253,6 +260,7 @@
 y , -100
 y c -35
 y a -30
+
 charset
 ha	600,740	2	0	asciicircum
 ti	600,347	0	1	asciitilde

Index: font/devps/ABI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/ABI,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- font/devps/ABI	1 Jan 2007 00:11:00 -0000	1.12
+++ font/devps/ABI	1 Jan 2007 13:49:55 -0000	1.13
@@ -1,17 +1,24 @@
-name ABI
-internalname AvantGarde-DemiOblique
-slant 10.5
-spacewidth 280
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Avant Garde Gothic Demi Oblique
 # Version 001.007
 # FamilyName ITC Avant Garde Gothic
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Mar  4 13:49:44 1991
 # Comment UniqueID 34373
 # Comment VMusage 6550 39938
+
+name ABI
+internalname AvantGarde-DemiOblique
+slant 10.5
+spacewidth 280
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y -50
 A w -65
@@ -254,6 +261,7 @@
 y , -100
 y c -35
 y a -30
+
 charset
 ha	600,740,0,46,-92,46	2	0	asciicircum
 ti	600,347,0,29,-64,29	0	1	asciitilde

Index: font/devps/AI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/AI,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- font/devps/AI	1 Jan 2007 00:11:00 -0000	1.12
+++ font/devps/AI	1 Jan 2007 13:49:55 -0000	1.13
@@ -1,17 +1,24 @@
-name AI
-internalname AvantGarde-BookOblique
-slant 10.5
-spacewidth 277
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Avant Garde Gothic Book Oblique
 # Version 001.006
 # FamilyName ITC Avant Garde Gothic
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Mar  4 13:41:11 1991
 # Comment UniqueID 34367
 # Comment VMusage 6555 39267
+
+name AI
+internalname AvantGarde-BookOblique
+slant 10.5
+spacewidth 277
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y -62
 A w -65
@@ -254,6 +261,7 @@
 y e -20
 y , -110
 y a -30
+
 charset
 ha	606,740,0,54,-60,54	2	0	asciicircum
 ti	606,319,0,28,-64,28	0	1	asciitilde

Index: font/devps/AR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/AR,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- font/devps/AR	1 Jan 2007 00:11:00 -0000	1.14
+++ font/devps/AR	1 Jan 2007 13:49:55 -0000	1.15
@@ -1,16 +1,23 @@
-name AR
-internalname AvantGarde-Book
-spacewidth 277
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Avant Garde Gothic Book
 # Version 001.006
 # FamilyName ITC Avant Garde Gothic
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Mar  4 13:37:31 1991
 # Comment UniqueID 34364
 # Comment VMusage 24225 31117
+
+name AR
+internalname AvantGarde-Book
+spacewidth 277
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y -62
 A w -65
@@ -253,6 +260,7 @@
 y e -20
 y , -110
 y a -30
+
 charset
 ha	606,740	2	0	asciicircum
 ti	606,319	0	1	asciitilde

Index: font/devps/BMB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/BMB,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/BMB	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/BMB	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,16 +1,23 @@
-name BMB
-internalname Bookman-Demi
-spacewidth 340
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Bookman Demi
 # Version 001.004
 # FamilyName ITC Bookman
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Tue Jan 21 16:13:29 1992
 # Comment UniqueID 37831
 # Comment VMusage 31983 38875
+
+name BMB
+internalname Bookman-Demi
+spacewidth 340
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y -1
 A w -9
@@ -107,6 +114,7 @@
 r d -10
 r , -101
 r c -9
+
 charset
 ha	600,681	2	0	asciicircum
 ti	600,368	0	1	asciitilde

Index: font/devps/BMBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/BMBI,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- font/devps/BMBI	1 Jan 2007 00:11:00 -0000	1.11
+++ font/devps/BMBI	1 Jan 2007 13:49:55 -0000	1.12
@@ -1,17 +1,24 @@
-name BMBI
-internalname Bookman-DemiItalic
-slant 10
-spacewidth 340
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Bookman Demi Italic
 # Version 001.004
 # FamilyName ITC Bookman
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Tue Jan 21 16:12:43 1992
 # Comment UniqueID 37832
 # Comment VMusage 32139 39031
+
+name BMBI
+internalname Bookman-DemiItalic
+slant 10
+spacewidth 340
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y 20
 A w 20
@@ -110,6 +117,7 @@
 r d -3
 r , -113
 r c -5
+
 charset
 ha	620,681,0,24,-42,24	2	0	asciicircum
 ti	620,368,0,35,-51,35	0	1	asciitilde

Index: font/devps/BMI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/BMI,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- font/devps/BMI	1 Jan 2007 00:11:00 -0000	1.11
+++ font/devps/BMI	1 Jan 2007 13:49:55 -0000	1.12
@@ -1,17 +1,24 @@
-name BMI
-internalname Bookman-LightItalic
-slant 10
-spacewidth 300
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Bookman Light Italic
 # Version 001.004
 # FamilyName ITC Bookman
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Tue Jan 21 16:12:06 1992
 # Comment UniqueID 37830
 # Comment VMusage 33139 40031
+
+name BMI
+internalname Bookman-LightItalic
+slant 10
+spacewidth 300
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A Y -62
 A W -73
@@ -103,6 +110,7 @@
 r d -9
 r , -143
 r c -8
+
 charset
 ha	600,681,0,49,-47,49	2	0	asciicircum
 ti	600,386,0,45,-41,45	0	1	asciitilde

Index: font/devps/BMR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/BMR,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/BMR	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/BMR	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,16 +1,23 @@
-name BMR
-internalname Bookman-Light
-spacewidth 320
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Bookman Light
 # Version 001.004
 # FamilyName ITC Bookman
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Tue Jan 21 16:15:53 1992
 # Comment UniqueID 37833
 # Comment VMusage 32321 39213
+
+name BMR
+internalname Bookman-Light
+spacewidth 320
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A y 32
 A w 4
@@ -99,6 +106,7 @@
 r d 7
 r , -58
 r c 7
+
 charset
 ha	600,681	2	0	asciicircum
 ti	600,352	0	1	asciitilde

Index: font/devps/CB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/CB,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/CB	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/CB	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,15 +1,22 @@
-name CB
-internalname Courier-Bold
-spacewidth 600
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Courier Bold
 # Version 004.000
 # FamilyName Courier
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1989, 1990, 1991, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1989, 1990, 1991, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Wed Aug 26 16:51:38 1998
 # Comment UniqueID 44053
 # Comment VMusage 32181 39117
+
+name CB
+internalname Courier-Bold
+spacewidth 600
+encoding text.enc
+
 charset
 ha	600,750	2	0	asciicircum
 ti	600,311	0	1	asciitilde

Index: font/devps/CBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/CBI,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- font/devps/CBI	1 Jan 2007 00:11:00 -0000	1.11
+++ font/devps/CBI	1 Jan 2007 13:49:55 -0000	1.12
@@ -1,16 +1,23 @@
-name CBI
-internalname Courier-BoldOblique
-slant 11
-spacewidth 600
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Courier Bold Oblique
 # Version 004.000
 # FamilyName Courier
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1989, 1990, 1991, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1989, 1990, 1991, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Wed Aug 26 16:53:05 1998
 # Comment UniqueID 44055
 # Comment VMusage 11931 56737
+
+name CBI
+internalname Courier-BoldOblique
+slant 11
+spacewidth 600
+encoding text.enc
+
 charset
 ha	600,750,0,57,-146,57	2	0	asciicircum
 ti	600,311,0,24,-64,24	0	1	asciitilde

Index: font/devps/CI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/CI,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- font/devps/CI	1 Jan 2007 00:11:00 -0000	1.11
+++ font/devps/CI	1 Jan 2007 13:49:55 -0000	1.12
@@ -1,16 +1,23 @@
-name CI
-internalname Courier-Oblique
-slant 11
-spacewidth 600
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Courier Oblique
 # Version 004.000
 # FamilyName Courier
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Wed Aug 26 16:52:23 1998
 # Comment UniqueID 44054
 # Comment VMusage 11074 54655
+
+name CI
+internalname Courier-Oblique
+slant 11
+spacewidth 600
+encoding text.enc
+
 charset
 ha	600,750,0,55,-144,55	2	0	asciicircum
 ti	600,274,0,22,-77,22	0	1	asciitilde

Index: font/devps/CR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/CR,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/CR	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/CR	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,15 +1,22 @@
-name CR
-internalname Courier
-spacewidth 600
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Courier
 # Version 004.000
 # FamilyName Courier
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Wed Aug 26 16:50:02 1998
 # Comment UniqueID 44052
 # Comment VMusage 31569 38505
+
+name CR
+internalname Courier
+spacewidth 600
+encoding text.enc
+
 charset
 ha	600,750	2	0	asciicircum
 ti	600,274	0	1	asciitilde

Index: font/devps/EURO
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/EURO,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- font/devps/EURO	1 Jan 2007 00:11:00 -0000	1.6
+++ font/devps/EURO	1 Jan 2007 13:49:55 -0000	1.7
@@ -1,11 +1,18 @@
-name EURO
-internalname FreeEuro
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName FreeEuro
 # Version 001.001
 # FamilyName FreeEuro
+#
+# The original AFM file contains the following comments:
+#
 # 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.)
 # Comment Generated by FontForge 20060105
 # Comment Creation Date: Sun Jan  8 10:14:22 2006
+
+name EURO
+internalname FreeEuro
+
 charset
 ---	750,685,12	3	0	Euro.symbol
 ---	750,685,12	3	1	Euro.symbol.bold

Index: font/devps/HB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HB,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/HB	1 Jan 2007 00:11:00 -0000	1.15
+++ font/devps/HB	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name HB
-internalname Helvetica-Bold
-spacewidth 278
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Bold
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 12:45:17 1999
 # Comment UniqueID 44699
 # Comment VMusage 29305 36241
+
+name HB
+internalname Helvetica-Bold
+spacewidth 278
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -40
 A ,C -40
@@ -1217,6 +1224,7 @@
 vz ^e 10
 vz :e 10
 vz `e 10
+
 charset
 ha	584,698	2	0	asciicircum
 ti	584,343	0	1	asciitilde

Index: font/devps/HBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HBI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/HBI	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/HBI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name HBI
-internalname Helvetica-BoldOblique
-slant 12
-spacewidth 278
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Bold Oblique
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 12:46:09 1999
 # Comment UniqueID 44700
 # Comment VMusage 10926 50493
+
+name HBI
+internalname Helvetica-BoldOblique
+slant 12
+spacewidth 278
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -40
 A ,C -40
@@ -1218,6 +1225,7 @@
 vz ^e 10
 vz :e 10
 vz `e 10
+
 charset
 ha	584,698,0,57,-80,57	2	0	asciicircum
 ti	584,343,0,43,-64,43	0	1	asciitilde

Index: font/devps/HI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/HI	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/HI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name HI
-internalname Helvetica-Oblique
-slant 12
-spacewidth 278
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Oblique
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 12:49:11 1999
 # Comment UniqueID 44702
 # Comment VMusage 11195 50629
+
+name HI
+internalname Helvetica-Oblique
+slant 12
+spacewidth 278
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -30
 A ,C -30
@@ -1334,6 +1341,7 @@
 vz `o -15
 vz /o -15
 vz ~o -15
+
 charset
 ha	469,688,0,121,8,89	2	0	asciicircum
 ti	584,326,0,47,-61,47	0	1	asciitilde

Index: font/devps/HNB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HNB,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/HNB	1 Jan 2007 00:11:00 -0000	1.15
+++ font/devps/HNB	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name HNB
-internalname Helvetica-Narrow-Bold
-spacewidth 228
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Narrow Bold
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:08:06 1999
 # Comment UniqueID 44712
 # Comment VMusage 10926 50493
+
+name HNB
+internalname Helvetica-Narrow-Bold
+spacewidth 228
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -40
 A ,C -40
@@ -1217,6 +1224,7 @@
 vz ^e 10
 vz :e 10
 vz `e 10
+
 charset
 ha	479,698	2	0	asciicircum
 ti	479,343	0	1	asciitilde

Index: font/devps/HNBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HNBI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/HNBI	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/HNBI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name HNBI
-internalname Helvetica-Narrow-BoldOblique
-slant 12
-spacewidth 228
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Narrow Bold Oblique
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:08:56 1999
 # Comment UniqueID 44713
 # Comment VMusage 10926 50493
+
+name HNBI
+internalname Helvetica-Narrow-BoldOblique
+slant 12
+spacewidth 228
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -40
 A ,C -40
@@ -1218,6 +1225,7 @@
 vz ^e 10
 vz :e 10
 vz `e 10
+
 charset
 ha	479,698,0,56,-57,56	2	0	asciicircum
 ti	479,343,0,44,-44,44	0	1	asciitilde

Index: font/devps/HNI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HNI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/HNI	1 Jan 2007 00:11:00 -0000	1.13
+++ font/devps/HNI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name HNI
-internalname Helvetica-Narrow-Oblique
-slant 12
-spacewidth 228
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Narrow Oblique
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:09:51 1999
 # Comment UniqueID 44714
 # Comment VMusage 11195 50629
+
+name HNI
+internalname Helvetica-Narrow-Oblique
+slant 12
+spacewidth 228
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -30
 A ,C -30
@@ -1334,6 +1341,7 @@
 vz `o -15
 vz /o -15
 vz ~o -15
+
 charset
 ha	385,688,0,108,16,89	2	0	asciicircum
 ti	479,326,0,47,-41,47	0	1	asciitilde

Index: font/devps/HNR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HNR,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/HNR	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/HNR	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name HNR
-internalname Helvetica-Narrow
-spacewidth 228
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica Narrow
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:07:10 1999
 # Comment UniqueID 44711
 # Comment VMusage 11195 50629
+
+name HNR
+internalname Helvetica-Narrow
+spacewidth 228
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -30
 A ,C -30
@@ -1333,6 +1340,7 @@
 vz `o -15
 vz /o -15
 vz ~o -15
+
 charset
 ha	385,688,0,12,12	2	0	asciicircum
 ti	479,326	0	1	asciitilde

Index: font/devps/HR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/HR,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/HR	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/HR	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name HR
-internalname Helvetica
-spacewidth 278
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Helvetica
 # Version 003.001
 # FamilyName Helvetica
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Helvetica is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 12:48:21 1999
 # Comment UniqueID 44701
 # Comment VMusage 28955 35891
+
+name HR
+internalname Helvetica
+spacewidth 278
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -30
 A ,C -30
@@ -1333,6 +1340,7 @@
 vz `o -15
 vz /o -15
 vz ~o -15
+
 charset
 ha	469,688,0,14,14	2	0	asciicircum
 ti	584,326	0	1	asciitilde

Index: font/devps/NB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/NB,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/NB	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/NB	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name NB
-internalname NewCenturySchlbk-Bold
-spacewidth 287
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName New Century Schoolbook Bold
 # Version 003.001
 # FamilyName New Century Schoolbook
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1988, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1985, 1987, 1988, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:51:41 1999
 # Comment UniqueID 44730
 # Comment VMusage 34691 41627
+
+name NB
+internalname NewCenturySchlbk-Bold
+spacewidth 287
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A T -55
 A U -18
@@ -669,6 +676,7 @@
 'y . -100
 :y , -100
 :y . -100
+
 charset
 ha	606,690	2	0	asciicircum
 ti	606,346	0	1	asciitilde

Index: font/devps/NBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/NBI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/NBI	1 Jan 2007 00:11:01 -0000	1.13
+++ font/devps/NBI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name NBI
-internalname NewCenturySchlbk-BoldItalic
-slant 16
-spacewidth 287
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName New Century Schoolbook Bold Italic
 # Version 003.001
 # FamilyName New Century Schoolbook
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1985, 1987, 1989, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:54:27 1999
 # Comment UniqueID 44731
 # Comment VMusage 35376 42312
+
+name NBI
+internalname NewCenturySchlbk-BoldItalic
+slant 16
+spacewidth 287
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C 5
 A ,C 5
@@ -1312,6 +1319,7 @@
 vz ^e 4
 vz :e 4
 vz `e 4
+
 charset
 ha	606,690,0,0,-16	2	0	asciicircum
 ti	606,346,0,0,-22	0	1	asciitilde

Index: font/devps/NI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/NI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/NI	1 Jan 2007 00:11:01 -0000	1.13
+++ font/devps/NI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name NI
-internalname NewCenturySchlbk-Italic
-slant 16
-spacewidth 278
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName New Century Schoolbook Italic
 # Version 003.001
 # FamilyName New Century Schoolbook
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1985, 1987, 1989, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:48:41 1999
 # Comment UniqueID 44729
 # Comment VMusage 35170 42106
+
+name NI
+internalname NewCenturySchlbk-Italic
+slant 16
+spacewidth 278
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -18
 A ,C -18
@@ -904,6 +911,7 @@
 'y . -75
 :y , -75
 :y . -75
+
 charset
 ha	606,690,0,0,-39	2	0	asciicircum
 ti	606,322,0,0,-22	0	1	asciitilde

Index: font/devps/NR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/NR,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/NR	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/NR	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name NR
-internalname NewCenturySchlbk-Roman
-spacewidth 278
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName New Century Schoolbook Roman
 # Version 003.001
 # FamilyName New Century Schoolbook
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Copyright (c) 1985, 1987, 1989, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:45:59 1999
 # Comment UniqueID 44728
 # Comment VMusage 33757 40693
+
+name NR
+internalname NewCenturySchlbk-Roman
+spacewidth 278
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A T -18
 A U -30
@@ -857,6 +864,7 @@
 'y . -125
 :y , -125
 :y . -125
+
 charset
 ha	606,690	2	0	asciicircum
 ti	606,322	0	1	asciitilde

Index: font/devps/PB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/PB,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/PB	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/PB	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name PB
-internalname Palatino-Bold
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Palatino Bold
 # Version 003.001
 # FamilyName Palatino
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Palatino is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:21:36 1999
 # Comment UniqueID 44717
 # Comment VMusage 41560 52496
+
+name PB
+internalname Palatino-Bold
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A T -92
 A V -129
@@ -457,6 +464,7 @@
 'y . -92
 :y , -92
 :y . -92
+
 charset
 ha	606,678	2	0	asciicircum
 ti	606,342	0	1	asciitilde

Index: font/devps/PBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/PBI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/PBI	1 Jan 2007 00:11:01 -0000	1.13
+++ font/devps/PBI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name PBI
-internalname Palatino-BoldItalic
-slant 10
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Palatino Bold Italic
 # Version 003.001
 # FamilyName Palatino
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Palatino is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:25:04 1999
 # Comment UniqueID 44718
 # Comment VMusage 42609 53545
+
+name PBI
+internalname Palatino-BoldItalic
+slant 10
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A T -55
 A V -74
@@ -483,6 +490,7 @@
 'y . -37
 :y , -37
 :y . -37
+
 charset
 ha	606,678,0,0,-13	2	0	asciicircum
 ti	606,346,0,0,-1	0	1	asciitilde

Index: font/devps/PI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/PI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/PI	1 Jan 2007 00:11:01 -0000	1.13
+++ font/devps/PI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name PI
-internalname Palatino-Italic
-slant 10
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Palatino Italic
 # Version 003.001
 # FamilyName Palatino
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Palatino is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:17:38 1999
 # Comment UniqueID 44716
 # Comment VMusage 44424 55360
+
+name PI
+internalname Palatino-Italic
+slant 10
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A T -55
 A V -74
@@ -482,6 +489,7 @@
 'y . -37
 :y , -37
 :y . -37
+
 charset
 ha	606,689,0,0,-1	2	0	asciicircum
 ti	606,339,0,0,-1	0	1	asciitilde

Index: font/devps/PR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/PR,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/PR	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/PR	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name PR
-internalname Palatino-Roman
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Palatino Roman
 # Version 003.001
 # FamilyName Palatino
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Palatino is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:13:46 1999
 # Comment UniqueID 44715
 # Comment VMusage 42362 53298
+
+name PR
+internalname Palatino-Roman
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A T -74
 A V -111
@@ -496,6 +503,7 @@
 'y . -111
 :y , -111
 :y . -111
+
 charset
 ha	606,689	2	0	asciicircum
 ti	606,347	0	1	asciitilde

Index: font/devps/S
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/S,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- font/devps/S	1 Jan 2007 00:11:01 -0000	1.12
+++ font/devps/S	1 Jan 2007 13:49:55 -0000	1.13
@@ -1,15 +1,22 @@
-name S
-internalname Symbol
-special
-spacewidth 250
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Symbol
 # Version 001.008
 # FamilyName Symbol
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997 Adobe Systems Incorporated. All rights reserved.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997 Adobe Systems Incorporated. All rights reserved.
 # Comment Creation Date: Thu May  1 15:12:25 1997
 # Comment UniqueID 43064
 # Comment VMusage 30820 39997
+
+name S
+internalname Symbol
+special
+spacewidth 250
+
 charset
 space	250	0	32	space
 !	333,672,17	3	33	exclam

Index: font/devps/SS
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/SS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- font/devps/SS	1 Jan 2007 00:11:01 -0000	1.5
+++ font/devps/SS	1 Jan 2007 13:49:55 -0000	1.6
@@ -1,16 +1,23 @@
-name SS
-internalname Symbol-Slanted
-special
-slant 15.5
-spacewidth 223
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Symbol Slanted
 # Version 001.008
 # FamilyName Symbol
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1997 Adobe Systems Incorporated. All rights reserved.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1997 Adobe Systems Incorporated. All rights reserved.
 # Comment Creation Date: Thu May  1 15:12:25 1997
 # Comment UniqueID 43064
 # Comment VMusage 30820 39997
+
+name SS
+internalname Symbol-Slanted
+special
+slant 15.5
+spacewidth 223
+
 charset
 space	223	0	32	space
 ---	296,598,15,137,-73,99	3	33	exclam

Index: font/devps/TB
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/TB,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/TB	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/TB	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name TB
-internalname Times-Bold
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Times Bold
 # Version 003.001
 # FamilyName Times
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Times is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 12:58:13 1999
 # Comment UniqueID 44707
 # Comment VMusage 33130 40066
+
+name TB
+internalname Times-Bold
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -55
 A ,C -55
@@ -296,6 +303,7 @@
 y o -25
 y /o -25
 y . -70
+
 charset
 ha	581,676	2	0	asciicircum
 ti	520,333	0	1	asciitilde

Index: font/devps/TBI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/TBI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/TBI	1 Jan 2007 00:11:01 -0000	1.13
+++ font/devps/TBI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name TBI
-internalname Times-BoldItalic
-slant 15
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Times Bold Italic
 # Version 003.001
 # FamilyName Times
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Times is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:00:52 1999
 # Comment UniqueID 44708
 # Comment VMusage 36699 43635
+
+name TBI
+internalname Times-BoldItalic
+slant 15
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -65
 A ,C -65
@@ -275,6 +282,7 @@
 x e -10
 y , -37
 y . -37
+
 charset
 ha	570,669,0,0,-17	2	0	asciicircum
 ti	570,333,0,0,-4	0	1	asciitilde

Index: font/devps/TI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/TI,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- font/devps/TI	1 Jan 2007 00:11:01 -0000	1.13
+++ font/devps/TI	1 Jan 2007 13:49:55 -0000	1.14
@@ -1,17 +1,24 @@
-name TI
-internalname Times-Italic
-slant 7
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Times Italic
 # Version 003.001
 # FamilyName Times
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Times is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:03:40 1999
 # Comment UniqueID 44709
 # Comment VMusage 38051 44987
+
+name TI
+internalname Times-Italic
+slant 7
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -30
 A ,C -30
@@ -285,6 +292,7 @@
 w . -74
 y , -55
 y . -55
+
 charset
 ha	422,666,0,50,50,43	2	0	asciicircum
 ti	541,323,0,11,10,11	0	1	asciitilde

Index: font/devps/TR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/TR,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font/devps/TR	1 Jan 2007 00:11:01 -0000	1.15
+++ font/devps/TR	1 Jan 2007 13:49:55 -0000	1.16
@@ -1,16 +1,23 @@
-name TR
-internalname Times-Roman
-spacewidth 250
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName Times Roman
 # Version 003.001
 # FamilyName Times
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Times is a trademark of Linotype-Hell AG and/or its subsidiaries.
 # Comment Copyright (c) 1985, 1987, 1989, 1990, 1993, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Mon Aug 23 13:06:12 1999
 # Comment UniqueID 44710
 # Comment VMusage 35112 42048
+
+name TR
+internalname Times-Roman
+spacewidth 250
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A C -40
 A ,C -40
@@ -283,6 +290,7 @@
 x e -15
 y , -65
 y . -65
+
 charset
 ha	469,662	2	0	asciicircum
 ti	541,323	0	1	asciitilde

Index: font/devps/ZCMI
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/ZCMI,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- font/devps/ZCMI	1 Jan 2007 00:11:01 -0000	1.11
+++ font/devps/ZCMI	1 Jan 2007 13:49:55 -0000	1.12
@@ -1,17 +1,24 @@
-name ZCMI
-internalname ZapfChancery-MediumItalic
-slant 14
-spacewidth 220
-encoding text.enc
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Zapf Chancery Medium Italic
 # Version 001.007
 # FamilyName ITC Zapf Chancery
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All Rights Reserved.ITC Zapf Chancery is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All Rights Reserved.
 # Comment Creation Date: Fri Dec 28 16:35:46 1990
 # Comment UniqueID 33936
 # Comment VMusage 34559 41451
+
+name ZCMI
+internalname ZapfChancery-MediumItalic
+slant 14
+spacewidth 220
+encoding text.enc
 ligatures fi fl 0
+
 kernpairs
 A ' -40
 A cq -40
@@ -164,6 +171,7 @@
 w o 10
 w h 20
 w , -20
+
 charset
 ha	520,594,0,62,-82,62	2	0	asciicircum
 ti	520,320,0,69,-73,69	0	1	asciitilde

Index: font/devps/ZD
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/ZD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- font/devps/ZD	10 Mar 2003 21:51:52 -0000	1.4
+++ font/devps/ZD	1 Jan 2007 13:49:55 -0000	1.5
@@ -1,7 +1,22 @@
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
+#   FullName ITC Zapf Dingbats
+#   Version 002.000
+#   FamilyName ITC Zapf Dingbats
+#
+# The original AFM file contains the following comments:
+#
+#   Notice Copyright (c) 1985, 1987, 1988, 1989, 1997 Adobe Systems Incorporated. All Rights Reserved.ITC Zapf Dingbats is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1988, 1989, 1997 Adobe Systems Incorporated. All Rights Reserved.
+#   Comment Creation Date: Thu May  1 15:14:13 1997
+#   Comment UniqueID 43082
+#   Comment VMusage 45775 55535
+
 name ZD
 internalname ZapfDingbats
 special
 spacewidth 278
+
 charset
 space	278	0	32	space
 ---	974,621	3	33	a1
@@ -98,6 +113,20 @@
 ---	392,705	3	124	a98
 ---	668,705	3	125	a99
 ---	668,705	3	126	a100
+---	390,705,14	3	128	a89
+---	390,705,14	3	129	a90
+---	317,692	3	130	a93
+---	317,692	3	131	a94
+---	276,692	3	132	a91
+---	276,692	3	133	a92
+---	509,692	3	134	a205
+---	509,692	3	135	a85
+---	410,692	3	136	a206
+---	410,692	3	137	a86
+---	234,705,14	3	138	a87
+---	234,705,14	3	139	a88
+---	334,692	3	140	a95
+---	334,692	3	141	a96
 ---	732,806,143	3	161	a101
 ---	544,706,14	3	162	a102
 ---	544,705,14	3	163	a103
@@ -191,17 +220,3 @@
 ---	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

Index: font/devps/ZDR
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/ZDR,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- font/devps/ZDR	1 Jan 2007 00:11:01 -0000	1.5
+++ font/devps/ZDR	1 Jan 2007 13:49:55 -0000	1.6
@@ -1,15 +1,22 @@
-name ZDR
-internalname ZapfDingbats-Reverse
-special
-spacewidth 278
+# This file has been generated with GNU afmtodit (groff) version 1.19.3
+#
 # FullName ITC Zapf Dingbats Reverse
 # Version 002.000
 # FamilyName ITC Zapf Dingbats
+#
+# The original AFM file contains the following comments:
+#
 # Notice Copyright (c) 1985, 1987, 1988, 1989, 1997 Adobe Systems Incorporated. All Rights Reserved.ITC Zapf Dingbats is a registered trademark of International Typeface Corporation.
 # Comment Copyright (c) 1985, 1987, 1988, 1989, 1997 Adobe Systems Incorporated. All Rights Reserved.
 # Comment Creation Date: Thu May  1 15:14:13 1997
 # Comment UniqueID 43082
 # Comment VMusage 45775 55535
+
+name ZDR
+internalname ZapfDingbats-Reverse
+special
+spacewidth 278
+
 charset
 space	278	0	32	space
 ---	974,621	3	33	a1

Index: man/groff_font.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff_font.man,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- man/groff_font.man	28 Jan 2006 06:55:42 -0000	1.24
+++ man/groff_font.man	1 Jan 2007 13:49:55 -0000	1.25
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2006, 2007
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -71,6 +71,9 @@
 .
 Later entries in the file override previous values.
 .
+.LP
+Empty lines are ignored.
+.
 .TP
 .B charset
 This line and everything following in the file are ignored.
@@ -83,11 +86,11 @@
 .IR fam .
 .
 .TP
-.BI fonts\  n\ F1\ F2\ F3\|.\|.\|.\|Fn
+.BI fonts\  n\ F1\ F2\ F3\ \|.\|.\|.\|\ Fn
 Fonts
-.I F1\|.\|.\|.\|Fn
+.IR F1 ,\ \|.\|.\|.,\  Fn
 are mounted in the font positions 
-.IR m +1,\|.\|.\|., m + n
+.IR m +1,\ \|.\|.\|.,\  m + n
 where
 .I m
 is the number of styles.
@@ -109,8 +112,10 @@
 Needed for
 .B \%grohtml
 only.
+.
 It specifies the program to generate PNG images from
 PostScript input.
+.
 Under GNU/Linux this is usually
 .I gs
 but under other systems (notably cygwin) it might be set to another name.
@@ -231,10 +236,10 @@
 machine units per inch.
 .
 .TP
-.BI sizes\  s1\ s2\|.\|.\|.\|sn\  0
+.BI sizes\  s1\ s2\ \|.\|.\|.\|\  sn\  0
 This means that the device has fonts at
 .IR s1 ,
-.IR s2 ,\|.\|.\|.\| sn
+.IR s2 ,\ \|.\|.\|.,\  sn
 scaled points.
 .
 The list of sizes must be terminated by a
@@ -267,11 +272,11 @@
 commands are given in scaled points.
 .
 .TP
-.BI styles\  S1\ S2\|.\|.\|.\|Sm
+.BI styles\  S1\ S2\ \|.\|.\|.\|\ Sm
 The first
 .I m
 font positions are associated with styles
-.IR S1\|.\|.\|.\|Sm .
+.IR S1 ,\ \|.\|.\|.,\  Sm .
 .
 .TP
 .B tcommand
@@ -291,6 +296,7 @@
 .TP
 .B unscaled_charwidths
 Make the font handling module always return unscaled character widths.
+.
 Needed for the
 .B \%grohtml
 device.
@@ -331,14 +337,17 @@
 .
 .SS Font file format
 .
-A font file has two sections.
+A font file has two sections;
+empty lines are ignored in both of them.
+.
+.LP
 The first section is a sequence
 of lines each containing a sequence of blank delimited
 words; the first word in the line is a key, and subsequent
 words give a value for that key.
 .
 .TP
-.BI ligatures\  lig1\ lig2\|.\|.\|.\|lign\ \fR[ 0 \fR]
+.BI ligatures\  lig1\ lig2\ \|.\|.\|.\|\ lign\ \fR[ 0 \fR]
 Characters
 .IR lig1 ,
 .IR lig2 ,\ \|.\|.\|.,\ lign
@@ -527,6 +536,7 @@
 This field is optional and is currently used by
 .B grops
 to build sub-encoding arrays for PS fonts containing more than 256 glyphs.
+.
 (It has also been used for
 .BR \%grohtml 's
 entity names but for efficiency reasons this data is now compiled directly

Index: src/utils/afmtodit/afmtodit.pl
===================================================================
RCS file: /cvsroot/groff/groff/src/utils/afmtodit/afmtodit.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/utils/afmtodit/afmtodit.pl	1 May 2006 08:37:13 -0000	1.19
+++ src/utils/afmtodit/afmtodit.pl	1 Jan 2007 13:49:55 -0000	1.20
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 # -*- Perl -*-
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
@@ -363,7 +363,7 @@
 		elsif ($component =~ /^u([0-9A-F]{4,6})$/) {
 		    $nv = hex("0x" . $1);
 		    if ($nv <= 0xD7FF || ($nv >= 0xE000 && $nv <= 0x10FFFF)) {
-			$utmp .= "U+" . $1;
+			$utmp = "U+" . $1;
 		    }
 		}
 
@@ -416,6 +416,30 @@
 open(FONT, ">$font") || die "$prog: can't open \`$font' for output: $!\n";
 select(FONT);
 
+print("# This file has been generated with " .
+      "GNU afmtodit (groff) version @VERSION@\n");
+print("#\n");
+print("#   $fullname\n") if defined $fullname;
+print("#   $version\n") if defined $version;
+print("#   $familyname\n") if defined $familyname;
+
+if ($opt_c) {
+    print("#\n");
+    if (defined $notice || @comments) {
+	print("# The original AFM file contains the following comments:\n");
+	print("#\n");
+	print("#   $notice\n") if defined $notice;
+	foreach my $comment (@comments) {
+	    print("#   $comment\n");
+	}
+    }
+    else {
+	print("# The original AFM file contains no comments.\n");
+    }
+}
+
+print("\n");
+
 print("name $font\n");
 print("internalname $psname\n") if $psname;
 print("special\n") if $opt_s;
@@ -428,16 +452,6 @@
     print("encoding $e\n");
 }
 
-if ($opt_c) {
-    print("# $fullname\n") if defined $fullname;
-    print("# $version\n") if defined $version;
-    print("# $familyname\n") if defined $familyname;
-    print("# $notice\n") if defined $notice;
-    foreach my $comment (@comments) {
-	print("# $comment\n");
-    }
-}
-
 if (!$opt_n && %ligatures) {
     print("ligatures");
     while (my $lig = each %ligatures) {
@@ -447,6 +461,7 @@
 }
 
 if ($#kern1 >= 0) {
+    print("\n");
     print("kernpairs\n");
 
     for (my $i = 0; $i <= $#kern1; $i++) {
@@ -500,6 +515,7 @@
 $slant = sin($italic_angle)/cos($italic_angle);
 $slant = 0 if $slant < 0;
 
+print("\n");
 print("charset\n");
 for (my $i = 0; $i <= $#encoding; $i++) {
     my $ch = $encoding[$i];



From MAILER-DAEMON Mon Jan 01 08:55:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H1Nd6-0007p7-40
	for mharc-groff-commit@gnu.org; Mon, 01 Jan 2007 08:55:08 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H1Nd3-0007mi-Vg
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:55:06 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H1Nd2-0007kZ-SI
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:55:05 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H1Nd2-0007kQ-OK
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:55:04 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H1Nd1-00081E-Qe
	for groff-commit@gnu.org; Mon, 01 Jan 2007 08:55:04 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H1Nd1-0001Ro-Ap
	for groff-commit@gnu.org; Mon, 01 Jan 2007 13:55:03 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H1Nd1-0001Rk-4M
	for groff-commit@gnu.org; Mon, 01 Jan 2007 13:55:03 +0000
To: groff-commit@gnu.org
Message-Id: <E1H1Nd1-0001Rk-4M@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 01 Jan 2007 13:55:03 +0000
Subject: [Groff-commit] groff/man groff.man
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jan 2007 13:55:06 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/01 13:55:03

Modified files:
	man            : groff.man 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff.man?cvsroot=groff&r1=1.83&r2=1.84

Patches:
Index: groff.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff.man,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- groff.man	26 Oct 2006 19:39:07 -0000	1.83
+++ groff.man	1 Jan 2007 13:55:03 -0000	1.84
@@ -2212,7 +2212,7 @@
 .\"Save tab positions internally.
 .
 .REQ .tc
-Remove tab repition character.
+Remove tab repetition character.
 .REQ .tc c
 Set tab repetition character to\~\c
 .IR c .



From MAILER-DAEMON Fri Jan 05 01:51:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H2iv5-0005YG-TD
	for mharc-groff-commit@gnu.org; Fri, 05 Jan 2007 01:51:15 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H2iv3-0005WM-Nt
	for groff-commit@gnu.org; Fri, 05 Jan 2007 01:51:13 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H2iv2-0005Vz-LL
	for groff-commit@gnu.org; Fri, 05 Jan 2007 01:51:13 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H2iv2-0005Vs-Eb
	for groff-commit@gnu.org; Fri, 05 Jan 2007 01:51:12 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H2iv1-0003QF-KF
	for groff-commit@gnu.org; Fri, 05 Jan 2007 01:51:11 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H2iv0-0000QK-NR
	for groff-commit@gnu.org; Fri, 05 Jan 2007 06:51:10 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H2iv0-0000QH-E7
	for groff-commit@gnu.org; Fri, 05 Jan 2007 06:51:10 +0000
To: groff-commit@gnu.org
Message-Id: <E1H2iv0-0000QH-E7@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Fri, 05 Jan 2007 06:51:10 +0000
Subject: [Groff-commit] groff ChangeLog tmac/e.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jan 2007 06:51:13 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/05 06:51:10

Modified files:
	.              : ChangeLog 
	tmac           : e.tmac 

Log message:
	Make -me macros ready for grohtml.
	
	* tmac/e.tmac: Load devtag.tmac.
	(need_eo_h, need_eo_tl, need_tl): New registers.
	(check_need_title, (x-html, )x-html, xp-html): New macros.
	(@h, hl, ip, @p, sh, (b, (l, EQ, EN, TS, TE, PS, PE, GS, GE, r, i,
	b, rb, bi, bx, (x, )x, xp): Adapt for use with grohtml.
	(bp): Rename to @b only if output device is not html.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1016&r2=1.1017
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/e.tmac?cvsroot=groff&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1016
retrieving revision 1.1017
diff -u -b -r1.1016 -r1.1017
--- ChangeLog	1 Jan 2007 13:49:54 -0000	1.1016
+++ ChangeLog	5 Jan 2007 06:51:10 -0000	1.1017
@@ -1,3 +1,14 @@
+2006-01-04  Gaius Mulley  <gaius@glam.ac.uk>
+
+	Make -me macros ready for grohtml.
+
+	* tmac/e.tmac: Load devtag.tmac.
+	(need_eo_h, need_eo_tl, need_tl): New registers.
+	(check_need_title, (x-html, )x-html, xp-html): New macros.
+	(@h, hl, ip, @p, sh, (b, (l, EQ, EN, TS, TE, PS, PE, GS, GE, r, i,
+	b, rb, bi, bx, (x, )x, xp): Adapt for use with grohtml.
+	(bp): Rename to @b only if output device is not html.
+
 2007-01-01  Werner LEMBERG  <wl@gnu.org>
 
 	* man/groff_font.man: Document empty lines.

Index: tmac/e.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/e.tmac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tmac/e.tmac	16 Jun 2003 21:39:15 -0000	1.6
+++ tmac/e.tmac	5 Jan 2007 06:51:10 -0000	1.7
@@ -39,18 +39,57 @@
 .\"			to provide variant functions.
 .\"		---	an internal macro.
 .\"
+.
+.do nr need_eo_h 0
+.do nr need_eo_tl 0
+.do nr need_tl 1
+.
+.do mso devtag.tmac
+.
 .if !\n(.g .ig
 .de @R			\" --- initialize number register to 0, if undefined
 .if !r\\$1 .nr \\$1 0
 ..
+.
+.\" --- check whether grohtml needs end of title/heading
+.de @html_check_need_title
+.do if (\\n[need_eo_tl] == 1) \
+\{\
+.	do nr need_eo_tl 0
+.	do DEVTAG-EO-TL
+.\}
+.do if (\\n[need_tl] == 1) \
+\{\
+.	do DEVTAG-TL
+.	do nr need_tl 0
+.	do nr need_eo_tl 1
+.\}
+.do if \\n[need_eo_h]>0 .do DEVTAG-EO-H
+.do nr need_eo_h 0
+..
+.
+.de @check_need_title
+..
+.
+.ie '\*(.T'html' \
+.	do als check_need_title @html_check_need_title
+.el \
+.	do als check_need_title @check_need_title
+.
 .@R pf
 .if \n(pf .nx
+.
 .if !\n(.g .ig
 .de @S			\" --- initialize string/macro to empty, if undefined
 .if !d\\$1 .ds \\$1 \" empty
 ..
+.
 .@R @\"			\" debugging level
+.
+.
 .\"		*** INTERNAL GP MACROS ***
+.
+.
 .de @C			\" --- change ev's, taking info with us
 .nr _S \\n(.s
 .nr _V \\n(.v
@@ -75,6 +114,7 @@
 .ls 1
 'ce 0
 ..
+.
 .de @D			\" --- determine display type (Indent, Left, Center)
 .ds |p "\\$3
 .nr _d 0
@@ -86,11 +126,14 @@
 .	nr _d 3
 .if "\\$2"M" \
 .	nr _d 4
-.if !\\n(_d \{\
+.if !\\n(_d \
+\{\
 .	nr _d \\$1
 .	ds |p "\\$2
 .\}
+.
 ..
+.
 .de @z			\" --- end macro
 .if \n@>1 .tm >> @z, .z=\\n(.z ?a=\\n(?a
 .if !"\\n(.z"" \
@@ -106,9 +149,14 @@
 .br
 .if \n@>1 .tm << @z
 ..
+.
+.
 .\"		*** STANDARD HEADERS AND FOOTERS ***
+.
+.
 .ie \n(.g .ds $* \\\\$*
 .el .ds $* \\\\$1 \\\\$2 \\\\$3 \\\\$4 \\\\$5 \\\\$6 \\\\$7 \\\\$8 \\\\$9
+.
 .de he			\" *** define header
 .ie !\\n(.$ \
 \{\
@@ -121,18 +169,21 @@
 .	ds |5 "\*($*
 .\}
 ..
+.
 .de eh			\" *** define even header
 .ie !\\n(.$ \
 .	rm |4
 .el \
 .	ds |4 "\*($*
 ..
+.
 .de oh			\" *** define odd header
 .ie !\\n(.$ \
 .	rm |5
 .el \
 .	ds |5 "\*($*
 ..
+.
 .de fo			\" *** define footer
 .ie !\\n(.$ \
 \{\
@@ -145,18 +196,21 @@
 .	ds |7 "\*($*
 .\}
 ..
+.
 .de ef			\" *** define even foot
 .ie !\\n(.$ \
 .	rm |6
 .el \
 .	ds |6 "\*($*
 ..
+.
 .de of			\" *** define odd footer
 .ie !\\n(.$ \
 .	rm |7
 .el \
 .	ds |7 "\*($*
 ..
+.
 .de ep			\" *** end page (must always be followed by a .bp)
 .if \\n(nl>0 \
 \{\
@@ -165,7 +219,11 @@
 .	@b
 .\}
 ..
+.
+.
 .\"		*** INTERNAL HEADER AND FOOTER MACROS ***
+.
+.
 .de @h			\" --- header
 .if \n@>1 .tm >> @h %=\\n% ?a=\\n(?a ?b=\\n(?b ?w=\\n(?w
 .if (\\n(.i+\\n(.o)>=\\n(.l \
@@ -186,11 +244,13 @@
 .ev 2
 .rs
 .if \\n(hm>0 \
+.	if !'\*(.T'html' \
 .	sp |\\n(hmu		\" move to header position
 .@t $h\"			\" output header title
 .if \\n(tm<=0 \
 .	nr tm \n(.Vu
-.sp |\\n(tmu			\" move to top of text
+.if !'\*(.T'html' \
+.	sp |\\n(tmu		\" move to top of text
 .ev
 .mk _k				\" for columned output
 .if \\n(?n .nm 1		\" restore line numbering if n1 mode
@@ -206,6 +266,7 @@
 .	@n\"			\" begin the column
 .if \n@>2 .tm << @h
 ..
+.
 .de @n			\" --- new column or page
 .if \n@>3 .tm >> @n nl=\\n(nl %=\\n% ?f=\\n(?f ?o=\\n(?o
 .if \\n(bm<=0 \
@@ -255,6 +316,7 @@
 .$H\"				\" special column header macro
 .ns
 ..
+.
 .de @f			\" --- footer
 .if \n@>1 .tm >> @f %=\\n% nl=\\n(nl ?a=\\n(?a ?b=\\n(?b ?f=\\n(?f
 .if \n@>2 .nr VL \\n(.pu-\\n(nlu
@@ -282,6 +344,7 @@
 .ev
 .if \n@>2 .tm << @f
 ..
+.
 .de @o			\" --- output footnote
 .nf
 .ls 1
@@ -305,6 +368,7 @@
 .rm |f
 .ch @r
 ..
+.
 .de @c			\" --- new column
 .if \n@>2 .tm	>> @c %=\\n%
 .rs
@@ -313,6 +377,7 @@
 .nr $c +1
 .@n
 ..
+.
 .de @e			\" --- end page
 .if \n@>2 .tm	>> @e
 .@O \\n(_ou
@@ -322,6 +387,7 @@
 .nr ?h 0
 .bp
 ..
+.
 .de @t			\" --- output header or footer title
 .if !\\n(?h \
 \{\
@@ -333,6 +399,7 @@
 .	br
 .\}
 ..
+.
 .de $h			\" $$$ print header
 .ds |z
 .if !\\n(?c \
@@ -344,6 +411,7 @@
 '	tl \\*(|z
 .rm |z
 ..
+.
 .de $f			\" $$$ print footer
 .ds |z
 .if \\n(?c \
@@ -360,6 +428,7 @@
 '	tl \\*(|z
 .rm |z
 ..
+.
 .de @r			\" --- reprocess overflow footnotes
 .if \n@>3 .tm		>> @r .z=\\n(.z ?f=\\n(?f ?a=\\n(?a ?b=\\n(?b _b=\\n(_b
 .di |o				\" save overflow footnote
@@ -367,8 +436,13 @@
 .nr _D \\n(dn
 .ns
 ..
+.
+.
 .\"		*** COMMANDS WITH VARIANT DEFINITIONS ***
-.rn bp @b		\" --- begin page
+.
+.
+.if !'\*(.T'html' .rn bp @b	\" --- begin page
+.
 .de bp			\" *** begin new page (overrides columns)
 .nr $c \\n($m			\" force new page, not new column
 .ie \\n(nl>0 \
@@ -383,6 +457,7 @@
 .br
 .wh 0 @h			\" reset header
 ..
+.
 .rn ll xl		\" *** special line length (local)
 .de ll			\" *** line length (global to environments)
 .xl \\$1
@@ -391,11 +466,14 @@
 .if (\\n($m<=1):(\\n($l>\\n(_L) \
 .	nr _L \\n(.l
 ..
+.
 .rn po @O		\" --- local page offset
+.
 .de po			\" *** page offset
 .@O \\$1
 .nr _o \\n(.o
 ..
+.
 .\" Redefine the fam request to set the family in
 .\" environment 2 as well as the current environment.
 .if !\n(.g .ig
@@ -406,24 +484,32 @@
 .do @fam \\$1
 .ev
 ..
+.
+.
 .\"		*** MISCELLANEOUS ROFF COMMANDS ***
+.
+.
 .de hx			\" *** suppress headers and footers next page
 .nr ?H 1
 ..
+.
 .de ix			\" *** indent, no break
 'in \\$1
 ..
+.
 .de bl			\" *** contiguous blank lines
 .br
 .ne \\$1
 .rs
 .sp \\$1
 ..
+.
 .de n1			\" *** line numbering 1
 .nm 1
 .xl -\w'0000'u
 .nr ?n 1
 ..
+.
 .de n2			\" *** line numbering 2
 .nm \\$1
 .ie \\n(.$ \
@@ -431,69 +517,95 @@
 .el \
 .	xl \\n($lu
 ..
+.
 .de pa			\" *** new page
 .bp \\$1
 ..
+.
 .de ro			\" *** roman page numbers
 .af % i
 ..
+.
 .de ar			\" *** arabic page numbers
 .af % 1
 ..
+.
 .de m1			\" *** position one space
 .nr _0 \\n(hmu
 .nr hm \\$1v
 .nr tm +\\n(hmu-\\n(_0u
 .rr _0
 ..
+.
 .de m2			\" *** position two space
 .nr tm \\n(hmu+\\n(tpp+\\$1v
 ..
+.
 .de m3			\" *** position three space
 .nr bm \\n(fmu+\\n(tpp+\\$1v
 ..
+.
 .de m4			\" *** position four space
 .nr _0 \\n(fmu
 .nr fm \\$1v
 .nr bm +\\n(fmu-\\n(_0u
 ..
+.
 .de sk			\" *** leave a blank page (next page)
 .if \\n(.$>0 \
 .	tm Line \\n(c. -- I cannot skip multiple pages
 .nr ?s 1
 ..
+.
+.
 .\"		*** MISCELLANEOUS USER SUPPORT COMMANDS ***
+.
+.
 .if !\n(.g .ig
 .de re			\" *** reset tabs (TROFF defines 15 stops default)
 .ta T 0.5i
 ..
+.
 .if \n(.g .ig
 .de re
 .ta 0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i
 ..
+.
 .de ba			\" *** set base indent
 .ie \\n(.$ \
 .	nr $i \\$1n
 .el \
 .	nr $i \\n(siu*\\n($0u
 ..
+.
 .de hl			\" *** draw horizontal line
 .br
+.if '\*(.T'html' \
+\{\
+.	HR
+.	do return
+.\}
 .ie \n(.g .do nr _I \\n[.in]
 .el .nr _I \\n(.i
 \l'\\n(.lu-\\n(_Iu'
 .sp
 ..
+.
+.
 .\"		*** PARAGRAPHING ***
+.
+.
 .de pp			\" *** paragraph
 .lp \\n(piu
 ..
+.
 .de lp			\" *** left aligned paragraph
 .@p
 .if \\n(.$ \
 .	ti +\\$1
 .nr $p 0 1
 ..
+.
 .de ip			\" *** indented paragraph w/ optional tag
 .if (\\n(ii>0)&(\\n(ii<1n) \
 .	nr ii \\n(iin
@@ -509,19 +621,28 @@
 .di
 .in \\n(_Iu
 .ds |j \\*(|i\\
-.if \\w"\\*(|j" \
+.ie \\w"\\*(|j" \
 \{\
 .	ti -\\n(_0u
 .	ie \\w"\\*(|j">=\\n(_0 \
 \{\
+.		do DEVTAG-COL 1
 \\*(|j
+.		do DEVTAG-COL-NEXT 2
 .		br
 .	\}
-.	el \\*(|j\h'|\\n(_0u'\c
+.	el \
+\{\
+.		do DEVTAG-COL 1
+\\*(|j\h'|\\n(_0u'\c
+.		do DEVTAG-COL 2
+.       \}
 .\}
+.el .do DEVTAG-COL 2
 .rr _0
 .rm |i |j
 ..
+.
 .de np			\" *** numbered paragraph
 .\" use string comparison in case user has changed format of $p
 .if '\\n($p'-1' \
@@ -531,6 +652,7 @@
 .ti -\w'\0(000)\0'u
 \0(\\n($p)\h'|\w'\0(000)\0'u'\c
 ..
+.
 .de bu			\" *** bulleted paragraph
 .br
 .\" use string comparison in case user has changed format of $p
@@ -541,7 +663,9 @@
 .ti -\w'\0\(bu\0'u
 \0\(bu\0\c
 ..
+.
 .de @p			\" --- initialize for paragraph
+.do check_need_title
 .if "\\n(.z"|e" .tm Line \\n(c. -- Unmatched continued equation
 .in \\n($iu+\\n(pou
 .if \\n(.$ \
@@ -554,12 +678,23 @@
 .ne \\n(.Lv+\\n(.Vu
 .ns
 ..
+.
+.
 .\"		*** SECTION HEADINGS ***
+.
+.
 .de sh			\" *** section heading
 .fi
+.do check_need_title
 .if (\\n(si>0)&(\\n(si<1n) \
 .	nr si \\n(sin
+.if '\*(.T'html' .nr si 0
 .ce 0
+.if '\*(.T'html' \
+\{\
+.	do DEVTAG-SH \\$1
+.	do nr need_eo_h 1
+.\}
 .@d "\\$1" +1 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
 .if !"\\$2"_" \
 \{\
@@ -570,6 +705,7 @@
 .\}
 .nr $p 0 1			\" reset .np count
 ..
+.
 .de @d			\" --- change section depth
 .if !""\\$1" \
 .	nr $0 \\$1
@@ -637,6 +773,7 @@
 .el \
 .	nr $6 0
 ..
+.
 .de sx			\" *** heading up, no increment (2.1.1 -> 2.1)
 .ce 0
 .ul 0
@@ -648,10 +785,12 @@
 .$p "" "" \\n($0
 .nr $p 0 1			\" reset .np count
 ..
+.
 .de uh			\" *** unnumbered section heading
 .$p "\\$1"
 .$0 "\\$1"
 ..
+.
 .de $p			\" $$$ print section heading
 .if (\\n(si>0)&(\\n(.$>2) \
 .	nr $i \\$3*\\n(si
@@ -677,7 +816,11 @@
 .@F \\n(pf
 .sz \\n(pp
 ..
+.
+.
 .\"		*** COLUMNNED OUTPUT ***
+.
+.
 .de 2c			\" *** double columned output
 .br
 .if \\n($m>1 \
@@ -693,6 +836,7 @@
 .mk _k
 .ns
 ..
+.
 .de 1c			\" *** single columned output
 .br
 .nr $c 1
@@ -701,15 +845,21 @@
 .sp |\\n(.hu
 .@O \\n(_ou
 ..
+.
 .de bc			\" *** begin column
 .sp 24i
 ..
+.
+.
 .\"		*** FLOATING TABLES AND NONFLOATING BLOCKS ***
+.
+.
 .de (z			\" *** begin floating keep
 .if \n@>4 .tm >> (z, .z=\n(.z
 .@D 4 \\$1 \\$2
 .@(
 ..
+.
 .de )z			\" *** end floating keep
 .if \n@>4 .tm >> )z, .z=\n(.z
 .sp \\n(zsu
@@ -756,6 +906,7 @@
 .ev
 .if \n@>4 .tm << )z, .z=\\n(.z
 ..
+.
 .de @k			\" --- output floating keep
 .if \n@>4 .tm >> @k, $1=\\$1, .z=\\n(.z
 .ev 1
@@ -769,18 +920,23 @@
 .rm \\$1
 .ev
 ..
+.
 .de (t			\" XXX temp ref to (z
 .(z \\$1 \\$2
 ..
+.
 .de )t			\" XXX temp ref to )t
 .)z \\$1 \\$2
 ..
+.
 .de (b			\" *** begin block
 .br
 .@D 3 \\$1 \\$2
 .sp \\n(bsu
 .@(
+.if '\*(.T'html' .sp \\n(bsu
 ..
+.
 .de )b			\" *** end block
 .br
 .@)
@@ -797,12 +953,14 @@
 .rm |k
 .sp \\n(bsu+\\n(.Lv-1v
 ..
+.
 .de @(			\" --- begin keep
 .if !"\\n(.z"" .tm Line \\n(c. -- Invalid nested keep \\n(.z
 .@M
 .di |k
 \!'rs
 ..
+.
 .de @M			\" --- set modes for display
 .nr ?k 1
 .@C 1
@@ -822,6 +980,7 @@
 .if \\n(_d=1 \
 .	ce 10000
 ..
+.
 .de @)			\" --- end keep
 .br
 .if !"\\n(.z"|k" .tm Line \\n(c. -- Close of a keep which has never been opened
@@ -830,10 +989,12 @@
 .in 0
 .ce 0
 ..
+.
 .de (c			\" *** begin block centered text
 .if "\\n(.z"|c" .tm Line \\n(c. -- Nested .(c requests
 .di |c
 ..
+.
 .de )c			\" *** end block centered text
 .if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c
 .br				\" force out final line
@@ -851,7 +1012,11 @@
 .ev
 .rm |c
 ..
+.
+.
 .\"		*** BLOCK QUOTES (OR WHATEVER) AND LISTS ***
+.
+.
 .de (q			\" *** begin block quote
 .br
 .@C 1
@@ -861,30 +1026,41 @@
 .xl -\\n(qiu
 .sz \\n(qp
 ..
+.
 .de )q			\" *** end block quote
 .br
 .ev
 .sp \\n(qsu+\\n(.Lv-1v
 .nr ?k 0
 ..
+.
 .de (l			\" *** begin list
 .br
 .sp \\n(bsu
 .@D 3 \\$1 \\$2
 .@M
+.if '\*(.T'html' .sp \\n(bsu
 ..
+.
 .de )l			\" *** end list
 .br
 .ev
 .sp \\n(bsu+\\n(.Lv-1v
 .nr ?k 0
 ..
+.
+.
 .\"		*** PREPROCESSOR SUPPORT ***
+.
+.
 .\"
 .\"	EQN
 .\"
 .de EQ			\" *** equation start
+.do if \\n[need_eo_h]>0 .do DEVTAG-EO-H
+.do nr need_eo_h 0
 .ec
+.do HTML-IMAGE
 .if !\\n(?e \
 \{\
 .	if "\\n(.z"|e" .tm Line \\n(c. -- Nested .EQ request
@@ -896,8 +1072,10 @@
 .in 0
 .nf
 ..
+.
 .de EN			\" *** equation end
 .br
+.do HTML-IMAGE-END
 .ie "\\$1"C" \
 \{\
 .	nr ?e 1
@@ -913,6 +1091,7 @@
 .	ev
 .\}
 ..
+.
 .de @q			\" --- equation output
 .nr _Q \\n(dnu
 .ev
@@ -943,11 +1122,13 @@
 .rr _q
 .rr _Q
 ..
+.
 .\"
 .\"	TBL
 .\"
 .de TS			\" *** table start
 .sp \\n(bsu
+.do HTML-IMAGE
 .@C 1
 .fi				\" drop into fill mode for text boxes
 .if "\\$1"H" \
@@ -960,6 +1141,7 @@
 .if \\n(.p-\\n(_b-1v<=\\n(nl \
 .	ch @f \\n(nlu+\n(.Vu
 ..
+.
 .de TH			\" *** end header part of table
 .nr T. 0
 .T# 0
@@ -975,17 +1157,21 @@
 .rr _i
 .mk #T
 ..
+.
 .de TE			\" *** table end
 .nr ?T 0
 .ch @f -\\n(_bu			\" reset pseudo-trap
 .if \\n(.p-\\n(_b<=\\n(nl \
 .	ch @f \\n(nlu+\n(.Vu
 .ev
+.do HTML-IMAGE-END
 .sp \\n(bsu+\\n(.Lv-1v
 .re
 ..
+.
 .de T&
 ..
+.
 .\"
 .\"	REFER
 .\"
@@ -993,6 +1179,7 @@
 .if \\$1>5 .tm Bad arg to []
 .[\\$1
 ..
+.
 .de [0				\" --- other
 .(f
 .ip "\\*([F.\0"
@@ -1005,6 +1192,7 @@
 .@p
 .)f
 ..
+.
 .de [1				\" --- journal article
 .(f
 .ip "\\*([F.\0"
@@ -1025,6 +1213,7 @@
 .if !"\\*([O"" \\*([O
 .)f
 ..
+.
 .de [2				\" --- book
 .(f
 .ip "\\*([F.\0"
@@ -1036,6 +1225,7 @@
 .if !"\\*([O"" \\*([O
 .)f
 ..
+.
 .de [3				\" --- article in book
 .(f
 .ip "\\*([F.\0"
@@ -1049,6 +1239,7 @@
 .if !"\\*([O"" \\*([O
 .)f
 ..
+.
 .de [4				\" --- report
 .(f
 .ip "\\*([F.\0"
@@ -1061,6 +1252,7 @@
 .if !"\\*([O"" \\*([O
 .)f
 ..
+.
 .de [5				\" --- tm style
 .(f
 .ip "\\*([F.\0"
@@ -1069,17 +1261,21 @@
 .el Bell Laboratories internal memorandum (\\*([D).
 .)f
 ..
+.
 .de ]<
 .$p References
 .lp
 .rm (f )f
 ..
+.
 .de ]>
 .sp
 ..
+.
 .de ]-
 .rm [V [P [A [T [N [C [B [O [R [I [E [D
 ..
+.
 .ie \n(.V<1v \
 \{\
 .	ds [. \s-2\v'-.4m'\f1
@@ -1090,6 +1286,7 @@
 .	ds [. " [
 .	ds .] ]
 .\}
+.
 .\"
 .\"	IDEAL
 .\"
@@ -1097,65 +1294,94 @@
 .nr g7 \\n(.u
 .ls 1
 ..
+.
 .de IF
 .if \\n(g7 .fi
 .ls
 ..
+.
 .de IE			\" *** end ideal picture
 .if \\n(g7 .fi
 .ls
 ..
+.
 .\"
 .\"	PIC
 .\"
 .de PS		\" *** start picture: $1=height, $2=width in units or inches
 .sp 0.3
+.do HTML-IMAGE
 .nr g7 \\$2
 .in (u;\\n(.l-\\n(g7>?0/2)
 .ne \\$1u
 .nr g7 \\n(.u
 .ls 1
 ..
+.
 .de PE			\" *** end picture
 .ls
 .in
 .if \\n(g7 .fi
+.do HTML-IMAGE-END
 .sp .6
 ..
+.
 .\"
 .\"	GREMLIN
 .\"
 .de GS			\" *** start gremlin picture
-.nr g7 (\\n(.lu-\\n(g1u)/2u
-.if "\\$1"L" .nr g7 \\n(.iu
-.if "\\$1"R" .nr g7 \\n(.lu-\\n(g1u
-.in \\n(g7u
-.nr g7 \\n(.u
-.ls 1
-.nf
-.ne \\n(g2u
+.ie '\*(.T'html' \
+\{\
+.	ie "\\$1"L" .do HTML-IMAGE-LEFT
+.	el .ie "\\$1"R" .do HTML-IMAGE-RIGHT
+.	el .do HTML-IMAGE
+.\}
+.el \
+\{\
+.	nr g7 (\\n(.lu-\\n(g1u)/2u
+.	if "\\$1"L" .nr g7 \\n(.iu
+.	if "\\$1"R" .nr g7 \\n(.lu-\\n(g1u
+.	in \\n(g7u
+.	nr g7 \\n(.u
+.	ls 1
+.	nf
+.	ne \\n(g2u
+.\}
 ..
+.
 .de GE			\" *** end gremlin picture
-.GF
-.sp .6
+.ie '\*(.T'html' .do HTML-IMAGE-END
+.el \
+\{\
+.	GF
+.	sp .6
+.\}
 ..
+.
 .de GF			\" *** finish gremlin picture; stay at top
 .ls
 .in
 .if \\n(g7 .fi
 ..
+.
+.
 .\"		*** FONT AIDS ***
+.
+.
 .de sz			\" *** set point size and vertical spacing
 .ps \\$1
 .if \\n($r .@v
 .vs \\n(.sp*\\n($vu/100u	\" default vs at pointsize + 20%
 ..
+.
 .de @v			\" --- possibly set $v from $r
 .if (1i>=240u)&(1p<=\\n($r)&(\\n($r<=4p) .nr $v \\n($r00/1p
 ..
+.
 .de @V			\" --- possibly set $V from $R
 .if (1i>=240u)&(1p<=\\n($R)&(\\n($R<=4p) .nr $V \\n($R00/1p
 ..
+.
 .de @E			\" --- store in _F argument to \f for restoring font
 .ie \\n(.f<10 \
 .	ds _F \\n(.f
@@ -1167,55 +1393,81 @@
 .		ds _F P
 .\}
 ..
+.
 .de r			\" *** enter roman font
+.do check_need_title
 .@E
 .ft 1
 .if \\n(.$ \&\\$1\f\\*(_F\\$2
+.do check_need_title
 ..
+.
 .de i			\" *** enter italic
+.do check_need_title
 .@E
 .ft 2
 .if \\n(.$ \&\\$1\f\\*(_F\\$2
+.do check_need_title
 ..
+.
 .de b			\" *** enter boldface
+.do check_need_title
 .@E
 .ft 3
 .if \\n(.$ \&\\$1\f\\*(_F\\$2
+.do check_need_title
 ..
+.
 .de rb			\" *** enter real boldface
+.do check_need_title
 .@E
 .ft 3
 .if \\n(.$ \&\\$1\f\\*(_F\\$2
+.do check_need_title
 ..
+.
 .de bi			\" *** enter bold italic
+.do check_need_title
 .@E
 .ft 4
 .if \\n(.$ \&\\$1\f\\*(_F\\$2
+.do check_need_title
 ..
+.
 .de u			\" *** enter underlined word
 \&\\$1\l'|0\(ul'\\$2
 ..
+.
 .\" a better version of u
 .if !\n(.g .ig
 .de u
 \Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
 ..
+.
 .de q			\" *** enter quoted word
 \&\\*(lq\\$1\\*(rq\\$2
 ..
+.
 .de bx			\" *** enter boxed word
-\k~\(br\|\\$1\|\(br\l'|\\n~u\(rn'\l'|\\n~u\(ul'\^\\$2
+.ie '\*(.T'html' \\$1\\$2
+.el \k~\(br\|\\$1\|\(br\l'|\\n~u\(rn'\l'|\\n~u\(ul'\^\\$2
 ..
+.
 .de sm			\" *** print in smaller font
 \s-1\\$1\\s0\\$2
 ..
+.
 .de @F			\" --- change font (0 -> no change)
 .nr ~ \\$1
 .if \\n~>0 \
 .	ft \\n~
 .rr ~
 ..
+.
+.
 .\"		*** FOOTNOTING ***
+.
+.
 .de (f			\" *** begin footnote
 .ec
 .if "\\n(.z"|f" .tm Line \\n(c. -- Invalid footnote nesting
@@ -1274,10 +1526,12 @@
 \!.@N
 .\}
 ..
+.
 .de @N			\" --- set no fill mode in the top-level diversion
 .ie "\\n(.z"" .nf
 .el \!.@N
 ..
+.
 .de )f			\" *** end footnote
 .ie "\\n(.z"|f" \
 \{\
@@ -1304,35 +1558,49 @@
 .	ev
 .\}
 ..
+.
 .@R ff
 .if \n(ff<=0 \
 .	nr ff 1			\" footnote font: Times Roman
 .@R fp
 .if \n(fp<=0 \
 .	nr fp 8			\" footnote pointsize
+.
 .de $s			\" $$$ footnote separator
 \l'2i'
 ..
+.
+.
 .\"		*** DELAYED TEXT ***
+.
+.
 .de (d			\" *** begin delayed text
 .am |d )d
 .sp \\n(bsu
 ..
+.
 .de )d			\" *** end delayed text
 .if \\n# \
 .	nr $d +1
 .ds # [\\n($d]\k#
 .rr #
 ..
+.
 .de pd			\" *** print delayed text
 .|d
 .rm |d
 .nr $d 1 1
 .ds # [1]\k#
 ..
+.
+.
 .\"		*** INDEXES (TABLE OF CONTENTS) ***
+.
+.
 .nr _x 0 1
+.do nr _xn 0
 .af _x a
+.
 .de (x			\" *** begin index entry
 .if \n@>4 .tm >> (x, .z=\\n(.z
 .ds |X x
@@ -1344,15 +1612,18 @@
 .	nr _z 1
 .@\\n(_z
 ..
+.
 .de @0			\" --- finish (x if no current diversion
 .am %\\*(|X )x
 .sp \\n(xsu
 .ti -\\n(piu
 ..
+.
 .de @1			\" --- finish (x if current diversion
 .if "\\n(_x"z" .nr _x 0
 .de =\\n+(_x )x
 ..
+.
 .de )x			\" *** end index entry
 .if \n@>4 .tm >> )x, .z=\\n(.z
 .ie "\\n(.z"" \
@@ -1378,6 +1649,7 @@
 \!.rm =\\n(_x
 .\}
 ..
+.
 .de xp			\" *** print the index
 .br
 .@C 2
@@ -1405,6 +1677,71 @@
 .in
 .rm |x
 ..
+.
+.
+.\"		*** HTML VERSIONS OF .x(, .x), AND .xp ***
+.
+.
+.de (x-html    \" --- create TAG and divert text
+.nr _x +1
+.do nr _xn +1
+.do TAG "_x\\n[_x]
+.br
+.do di |x\\n[_xn]
+.br
+..
+.
+.de )x-html    \" --- end diversion
+.br
+.di
+..
+.
+.de xp-html    \" --- create list of links
+.do nr _xx 1
+.br
+.do ev xp-html-ev
+.sp
+.do ULS
+.do while \\n[_xx]<=\\n[_xn] \
+\{\
+.	br
+.	do unformat |x\\n[_xx]
+.	do di xp-html-div
+.	br
+.	ll 100i
+.	fi
+.	do |x\\n[_xx]
+.	br
+.	di
+.	do asciify xp-html-div
+.	do rm xp-html-as
+.	do as xp-html-as #
+.	do as xp-html-as _x\\n[_xx]
+.	ll
+.	LI
+.	do URL \\*[xp-html-as] "\\*[xp-html-div]
+.	do rm xp-html-as
+.	do nr _xx +1
+.\}
+.do ULE
+.sp
+.ev
+..
+.
+.if '\*(.T'html' \
+\{\
+.	rm (x
+.	do als (x (x-html
+.	rm )x
+.	do als )x )x-html
+.	rm xp
+.	do als xp xp-html
+.\}
+.
+.
+.\"		*** CHAPTERS AND TITLES ***
+.
+.
 .de +c			\" *** begin chapter
 .ep\"				\" force out footnotes
 .if \\n(?o:\\n(?a \
@@ -1426,6 +1763,7 @@
 .el \
 .	sp 3
 ..
+.
 .de ++			\" *** declare chapter type
 .nr _0 0
 .if "\\$1"C" \
@@ -1477,6 +1815,7 @@
 .nr _M \\n(_0
 .rr _0
 ..
+.
 .de $c			\" $$$ print chapter title
 .sz 12
 .ft 3
@@ -1497,6 +1836,7 @@
 .el .if \\n(_M=2 \
 .	$C Appendix \\n(ch "\\$1"
 ..
+.
 .de tp			\" *** title page
 .hx
 .bp
@@ -1504,6 +1844,7 @@
 .rs
 .pn \\n%
 ..
+.
 .\"		*** DATES ***
 .if \n(mo=1 .ds mo January
 .if \n(mo=2 .ds mo February
@@ -1528,7 +1869,11 @@
 .af y2 00
 .nr y4 \n(yr+1900
 .ds td \*(mo \n(dy, \n(y4
+.
+.
 .\"		*** PARAMETRIC INITIALIZATIONS ***
+.
+.
 .rr x
 .nr $v \n(.v00+\n(.sp-1/\n(.sp	\" vs as percentage of ps for .sz request
 .nr $V \n($v			\" same for displays & footnotes
@@ -1552,7 +1897,11 @@
 .nr sp 10			\" section title pointsize
 .nr ss 12p			\" section prespacing
 .nr si 0			\" section indent
+.
+.
 .\"		*** OTHER INITIALIZATION ***
+.
+.
 .\" GNU pic sets this register to 1, to indicate that \x should not be used.
 .@R 0x
 .ds { \v'-0.4m'\x'\\n(0x=0*-0.2m'\s-3
@@ -1581,6 +1930,7 @@
 .@S $8
 .@S $9
 .@S ..
+.
 .@R po\"			\" simulated page offset
 .@R $0\"			\" section depth
 .@R $i\"			\" paragraph base indent
@@ -1605,6 +1955,7 @@
 .@R ?T\"			\" inside .TS H?
 .@R ?W\"			\" wide floating keep at page bottom?
 .@R ?w\"			\" wide floating keep at page top?
+.
 .nr fi 0.3i
 .nr _o \n(.o
 .nr $b 3			\" bold
@@ -1630,37 +1981,53 @@
 .ds lq \(lq\"			\" left quote
 .ds rq \(rq\"			\" right quote
 .em @z
+.
+.
 .\"		*** FOREIGN LETTERS AND SPECIAL CHARACTERS ***
+.
+.
 .ds #h ((1u-(\\\\n(.fu%2u))*0.13m)
 .ds #v 0.6m
+.
 .\"			\" accents
 .ds ' \k_\h'-(\\n(.wu*8/10-\*(#h)'\(aa\h'|\\n_u'
 .ds ` \k_\h'-(\\n(.wu*7/10-\*(#h)'\(ga\h'|\\n_u'
+.
 .\"			\" umlaut
 .ds : \k_\h'-(\\n(.wu*8/10-\*(#h+0.1m)'\v'-\*(#v'\z.\h'0.2m'.\h'|\\n_u'\v'\*(#v'
+.
 .\"			\" circumflex and tilde
 .ds ^ \k_\h'-(\\n(.wu-\*(#h-0.05m)'^\h'|\\n_u'
 .ds ~ \k_\h'-(\\n(.wu-\*(#h-0.05m)'~\h'|\\n_u'
+.
 .\"			\" cedilla and czech
 .ds , \k_\h'-(\\n(.wu)',\h'|\\n_u'
 .ds v \k_\h'-(\\n(.wu*9/10-\*(#h)'\v'-\*(#v'\s-4v\s0\v'\*(#v'\h'|\\n_u'
+.
 .\"			\" Norwegian A or angstrom
 .ds o \k_\h'-(\\n(.wu+\w'\(de'u-\*(#h)/2u'\v'-0.4n'\z\(de\v'0.4n'\h'|\\n_u'
+.
 .\"			\" there exists, for all
 .ds qe \s-2\v'0.45m'\z\(em\v'-0.625m'\z\(em\v'-0.625m'\(em\v'0.8m'\s0\h'-0.1m'\v'-0.05m'\(br\v'0.05m'\h'0.1m'
 .ds qa \z\e\h'0.35m'\z\(sl\h'-0.33m'\v'-0.3m'\s-4\(em\s0\v'0.3m'\h'0.15m'
 .rm #h #v
 .ll 6.0i
 .lt 6.0i
+.
 .de @U
 .tm The \\$1 macro has been removed from this version of the -me macros.
 ..
+.
 .de lo
 .@U lo
 ..
+.
 .de th
 .@U th
 ..
+.
 .de ac
 .@U ac
 ..
+.
+.\" EOF



From MAILER-DAEMON Fri Jan 05 08:37:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H2pGP-0002kU-Uo
	for mharc-groff-commit@gnu.org; Fri, 05 Jan 2007 08:37:41 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H2pGN-0002jY-Rt
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:37:40 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H2pGN-0002im-7t
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:37:39 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H2pGN-0002iW-3s
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:37:39 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H2pGM-0000JL-Q4
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:37:38 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H2pGM-0006Er-96
	for groff-commit@gnu.org; Fri, 05 Jan 2007 13:37:38 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H2pGM-0006Em-38
	for groff-commit@gnu.org; Fri, 05 Jan 2007 13:37:38 +0000
To: groff-commit@gnu.org
Message-Id: <E1H2pGM-0006Em-38@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Fri, 05 Jan 2007 13:37:38 +0000
Subject: [Groff-commit] groff/contrib/mm ChangeLog Makefile.sub
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jan 2007 13:37:40 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/05 13:37:38

Modified files:
	contrib/mm     : ChangeLog Makefile.sub 

Log message:
	Fix installation.  Reported by Jennifer Sayers.
	
	* Makefile.sub (install, install_mm): Remove.
	(install_bin, install_data): New targets.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mm/ChangeLog?cvsroot=groff&r1=2.39&r2=2.40
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mm/Makefile.sub?cvsroot=groff&r1=2.4&r2=2.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/mm/ChangeLog,v
retrieving revision 2.39
retrieving revision 2.40
diff -u -b -r2.39 -r2.40
--- ChangeLog	13 Aug 2006 12:36:49 -0000	2.39
+++ ChangeLog	5 Jan 2007 13:37:37 -0000	2.40
@@ -1,3 +1,10 @@
+Fr Jan  5 14:35:35 CET 2007  Werner LEMBERG  <wl@gnu.org>
+
+	Fix installation.  Reported by Jennifer Sayers.
+
+	* Makefile.sub (install, install_mm): Remove.
+	(install_bin, install_data): New targets.
+
 Sa Aug 12 23:33:45 2006  Nick Stoughton  <nick@msbit.com>
 
 	* m.tmac (P): Ignore P after H, as documented.

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/mm/Makefile.sub,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -b -r2.4 -r2.5
--- Makefile.sub	26 Feb 2006 14:02:30 -0000	2.4
+++ Makefile.sub	5 Jan 2007 13:37:38 -0000	2.5
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sub,v 2.4 2006/02/26 14:02:30 wl Exp $
+# $Id: Makefile.sub,v 2.5 2007/01/05 13:37:38 wl Exp $
 #
 PROG=mmroff
 MAN1=\
@@ -14,9 +14,9 @@
 
 all: mmroff
 
-install: install_mm
+install_bin: install_mmroff
 
-install_mm: install_mmroff install_m
+install_data: install_m
 	-test -d $(DESTDIR)$(tmacdir)/mm \
 	  || $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
 	-for f in $(FILES); do \
@@ -53,7 +53,9 @@
 	-chmod +x $@
 
 uninstall_sub:
-	-for f in $(FILES); do rm -f $(DESTDIR)$(tmacdir)/mm/$$f; done
+	-for f in $(FILES); do \
+		rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
+	done
 	-for f in $(LOCALE); do \
 		test -s $(DESTDIR)$(tmacdir)/mm/$$f \
 		  || rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \



From MAILER-DAEMON Fri Jan 05 08:47:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H2pPj-0003nN-TP
	for mharc-groff-commit@gnu.org; Fri, 05 Jan 2007 08:47:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H2pPh-0003k9-Hq
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:47:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H2pPf-0003gf-7A
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:47:16 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H2pPe-0003gK-OW
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:47:14 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H2pPe-000329-Cp
	for groff-commit@gnu.org; Fri, 05 Jan 2007 08:47:14 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H2pPd-0007Bf-R4
	for groff-commit@gnu.org; Fri, 05 Jan 2007 13:47:13 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H2pPd-0007Bc-Jf
	for groff-commit@gnu.org; Fri, 05 Jan 2007 13:47:13 +0000
To: groff-commit@gnu.org
Message-Id: <E1H2pPd-0007Bc-Jf@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Fri, 05 Jan 2007 13:47:13 +0000
Subject: [Groff-commit] groff ChangeLog NEWS src/preproc/tbl/tbl.man
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jan 2007 13:47:18 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/05 13:47:13

Modified files:
	.              : ChangeLog NEWS 
	src/preproc/tbl: tbl.man 

Log message:
	* src/preproc/tbl/tbl.man, NEWS: Document \n[TW].

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1017&r2=1.1018
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/tbl/tbl.man?cvsroot=groff&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -b -r1.1017 -r1.1018
--- ChangeLog	5 Jan 2007 06:51:10 -0000	1.1017
+++ ChangeLog	5 Jan 2007 13:47:13 -0000	1.1018
@@ -1,3 +1,7 @@
+2006-01-05  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/tbl/tbl.man, NEWS: Document \n[TW].
+
 2006-01-04  Gaius Mulley  <gaius@glam.ac.uk>
 
 	Make -me macros ready for grohtml.

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- NEWS	31 Dec 2006 17:34:32 -0000	1.231
+++ NEWS	5 Jan 2007 13:47:13 -0000	1.232
@@ -72,7 +72,6 @@
   For backwards compatibility, the old set of font definition files is still
   available; for details please read the man page of `grops(1)'.
   
-
 Pic
 ---
 
@@ -83,6 +82,12 @@
 o Pic now supports up to 32 macro arguments (and up to 16 on EBCDIC
   platforms).
 
+Tbl
+---
+
+o The number register `TW' holds the width of the last table.  This GNU
+  extension isn't new but hasn't been documented before.
+
 Chem
 ----
 

Index: src/preproc/tbl/tbl.man
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/tbl/tbl.man,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/preproc/tbl/tbl.man	16 Jun 2006 06:32:18 -0000	1.16
+++ src/preproc/tbl/tbl.man	5 Jan 2007 13:47:13 -0000	1.17
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2006, 2007
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -17,7 +17,11 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
+.
 .TH @G@TBL @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 @g@tbl \- format tables for troff
 .
@@ -70,6 +74,7 @@
 .B .TE
 even when followed by a character other than space or newline.
 Leader characters (\[rs]a) are handled as interpreted.
+.
 .TP
 .B \-v
 Print the version number.
@@ -163,6 +168,7 @@
 .LP
 The global options must end with a semicolon.
 There might be whitespace after an option and its argument in parentheses.
+.
 .LP
 After global options come lines describing the format of each line of
 the table.
@@ -172,15 +178,18 @@
 A single key character describes each column of each line of the table.
 You may run format specs for multiple lines together on the same line by
 separating them with commas.
+.
 .LP
 You may follow each key character with specifiers that determine the font
 and point size of the corresponding item, that determine column width,
 inter-column spacing, etc.
+.
 .LP
 The longest format line defines the number of columns in the table; missing
 format descriptors at the end of format lines are assumed to be `L'.
 Extra columns in the data (which have no corresponding format entry) are
 ignored.
+.
 .LP
 The available key characters are:
 .
@@ -231,6 +240,7 @@
 .LP
 A vertical bar to the left of the first key-letter or to the right of the
 last one produces a line at the edge of the table.
+.
 .LP
 Here are the specifiers that can appear in suffixes to column key letters:
 .
@@ -334,6 +344,7 @@
 .B expand
 option is on).
 Default separation is 3n.
+.
 .LP
 The format lines are followed by lines containing the actual data for the
 table, followed finally by
@@ -343,26 +354,31 @@
 .B tab
 option).
 Long input lines can be broken across multiple lines if the last character
-on the line is `\e' (which vanishes after concatenation).
+on the line is `\[rs]' (which vanishes after concatenation).
+.
 .LP
 A dot starting a line, followed by anything but a digit is handled as a
 troff command, passed through without changes.
 The table position is unchanged in this case.
+.
 .LP
 If a data line consists of only `_' or `=', a single or double line,
 respectively, is drawn across the table at that point; if a single item in a
 data line consists of only `_' or `=', then that item is replaced by a
 single or double line, joining its neighbours.
-If a data item consists only of `\e_' or `\e=', a single or double line,
+If a data item consists only of `\[rs]_' or `\[rs]=', a single or double line,
 respectively, is drawn across the field at that point which does not join
 its neighbours.
+.
 .LP
-A data item consisting only of `\eRx' (`x' any character) is replaced by
+A data item consisting only of `\[rs]Rx' (`x' any character) is replaced by
 repetitions of character `x' as wide as the column (not joining its
 neighbours).
+.
 .LP
-A data item consisting only of `\e^' indicates that the field immediately
+A data item consisting only of `\[rs]^' indicates that the field immediately
 above spans downward over this row.
+.
 .LP
 A text block can be used to enter data as a single entry which would be
 too long as a simple string between tabs.
@@ -385,6 +401,7 @@
 The default length of a text block is given by L\[tmu]C/(N+1),
 where `L' is the current line length, `C' the number of columns spanned
 by the text block, and `N' the total number of columns in the table.
+.
 .LP
 To change the data format within a table, use the
 .B .T&
@@ -411,10 +428,13 @@
 Table continuation
 .RB ( .T& )
 lines are not restricted to the first 200 lines.
+.
 .LP
 Numeric and alphabetic items may appear in the same column.
+.
 .LP
 Numeric and alphabetic items may span horizontally.
+.
 .LP
 .B @g@tbl
 uses register, string, macro and diversion names beginning with the digit\~\c
@@ -424,6 +444,11 @@
 you should avoid using any names beginning with a\~\c
 .BR 3 .
 .
+.LP
+The number register
+.B \[rs]n[TW]
+holds the table width of the previous table.
+.
 .
 .SH "GNU TBL WITHIN MACROS"
 Since
@@ -455,6 +480,7 @@
 .B .ATABLE Another table
 .br
 .B .ATABLE And \[dq]another one\[dq]
+.
 .LP
 Note, however, that not all features of
 .B @g@tbl
@@ -482,8 +508,10 @@
 line immediately after the format section.
 Do not enclose a multi-page table within keep/release macros,
 or divert it in any other way.
+.
 .LP
 A text block within a table must be able to fit on one page.
+.
 .LP
 The
 .B bp
@@ -494,21 +522,23 @@
 .IP
 .B .de BP
 .br
-.B .ie '\e\en(.z'' .bp \e\e$1
+.B .ie '\[rs]\[rs]n(.z'' .bp \[rs]\[rs]$1
 .br
-.B .el \e!.BP \e\e$1
+.B .el \[rs]!.BP \[rs]\[rs]$1
 .br
 .B ..
 .br
+.
 .LP
 and use
 .B BP
 instead of
 .BR bp .
+.
 .LP
-Using \ea directly in a table to get leaders will not work (except in
+Using \[rs]a directly in a table to get leaders will not work (except in
 compatibility mode).
-This is correct behaviour: \ea is an
+This is correct behaviour: \[rs]a is an
 .B uninterpreted
 leader.
 To get leaders use a real leader, either by using a control A or like
@@ -516,11 +546,11 @@
 .IP
 .nf
 .ft B
-\&.ds a \ea
+\&.ds a \[rs]a
 \&.TS
 tab(;);
 lw(1i) l.
-A\e*a;B
+A\[rs]*a;B
 \&.TE
 .ft
 .fi



From MAILER-DAEMON Fri Jan 05 09:42:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H2qH3-0003s8-R0
	for mharc-groff-commit@gnu.org; Fri, 05 Jan 2007 09:42:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H2qH2-0003rI-Uv
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:42:24 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H2qH2-0003r0-HD
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:42:24 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H2qH2-0003qq-6d
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:42:24 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H2qH1-0006fm-TK
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:42:24 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H2qH1-0001dS-7M
	for groff-commit@gnu.org; Fri, 05 Jan 2007 14:42:23 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H2qH0-0001dP-VU
	for groff-commit@gnu.org; Fri, 05 Jan 2007 14:42:23 +0000
To: groff-commit@gnu.org
Message-Id: <E1H2qH0-0001dP-VU@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Fri, 05 Jan 2007 14:42:22 +0000
Subject: [Groff-commit] groff ChangeLog NEWS src/preproc/tbl/tbl.man
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jan 2007 14:42:25 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/05 14:42:22

Modified files:
	.              : ChangeLog NEWS 
	src/preproc/tbl: tbl.man 

Log message:
	* src/preproc/tbl/tbl.man: Document .T#.
	
	Revert last NEWS change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1018&r2=1.1019
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/tbl/tbl.man?cvsroot=groff&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1018
retrieving revision 1.1019
diff -u -b -r1.1018 -r1.1019
--- ChangeLog	5 Jan 2007 13:47:13 -0000	1.1018
+++ ChangeLog	5 Jan 2007 14:42:22 -0000	1.1019
@@ -1,6 +1,6 @@
 2006-01-05  Werner LEMBERG  <wl@gnu.org>
 
-	* src/preproc/tbl/tbl.man, NEWS: Document \n[TW].
+	* src/preproc/tbl/tbl.man: Document .T# and \n[TW].
 
 2006-01-04  Gaius Mulley  <gaius@glam.ac.uk>
 

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- NEWS	5 Jan 2007 13:47:13 -0000	1.232
+++ NEWS	5 Jan 2007 14:42:22 -0000	1.233
@@ -82,12 +82,6 @@
 o Pic now supports up to 32 macro arguments (and up to 16 on EBCDIC
   platforms).
 
-Tbl
----
-
-o The number register `TW' holds the width of the last table.  This GNU
-  extension isn't new but hasn't been documented before.
-
 Chem
 ----
 

Index: src/preproc/tbl/tbl.man
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/tbl/tbl.man,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/preproc/tbl/tbl.man	5 Jan 2007 13:47:13 -0000	1.17
+++ src/preproc/tbl/tbl.man	5 Jan 2007 14:42:22 -0000	1.18
@@ -411,6 +411,32 @@
 .B .TS
 request.
 .
+.LP
+The number register
+.B \[rs]n[TW]
+holds the table width; it can't be used within the table itself but is defined
+right before calling
+.B .TE
+so that this macro can make use of it.
+.
+.LP
+.B tbl
+also defines a macro
+.B .T#
+which produces the bottom and side lines of a boxed table.
+While
+.B tbl
+does call this macro itself at the end of the table, it can be used by
+macro packages to create boxes for multi-page tables by calling it within the
+page footer.
+An example of this is shown by the
+.B \-ms
+macros which provide this functionality if a table starts with
+.B .TS\ H
+instead of the standard call to the
+.B .TS
+macro.
+.
 .
 .SH "INTERACTION WITH @G@EQN"
 .BR @g@tbl (@MAN1EXT@)
@@ -444,11 +470,6 @@
 you should avoid using any names beginning with a\~\c
 .BR 3 .
 .
-.LP
-The number register
-.B \[rs]n[TW]
-holds the table width of the previous table.
-.
 .
 .SH "GNU TBL WITHIN MACROS"
 Since



From MAILER-DAEMON Sat Jan 06 11:47:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H3EhW-0000BH-Pd
	for mharc-groff-commit@gnu.org; Sat, 06 Jan 2007 11:47:22 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H2qPK-0002sB-6F
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:50:58 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H2qPC-0002iX-Q5
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:50:57 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H2qPC-0002i3-IJ
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:50:50 -0500
Received: from [143.93.160.9] (helo=ns.Fh-Worms.de)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1H2qPB-00081R-Jc
	for groff-commit@gnu.org; Fri, 05 Jan 2007 09:50:50 -0500
Received: from mailhost.ztt.fh-worms.de (mail.ztt.fh-worms.de [143.93.190.139])
	by ns.Fh-Worms.de (8.13.8/8.13.8) with ESMTP id l05ETWx2028391
	for <groff-commit@gnu.org>; Fri, 5 Jan 2007 15:29:32 +0100 (MET)
Received: from sqmail.ztt.fh-worms.de (sqmail.ztt.fh-worms.de [143.93.190.175])
	by mailhost.ztt.fh-worms.de (Postfix) with ESMTP id 20DAB368055
	for <groff-commit@gnu.org>; Fri,  5 Jan 2007 15:29:27 +0100 (CET)
Received: from 143.93.190.201 (SquirrelMail authenticated user schockert)
	by sqmail.ztt.fh-worms.de with HTTP;
	Fri, 5 Jan 2007 15:29:27 +0100 (CET)
Message-ID: <5710.143.93.190.201.1168007367.squirrel@sqmail.ztt.fh-worms.de>
Date: Fri, 5 Jan 2007 15:29:27 +0100 (CET)
From: schockert@ztt.fh-worms.de
To: groff-commit@gnu.org
User-Agent: SquirrelMail/1.4.8
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
X-Priority: 3 (Normal)
Importance: Normal
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.4
	(ns.Fh-Worms.de [0.0.0.0]); Fri, 05 Jan 2007 15:29:32 +0100 (CET)
X-Virus-Scanned: by amavisd-milter (http://amavis.org/)
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by ns.Fh-Worms.de id
	l05ETWx2028391
X-Mailman-Approved-At: Sat, 06 Jan 2007 11:47:21 -0500
Subject: [Groff-commit] groff utf-8 capabilities
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jan 2007 14:50:58 -0000

Hey all,

i=B4d like to use groff for creating postscript documents. The source tex=
t
could contain japanese or other utf-8 encoded characters. As font i
planned to use Code2000.

Is groff able to do that?If the answer is yes, how can i add this font to
groff and which other steps are required?

Cheers,
Benjamin




From MAILER-DAEMON Sat Jan 06 12:15:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H3F8t-0000ns-LY
	for mharc-groff-commit@gnu.org; Sat, 06 Jan 2007 12:15:39 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H3F8r-0000mP-Hi
	for groff-commit@gnu.org; Sat, 06 Jan 2007 12:15:37 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H3F8q-0000l3-0N
	for groff-commit@gnu.org; Sat, 06 Jan 2007 12:15:37 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H3F8p-0000kz-TL
	for groff-commit@gnu.org; Sat, 06 Jan 2007 12:15:35 -0500
Received: from [212.227.126.188] (helo=moutng.kundenserver.de)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1H3F8p-0004CT-CM
	for groff-commit@gnu.org; Sat, 06 Jan 2007 12:15:35 -0500
Received: from [62.143.170.166] (helo=localhost)
	by mrelayeu.kundenserver.de (node=mrelayeu6) with ESMTP (Nemesis),
	id 0ML29c-1H3F8o2SRL-0007tn; Sat, 06 Jan 2007 18:15:34 +0100
Date: Sat, 06 Jan 2007 18:16:10 +0100 (CET)
Message-Id: <20070106.181610.198227540.wl@gnu.org>
To: schockert@ztt.fh-worms.de
Subject: Re: [Groff-commit] groff utf-8 capabilities
From: Werner LEMBERG <wl@gnu.org>
In-Reply-To: <5710.143.93.190.201.1168007367.squirrel@sqmail.ztt.fh-worms.de>
References: <5710.143.93.190.201.1168007367.squirrel@sqmail.ztt.fh-worms.de>
X-Mailer: Mew version 5.1.50 on Emacs 22.0.92.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: kundenserver.de abuse@kundenserver.de
	login:2dc398bc694a1e60948148ba0a42c0da
Cc: groff-commit@gnu.org
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jan 2007 17:15:37 -0000


> i=B4d like to use groff for creating postscript documents. The source=

> text could contain japanese or other utf-8 encoded characters. As
> font i planned to use Code2000.
> =

> Is groff able to do that?

Yes.

> If the answer is yes, how can i add this font to groff and which
> other steps are required?

. Download the current CVS of groff.

. Convert Code2000 with FontForge to a PFA file (ignoring the warning
  about more than 256 characters).

. Call `afmtodit' to build a font description file from this PFA.
  Install the font.  This is documented in the man page of `grops'.

. Use the -k (and -K) option to select the proper input encoding
  (which is utf-8, I assume).


     Werner



From MAILER-DAEMON Sun Jan 14 03:50:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H6145-0005Jp-GA
	for mharc-groff-commit@gnu.org; Sun, 14 Jan 2007 03:50:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H6144-0005JK-7o
	for groff-commit@gnu.org; Sun, 14 Jan 2007 03:50:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H6143-0005In-JA
	for groff-commit@gnu.org; Sun, 14 Jan 2007 03:50:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H6143-0005Ig-CO
	for groff-commit@gnu.org; Sun, 14 Jan 2007 03:50:07 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H6142-0005tf-U5
	for groff-commit@gnu.org; Sun, 14 Jan 2007 03:50:07 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H6142-00067U-Ds
	for groff-commit@gnu.org; Sun, 14 Jan 2007 08:50:06 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H6142-00067R-3E
	for groff-commit@gnu.org; Sun, 14 Jan 2007 08:50:06 +0000
To: groff-commit@gnu.org
Message-Id: <E1H6142-00067R-3E@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Sun, 14 Jan 2007 08:50:06 +0000
Subject: [Groff-commit] groff NEWS
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jan 2007 08:50:08 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/14 08:50:06

Modified files:
	.              : NEWS 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.233&r2=1.234

Patches:
Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- NEWS	5 Jan 2007 14:42:22 -0000	1.233
+++ NEWS	14 Jan 2007 08:50:05 -0000	1.234
@@ -64,10 +64,10 @@
   macro as if they were an argument to the `ds' request.  This is used by
   `trace.tmac'.
 
-o The PS font definition files have been regenerated with the newer AFM
-  versions from Adobe's 35 core fonts as present in most Level 2 PS
-  printers.  The changes are minor (most notably, the addition of the
-  `Euro' glyph and an extended set of kerning values).
+o The PS font definition files have been regenerated with newer AFM versions
+  from Adobe's 35 core fonts as present in most Level 2 PS printers.  The
+  changes are minor (most notably, the addition of the `Euro' glyph and an
+  extended set of kerning values).
 
   For backwards compatibility, the old set of font definition files is still
   available; for details please read the man page of `grops(1)'.



From MAILER-DAEMON Mon Jan 15 02:17:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H6M5w-0004aL-IF
	for mharc-groff-commit@gnu.org; Mon, 15 Jan 2007 02:17:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H6M5v-0004Zp-Af
	for groff-commit@gnu.org; Mon, 15 Jan 2007 02:17:27 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H6M5u-0004ZM-Da
	for groff-commit@gnu.org; Mon, 15 Jan 2007 02:17:27 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H6M5u-0004ZG-6s
	for groff-commit@gnu.org; Mon, 15 Jan 2007 02:17:26 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H6M5t-0003sz-R0
	for groff-commit@gnu.org; Mon, 15 Jan 2007 02:17:26 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H6M5t-0005dS-Bs
	for groff-commit@gnu.org; Mon, 15 Jan 2007 07:17:25 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H6M5t-0005dP-1H
	for groff-commit@gnu.org; Mon, 15 Jan 2007 07:17:25 +0000
To: groff-commit@gnu.org
Message-Id: <E1H6M5t-0005dP-1H@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 15 Jan 2007 07:17:25 +0000
Subject: [Groff-commit] groff ChangeLog tmac/Makefile.sub tmac/an-old.t...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jan 2007 07:17:27 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/15 07:17:24

Modified files:
	.              : ChangeLog 
	tmac           : Makefile.sub an-old.tmac s.tmac 
Added files:
	tmac           : an-ext.tmac 

Log message:
	* tmac/an-ext.tmac: New file, containing extension macros
	for -man.  See discussion on the groff mailing list for
	background information.
	* tmac/an-old.tmac: Load an-ext.tmac.
	Decorate .ds and as with comment escapes where appropriate.
	* tmac/Makefile.sub (NORMALFILES): Add an-ext.tmac.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1019&r2=1.1020
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/Makefile.sub?cvsroot=groff&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-old.tmac?cvsroot=groff&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/s.tmac?cvsroot=groff&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-ext.tmac?cvsroot=groff&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -b -r1.1019 -r1.1020
--- ChangeLog	5 Jan 2007 14:42:22 -0000	1.1019
+++ ChangeLog	15 Jan 2007 07:17:24 -0000	1.1020
@@ -1,3 +1,12 @@
+2006-01-14  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-ext.tmac: New file, containing extension macros
+	for -man.  See discussion on the groff mailing list for
+	background information.
+	* tmac/an-old.tmac: Load an-ext.tmac.
+	Decorate .ds and as with comment escapes where appropriate.
+	* tmac/Makefile.sub (NORMALFILES): Add an-ext.tmac.
+
 2006-01-05  Werner LEMBERG  <wl@gnu.org>
 
 	* src/preproc/tbl/tbl.man: Document .T# and \n[TW].

Index: tmac/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/tmac/Makefile.sub,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- tmac/Makefile.sub	19 Dec 2006 08:02:52 -0000	1.42
+++ tmac/Makefile.sub	15 Jan 2007 07:17:24 -0000	1.43
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
@@ -27,7 +27,7 @@
   groff_www.n
 
 NORMALFILES=\
-  man.tmac mandoc.tmac andoc.tmac an-old.tmac \
+  man.tmac mandoc.tmac andoc.tmac an-old.tmac an-ext.tmac \
   ms.tmac \
   me.tmac \
   mdoc.tmac \

Index: tmac/an-old.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/an-old.tmac,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- tmac/an-old.tmac	27 May 2006 14:48:22 -0000	1.55
+++ tmac/an-old.tmac	15 Jan 2007 07:17:24 -0000	1.56
@@ -1,6 +1,6 @@
 .\" an-old.tmac
 .\"
-.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005, 2007
 .\"   Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
@@ -89,7 +89,7 @@
 .nr FT -.5i
 .
 .\" Default heading font
-.ds HF B
+.ds HF B\"
 .
 .nr an-first 1
 .
@@ -129,17 +129,17 @@
 .de1 TH
 .  if \\n[an-html] \{\
 .    DEVTAG-TL
-\\$1
+.    nop \\$1
 .    DEVTAG-EO-TL
 .  \}
 .
 .  de an-init \" We have to do it like this to get multiple man pages right.
-.    ds an-title "\\$1
-.    ds an-section "\\$2
-.    ds an-extra1 "\\$3
-.    ie (\\n[.$] > 3) .ds an-extra2 "\\$4
+.    ds an-title "\\$1\"
+.    ds an-section "\\$2\"
+.    ds an-extra1 "\\$3\"
+.    ie (\\n[.$] > 3) .ds an-extra2 "\\$4\"
 .    el               .ds an-extra2 \"Sun Release 4.0
-.    ie (\\n[.$] > 4) .ds an-extra3 "\\$5
+.    ie (\\n[.$] > 4) .ds an-extra3 "\\$5\"
 .    el               .ds an-extra3 \"System Programmer's Manual
 .    ds an-init
 \\..
@@ -208,22 +208,22 @@
 .\" BSD compatibility macros: .AT and .UC
 .
 .de1 AT
-.  ds an-extra2 "7th Edition
-.  if "\\$1"3" .ds an-extra2 "7th Edition
-.  if "\\$1"4" .ds an-extra2 "System III
+.  ds an-extra2 "7th Edition\"
+.  if "\\$1"3" .ds an-extra2 "7th Edition\"
+.  if "\\$1"4" .ds an-extra2 "System III\"
 .  if "\\$1"5" \{\
-.    ie "\\$2"" .ds an-extra2 "System V
-.    el .ds an-extra2 "System V Release \\$2
+.    ie "\\$2"" .ds an-extra2 "System V\"
+.    el .ds an-extra2 "System V Release \\$2\"
 .  \}
 ..
 .
 .de1 UC
-.  ds an-extra2 "3rd Berkeley Distribution
-.  if "\\$1"3" .ds an-extra2 "3rd Berkeley Distribution
-.  if "\\$1"4" .ds an-extra2 "4th Berkeley Distribution
-.  if "\\$1"5" .ds an-extra2 "4.2 Berkeley Distribution
-.  if "\\$1"6" .ds an-extra2 "4.3 Berkeley Distribution
-.  if "\\$1"7" .ds an-extra2 "4.4 Berkeley Distribution
+.  ds an-extra2 "3rd Berkeley Distribution\"
+.  if "\\$1"3" .ds an-extra2 "3rd Berkeley Distribution\"
+.  if "\\$1"4" .ds an-extra2 "4th Berkeley Distribution\"
+.  if "\\$1"5" .ds an-extra2 "4.2 Berkeley Distribution\"
+.  if "\\$1"6" .ds an-extra2 "4.3 Berkeley Distribution\"
+.  if "\\$1"7" .ds an-extra2 "4.4 Berkeley Distribution\"
 ..
 .
 .de1 DT
@@ -299,14 +299,14 @@
 .    ie r X \{\
 .      if (\\n[%] > \\n[X]) \{\
 .        nr an-page-letter (\\n[%] - \\n[X])
-.        ds an-page-string \\n[X]\\n[an-page-letter]
+.        ds an-page-string \\n[X]\\n[an-page-letter]\"
 .      \}
 .    \}
 .    el \{\
 .      ie \\n[cR] \
-.        ds an-page-string "\\*[an-title](\\*[an-section])
+.        ds an-page-string "\\*[an-title](\\*[an-section])\"
 .      el \
-.        ds an-page-string \\n[%]
+.        ds an-page-string \\n[%]\"
 .    \}
 .  \}
 .  BT
@@ -487,13 +487,13 @@
 .
 .de1 RI
 .  if \\n[.$] \{\
-.    ds an-result \&\f[R]\\$1
+.    ds an-result \&\f[R]\\$1\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]
+.      as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \,\f[I]\\$1
+.    if \\n[.$] .as an-result \,\f[I]\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
@@ -501,13 +501,13 @@
 .
 .de1 IR
 .  if \\n[.$] \{\
-.    ds an-result \&\f[I]\\$1\f[R]
+.    ds an-result \&\f[I]\\$1\f[R]\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \/\\$1\f[I]\,\\$2\f[R]
+.      as an-result \/\\$1\f[I]\,\\$2\f[R]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \/\\$1
+.    if \\n[.$] .as an-result \/\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
@@ -515,13 +515,13 @@
 .
 .de1 IB
 .  if \\n[.$] \{\
-.    ds an-result \&\f[I]\\$1
+.    ds an-result \&\f[I]\\$1\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty]
+.      as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \/\f[B]\\$1
+.    if \\n[.$] .as an-result \/\f[B]\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
@@ -529,36 +529,36 @@
 .
 .de1 BI
 .  if \\n[.$] \{\
-.    ds an-result \&\f[B]\\$1
+.    ds an-result \&\f[B]\\$1\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty]
+.      as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \,\f[I]\\$1
+.    if \\n[.$] .as an-result \,\f[I]\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
 ..
 .
 .de1 RB
-.  ds an-result \&
+.  ds an-result \&\"
 .  while (\\n[.$] >= 2) \{\
-.    as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]
+.    as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]\"
 .    shift 2
 .  \}
-.  if \\n[.$] .as an-result \f[R]\\$1
+.  if \\n[.$] .as an-result \f[R]\\$1\"
 \\*[an-result]
 .  ft R
 ..
 .
 .de1 BR
-.  ds an-result \&
+.  ds an-result \&\"
 .  while (\\n[.$] >= 2) \{\
-.    as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]
+.    as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]\"
 .    shift 2
 .  \}
-.  if \\n[.$] .as an-result \f[B]\\$1
+.  if \\n[.$] .as an-result \f[B]\\$1\"
 \\*[an-result]
 .  ft R
 ..
@@ -620,11 +620,11 @@
 .
 .\" these strings must work in compatibility mode also
 .
-.ds S \s'\\n(PSu'
-.ie c\[tm] .ds Tm \(tm
-.el        .ds Tm (TM)
-.ds lq \(lq
-.ds rq \(rq
+.ds S \s'\\n(PSu'\"
+.ie c\[tm] .ds Tm \(tm\"
+.el        .ds Tm (TM)\"
+.ds lq \(lq\"
+.ds rq \(rq\"
 .
 .if !\n[an-html] \{\
 .  if !rHY \{\
@@ -636,6 +636,9 @@
 .  hy \n[HY]
 .\}
 .
+.\" Load man macro extensions.
+.mso an-ext.tmac
+.
 .\" Load local modifications.
 .mso man.local
 .

Index: tmac/s.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/s.tmac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26

Index: tmac/an-ext.tmac
===================================================================
RCS file: tmac/an-ext.tmac
diff -N tmac/an-ext.tmac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tmac/an-ext.tmac	15 Jan 2007 07:17:24 -0000	1.1
@@ -0,0 +1,124 @@
+.\" an-ext.tmac
+.\"
+.\" Written by Eric S. Raymond <esr@thyrsus.com>
+.\"            Werner Lemberg <wl@gnu.org>
+.\"
+.\" Version 2006-Jan-14
+.\"
+.\" This file is explicitly placed into the public domain.
+.\"
+.\"
+.\" The code below provides extension macros for the `man' macro package.
+.\" It is written without any groff extensions so that other `man'
+.\" implementations can use it without changes.
+.\"
+.\" With groff, this file is sourced by the `man' macro package itself.
+.\" Man page authors who are concerned about portability might add the
+.\" used macros directly to the prologue of the man page(s).
+.
+.
+.if n \{\
+.  do ftr CR R
+.  do ftr CI I
+.  do ftr CB B
+.\}
+.
+.if '\(.T'dvi' \
+.  do ftr CB CW
+.
+.ie \n(.g \{\
+.  ds la \[la]\"
+.  ds ra \[ra]\"
+.\}
+.el \{\
+.  ds la <\"
+.  ds ra >\"
+.  nr HY 1
+.\}
+.
+.nr SY 0
+.
+.
+.\" Declare start of command synopsis.  Sets up hanging indentation.
+.de SY
+.  if !\\n(SY \{\
+.    nh
+.    nr SY 1
+.    nr a \\n(.j
+.    ad l
+.    nr i \\n(.i
+.  \}
+.
+.  HP \w'\fB\\$1\fP 'u
+.  B "\\$1"
+..
+.
+.
+.\" End of command synopsis.  Restores adjustment.
+.de YS
+.  in \\niu
+.  ad \\na
+.  hy \\n(HY
+.  nr SY 0
+..
+.
+.
+.\" Declare optional option.
+.de OP
+.  ie \\n(.$-1 \
+.    RI "[\fB\\$1\fP" "\ \\$2" "]"
+.  el \
+.    RB "[" "\\$1" "]"
+..
+.
+.
+.\" Universal resource locator.
+.\" XXX to be modified
+.de URL
+.  nh
+.  if \\n(.$-1 \
+\\$2 \*(laURL:\\$1\*(ra\"
+.  el \
+\*(la\\$1\*(ra\"
+.  hy \n(HY
+..
+.
+.
+.\" Continuation line for .TP header.
+.de TQ
+.  br
+.  ns
+.  TP "\\$1"
+..
+.
+.
+.\" Start example.
+.de EX
+.  sp 0.5
+.  nf
+.  nh
+.  ft CW
+..
+.
+.
+.\" End example.
+.de EE
+.  ft
+.  fi
+.  hy \n(HY
+.  sp 0.5
+..
+.
+.
+.\" Start display.
+.de DS
+.  \" XXX to be written
+..
+.
+.
+.\" End display.
+.de DE
+.  \" XXX to be written
+..
+.
+.\" EOF



From MAILER-DAEMON Tue Jan 16 16:45:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H6w7K-0004o5-DV
	for mharc-groff-commit@gnu.org; Tue, 16 Jan 2007 16:45:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H6w7I-0004mc-NQ
	for groff-commit@gnu.org; Tue, 16 Jan 2007 16:45:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H6w7I-0004mB-31
	for groff-commit@gnu.org; Tue, 16 Jan 2007 16:45:16 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H6w7H-0004lt-N8
	for groff-commit@gnu.org; Tue, 16 Jan 2007 16:45:15 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H6w7H-0005fB-A9
	for groff-commit@gnu.org; Tue, 16 Jan 2007 16:45:15 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H6w7G-0006uu-Uo
	for groff-commit@gnu.org; Tue, 16 Jan 2007 21:45:15 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H6w7G-0006ur-Nc
	for groff-commit@gnu.org; Tue, 16 Jan 2007 21:45:14 +0000
To: groff-commit@gnu.org
Message-Id: <E1H6w7G-0006ur-Nc@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Tue, 16 Jan 2007 21:45:14 +0000
Subject: [Groff-commit] groff ChangeLog tmac/an-ext.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jan 2007 21:45:17 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/16 21:45:14

Modified files:
	.              : ChangeLog 
	tmac           : an-ext.tmac 

Log message:
	* tmac/an-ext.tmac: Remove code for grodvi.
	(SY): Fix typos.
	Don't insert empty line.
	(URL, TQ): Fix typos.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1020&r2=1.1021
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-ext.tmac?cvsroot=groff&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1020
retrieving revision 1.1021
diff -u -b -r1.1020 -r1.1021
--- ChangeLog	15 Jan 2007 07:17:24 -0000	1.1020
+++ ChangeLog	16 Jan 2007 21:45:14 -0000	1.1021
@@ -1,3 +1,10 @@
+2006-01-16  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-ext.tmac: Remove code for grodvi.
+	(SY): Fix typos.
+	Don't insert empty line.
+	(URL, TQ): Fix typos.
+
 2006-01-14  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/an-ext.tmac: New file, containing extension macros

Index: tmac/an-ext.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/an-ext.tmac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tmac/an-ext.tmac	15 Jan 2007 07:17:24 -0000	1.1
+++ tmac/an-ext.tmac	16 Jan 2007 21:45:14 -0000	1.2
@@ -3,7 +3,7 @@
 .\" Written by Eric S. Raymond <esr@thyrsus.com>
 .\"            Werner Lemberg <wl@gnu.org>
 .\"
-.\" Version 2006-Jan-14
+.\" Version 2006-Jan-16
 .\"
 .\" This file is explicitly placed into the public domain.
 .\"
@@ -17,18 +17,17 @@
 .\" used macros directly to the prologue of the man page(s).
 .
 .
+.\" Map mono-width fonts to standard fonts for groff's TTY device
 .if n \{\
 .  do ftr CR R
 .  do ftr CI I
 .  do ftr CB B
 .\}
 .
-.if '\(.T'dvi' \
-.  do ftr CB CW
-.
+.\" groff has glyph entities for angle brackets.
 .ie \n(.g \{\
-.  ds la \[la]\"
-.  ds ra \[ra]\"
+.  ds la \(la\"
+.  ds ra \(ra\"
 .\}
 .el \{\
 .  ds la <\"
@@ -41,15 +40,19 @@
 .
 .\" Declare start of command synopsis.  Sets up hanging indentation.
 .de SY
-.  if !\\n(SY \{\
+.  ie !\\n(SY \{\
 .    nh
 .    nr SY 1
 .    nr a \\n(.j
 .    ad l
 .    nr i \\n(.i
 .  \}
+.  el \{\
+.    br
+.    ns
+.  \}
 .
-.  HP \w'\fB\\$1\fP 'u
+.  HP \w'\fB\\$1\fP\ 'u
 .  B "\\$1"
 ..
 .
@@ -76,7 +79,7 @@
 .\" XXX to be modified
 .de URL
 .  nh
-.  if \\n(.$-1 \
+.  ie \\n(.$-1 \
 \\$2 \*(laURL:\\$1\*(ra\"
 .  el \
 \*(la\\$1\*(ra\"
@@ -88,7 +91,7 @@
 .de TQ
 .  br
 .  ns
-.  TP "\\$1"
+.  TP \\$1\" no doublequotes around argument!
 ..
 .
 .



From MAILER-DAEMON Mon Jan 22 00:43:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H8ry0-0001FR-63
	for mharc-groff-commit@gnu.org; Mon, 22 Jan 2007 00:43:40 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H8rxy-0001CG-1y
	for groff-commit@gnu.org; Mon, 22 Jan 2007 00:43:38 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H8rxw-0001Aq-UQ
	for groff-commit@gnu.org; Mon, 22 Jan 2007 00:43:37 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H8rxw-0001AR-Lv
	for groff-commit@gnu.org; Mon, 22 Jan 2007 00:43:36 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H8rxv-0006o4-SF
	for groff-commit@gnu.org; Mon, 22 Jan 2007 00:43:36 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H8rxv-00033i-DZ
	for groff-commit@gnu.org; Mon, 22 Jan 2007 05:43:35 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H8rxv-00033e-4w
	for groff-commit@gnu.org; Mon, 22 Jan 2007 05:43:35 +0000
To: groff-commit@gnu.org
Message-Id: <E1H8rxv-00033e-4w@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 22 Jan 2007 05:43:35 +0000
Subject: [Groff-commit] groff ChangeLog contrib/pdfmark/pdfroff.man
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jan 2007 05:43:38 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/22 05:43:35

Modified files:
	.              : ChangeLog 
	contrib/pdfmark: pdfroff.man 

Log message:
	* contrib/pdfmark/pdfroff.man: Revised, based on a patch from Eric
	Raymond.  It now uses the new macros from an-ext.tmac.  This is the
	first of a series of man patches which Eric has contributed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1021&r2=1.1022
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/pdfroff.man?cvsroot=groff&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1021
retrieving revision 1.1022
diff -u -b -r1.1021 -r1.1022
--- ChangeLog	16 Jan 2007 21:45:14 -0000	1.1021
+++ ChangeLog	22 Jan 2007 05:43:34 -0000	1.1022
@@ -1,3 +1,9 @@
+2006-01-21  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/pdfmark/pdfroff.man: Revised, based on a patch from Eric
+	Raymond.  It now uses the new macros from an-ext.tmac.  This is the
+	first of a series of man patches which Eric has contributed.
+
 2006-01-16  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/an-ext.tmac: Remove code for grodvi.

Index: contrib/pdfmark/pdfroff.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/pdfroff.man,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- contrib/pdfmark/pdfroff.man	14 Jul 2006 23:48:35 -0000	1.7
+++ contrib/pdfmark/pdfroff.man	22 Jan 2007 05:43:35 -0000	1.8
@@ -8,10 +8,11 @@
 File position: <groff-source>/contrib/pdfmark/pdfroff.man
 
 Last update: 
+16 Jan 2007.  Converted to use .SY/.OP/.YS
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 written by Keith Marshall <keith.d.marshall@ntlworld.com>
 
 Permission is granted to copy, distribute and/or modify this document
@@ -29,121 +30,76 @@
 A copy of the Free Documentation License is included as a file called
 FDL in the main directory of the groff source package.
 ..
-.\" --------------------------------------------------------------------
 .
-.SH NAME
-pdfroff \- create PDF documents using
-.I groff
 .
-.ig
-  This `.ig' block is here to make mandb happy -- it forces the end of
-  the NAME section processing.
-..
+.\" --------------------------------------------------------------------
+.\" Local macro definitions
 .
 .hw pdfmark
-.de Q
-\&\\$3\*(lq\\$1\*(rq\\$2
-..
-.de nohy
-.hy 0
+.
+.de NH
+.  hy 0
 \&\\$*
-.hy
+.  hy
 ..
+.
+.
+.\" --------------------------------------------------------------------
+.
+.SH NAME
+.
+pdfroff \- create PDF documents using groff
+.
+.
 .\" --------------------------------------------------------------------
 .
 .SH SYNOPSIS
-.de cmd
-.   if r@i .in
-.   nr @i \\n(.i
-.   in +\w'\f[B]\\$1\0'u
-.   ti \\n(@iu
-.   B \\$1\0\c
-..
-.de opt
-.   tr -\-
-.   RB [ -\\$1\c
-.   IR \&\\$2 ]
-.   tr --
-..
-.de opta
-.   ie \\n(.$>1 .opt \\$1 \0\\$2
-.   el .opt \\$1
-..
-.de opte
-.   tr -\-
-.   RB [ -\\$1 =\c
-.   IR \&\\$2 ]
-.   tr --
-..
-.de optx
-.   tr -\-
-.   RB [ --no\\$1 \0|\0\c
-.   BR -\\$1 =\c
-.   IR \&\\$2 ]
-.   tr --
-..
-.ad l
-.hy 0
-.ll -5
-.cmd pdfroff
-.opt  abcegilpstzCEGNRSUVXZ
-.opta d cs
-.opta f fam
-.opta F dir
-.opta I dir
-.opta L arg
-.opta m name
-.opta M dir
-.opta n num
-.opta o list
-.opta P arg
-.opta r cn
-.opta T dev
-.opta w name
-.opta W name
-.opt  -emit-ps
-.opt  -no-toc-relocation
-.opt  -no-kill-null-pages
-.opte -stylesheet name
-.optx -pdf-output name
-.optx -reference-dictionary name
-.opt  -report-progress
-.opt  -keep-temporary-files
-.B file
-.I ...
-.ll
-.sp
-.cmd pdfroff
-.B -h
+.
+.SY pdfroff
+.OP \-abcegilpstzCEGNRSUVXZ
+.OP \-d cs
+.OP \-f fam
+.OP \-F dir
+.OP \-I dir
+.OP \-L arg
+.OP \-m name
+.OP \-M dir
+.OP \-n num
+.OP \-o list
+.OP \-P arg
+.OP \-r cn
+.OP \-T dev
+.OP \-w name
+.OP \-W name
+.OP \-\-emit\-ps
+.OP \-\-no\-toc\-relocation
+.OP \-\-no-kill\-null\-pages
+.OP \-\-stylesheet=\fIname\fP
+.OP \-\-no\-pdf\-output
+.OP \-\-pdf\-output=\fIname\fP
+.OP \-\-no\-reference\-dictionary
+.OP \-\-reference\-dictionary=\fIname\fP
+.OP \-\-report\-progress
+.OP \-\-keep\-temporary\-files
+.I file .\|.\|.
+.
+.SY pdfroff
+.B \-h
 |
-.B --help
-.sp
-.cmd pdfroff
-.B -v
+.B \-\-help
+.
+.SY pdfroff
+.B \-v
 |
-.B --version
-.RI [ option
-.IR ... ]
-.rr @i
-.in
-.ad
-.hy
-.P
-The command line is parsed in accordance with normal GNU conventions,
-but with one exception \(em when specifying any short form option
-(i.e., a single character option introduced by a single hyphen),
-and if that option expects an argument, then it
-.I must
-be specified independently (i.e., it may
-.I not
-be appended to any group of other single character short form options).
-.P
-Long form option names (i.e., those introduced by a double hyphen)
-may be abbreviated to their minimum length unambigous initial substring.
+.B \-\-version
+.RI [ option\ .\|.\|. ]
+.YS
+.
 .
 .\" --------------------------------------------------------------------
 .
 .SH DESCRIPTION
+.
 .B pdfroff
 is a wrapper program for the GNU text processing system,
 .BR  groff .
@@ -156,17 +112,19 @@
 and are subsequently combined in the correct order, for final publication
 as a single PDF document.
 A further optional
-.Q style\0sheet
+\*(lqstyle sheet\*(rq
 capability is provided;
-this allows for the definition of content which is required to preceed the
+this allows for the definition of content which is required to precede the
 table of contents, in the published document.
+.
 .P
 For each invocation of
 .BR pdfroff ,
 the ultimate
 .B groff
-output stream is post\(hyprocessed by the GhostScript interpreter,
+output stream is post-processed by the GhostScript interpreter,
 to produce a finished PDF document.
+.
 .P
 .B pdfroff
 makes no assumptions about, and imposes no restrictions on,
@@ -186,7 +144,7 @@
 package, is used to define public reference marks,
 or dynamic links to such reference marks, then
 .B pdfroff
-will perform as many preformatting
+performs as many preformatting
 .B groff
 passes as required, up to a maximum limit of
 .IR four ,
@@ -194,9 +152,27 @@
 to resolve references, and to expand the dynamically defined
 content of links.
 .
+.
 .\" --------------------------------------------------------------------
 .
 .SH USAGE
+.
+The command line is parsed in accordance with normal GNU conventions,
+but with one exception \(em when specifying any short form option
+(i.e., a single character option introduced by a single hyphen),
+and if that option expects an argument, then it
+.I must
+be specified independently (i.e., it may
+.I not
+be appended to any group of other single character short form options).
+.
+.P
+Long form option names (i.e., those introduced by a double hyphen)
+may be abbreviated to their minimum length unambiguous initial
+substring.
+.
+.P
+Otherwise,
 .B pdfroff
 usage closely mirrors that of
 .B groff
@@ -206,7 +182,7 @@
 .BR \-h ,
 .BR \-v ,
 and
-.BI \-T \0dev
+.BI \-T \ dev
 short form options, and
 all long form options,
 which are parsed internally by
@@ -223,9 +199,11 @@
 .BR pdfroff
 options and argument usage.
 .
+.
 .\" --------------------------------------------------------------------
 .
 .SH OPTIONS
+.
 .B pdfroff
 accepts all of the short form options
 (i.e., those introduced by a single hyphen),
@@ -236,11 +214,13 @@
 .BR groff ;
 the following, however, are handled specially by
 .BR pdfroff .
+.
 .TP
 .B \-h
 Same as
 .BR \-\-help ;
 see below.
+.
 .TP
 .B \-i
 Process standard input, after all other specified input files.
@@ -249,25 +229,28 @@
 but, if grouped with other options, it
 .I must
 be the first in the group.
-Hiding it within a group will
-break standard input processing, in the multiple pass
+Hiding it within a group
+breaks standard input processing, in the multiple pass
 .B groff
 processing context of
 .BR pdfroff .
+.
 .TP
-.BI \-T \0dev
+.BI \-T \ dev
 Only
-.BI \-T \0ps
+.B \-T\ ps
 is supported by
 .BR pdfroff .
-Attempting to specify any other device will cause
+Attempting to specify any other device causes
 .B pdfroff
 to abort.
+.
 .TP
 .B \-v
 Same as
 .BR \-\-version ;
 see below.
+.
 .P
 See
 .BR groff (@MAN1EXT@)
@@ -276,6 +259,7 @@
 .BR pdfroff
 to
 .BR groff .
+.
 .P
 All long form options
 (i.e., those introduced by a double hyphen)
@@ -286,12 +270,14 @@
 passed on to
 .BR groff ,
 unless otherwise stated below.
+.
 .TP
 .B \-\-help
 Causes
 .B pdfroff
 to display a summary of the its usage syntax, and supported options,
 and then exit.
+.
 .TP
 .B \-\-emit\-ps
 Suppresses the final output conversion step,
@@ -307,6 +293,7 @@
 in place of the default
 .I GhostScript
 PDF writer.
+.
 .TP
 .B \-\-keep\-temporary\-files
 Suppresses the deletion of temporary files,
@@ -320,21 +307,24 @@
 .BR FILES ,
 for a description of the temporary files used by
 .BR pdfroff .
+.
 .TP
 .B \-\-no\-pdf\-output
 May be used with the
-.BI \-\-reference\-dictionary= name
+.BI \%\-\-reference\-dictionary= name
 option (described below) to eliminate the overhead of PDF formatting,
 when running
 .B pdfroff
 to create a reference dictionary, for use in a different document.
+.
 .TP
 .B \-\-no\-reference\-dictionary
 May be used to eliminate the overhead of creating a reference dictionary,
-when it is known that the target PDF document will contain no public
+when it is known that the target PDF document contains no public
 references, created by the
 .I pdfhref
 macro.
+.
 .TP
 .B \-\-no\-toc\-relocation
 May be used to eliminate the extra
@@ -344,14 +334,15 @@
 and relocate it to the start of the PDF document,
 when processing any document which lacks an automatically
 generated table of contents.
+.
 .TP
 .B \-\-no\-kill\-null\-pages
 While preparing for simulation of the manual collation step,
 which is traditionally required to relocate of a
-.I "table of contents
+.I "table of contents"
 to the start of a document,
 .B pdfroff
-will accumulate a number of empty page descriptions
+accumulates a number of empty page descriptions
 into the intermediate
 .I PostScript
 output stream.
@@ -360,6 +351,7 @@
 this option forces
 .B pdfroff
 to leave them in place.
+.
 .TP
 .BI \-\-pdf\-output= name
 Specifies the name to be used for the resultant PDF document;
@@ -368,6 +360,7 @@
 .B pdfroff
 may use this option,
 to encode the document name in a generated reference dictionary.
+.
 .TP
 .BI \-\-reference\-dictionary= name
 Specifies the name to be used for the generated reference dictionary file;
@@ -379,6 +372,7 @@
 .I must
 be specified, if it is desired to save the reference dictionary,
 for use in references placed in other PDF documents.
+.
 .TP
 .B \-\-report\-progress
 Causes
@@ -387,6 +381,7 @@
 at the start of each
 .B groff
 processing pass.
+.
 .TP
 .BI \-\-stylesheet= name
 Specifies the name of an
@@ -396,6 +391,7 @@
 .I before
 the table of contents,
 in the formatted PDF document.
+.
 .TP
 .B \-\-version
 Causes
@@ -411,12 +407,14 @@
 .B groff
 version information, before exiting.
 .
+.
 .\" --------------------------------------------------------------------
 .
 .SH ENVIRONMENT
 The following environment variables may be set, and exported,
 to modify the behaviour of
 .BR pdfroff .
+.
 .TP
 .B PDFROFF_COLLATE
 Specifies the program to be used
@@ -429,18 +427,18 @@
 which print them at the end.
 However,
 users should not normally need to specify
-.BR PDFROFF_COLLATE ,
+.BR \%PDFROFF_COLLATE ,
 (and indeed,
 are not encouraged to do so).
 If unspecified,
 .B pdfroff
-will use
-.BI sed (@MAN1EXT@)
+uses
+.BR sed (@MAN1EXT@)
 by default,
-which will normally suffice.
+which normally suffices.
 .IP
 If
-.B PDFROFF_COLLATE
+.B \%PDFROFF_COLLATE
 .I is
 specified,
 then it must act as a filter,
@@ -449,31 +447,32 @@
 .I stdout
 stream,
 whence it is piped to the
-.BR PDFROFF_POSTPROCESSOR_COMMAND ,
+.BR \%PDFROFF_POSTPROCESSOR_COMMAND ,
 to produce the finished PDF output.
 .IP
 When specifying
-.BR PDFROFF_COLLATE ,
-it will normally be necessary to also specify
-.BR PDFROFF_KILL_NULL_PAGES .
+.BR \%PDFROFF_COLLATE ,
+it is normally necessary to also specify
+.BR \%PDFROFF_KILL_NULL_PAGES .
 .IP
-.B PDFROFF_COLLATE
+.B \%PDFROFF_COLLATE
 is ignored,
 if
 .B pdfroff
 is invoked with the
-.I \-\-no\-kill\-null\-pages
+.I \%\-\-no\-kill\-null\-pages
 option.
+.
 .TP
 .B PDFROFF_KILL_NULL_PAGES
-Sepcifies options to be passed to the
-.B PDFROFF_COLLATE
+Specifies options to be passed to the
+.B \%PDFROFF_COLLATE
 program.
 .IP
 It should not normally be necessary to specify
-.BR PDFROFF_KILL_NULL_PAGES .
+.BR \%PDFROFF_KILL_NULL_PAGES .
 The internal default is a
-.BI sed (@MAN1EXT@)
+.BR sed (@MAN1EXT@)
 script,
 which is intended to remove completely blank pages
 from the collated output stream,
@@ -481,22 +480,23 @@
 .BR pdfroff .
 However,
 if any alternative to
-.BI sed (@MAN1EXT@)
+.BR sed (@MAN1EXT@)
 is specified for
-.BR PDFROFF_COLLATE ,
+.BR \%PDFROFF_COLLATE ,
 then it is likely that a corresponding alternative specification for
-.B PDFROFF_KILL_NULL_PAGES
-will be required.
+.B \%PDFROFF_KILL_NULL_PAGES
+is required.
 .IP
 As in the case of
-.BR PDFROFF_COLLATE ,
-.B PDFROFF_KILL_NULL_PAGES
+.BR \%PDFROFF_COLLATE ,
+.B \%PDFROFF_KILL_NULL_PAGES
 is ignored,
 if
 .B pdfroff
 is invoked with the
-.I \-\-no\-kill\-null\-pages
+.I \%\-\-no\-kill\-null\-pages
 option.
+.
 .TP
 .B PDFROFF_POSTPROCESSOR_COMMAND
 Specifies the command to be used for the final document conversion
@@ -506,7 +506,7 @@
 .I stdout
 stream,
 and must accept an arbitrary number of
-.I files ...
+.I files .\|.\|.\&
 arguments,
 with the special case of
 .I \-
@@ -515,22 +515,24 @@
 stream.
 .IP
 If unspecified,
-.B PDFROFF_POSTPROCESSOR_COMMAND
-defaults to:
+.B \%PDFROFF_POSTPROCESSOR_COMMAND
+defaults to
+.
 .RS 2
 .IP
 .I
 .ad l
-.nohy gs \-dBATCH \-dQUIET \-dNOPAUSE \-sDEVICE=pdfwrite \-sOutputFile=\-
+.NH gs \-dBATCH \-dQUIET \-dNOPAUSE \-sDEVICE=pdfwrite \-sOutputFile=\-
 .ad
 .RE
+.
 .TP
 .B GROFF_TMPDIR
 Identifies the directory in which
 .B pdfroff
 should create temporary files.
 If
-.B GROFF_TMPDIR
+.B \%GROFF_TMPDIR
 is
 .I not
 specified, then the variables
@@ -539,8 +541,9 @@
 and
 .B TEMP
 are considered in turn, as possible temporary file repositories.
-If none of these are set, then temporary files will be created
+If none of these are set, then temporary files are created
 in the current directory.
+.
 .TP
 .B GROFF_GHOSTSCRIPT_INTERPRETER
 Specifies the program to be invoked, when
@@ -549,24 +552,25 @@
 .B groff
 PostScript output to PDF.
 If
-.B PDFROFF_POSTPROCESSOR_COMMAND
+.B \%PDFROFF_POSTPROCESSOR_COMMAND
 is specified,
 then the command name it specifies is
 .I implicitly
 assigned to
-.BR GROFF_GHOSTSCRIPT_INTERPRETER ,
+.BR \%GROFF_GHOSTSCRIPT_INTERPRETER ,
 overriding any explicit setting specified in the environment.
 If
-.B GROFF_GHOSTSCRIPT_INTERPRETER
+.B \%GROFF_GHOSTSCRIPT_INTERPRETER
 is not specified, then
 .B pdfroff
-will search the process
+searches the process
 .BR PATH ,
 looking for a program with any of the well known names
 for the GhostScript interpreter;
 if no GhostScript interpreter can be found,
 .B pdfroff
-will abort.
+aborts.
+.
 .TP
 .B GROFF_AWK_INTERPRETER
 Specifies the program to be invoked, when
@@ -575,49 +579,53 @@
 .B groff
 intermediate message stream.
 If
-.B GROFF_AWK_INTERPRETER
+.B \%GROFF_AWK_INTERPRETER
 is not specified, then
 .B pdfroff
-will search the process
+searches the process
 .BR PATH ,
 looking for any of the preferred programs, `gawk', `mawk', `nawk'
 and `awk', in this order;
 if none of these are found,
 .B pdfroff
-will issue a warning message, and continue processing;
-however, in this case, no reference dictionary will be created.
+issues a warning message, and continue processing;
+however, in this case, no reference dictionary is created.
+.
 .TP
 .B OSTYPE
 Typically defined automatically by the operating system,
 .B OSTYPE
-is used on Microsoft Win32/MS\(hyDOS platforms
+is used on Microsoft Win32/MS-DOS platforms
 .IR only ,
 to infer the default
-.B PATH_SEPARATOR
+.B \%PATH_SEPARATOR
 character,
 which is used when parsing the process
 .B PATH
 to search for external helper programs.
+.
 .TP
 .B PATH_SEPARATOR
 If set,
-.B PATH_SEPARATOR
+.B \%PATH_SEPARATOR
 overrides the default separator character,
-(':' on POSIX/UNIX systems,
+(`:' on POSIX/UNIX systems,
 inferred from
 .B OSTYPE
-on Microsoft Win32/MS\(hyDOS),
+on Microsoft Win32/MS-DOS),
 which is used when parsing the process
 .B PATH
 to search for external helper programs.
+.
 .TP
 .B SHOW_PROGRESS
 If this is set to a non-empty value, then
 .B pdfroff
-will always behave as if the
-.B \-\-report\-progress
+always behaves as if the
+.B \%\-\-report\-progress
 option is specified, on the command line.
 .
+.
 .\" --------------------------------------------------------------------
 .
 .SH FILES
@@ -634,6 +642,7 @@
 normally, the final output file should be named
 .IB file .pdf\c
 \&.
+.
 .P
 Temporary files, created by
 .BR pdfroff ,
@@ -650,8 +659,8 @@
 .I *
 represents any of the extensions used by
 .B pdfroff
-to identify the following temporary and intermediate files:\(em
-.RS
+to identify the following temporary and intermediate files.
+.
 .TP
 .BI pdf $$ .tmp
 A scratch pad file,
@@ -660,6 +669,7 @@
 during the
 .I reference dictionary
 compilation phase.
+.
 .TP
 .BI pdf $$ .ref
 The
@@ -676,7 +686,7 @@
 as collected in the preceding pass).
 .IP
 If the
-.BR \-\-reference\-dictionary =\c
+.BR \%\-\-reference\-dictionary =\c
 .I name
 option is specified,
 this intermediate file becomes permanent,
@@ -685,6 +695,7 @@
 rather than
 .BI pdf $$ .ref\c
 \&.
+.
 .TP
 .BI pdf $$ .cmp
 Used to collect
@@ -699,7 +710,7 @@
 .BI pdf $$ .ref\c
 \&,
 (or the corresponding file named by the
-.BR \-\-reference\-dictionary =\c
+.BR \%\-\-reference\-dictionary =\c
 .I name
 option),
 then
@@ -709,6 +720,7 @@
 .I document reference map
 is appended to this intermediate file,
 for inclusion in the final formatting passes.
+.
 .TP
 .BI pdf $$ .tc
 An intermediate
@@ -719,6 +731,7 @@
 on ultimate output to the
 .I GhostScript
 postprocessor.
+.
 .TP
 .BI pdf $$ .ps
 An intermediate
@@ -731,7 +744,7 @@
 .I after
 .BI pdf $$ .tc\c
 \&.
-.RE
+.
 .
 .\" --------------------------------------------------------------------
 .
@@ -753,6 +766,7 @@
 with this document providing the reference to
 .BR pdfroff 's
 extended features.
+.
 .P
 While
 .B pdfroff
@@ -769,32 +783,31 @@
 in PDF format, in the reference guide
 .BR "\*(lqPortable Document Format Publishing with GNU Troff\*(rq" ,
 included in the installed documentation set as
-.hy 0
-.BR @PDFDOCDIR@/pdfmark.pdf .
-.hy
+.BR \%@PDFDOCDIR@/pdfmark.pdf .
+.
 .
 .\" --------------------------------------------------------------------
 .
 .SH AUTHOR
-Copyright \(co 2005, 2006, Free Software Foundation, Inc.
-.LP
+Copyright \(co 2005, 2006, 2007 Free Software Foundation, Inc.
+.
+.P
 This man page is distributed under the terms of the
 GNU Free Documentation License (FDL), version 1.1 or later,
 and is part of the
 .I GNU troff
 software package.
 It was originally written by Keith Marshall,
-.nohy <keith.d.marshall@ntlworld.com>,
+.NH <keith.d.marshall@ntlworld.com>,
 who also wrote the implementation of the
 .I pdfroff
 program, to which it relates.
-.LP
+.
+.P
 You should have received a copy of the FDL as part of the
 .I GNU troff
-distribution; it is also available on\-line, at the GNU
-.Q copyleft
-site,
-.nohy <http://www.gnu.org/copyleft/fdl.html>.
+distribution; it is also available on\-line, at
+.URL http://www.gnu.org/copyleft/fdl.html "The GNU copyleft site" .
 .
 .\" --------------------------------------------------------------------
 .\" EOF / vim: ft=groff



From MAILER-DAEMON Mon Jan 22 02:52:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H8tyY-0005Fc-MU
	for mharc-groff-commit@gnu.org; Mon, 22 Jan 2007 02:52:22 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H8tyX-0005Eg-7A
	for groff-commit@gnu.org; Mon, 22 Jan 2007 02:52:21 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H8tyW-0005EF-Ed
	for groff-commit@gnu.org; Mon, 22 Jan 2007 02:52:20 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H8tyW-0005EC-9t
	for groff-commit@gnu.org; Mon, 22 Jan 2007 02:52:20 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H8tyV-0001aI-Tc
	for groff-commit@gnu.org; Mon, 22 Jan 2007 02:52:20 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H8tyV-0007z4-Ct
	for groff-commit@gnu.org; Mon, 22 Jan 2007 07:52:19 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H8tyV-0007z1-5p
	for groff-commit@gnu.org; Mon, 22 Jan 2007 07:52:19 +0000
To: groff-commit@gnu.org
Message-Id: <E1H8tyV-0007z1-5p@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 22 Jan 2007 07:52:19 +0000
Subject: [Groff-commit] groff ChangeLog tmac/an-ext.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jan 2007 07:52:21 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/22 07:52:19

Modified files:
	.              : ChangeLog 
	tmac           : an-ext.tmac 

Log message:
	* tmac/an-ext.tmac: Protect against being sourced twice.
	(URL, EE): Use always two backslashes.
	(MTO): New macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1022&r2=1.1023
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-ext.tmac?cvsroot=groff&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -b -r1.1022 -r1.1023
--- ChangeLog	22 Jan 2007 05:43:34 -0000	1.1022
+++ ChangeLog	22 Jan 2007 07:52:18 -0000	1.1023
@@ -1,3 +1,9 @@
+2006-01-22  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-ext.tmac: Protect against being sourced twice.
+	(URL, EE): Use always two backslashes.
+	(MTO): New macro.
+
 2006-01-21  Werner LEMBERG  <wl@gnu.org>
 
 	* contrib/pdfmark/pdfroff.man: Revised, based on a patch from Eric

Index: tmac/an-ext.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/an-ext.tmac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tmac/an-ext.tmac	16 Jan 2007 21:45:14 -0000	1.2
+++ tmac/an-ext.tmac	22 Jan 2007 07:52:19 -0000	1.3
@@ -3,7 +3,7 @@
 .\" Written by Eric S. Raymond <esr@thyrsus.com>
 .\"            Werner Lemberg <wl@gnu.org>
 .\"
-.\" Version 2006-Jan-16
+.\" Version 2006-Jan-22
 .\"
 .\" This file is explicitly placed into the public domain.
 .\"
@@ -17,6 +17,12 @@
 .\" used macros directly to the prologue of the man page(s).
 .
 .
+.\" Protect against being sourced twice.
+.nr EX +1
+.if \n(EX>1 \
+.  nx
+.
+.
 .\" Map mono-width fonts to standard fonts for groff's TTY device
 .if n \{\
 .  do ftr CR R
@@ -80,10 +86,22 @@
 .de URL
 .  nh
 .  ie \\n(.$-1 \
-\\$2 \*(laURL:\\$1\*(ra\"
+\\$2 \\*(laURL:\\$1\\*(ra\"
+.  el \
+\\*(la\\$1\\*(ra\"
+.  hy \\n(HY
+..
+.
+.
+.\" Email address.
+.\" XXX to be modified
+.de MTO
+.  nh
+.  ie \\n(.$-1 \
+\\$2 \\*(la\\$1\\*(ra\"
 .  el \
-\*(la\\$1\*(ra\"
-.  hy \n(HY
+\\*(la\\$1\\*(ra\"
+.  hy \\n(HY
 ..
 .
 .
@@ -108,7 +126,7 @@
 .de EE
 .  ft
 .  fi
-.  hy \n(HY
+.  hy \\n(HY
 .  sp 0.5
 ..
 .



From MAILER-DAEMON Mon Jan 22 18:53:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1H98yK-0007R0-SF
	for mharc-groff-commit@gnu.org; Mon, 22 Jan 2007 18:53:08 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H98yI-0007PC-AG
	for groff-commit@gnu.org; Mon, 22 Jan 2007 18:53:06 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H98yH-0007OP-0U
	for groff-commit@gnu.org; Mon, 22 Jan 2007 18:53:05 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H98yG-0007O0-9b
	for groff-commit@gnu.org; Mon, 22 Jan 2007 18:53:04 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1H98yF-0004Ap-Sd
	for groff-commit@gnu.org; Mon, 22 Jan 2007 18:53:04 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1H98yF-0001fM-Ad
	for groff-commit@gnu.org; Mon, 22 Jan 2007 23:53:03 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1H98yF-0001fJ-2F
	for groff-commit@gnu.org; Mon, 22 Jan 2007 23:53:03 +0000
To: groff-commit@gnu.org
Message-Id: <E1H98yF-0001fJ-2F@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 22 Jan 2007 23:53:03 +0000
Subject: [Groff-commit] groff ChangeLog tmac/an-old.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jan 2007 23:53:06 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/22 23:53:03

Modified files:
	.              : ChangeLog 
	tmac           : an-old.tmac 

Log message:
	* tmac/an-old.tmac (an-trap, HP): Make `HP' work as expected.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1023&r2=1.1024
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-old.tmac?cvsroot=groff&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1023
retrieving revision 1.1024
diff -u -b -r1.1023 -r1.1024
--- ChangeLog	22 Jan 2007 07:52:18 -0000	1.1023
+++ ChangeLog	22 Jan 2007 23:53:02 -0000	1.1024
@@ -1,3 +1,7 @@
+2006-01-22  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* tmac/an-old.tmac (an-trap, HP): Make `HP' work as expected.
+
 2006-01-22  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/an-ext.tmac: Protect against being sourced twice.

Index: tmac/an-old.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/an-old.tmac,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- tmac/an-old.tmac	15 Jan 2007 07:17:24 -0000	1.56
+++ tmac/an-old.tmac	22 Jan 2007 23:53:02 -0000	1.57
@@ -61,6 +61,7 @@
 .\}
 .
 .nr need_eo_h 0
+.nr need_col2 0
 .
 .\" set up the line length...
 .\" giving precedence to any prior assignment to the \n[LL] register.
@@ -398,6 +399,8 @@
 .de1 an-trap
 .  if \\n[need_eo_h]>0 .DEVTAG-EO-H
 .  nr need_eo_h 0
+.  if \\n[need_col2]>0 .DEVTAG-COL 2
+.  nr need_col2 0
 .  ft R
 .  ps \\n[PS]u
 .  vs \\n[VS]u
@@ -481,6 +484,8 @@
 .  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
 .  in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .  ti \\n[an-margin]u
+.  DEVTAG-COL 1
+.  nr need_col2 1
 ..
 .
 .ds an-empty \" this is referenced to avoid looping on eg .RB ( \\ )



From MAILER-DAEMON Thu Jan 25 07:10:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HA3RR-0008AC-1h
	for mharc-groff-commit@gnu.org; Thu, 25 Jan 2007 07:10:57 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HA3RP-00089T-JU
	for groff-commit@gnu.org; Thu, 25 Jan 2007 07:10:55 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HA3RO-00089D-Gw
	for groff-commit@gnu.org; Thu, 25 Jan 2007 07:10:54 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HA3RO-000898-AW
	for groff-commit@gnu.org; Thu, 25 Jan 2007 07:10:54 -0500
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1HA3RO-0004zE-0K
	for groff-commit@gnu.org; Thu, 25 Jan 2007 07:10:54 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HA3RN-0005cd-2Z
	for groff-commit@gnu.org; Thu, 25 Jan 2007 12:10:53 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1HA3RM-0005ca-7e
	for groff-commit@gnu.org; Thu, 25 Jan 2007 12:10:52 +0000
To: groff-commit@gnu.org
Message-Id: <E1HA3RM-0005ca-7e@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Thu, 25 Jan 2007 12:10:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff ChangeLog
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jan 2007 12:10:55 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/25 12:10:52

Modified files:
	.              : ChangeLog 

Log message:
	s/2006/2007/.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1024&r2=1.1025

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -b -r1.1024 -r1.1025
--- ChangeLog	22 Jan 2007 23:53:02 -0000	1.1024
+++ ChangeLog	25 Jan 2007 12:10:51 -0000	1.1025
@@ -1,27 +1,27 @@
-2006-01-22  Gaius Mulley  <gaius@glam.ac.uk>
+2007-01-22  Gaius Mulley  <gaius@glam.ac.uk>
 
 	* tmac/an-old.tmac (an-trap, HP): Make `HP' work as expected.
 
-2006-01-22  Werner LEMBERG  <wl@gnu.org>
+2007-01-22  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/an-ext.tmac: Protect against being sourced twice.
 	(URL, EE): Use always two backslashes.
 	(MTO): New macro.
 
-2006-01-21  Werner LEMBERG  <wl@gnu.org>
+2007-01-21  Werner LEMBERG  <wl@gnu.org>
 
 	* contrib/pdfmark/pdfroff.man: Revised, based on a patch from Eric
 	Raymond.  It now uses the new macros from an-ext.tmac.  This is the
 	first of a series of man patches which Eric has contributed.
 
-2006-01-16  Werner LEMBERG  <wl@gnu.org>
+2007-01-16  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/an-ext.tmac: Remove code for grodvi.
 	(SY): Fix typos.
 	Don't insert empty line.
 	(URL, TQ): Fix typos.
 
-2006-01-14  Werner LEMBERG  <wl@gnu.org>
+2007-01-14  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/an-ext.tmac: New file, containing extension macros
 	for -man.  See discussion on the groff mailing list for
@@ -30,11 +30,11 @@
 	Decorate .ds and as with comment escapes where appropriate.
 	* tmac/Makefile.sub (NORMALFILES): Add an-ext.tmac.
 
-2006-01-05  Werner LEMBERG  <wl@gnu.org>
+2007-01-05  Werner LEMBERG  <wl@gnu.org>
 
 	* src/preproc/tbl/tbl.man: Document .T# and \n[TW].
 
-2006-01-04  Gaius Mulley  <gaius@glam.ac.uk>
+2007-01-04  Gaius Mulley  <gaius@glam.ac.uk>
 
 	Make -me macros ready for grohtml.
 



From MAILER-DAEMON Tue Jan 30 18:05:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HC22F-0000p5-Tf
	for mharc-groff-commit@gnu.org; Tue, 30 Jan 2007 18:05:07 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HC22D-0000o0-T4
	for groff-commit@gnu.org; Tue, 30 Jan 2007 18:05:05 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HC22C-0000le-Dt
	for groff-commit@gnu.org; Tue, 30 Jan 2007 18:05:05 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HC22C-0000lR-BI
	for groff-commit@gnu.org; Tue, 30 Jan 2007 18:05:04 -0500
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
	(Exim 4.52) id 1HC22B-0007A2-IH
	for groff-commit@gnu.org; Tue, 30 Jan 2007 18:05:04 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HC22A-0001iB-Un
	for groff-commit@gnu.org; Tue, 30 Jan 2007 23:05:03 +0000
Received: from wl by savannah.gnu.org with local (Exim 4.50)
	id 1HC22A-0001i8-Mj
	for groff-commit@gnu.org; Tue, 30 Jan 2007 23:05:02 +0000
To: groff-commit@gnu.org
Message-Id: <E1HC22A-0001i8-Mj@savannah.gnu.org>
From: Werner LEMBERG <wl@gnu.org>
Date: Tue, 30 Jan 2007 23:05:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff ChangeLog contrib/pdfmark/pdfroff.man man...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jan 2007 23:05:06 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/01/30 23:05:02

Modified files:
	.              : ChangeLog 
	contrib/pdfmark: pdfroff.man 
	man            : ditroff.man groff_diff.man roff.man 
	tmac           : an-ext.tmac 

Log message:
	* tmac/an-ext.tmac (\n[EX]): Rename to \n[mX].
	(\n[mH]): New register (set if grohtml is used).
	(\n[SY]): Rename to \n[mS].
	(\n[a]): Rename to \n[mA].
	(\n[i]): Rename to \n[mI].
	(mU): New auxiliary input trap macro.
	(UR, UE): Replace stub with real definition.
	(URL): Remove.
	(MT, ME): New macros.
	(MTO): Remove.
	(EX, EE): Don't insert vertical space.
	Use a register to store (and restore) the current font.
	
	* man/ditroff.man, man/groff_diff.man, man/roff.man: Revised, based
	on patches from Eric Raymond.
	Fix URL addresses.
	* contrib/pdfmark/pdfroff.man: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1025&r2=1.1026
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/pdfroff.man?cvsroot=groff&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/groff/man/ditroff.man?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_diff.man?cvsroot=groff&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/groff/man/roff.man?cvsroot=groff&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-ext.tmac?cvsroot=groff&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1025
retrieving revision 1.1026
diff -u -b -r1.1025 -r1.1026
--- ChangeLog	25 Jan 2007 12:10:51 -0000	1.1025
+++ ChangeLog	30 Jan 2007 23:05:02 -0000	1.1026
@@ -1,3 +1,23 @@
+2007-01-30  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-ext.tmac (\n[EX]): Rename to \n[mX].
+	(\n[mH]): New register (set if grohtml is used).
+	(\n[SY]): Rename to \n[mS].
+	(\n[a]): Rename to \n[mA].
+	(\n[i]): Rename to \n[mI].
+	(mU): New auxiliary input trap macro.
+	(UR, UE): Replace stub with real definition.
+	(URL): Remove.
+	(MT, ME): New macros.
+	(MTO): Remove.
+	(EX, EE): Don't insert vertical space.
+	Use a register to store (and restore) the current font.
+
+	* man/ditroff.man, man/groff_diff.man, man/roff.man: Revised, based
+	on patches from Eric Raymond.
+	Fix URL addresses.
+	* contrib/pdfmark/pdfroff.man: Updated.
+
 2007-01-22  Gaius Mulley  <gaius@glam.ac.uk>
 
 	* tmac/an-old.tmac (an-trap, HP): Make `HP' work as expected.

Index: contrib/pdfmark/pdfroff.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/pdfroff.man,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- contrib/pdfmark/pdfroff.man	22 Jan 2007 05:43:35 -0000	1.8
+++ contrib/pdfmark/pdfroff.man	30 Jan 2007 23:05:02 -0000	1.9
@@ -8,7 +8,7 @@
 File position: <groff-source>/contrib/pdfmark/pdfroff.man
 
 Last update: 
-16 Jan 2007.  Converted to use .SY/.OP/.YS
+30 Jan 2007.
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -797,8 +797,10 @@
 and is part of the
 .I GNU troff
 software package.
-It was originally written by Keith Marshall,
-.NH <keith.d.marshall@ntlworld.com>,
+It was originally written by
+.MT keith.d.marshall@\:ntlworld.com ,
+Keith Marshall
+.ME
 who also wrote the implementation of the
 .I pdfroff
 program, to which it relates.
@@ -807,7 +809,9 @@
 You should have received a copy of the FDL as part of the
 .I GNU troff
 distribution; it is also available on\-line, at
-.URL http://www.gnu.org/copyleft/fdl.html "The GNU copyleft site" .
+.UR http://\:www.gnu.org/\:copyleft/\:fdl.html .
+the GNU copyleft site
+.UE
 .
 .\" --------------------------------------------------------------------
 .\" EOF / vim: ft=groff

Index: man/ditroff.man
===================================================================
RCS file: /cvsroot/groff/groff/man/ditroff.man,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- man/ditroff.man	3 Jul 2004 12:46:58 -0000	1.5
+++ man/ditroff.man	30 Jan 2007 23:05:02 -0000	1.6
@@ -1,11 +1,12 @@
 .ig
 ditroff.man
 
-Last update: 2 Jul 2004
+Last update:
+30 Jan 2007 -- converted to use .SY/.OP./.YS.
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -19,28 +20,14 @@
 FDL in the main directory of the groff source package.
 ..
 .
-.\" --------------------------------------------------------------------
-.\" Setup
-.\" --------------------------------------------------------------------
-.
-.mso www.tmac
-.
-.if n \{\
-.  mso tty-char.tmac
-.  ftr CR R
-.  ftr CI I
-.  ftr CB B
-.\}
-.
-.if '\*[.T]'dvi' \
-.  ftr CB CW
-.
 .
 .\" --------------------------------------------------------------------
 .\" Title
 .\" --------------------------------------------------------------------
 .
 .TH DITROFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 ditroff \- classical device independent roff
 .
@@ -86,7 +73,7 @@
 it was called
 .I ditroff
 (\c
-.IR d\/ evice\~ i\/ ndependent\~ troff\/\c
+.IR d\/ "evice " i\/ "ndependent " troff\/\c
 )
 on some systems, though this naming isn't mentioned in the classical
 documentation.
@@ -128,13 +115,13 @@
 The 1992 revision of the
 .I Nroff/Troff User's Manual
 by
-.I J. F. Osanna
+.I J.\& F.\& Osanna
 and
 .IR "Brian Kernighan" ,
 see
-.br
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz \
-     "Bell Labs CSTR\~#54" .
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz .
+Bell Labs CSTR\~#54
+.UE
 .
 .TP
 .I [CSTR\~#97]
@@ -144,9 +131,9 @@
 is the original documentation of the first multi-device troff
 .RI ( ditroff\/ ),
 see
-.br
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz \
-     "Bell Labs CSTR\~#97" .
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz .
+Bell Labs CSTR\~#97
+.UE
 .
 .TP
 .BR roff (@MAN7EXT@)
@@ -171,7 +158,7 @@
 .SH "AUTHORS"
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -179,7 +166,9 @@
 .
 You should have received a copy of the FDL on your system, it is also
 available on-line at the
-.URL http://\:www.gnu.org/\:copyleft/\:fdl.html "GNU copyleft site" .
+.UR http://\:www.gnu.org/\:copyleft/\:fdl.html .
+GNU copyleft site
+.UE
 .
 .P
 This document is part of
@@ -187,9 +176,13 @@
 the GNU roff distribution.
 .
 It was written by
-.MTO bwarken@mayn.de "Bernd Warken"
+.MT bwarken@\:mayn.de
+Bernd Warken
+.ME
 and is maintained by
-.MTO wl@gnu.org "Werner Lemberg" .
+.MT wl@\:gnu.org .
+Werner Lemberg
+.ME
 .
 .
 .\" --------------------------------------------------------------------

Index: man/groff_diff.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff_diff.man,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- man/groff_diff.man	26 Oct 2006 19:39:07 -0000	1.60
+++ man/groff_diff.man	30 Jan 2007 23:05:02 -0000	1.61
@@ -3,12 +3,13 @@
 .ig
 groff_diff.man
 
-Last update : 26 Oct 2006
+Last update:
+24 Jan 2007 -- macro simplification by ESR.
 
 This file is part of groff, the GNU roff type-setting system.
 It is the source of the man-page groff_diff(7).
 
-Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007
   Free Software Foundation, Inc.
 written by James Clark
 
@@ -25,25 +26,11 @@
 FDL in the main directory of the groff source package.
 ..
 .
+.
 .\" --------------------------------------------------------------------
-.\" Setup
+.\" Local definitions
 .\" --------------------------------------------------------------------
 .
-.do nr groff_diff_C \n[.C]
-.cp 0
-.
-.mso www.tmac
-.
-.if n \{\
-.  mso tty-char.tmac
-.  ftr CR R
-.  ftr CI I
-.  ftr CB B
-.\}
-.
-.if '\*[.T]'dvi' \
-.  ftr CB CW
-.
 .\" define a string tx for the TeX logo
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 .el   .ds tx TeX
@@ -52,56 +39,46 @@
 .\" --------------------------------------------------------------------
 .\" start of macro definitions
 .
-.eo
-.
-.de c
-..
-.
-.de TQ
-.  br
-.  ns
-.  TP \$1
-..
 .de Text
-.  RI "\$*"
+.  RI "\\$*"
 ..
+.
+.
 .de Topic
 .  TP 2m
 .  Text \[bu]
+.  RI "\\$*"
 ..
+.
+.
 .de squoted
-.  ds @arg1 \$1
-.  shift
-.\"  Text \[oq]\f[CB]\*[@arg1]\f[]\[cq]\$*
-.  Text \[oq]\f[B]\*[@arg1]\f[]\[cq]\$*
+.  ds @arg1 \\$1
+.  shift 1
+.  Text \[oq]\\fB\\*[@arg1]\\fP\[cq]\\$*
 .  rm @arg1
 ..
-.c A shell command line
-.de ShellCommand
-.  br
-.  IR "shell#" "\h'1m'\f[CB]\$*\f[]\/"
-..
-.c reference of a request or macro
+.
+.
+.\" reference of a request or macro
 .de request
-.  ds @arg1 \$1
+.  ds @arg1 \\$1
 .  shift 1
-.\"  Text \f[CB]\*[@arg1]\f[]\$*
-.  Text \f[B]\*[@arg1]\f[]\$*
+.  Text \\fB\\*[@arg1]\\fP\\$*
 .  rm @arg1
 ..
 .als option request
 .
-.c representation of an escape sequence
+.
+.\" representation of an escape sequence
 .de esc
-.  ds @arg1 \$1
-.  shift
-.\"  Text \f[CB]\[rs]\*[@arg1]\f[]\$*
-.  Text \f[B]\[rs]\*[@arg1]\&\f[]\$*
+.  ds @arg1 \\$1
+.  shift 1
+.  Text \\fB\[rs]\\*[@arg1]\\fP\\$*
 .  rm @arg1
 ..
-.ec
 .\" end of macro definitions
 .
+.
 .\" from old groff_out.man
 .ie \n(.g \
 .  ds ic \/
@@ -413,13 +390,13 @@
 .
 .RS
 .IP
-.ft CB
-.Text .ds { \[rs]v'\-.3m'\[rs]s'\[rs]En[.s]*6u/10u'
-.br
-.Text .ds } \[rs]s0\[rs]v'.3m'
-.ft
+.EX
+\&.ds { \[rs]v'\-.3m'\[rs]s'\[rs]En[.s]*6u/10u'
+\&.ds } \[rs]s0\[rs]v'.3m'
+.EE
+.RE
 .
-.P
+.IP
 The use of
 .B \[rs]E
 ensures that these definitions work even if
@@ -1166,7 +1143,7 @@
 to glyph name
 .I glyph2
 if it is used in
-.BI \[rs][ ... ]
+.BI \[rs][ .\|.\|. ]
 with more than one component.
 .
 .TP
@@ -1822,7 +1799,7 @@
 .IP
 Line-tabs mode is associated with the current environment; the
 read-only number register
-.B \\[rs]n[.linetabs]
+.B \[rs]n[.linetabs]
 is set to\~1 if in line-tabs mode, and 0 otherwise.
 .
 .TP
@@ -3840,7 +3817,7 @@
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007
 Free Software Foundation, Inc.
 .
 .P
@@ -3849,12 +3826,18 @@
 .
 You should have received a copy of the FDL on your system, it is also
 available on-line at the
-.URL http://\:www.gnu.org/\:copyleft/\:fdl.html "GNU copyleft site" .
+.UR http://\:www.gnu.org/\:copyleft/\:fdl.html .
+GNU copyleft site
+.UE
 .
 This document was written by James Clark, with modifications by
-.MTO wl@gnu.org "Werner Lemberg"
-and
-.MTO bwarken@mayn.de "Bernd Warken" .
+.MT wl@gnu.org
+Werner Lemberg
+.ME
+and
+.MT bwarken@mayn.de .
+Bernd Warken
+.ME
 .
 .P
 This document is part of
@@ -3898,8 +3881,12 @@
 .IR groff .
 From the command line, this is called using
 .
+.RS
 .IP
-.ShellCommand man\~7\~groff
+.EX
+man 7 groff
+.EE
+.RE
 .
 .TP
 .BR roff (@MAN7EXT@)
@@ -3916,10 +3903,9 @@
 of 1976 in the revision of
 .I Brian Kernighan
 of 1992, being the
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz \
-     "classical troff documentation" .
-.
-.cp \n[groff_diff_C]
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz .
+classical troff documentation
+.UE
 .
 .\" --------------------------------------------------------------------
 .\" Emacs variables

Index: man/roff.man
===================================================================
RCS file: /cvsroot/groff/groff/man/roff.man,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- man/roff.man	19 Nov 2006 09:56:49 -0000	1.34
+++ man/roff.man	30 Jan 2007 23:05:02 -0000	1.35
@@ -1,11 +1,12 @@
+.\" t
 .ig
 roff.man
 
-Last update: 18 Nov 2006
+Last update: 30 Jan 2007
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007
 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
@@ -20,130 +21,25 @@
 FDL in the main directory of the groff source package.
 ..
 .
-.\" --------------------------------------------------------------------
-.\" Setup
-.\" --------------------------------------------------------------------
-.
-.do nr roff_C \n[.C]
-.cp 0
-.
-.mso www.tmac
-.
-.if n \{\
-.  mso tty-char.tmac
-.  ftr CR R
-.  ftr CI I
-.  ftr CB B
-.\}
-.
-.if '\*[.T]'dvi' \{\
-.  ftr CB CW
-.\}
-.
 .
 .\" --------------------------------------------------------------------
-.\" String definitions
-.
-.\" Final `\""' comments are used to make Emacs happy, sic \""
-.
-.\" The `-' sign for options.
-.ie t \{\
-.  ds @- \-\"
-.  ds @-- \-\-\"
-.\}
-.el \{\
-.  ds @- -\"
-.  ds @-- --\"
-.\}
-.
-.ds Comment \.\[rs]\[dq]\"
-.ds Ellipsis \.\|.\|.\&\"
-.
-.
-.\" --------------------------------------------------------------------
-.\" Begin of macro definitions
-.
-.de c
-.\" this is like a comment request when escape mechanism is off
-..
-.
-.eo
-.
-.c ---------------------------------------------------------------------
-.
-.de Text
-.  nop \)\$*
-..
-.
-.de CodeSkip
-.  ie t \
-.    sp 0.2v
-.  el \
-.    sp
-..
+.\" Local macros
 .
 .de Esc
-.  ds @1 \$1\"
-.  shift
-.  Text \f[B]\[rs]\*[@1]\f[]\$*
-.  rm @1
-..
-.
-.de QuotedChar
-.  ds @1 \$1
+.  ds @1 \\$1
 .  shift
-.  nop `\f[B]\*[@1]\f[]'\$*
+.  nop \f[B]\[rs]\\*[@1]\f[]\\$*
 .  rm @1
 ..
 .
-.c --------------------------------------------------------------------
 .
-.c a shell command line
-.de ShellCommand
-.  br
-.  ad l
-.  nh
-.  Text \f[I]sh#\h'1m'\f[]\f[CR]\$*\f[]\&\"
-.  ft R
-.  ft P
-.  hy
-.  ad
-..
-.
-.c --------------------------------------------------------------------
-.
-.c ShortOpt ([c [punct]])
-.c
-.c `-c' somewhere in the text.
-.c The second argument is some trailing punctuation.
-.c
-.de ShortOpt
-.  ds @1 \$1\"
+.de QuotedChar
+.  ds @1 \\$1
 .  shift
-.  nh
-.  Text \f[CB]\*[@-]\f[]\f[B]\*[@1]\f[]\/\$*
-.  hy
+.  nop `\f[B]\\*[@1]\f[]'\\$*
 .  rm @1
 ..
 .
-.de TP+
-.  br
-.  ns
-.  TP \$1
-..
-.
-.c --------------------------------------------------------------------
-.
-.c Topic
-.c
-.de Topic
-.  TP 2m
-.  Text \[bu]
-..
-.
-.ec
-.\" End of macro definitions
-.
 .
 .\" --------------------------------------------------------------------
 .\" Title
@@ -291,7 +187,9 @@
 as early as 1964 \[en] note that CTSS commands were all uppercase.
 .
 When CTSS was further developed into the operating system
-.URL http://\:www.multicians.org "Multics" ,
+.UR http://\:www.multicians.org ,
+Multics
+.UE
 the famous predecessor of Unix from 1963,
 .I runoff
 has been improved further by people from the Massachusetts Institute of
@@ -484,7 +382,7 @@
 All of the different commercial
 .I roff
 systems made heavy use of Osanna/\:Kernighan's open source code and
-documentation, but sold them as \[lq]their\[rq] system \[em] with only
+documentation, but sold them as \[lq]their\[rq] system \[en] with only
 minor additions.
 .
 .P
@@ -508,7 +406,9 @@
 project was the \f[CR]GNU\f[] implementation of
 .IR troff ,
 written from scratch by James Clark and put under the
-.URL http://\:www.gnu.org/\:copyleft "GNU Public License" .
+.UR http://\:www.gnu.org/\:copyleft .
+GNU Public License
+.UE
 .
 It was called
 .I groff
@@ -529,7 +429,7 @@
 .
 It is the first
 .I roff
-system that is available on almost all operating systems \[em] and it
+system that is available on almost all operating systems \[en] and it
 is free.
 .
 This makes
@@ -540,7 +440,9 @@
 .
 .P
 An alternative is Gunnar Ritter's
-.URL http://\:heirloom.sf.net "Heirloom Documentation Tools"
+.UR http://\:heirloom.sf.net
+Heirloom Documentation Tools
+.UE
 project, started in 2005, which provides enhanced versions of the various
 roff tools found in the OpenSolaris and Plan\~9 operating systems, now
 available under free licenses.
@@ -609,23 +511,22 @@
 where the output of each program in the queue is taken as the input
 for the next program.
 .
-.CodeSkip
-.
-.ds @1 "cat \f[I]file\f[P] |\""
-.ds @2 "\*[Ellipsis] | \f[I]preproc\f[P] | \*[Ellipsis] |\""
-.ds @3 "troff \f[I]options\f[P] | \f[I]postproc\f[P]\""
-.
-.ShellCommand "\*[@1] \*[@2] \*[@3]"
+.RS
+.P
+cat \f[I]file\f[P] \
+| .\|.\|. \
+| \f[I]preproc\f[P] \
+| .\|.\|. \
+| troff \f[I]options\f[P] \
+| \f[I]postproc\f[P]
+.RE
 .
-.rm @1
-.rm @2
-.rm @3
 .P
 The preprocessors generate
 .I roff
 code that is fed into a
 .I roff
-formatter (e.g.
+formatter (e.g.\&
 .BR troff ),
 which in turn generates
 .I intermediate output
@@ -699,55 +600,32 @@
 .
 The classical preprocessors are
 .
-
-.de @TP
-.\" local indent for .TP
-.TP \\w'\\f[B]soelim\\f[P]'u+2n
-..
-.P
 .RS
-.PD 0
-.@TP
-.B tbl
-for tables.
-.@TP
-.B eqn
-for mathematical formul\[ae].
-.@TP
-.B pic
-for drawing diagrams.
-.@TP
-.B refer
-for bibliographic references.
-.@TP
-.B soelim
-for including macro files from standard locations.
-.@TP
-.B chem
-for drawing chemical formul\[ae].
-.PD
+.TS
+tab (@);
+lb l.
+tbl@for tables.
+eqn@for mathematical formul\[ae].
+pic@for drawing diagrams.
+refer@for bibliographic references.
+soelim@for including macro files from standard locations.
+chem@for drawing chemical formul\[ae].
+.TE
 .RE
 .
 .P
 Other known preprocessors that are not available on all systems
 include
 .
-.P
 .RS
-.PD 0
-.@TP
-.B grap
-for constructing graphical elements.
-.@TP
-.B grn
-for including
-.BR gremlin (1)
-pictures.
-.PD
+.TS
+tab (@);
+lb l.
+grap@for constructing graphical elements.
+grn@for including \fBgremlin\fR(1) pictures.
+.TE
 .RE
 .
-.rm @TP
-.
 .\" --------------------------------------------------------------------
 .SS "Formatter Programs"
 .\" --------------------------------------------------------------------
@@ -917,7 +795,7 @@
 .P
 A macro package that is to be used in a document can be announced to
 the formatter by the command line option
-.ShortOpt m ,
+.BR \-m ,
 see
 .BR troff (@MAN1EXT@),
 or it can be specified within a document using the file inclusion
@@ -1029,7 +907,7 @@
 of the man pages.
 .
 .P
-The classical macro packages take the package name as an extension, e.g.
+The classical macro packages take the package name as an extension, e.g.\&
 .IB file. me
 for a document using the
 .I me
@@ -1069,10 +947,14 @@
 .BR LESSOPEN .
 This process is not well documented, so here an example:
 .
-.CodeSkip
-.ShellCommand LESSOPEN='|lesspipe %s'
-.CodeSkip
+.RS
+.P
+.EX
+LESSOPEN='|lesspipe %s'
+.EE
+.RE
 .
+.P
 where
 .B lesspipe
 is either a system supplied command or a shell script of your own.
@@ -1111,28 +993,36 @@
 But it is also possible to have the mode automatically selected when
 the file is loaded into the editor.
 .
-.Topic
+.IP \(bu
 The most general method is to include the following 3 comment lines at
 the end of the file.
 .
-.CodeSkip
-.nf
-.B \*[Comment] Local Variables:
-.B \*[Comment] mode: nroff
-.B \*[Comment] End:
-.fi
+.RS
+.IP
+.EX
+\&.\[rs]" Local Variables:
+\&.\[rs]" mode: nroff
+\&.\[rs]" End:
+.EE
+.RE
 .
-.Topic
-There is a set of file name extensions, e.g. the man pages that
+.IP \(bu
+There is a set of file name extensions, e.g.\& the man pages that
 trigger the automatic activation of the
 .I nroff
 mode.
 .
-.Topic
+.IP \(bu
 Theoretically, it is possible to write the sequence
-.CodeSkip
-.B \*[Comment] \%-*-\ nroff\ -*-
-.CodeSkip
+.
+.RS
+.IP
+.EX
+\&.\[rs]" \%-*-\ nroff\ -*-
+.EE
+.RE
+.
+.IP
 as the first line of a file to have it started in
 .I nroff
 mode when loaded.
@@ -1149,17 +1039,17 @@
 .
 In order to not disturb this, the following tips can be helpful.
 .
-.Topic
+.IP \(bu
 Never include empty or blank lines in a
 .I roff
 document.
 .
 Instead, use the empty request (a line consisting of a dot only) or a
 line comment
-.B \*[Comment]
+.B .\e"
 if a structuring element is needed.
 .
-.Topic
+.IP \(bu
 Never start a line with whitespace because this can lead to
 unexpected behavior.
 .
@@ -1167,14 +1057,14 @@
 .I roff
 requests.
 .
-.Topic
+.IP \(bu
 Start each sentence on a line of its own, for the spacing after a dot
 is handled differently depending on whether it terminates an
 abbreviation or a sentence.
 .
 To distinguish both cases, do a line break after each sentence.
 .
-.Topic
+.IP \(bu
 To additionally use the auto-fill mode in Emacs, it is best to insert
 an empty
 .I roff
@@ -1185,22 +1075,24 @@
 .I roff
 editing could look.
 .
-.IP
-.nf
+.RS
+.P
+.EX
 This is an example for a
-.I roff
+\&.I roff
 document.
-.Text .
+\&.
 This is the next sentence in the same paragraph.
-.Text .
+\&.
 This is a longer sentence stretching over several
 lines; abbreviations like `cf.' are easily
 identified because the dot is not followed by a
 line break.
-.Text .
+\&.
 In the output, this will still go to the same
 paragraph.
-.fi
+.EE
+.RE
 .
 .P
 Besides Emacs, some other editors provide
@@ -1243,13 +1135,17 @@
 .
 .TP
 troff.org
-.URL http://\:www.troff.org "The historical troff site"
+.UR http://\:www.troff.org
+The historical troff site
+.UE
 provides an overview and pointers to all historical aspects of
 .IR roff .
 .
 .TP
 Multics
-.URL http://\:www.multicians.org "The Multics site"
+.UR http://\:www.multicians.org
+The Multics site
+.UE
 contains a lot of information on the MIT projects, CTSS, Multics,
 early Unix, including
 .IR  runoff ;
@@ -1258,42 +1154,49 @@
 .
 .TP
 Unix Archive
-.URL http://\:www.tuhs.org/\:Archive/ \
-     "The Ancient Unixes Archive"
+.UR http://\:www.tuhs.org/\:Archive/
+The Ancient Unixes Archive
+.UE
 .
 provides the source code and some binaries of the ancient Unixes
 (including the source code of
 .I troff
 and its documentation) that were made public by Caldera since 2001,
-e.g. of the famous Unix version\~7 for PDP-11 at the
-.URL http://\:www.tuhs.org/\:Archive/\:PDP-11/\:Trees/\:V7 \
-     "Unix V7 site" .
+e.g.\& of the famous Unix version\~7 for PDP-11 at the
+.UR http://\:www.tuhs.org/\:Archive/\:PDP-11/\:Trees/\:V7 .
+Unix V7 site
+.UE
 .
 .TP
 Developers at AT&T Bell Labs
-.URL http://\:cm.bell-labs.com/\:cm/\:index.html \
-     "Bell Labs Computing and Mathematical Sciences Research"
+.UR http://\:www.bell-labs.com/
+Bell Labs Computing and Mathematical Sciences Research
+.UE
 .
 provides a search facility for tracking information on the early
 developers.
 .
 .TP
 Plan 9
-.URL http://\:plan9.bell-labs.com "The Plan\~9 operating system"
+.UR http://\:plan9.bell-labs.com
+The Plan\~9 operating system
+.UE
 .
 by AT&T Bell Labs.
 .
 .TP
 runoff
-.URL http://web.mit.edu/\:Saltzer/\:www/\:publications/\:pubs.html \
-"Jerry Saltzer's home page"
+.UR http://web.mit.edu/\:Saltzer/\:www/\:publications/\:pubs.html
+Jerry Saltzer's home page
+.UE
 .
 stores some documents using the ancient RUNOFF formatting language.
 .
 .TP
 CSTR Papers
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr.html \
-     "The Bell Labs CSTR site"
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr.html
+The Bell Labs CSTR site
+.UE
 .
 stores the original
 .I troff
@@ -1302,7 +1205,9 @@
 .
 .TP
 \f[CR]GNU\f[] \f[I]roff\f[]
-.URL http://\:www.gnu.org/\:software/\:groff "The groff web site"
+.UR http://\:www.gnu.org/\:software/\:groff
+The groff web site
+.UE
 provides the free
 .I roff
 implementation
@@ -1326,47 +1231,51 @@
 .TP
 [CSTR\~#54]
 J. F. Osanna,
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:54.ps \
-     "\fINroff/\:Troff User's Manual\fP" ;
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz ;
+.I "Nroff/\:Troff User's Manual"
+.UE
 .
 Bell Labs, 1976; revised by Brian Kernighan, 1992.
-
 .
 .TP
 [CSTR\~#97]
 Brian Kernighan,
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:97.ps \
-     "\fIA Typesetter-independent TROFF\fP" ,
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz ,
+.I "A Typesetter-independent TROFF"
+.UE
 .
 Bell Labs, 1981, revised March 1982.
 .
 .P
-The "little language"
+The \[lq]little language\[rq]
 .I roff
 papers are
 .
 .TP
 [CSTR\~#114]
 Jon L. Bentley and Brian W. Kernighan,
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:114.ps \
-     "\fIGRAP \(em A Language for Typesetting Graphs\fP" ;
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:114.ps.gz ;
+.I "GRAP \[en] A Language for Typesetting Graphs"
+.UE
 .
 Bell Labs, August 1984.
 .
 .TP
 [CSTR\~#116]
 Brian W. Kernighan,
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:116.ps \
-     "\fIPIC -- A Graphics Language for Typesetting\fP" ;
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:116.ps.gz ;
+.I "PIC \[en] A Graphics Language for Typesetting"
+.UE
 .
 Bell Labs, December 1984.
 .
 .TP
 [CSTR\~#122]
 J. L. Bentley, L. W. Jelinski, and B. W. Kernighan,
-.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:122.ps \
-"\fICHEM \(em A Program for Typesetting Chemical Structure Diagrams, \
-Computers and Chemistry\fP" ;
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:122.ps.gz ;
+.I "CHEM \[en] A Program for Typesetting Chemical Structure Diagrams,"
+.I "Computers and Chemistry"
+.UE
 .
 Bell Labs, April 1986.
 .
@@ -1403,7 +1312,7 @@
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007
 Free Software Foundation, Inc.
 .
 .P
@@ -1412,7 +1321,9 @@
 .
 You should have received a copy of the \f[CR]FDL\f[] on your system,
 it is also available on-line at the
-.URL http://\:www.gnu.org/\:copyleft/\:fdl.html "GNU copyleft site" .
+.UR http://\:www.gnu.org/\:copyleft/\:fdl.html .
+GNU copyleft site
+.UE
 .
 .P
 This document is part of
@@ -1422,11 +1333,13 @@
 distribution.
 .
 It was written by
-.MTO bwarken@mayn.de "Bernd Warken" ;
+.MT bwarken@mayn.de ;
+Bernd Warken
+.ME
 it is maintained by
-.MTO wl@gnu.org "Werner Lemberg".
-.
-.cp \n[roff_C]
+.MT wl@gnu.org .
+Werner Lemberg
+.ME
 .
 .\" --------------------------------------------------------------------
 .\" Emacs setup

Index: tmac/an-ext.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/an-ext.tmac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tmac/an-ext.tmac	22 Jan 2007 07:52:19 -0000	1.3
+++ tmac/an-ext.tmac	30 Jan 2007 23:05:02 -0000	1.4
@@ -3,9 +3,10 @@
 .\" Written by Eric S. Raymond <esr@thyrsus.com>
 .\"            Werner Lemberg <wl@gnu.org>
 .\"
-.\" Version 2006-Jan-22
+.\" Version 2007-Jan-26
 .\"
-.\" This file is explicitly placed into the public domain.
+.\" Copyright (C) 2007 Free Software Foundation, Inc.
+.\" You may freely use, modify and/or distribute this file.
 .\"
 .\"
 .\" The code below provides extension macros for the `man' macro package.
@@ -17,13 +18,23 @@
 .\" used macros directly to the prologue of the man page(s).
 .
 .
+.\" Convention: Auxiliary macros and registers start with `m' followed
+.\"             by an uppercase letter or digit.
+.
+.
 .\" Protect against being sourced twice.
-.nr EX +1
-.if \n(EX>1 \
+.nr mX +1
+.if \n(mX>1 \
 .  nx
 .
+.\" Check whether we are using grohtml.
+.nr mH 0
+.if \n(.g \
+.  if '\*(.T'html' \
+.    nr mH 1
 .
-.\" Map mono-width fonts to standard fonts for groff's TTY device
+.
+.\" Map mono-width fonts to standard fonts for groff's TTY device.
 .if n \{\
 .  do ftr CR R
 .  do ftr CI I
@@ -38,20 +49,21 @@
 .el \{\
 .  ds la <\"
 .  ds ra >\"
+.  \" groff's man macros control hyphenation with this register.
 .  nr HY 1
 .\}
 .
-.nr SY 0
+.nr mS 0
 .
 .
 .\" Declare start of command synopsis.  Sets up hanging indentation.
 .de SY
-.  ie !\\n(SY \{\
+.  ie !\\n(mS \{\
 .    nh
-.    nr SY 1
-.    nr a \\n(.j
+.    nr mS 1
+.    nr mA \\n(.j
 .    ad l
-.    nr i \\n(.i
+.    nr mI \\n(.i
 .  \}
 .  el \{\
 .    br
@@ -65,10 +77,10 @@
 .
 .\" End of command synopsis.  Restores adjustment.
 .de YS
-.  in \\niu
-.  ad \\na
+.  in \\n(mIu
+.  ad \\n(mA
 .  hy \\n(HY
-.  nr SY 0
+.  nr mS 0
 ..
 .
 .
@@ -81,26 +93,82 @@
 ..
 .
 .
-.\" Universal resource locator.
-.\" XXX to be modified
-.de URL
+.\" Start URL.
+.de UR
+.  ds m1 \\$1\"
+.  ds m2 \\$2\"
 .  nh
-.  ie \\n(.$-1 \
-\\$2 \\*(laURL:\\$1\\*(ra\"
+.  if \\n(mH \{\
+.    \" Start diversion in a new environment.
+.    do ev URL-div
+.    do di URL-div
+.  \}
+..
+.
+.
+.\" End URL.
+.de UE
+.  ie \\n(mH \{\
+.    br
+.    di
+.    ev
+.
+.    \" Has there been one or more input lines for the link text?
+.    ie \\n(dn \{\
+.      do HTML-NS "<a href=""\\*(m1"">"
+.      \" Yes, strip off final newline of diversion and emit it.
+.      do chop URL-div
+.      do URL-div
+\c
+.      do HTML-NS </a>
+.    \}
+.    el \
+.      do HTML-NS "<a href=""\\*(m1"">\\*(m1</a>"
+\&\\*(m2\"
+.  \}
 .  el \
-\\*(la\\$1\\*(ra\"
+\\*(la\\*(m1\\*(ra\\*(m2\"
+.
 .  hy \\n(HY
 ..
 .
 .
-.\" Email address.
-.\" XXX to be modified
-.de MTO
+.\" Start email address.
+.de MT
+.  ds m1 \\$1\"
+.  ds m2 \\$2\"
 .  nh
-.  ie \\n(.$-1 \
-\\$2 \\*(la\\$1\\*(ra\"
+.  if \\n(mH \{\
+.    \" Start diversion in a new environment.
+.    do ev URL-div
+.    do di URL-div
+.  \}
+..
+.
+.
+.\" End email address.
+.de ME
+.  ie \\n(mH \{\
+.    br
+.    di
+.    ev
+.
+.    \" Has there been one or more input lines for the link text?
+.    ie \\n(dn \{\
+.      do HTML-NS "<a href=""mailto:\:\\*(m1"">"
+.      \" Yes, strip off final newline of diversion and emit it.
+.      do chop URL-div
+.      do URL-div
+\c
+.      do HTML-NS </a>
+.    \}
 .  el \
-\\*(la\\$1\\*(ra\"
+.      do HTML-NS "<a href=""mailto:\:\\*(m1"">\\*(m1</a>"
+\&\\*(m2\"
+.  \}
+.  el \
+\\*(la\\*(m1\\*(ra\\*(m2\"
+.
 .  hy \\n(HY
 ..
 .
@@ -115,7 +183,7 @@
 .
 .\" Start example.
 .de EX
-.  sp 0.5
+.  nr mE \\n(.f
 .  nf
 .  nh
 .  ft CW
@@ -124,10 +192,9 @@
 .
 .\" End example.
 .de EE
-.  ft
+.  ft \\n(mE
 .  fi
 .  hy \\n(HY
-.  sp 0.5
 ..
 .
 .



