From 0988851e6e45abd132db555273a43a0c1c8157c7 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 21 Dec 2001 11:31:30 +0000
Subject: [PATCH 1/2] From ChangeLog:

: 2001-11-16  Ruslan Ermilov  <ru@FreeBSD.org>
:
:         * tmac/doc-common (doc-header): Handle very long document titles
:         better.

PR:		docs/10349
---
 contrib/groff/tmac/doc-common | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 9e1a81a20186..5730ce6581f8 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -522,12 +522,25 @@
 .
 .\" NS doc-header macro
 .\" NS   print page header
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dh
+.\" NS   doc-reg-dh1
 .
 .de doc-header
 .  ev doc-env-dh
 .  doc-setup-page-layout
 .  if !\n[cR] \
 '    sp \n[doc-header-space]u
+.  nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[P]'
+.  nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[P]'
+.  if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
+.    while (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
+.      substring doc-header-string 1 -1
+.      nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\|.\|.\|.\f[P]'
+.    \}
+.    as doc-header-string "\|.\|.\|.
+.  \}
 .  tl \*[doc-caption-font]\*[doc-header-string]\f[P]\*[doc-caption-font2]\*[doc-volume]\f[P]\*[doc-caption-font]\*[doc-header-string]\f[P]
 '  sp \n[doc-header-space]u
 .  ev

From e8777213c888f7e2d317b905263ce443ef40188e Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 21 Dec 2001 11:46:21 +0000
Subject: [PATCH 2/2] Bring in latest (cosmetic) vendor fixes to this file.

---
 contrib/groff/tmac/groff_mdoc.man | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/groff/tmac/groff_mdoc.man b/contrib/groff/tmac/groff_mdoc.man
index 534c5168c660..b4b5430c2d43 100644
--- a/contrib/groff/tmac/groff_mdoc.man
+++ b/contrib/groff/tmac/groff_mdoc.man
@@ -236,7 +236,8 @@ as follows:
 .El
 .
 .\" XXX
-.ne 7
+.if t \
+.  ne 7
 .
 .
 .Sh "TROFF IDIOSYNCRASIES"
@@ -2335,7 +2336,7 @@ macro always invokes the
 macro after eliminating the space unless another macro name follows it.
 If used as a request (i.e., the second form above in the
 .Sq Usage
-line,
+line),
 .Ql .Ns
 is identical to
 .Ql .No .