From 6ed1daf7e1cd0a9cbe0d2f1d7c9a6ce1cf52c51d Mon Sep 17 00:00:00 2001
From: joerg <joerg@FreeBSD.org>
Date: Thu, 27 Jan 2000 17:56:41 +0000
Subject: Fix a problem that caused the generation of an (almost) empty first
 page of -mdoc manual pages in troff mode.  The problem has been introduced in
 rev 1.12; apparently ending a line inside a macro definition with \c doesn't
 behave as Bill expected, and troff was fooled to believe previous output was
 already pending thus a new page needed to be emitted.  Using a troff comment
 .\" instead of \c seems to solve this, alas the brain^Wnice sed(1) magic
 needs to be taught to _not_ strip those comments now.

I think -stable is not affected by this.
---
 contrib/groff/tmac/doc-common | 56 +++++++++++++++++++++----------------------
 contrib/groff/tmac/strip.sed  |  2 ++
 2 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'contrib/groff/tmac')

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 1fc5de1..d3e80f3 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -231,34 +231,34 @@
 .\}
 .if "\\$1"FreeBSD" \{\
 .	if "\\$2"2"      .ds oS FreeBSD 2.0
-.	    ie \\n(.$==1        \c
-.	el .ie "\\$2"1.0"       \c
-.	el .ie "\\$2"1.1"       \c
-.	el .ie "\\$2"1.1.5"     \c
-.	el .ie "\\$2"1.1.5.1"   \c
-.	el .ie "\\$2"2"         \c
-.	el .ie "\\$2"2.0"       \c
-.	el .ie "\\$2"2.0.5"     \c
-.	el .ie "\\$2"2.1"       \c
-.	el .ie "\\$2"2.1.5"     \c
-.	el .ie "\\$2"2.1.6"     \c
-.	el .ie "\\$2"2.1.7"     \c
-.	el .ie "\\$2"2.2"       \c
-.	el .ie "\\$2"2.2.1"     \c
-.	el .ie "\\$2"2.2.2"     \c
-.	el .ie "\\$2"2.2.5"     \c
-.	el .ie "\\$2"2.2.6"     \c
-.	el .ie "\\$2"2.2.7"     \c
-.	el .ie "\\$2"2.2.8"     \c
-.	el .ie "\\$2"3"         \c
-.	el .ie "\\$2"3.0"       \c
-.	el .ie "\\$2"3.1"       \c
-.	el .ie "\\$2"3.2"       \c
-.	el .ie "\\$2"3.3"       \c
-.	el .ie "\\$2"3.4"       \c
-.	el .ie "\\$2"3.5"       \c
-.	el .ie "\\$2"4"         \c
-.	el .ie "\\$2"4.0"       \c
+.	    ie \\n(.$==1        %comment%
+.	el .ie "\\$2"1.0"       %comment%
+.	el .ie "\\$2"1.1"       %comment%
+.	el .ie "\\$2"1.1.5"     %comment%
+.	el .ie "\\$2"1.1.5.1"   %comment%
+.	el .ie "\\$2"2"         %comment%
+.	el .ie "\\$2"2.0"       %comment%
+.	el .ie "\\$2"2.0.5"     %comment%
+.	el .ie "\\$2"2.1"       %comment%
+.	el .ie "\\$2"2.1.5"     %comment%
+.	el .ie "\\$2"2.1.6"     %comment%
+.	el .ie "\\$2"2.1.7"     %comment%
+.	el .ie "\\$2"2.2"       %comment%
+.	el .ie "\\$2"2.2.1"     %comment%
+.	el .ie "\\$2"2.2.2"     %comment%
+.	el .ie "\\$2"2.2.5"     %comment%
+.	el .ie "\\$2"2.2.6"     %comment%
+.	el .ie "\\$2"2.2.7"     %comment%
+.	el .ie "\\$2"2.2.8"     %comment%
+.	el .ie "\\$2"3"         %comment%
+.	el .ie "\\$2"3.0"       %comment%
+.	el .ie "\\$2"3.1"       %comment%
+.	el .ie "\\$2"3.2"       %comment%
+.	el .ie "\\$2"3.3"       %comment%
+.	el .ie "\\$2"3.4"       %comment%
+.	el .ie "\\$2"3.5"       %comment%
+.	el .ie "\\$2"4"         %comment%
+.	el .ie "\\$2"4.0"       %comment%
 .	el .tm Unknown FreeBSD version ``\\$2'' at line \\n(c.
 .\}
 .if "\\*(oS"Null" \{\
diff --git a/contrib/groff/tmac/strip.sed b/contrib/groff/tmac/strip.sed
index b309e86..400dbf9 100644
--- a/contrib/groff/tmac/strip.sed
+++ b/contrib/groff/tmac/strip.sed
@@ -1,2 +1,4 @@
+# $FreeBSD$
 /%beginstrip%/,$s/[	 ]*\\".*//
 /^\.$/d
+/%comment%/s/%comment%/.\\"/
-- 
cgit v1.1