From 8ab9883931714199272190df172266b04188c708 Mon Sep 17 00:00:00 2001
From: wl <wl>
Date: Thu, 1 Sep 2005 22:25:06 +0000
Subject: Backward compatibility support for `man' program.

* tmac/an-old.tmac (LL): Initialize it to respect prior LL register
assignment, prior `.ll' request and then package defaults, in this
specified order of decreasing priority.

* tmac/groff_man.man, doc/groff.texinfo: Document altered `LL'
register initialization priorities.
---
 tmac/an-old.tmac    | 23 ++++++++++++++++++++---
 tmac/groff_man.man  | 30 +++++++++++++++++++++++++++++-
 tmac/groff_mdoc.man |  9 ++++++---
 3 files changed, 55 insertions(+), 7 deletions(-)

(limited to 'tmac')

diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 6742fb77..b51f2e2f 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -1,6 +1,6 @@
 .\" an-old.tmac
 .\"
-.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005
 .\"   Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
@@ -62,10 +62,27 @@
 .
 .nr need_eo_h 0
 .
+.\" set up the line length...
+.\" giving precedence to any prior assignment to the \n[LL] register.
 .if !r LL \{\
-.  ie n .nr LL 78n
-.  el   .nr LL 6.5i
+.
+.  \" but if that isn't predefined...
+.  \" then try to respect any prior `.ll' request.
+.  nr LL \n[.l]
+.
+.  \" For troff, this is sufficient to give us a default line length of
+.  \" 6.5i, but for nroff, we prefer a default of 78n to nroff's default
+.  \" 65n.  This has the unfortunate side effect that we will override a
+.  \" user's `.ll 65n' request, with our preferred 78n default; we can't
+.  \" possibly know that the 65n came from a `.ll' request, and MUST
+.  \" assume that it was set by nroff, as its built-in default!  If the
+.  \" user wants to force this setting, then he MUST use the `-rLL=65n'
+.  \" option, or an equivalent `.nr LL 65n' request.
+.  if n \
+.    if (\n[LL] = 65n) \
+.      nr LL 78n
 .\}
+.
 .if !r LT \
 .  nr LT \n[LL]
 .
diff --git a/tmac/groff_man.man b/tmac/groff_man.man
index a070450b..985014eb 100644
--- a/tmac/groff_man.man
+++ b/tmac/groff_man.man
@@ -138,12 +138,40 @@ consistent indentation.
 .BI \-rLL= line-length
 Set line length.
 .
-If this option is not given, the line length defaults to 78n in
+If this option is not given,
+the line length is set to respect any value set by a prior `.ll' request,
+(which
+.I must
+be in effect when the `.TH' macro is invoked),
+if this differs from the built\-in default for the formatter;
+otherwise it defaults to 78n in
 .I nroff
 mode and 6.5i in
 .I troff
 mode.
 .
+.IP
+Note that the use of a `.ll' request to initialize the line length
+is supported for backward compatibility with some versions of the
+.B man
+program;
+direct initialization of the `LL' register should
+.I always
+be preferred to the use of such a request.
+In particular, note that a `.ll\ 65n' request will
+.I not
+preserve the normal
+.I nroff
+default line length,
+(the
+.B man
+default initialization to 78n will prevail),
+whereas,
+the `-rLL=65n' option, or an equivalent `.nr\ LL\ 65n'
+request preceding the use of the `TH' macro,
+.I will
+set a line length of 65n.
+.
 .TP
 .BI \-rLT= title-length
 Set title length.
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index 0893760d..004d784f 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -2901,10 +2901,13 @@ outlined historically in this section.
 .
 .It Li ".Sh AUTHORS"
 Credits should be placed here.
-The
+Use the
 .Ql .An
-macro should be used to specify the name(s) of the person(s).
-.
+macro for names and the
+.Ql .Aq
+macro for e-mail addresses within optional contact information.
+Explicitly indicate whether the person authored the initial manual page
+or the software or whatever the person is being credited for.
 .It Li ".Sh BUGS"
 Blatant problems with the topic go here.
 .El
-- 
cgit v1.2.1