From 9632ecc853b0ac2e33ebb01e0c5839e33e2b9302 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Thu, 21 Sep 2000 17:02:15 +0000
Subject: Fixed the `mysterious blank lines' problem.  This was due to
 unconditional use of the .ne requests.  groff(1) apparently inserts some
 virtual trap at the end of each page, and this was causing the .ne request to
 output extra lines.  Solution is to only use them in troff mode.

Also fixed a related bug in .It macros, where it would insert a page break
in the middle of a sentence.

Removed the end of page trap in nroff mode, as this causes .sp requests to
sometimes eat the space due to the nearby trap.

Removed blank line that appeared as the first line on each nroff-formatted
manual page.

Obtained from:	NetBSD
---
 contrib/groff/tmac/doc-common | 4 ++--
 contrib/groff/tmac/doc-nroff  | 4 ++--
 contrib/groff/tmac/tmac.doc   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'contrib')

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index fad8055..f80d63c 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -328,7 +328,7 @@
 ..
 .de Pp
 .sp \\n(Ppu
-.ne 2
+.if !\\n(cR .ne 2
 .ns
 ..
 .de Lp
@@ -348,7 +348,7 @@
 ..
 .de Ss
 .sp
-.ne 2
+.if !\\n(cR .ne 2
 .ti -.25i
 \&\\*(sH\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
 \&\fP\s0
diff --git a/contrib/groff/tmac/doc-nroff b/contrib/groff/tmac/doc-nroff
index c036f21..faad1cb 100644
--- a/contrib/groff/tmac/doc-nroff
+++ b/contrib/groff/tmac/doc-nroff
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)doc-nroff	5.6 (Berkeley) 8/5/91
+.\"	$FreeBSD$
 .\"
 .\" tmac.mdoc-nroff
 .\"     %beginstrip%
@@ -118,7 +119,6 @@
 .ds If infinity
 .ds Na \fINaN\fP
 .ds Ba \fR\&|\fP
-
 .\"
 .de hK
 .nr % 1
@@ -130,7 +130,7 @@
 .if "\\*(cH"Null" .if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|)
 .ie \\n(cR \{\
 .	hM
-.	wh -1v fM
+.\"	wh -1v fM
 .\}
 .el \{\
 .	wh 0 hM
diff --git a/contrib/groff/tmac/tmac.doc b/contrib/groff/tmac/tmac.doc
index 1cd6904..516584c 100644
--- a/contrib/groff/tmac/tmac.doc
+++ b/contrib/groff/tmac/tmac.doc
@@ -1957,7 +1957,7 @@
 .	tm .It \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
 .\}
 .\" .tm Here is L[\\n(lC]==\\*(L\\n(lC
-.ne 3v
+.if !\\n(cR .ne 3v
 .ie \\n(.$>0 \{\
 .	ds mN It
 .	ds b1
-- 
cgit v1.1