* doc/groff.texinfo: Don't use the string `Appendix' for appendix

headers (both in the text and the table of contents).
* man/groff_tmac.man, src/roff/troff/troff.man: Fix order of tmac
directories.

Use registers LL and LT (similar to -ms) for controlling the
length of title and line, respectively, in the -man and -mdoc
macro packages.

* tmac/doc-ditroff (doc-setup-page-layout), tmac/doc-nroff
(doc-setup-page-layout): Use \n[LL] and \n[LT].
* tmac/an-old.tmac: Set \n[LL] and \n[LT] if not defined.
(TH): Use \n[LL].
(an-header, an-p-footer): Use \n[LT].
* NEWS, tmac/groff_man.man, tmac/groff_mdoc.man,
doc/groff.texinfo: Document it.

10 files changed, 132 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 73f72dc9..fa524761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,22 @@
 2002-05-03  Werner LEMBERG  <wl@gnu.org>
 
 	* doc/groff.texinfo: Finished separation of glyphs and characters.
+	Don't use the string `Appendix' for appendix headers (both in
+	the text and the table of contents).
+	* man/groff_tmac.man, src/roff/troff/troff.man: Fix order of tmac
+	directories.
+
+	Use registers LL and LT (similar to -ms) for controlling the
+	length of title and line, respectively, in the -man and -mdoc
+	macro packages.
+
+	* tmac/doc-ditroff (doc-setup-page-layout), tmac/doc-nroff
+	(doc-setup-page-layout): Use \n[LL] and \n[LT].
+	* tmac/an-old.tmac: Set \n[LL] and \n[LT] if not defined.
+	(TH): Use \n[LL].
+	(an-header, an-p-footer): Use \n[LT].
+	* NEWS, tmac/groff_man.man, tmac/groff_mdoc.man,
+	doc/groff.texinfo: Document it.
 
 2002-05-02  Werner LEMBERG  <wl@gnu.org>
 
diff --git a/NEWS b/NEWS
index c43e9cb3..c7115606 100644
--- a/NEWS
+++ b/NEWS
@@ -160,6 +160,12 @@ o Using the latin-1 input character 0xAD (soft hyphen) for the `shc'
 o Two macros `AT' (AT&T) and `UC' (Univ. of California) have been added to
   the man macros for compatibility with older BSD releases.
 
+o Both the man and mdoc macro packages now use the LL and LT registers for
+  setting the line and title length, respectively (similar to those
+  registers in the ms macro package).  If not set on the command line or
+  in a macro file loaded before the macro package itself, they default to
+  78n in nroff mode and 6.5i in troff mode.
+
 o The `-xwidth' specifier in the mdoc macro package has been removed.  Its
   functionality is now integrated directly into `-width'.  Similarly,
   `-column' has been extended to provide this functionality also.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 69a3a5da..2d9a9242 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -362,6 +362,12 @@ Software Foundation raise funds for GNU development.''
 @end macro
 
 
+@tex
+\gdef\gobblefirst#1#2{#2}
+\gdef\putwordAppendix{\gobblefirst}
+@end tex
+
+
 @c Note: We say `Roman numerals' but `roman font'.
 
 
@@ -554,12 +560,12 @@ He rewrote it in C, although it was now 7000@w{ }lines of uncommented
 code and still dependent on the CAT.  As the CAT became less common, and
 was no longer supported by the manufacturer, the need to make it support
 other devices became a priority.  However, before this could be done,
-Ossanna was killed in an auto accident.
+Ossanna was killed in a car accident.
 
 @pindex ditroff
 @cindex @code{ditroff}, the program
 So, Brian Kernighan took on the task of rewriting @code{troff}.  The
-newly rewritten version produced a device independent code which was
+newly rewritten version produced device independent code which was
 very easy for postprocessors to read and translate to the appropriate
 printer codes.  Also, this new version of @code{troff} (called
 @code{ditroff} for ``device independent @code{troff}'') had several
@@ -585,7 +591,7 @@ The @code{soelim}, @code{pic}, @code{tbl}, and @code{eqn} preprocessors.
 
 @item
 Postprocessors for character devices, @sc{PostScript}, @TeX{} DVI, and
-X@w{ }windows.  GNU @code{troff} also eliminated the need for a
+X@w{ }Windows.  GNU @code{troff} also eliminated the need for a
 separate @code{nroff} program with a postprocessor which would produce
 @acronym{ASCII} output.
 
@@ -635,7 +641,7 @@ hyphenation
 page control
 
 @item
-font and character size control
+font and glyph size control
 
 @item
 vertical spacing (i.e.@: double spacing)
@@ -783,11 +789,18 @@ the preprocessors, @code{gtroff} and the postprocessor.
 It has become a tradition that GNU programs get the prefix @samp{g} to
 distinguish it from its original counterparts provided by the host (see
 @ref{Environment}, for more details).  Thus, for example, @code{geqn} is
-GNU @code{eqn}.  On operating systems like Linux or the Hurd, which
-don't contain proprietary software, and on MS-DOS/MS-Windows, where
-@code{troff} and associated programs are not available at all, this
-prefix is omitted since GNU @code{troff} is the only used incarnation of
-@code{troff}.  Exception: @code{groff} is never replaced by @code{roff}.
+GNU @code{eqn}.  On operating systems like GNU/Linux or the Hurd, which
+don't contain proprietary versions of @code{troff}, and on
+MS-DOS/MS-Windows, where @code{troff} and associated programs are not
+available at all, this prefix is omitted since GNU @code{troff} is the
+only used incarnation of @code{troff}.  Exception: @samp{groff} is never
+replaced by @samp{roff}.
+
+In this document, we consequently say @samp{gtroff} when talking about
+the GNU @code{troff} program.  All other implementations of @code{troff}
+are called @acronym{AT&T} @code{troff} which is the common origin of
+all @code{troff} derivates (with more or less compatible changes).
+Similarly, we say @samp{gpic}, @samp{geqn}, etc.
 
 @menu
 * Groff Options::
@@ -944,18 +957,21 @@ For @TeX{} DVI format.
 For a 75@dmn{dpi} X11 previewer.
 
 @item X75-12
-For a 75@dmn{dpi} X11 previewer with a 12@dmn{pt} base font.
+For a 75@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the
+document.
 
 @item X100
 For a 100@dmn{dpi} X11 previewer.
 
 @item X100-12
-For a 100@dmn{dpi} X11 previewer with a 12@dmn{pt} base font.
+For a 100@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the
+document.
 
 @item ascii
 @cindex encoding, @acronym{ASCII}
 @cindex @acronym{ASCII}, encoding
-For typewriter-like devices.
+For typewriter-like devices using the (7-bit) @acronym{ASCII}
+character set.
 
 @item latin1
 @cindex encoding, latin-1
@@ -979,7 +995,7 @@ For typewriter-like devices which use the @acronym{EBCDIC} encoding IBM
 cp1047.
 
 @item lj4
-For an HP LaserJet4-compatible (or other PCL5-compatible) printer.
+For HP LaserJet4-compatible (or other PCL5-compatible) printers.
 
 @item lbp
 For Canon @acronym{CAPSL} printers (@w{LBP-4} and @w{LBP-8} series laser
@@ -1034,7 +1050,8 @@ requests.  For security reasons, this is enabled by default.
 @item -U
 @cindex mode, unsafe
 @cindex unsafe mode
-Unsafe mode.  Reverts to the old unsafe behaviour.
+Unsafe mode.  This enables the @code{open}, @code{opena}, @code{pso},
+@code{sy}, and @code{pi} requests.
 
 @item -a
 @cindex @acronym{ASCII} approximation output register (@code{.A})
@@ -1073,11 +1090,11 @@ Inhibit all error messages.
 
 @item -C
 Enable compatibility mode.  @xref{Implementation Differences}, for the
-list of incompatibilities between @code{groff} and traditional @acronym{AT&T}
+list of incompatibilities between @code{groff} and @acronym{AT&T}
 @code{troff}.
 
-@item -d@var{cs}
-@itemx -d@var{name}=s
+@item -d@var{c}@var{s}
+@itemx -d@var{name}=@var{s}
 Define @var{c} or @var{name} to be a string@w{ }@var{s}.  @var{c}@w{ }must
 be a one-letter name; @var{name} can be of arbitrary length.  All string
 assignments happen before loading any macro file (including the start-up
@@ -1089,7 +1106,7 @@ Use @var{fam} as the default font family.  @xref{Font Families}.
 @item -m@var{name}
 Read in the file @file{@var{name}.tmac}.  Normally @code{groff} searches
 for this in its macro directories.  If it isn't found, it tries
-@file{tmac.@var{name}} (and searches in the same directories).
+@file{tmac.@var{name}} (searching in the same directories).
 
 @item -n@var{num}
 Number the first page @var{num}.
@@ -1110,7 +1127,7 @@ If your document restarts page numbering at the beginning of each
 chapter, then @code{gtroff} prints the specified page range for each
 chapter.
 
-@item -r@var{cn}
+@item -r@var{c}@var{n}
 @itemx -r@var{name}=@var{n}
 Set number register@w{ }@var{c} or @var{name} to the value@w{ }@var{n}.
 @var{c}@w{ }must be a one-letter name; @var{name} can be of arbitrary
@@ -1250,12 +1267,12 @@ The home directory.
 @cindex directory, site-specific
 @cindex platform-specific directory
 @cindex directory, platform-specific
-A site-specific (platform-independent) directory, a platform-specific
+A platform-dependent directory, a site-specific (platform-independent)
 directory, and the main tmac directory; the default locations are
 
 @Example
-/usr/local/share/groff/site-tmac
 /usr/local/lib/groff/site-tmac
+/usr/local/share/groff/site-tmac
 /usr/local/share/groff/1.18/tmac
 @endExample
 
@@ -1852,7 +1869,8 @@ The command line format for using the @file{man} macros with
 @code{groff} is:
 
 @Example
-groff -m man [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ]
+groff -m man [ -rLL=@var{length} ] [ -rLT=@var{length} ]
+      [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ]
       [ -rS@var{xx} ] [ -rX@var{nnn} ] [ @var{files}@dots{} ]
 @endExample
 
@@ -1860,6 +1878,14 @@ groff -m man [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ]
 It is possible to use @samp{-man} instead of @w{@samp{-m man}}.
 
 @table @code
+@item -rLL=@var{length}
+Set line length to @var{length}.  If not specified, the line lenght
+defaults to 78@dmn{n} in nroff mode and 6.5@dmn{i} otherwise.
+
+@item -rLT=@var{length}
+Set title length to @var{length}.  If not specified, the title lenght
+defaults to 78@dmn{n} in nroff mode and 6.5@dmn{i} otherwise.
+
 @item -rcR=1
 This option (the default if a TTY output device is used) creates a
 single, very long page instead of multiple pages.  Use @code{-rcR=0}
@@ -5367,8 +5393,9 @@ The current year.
 The current year minus@w{ }1900.  Unfortunately, the documentation of
 @acronym{UNIX} Version@w{ }7's @code{troff} had a year@w{ }2000 bug: It
 incorrectly claimed that @code{yr} contains the last two digits of the
-year.  That claim has never been true of either traditional @code{troff}
-or GNU @code{troff}.  Old @code{troff} input that looks like this:
+year.  That claim has never been true of either @acronym{AT&T}
+@code{troff} or GNU @code{troff}.  Old @code{troff} input that looks
+like this:
 
 @Example
 '\" The following line stopped working after 1999
@@ -5670,7 +5697,7 @@ values of the parameters set by the first and second arguments of the
 The word space and sentence space values are associated with the current
 environment (@pxref{Environments}).
 
-Contrary to traditional @acronym{AT&T} @code{troff}, this request is @emph{not}
+Contrary to @acronym{AT&T} @code{troff}, this request is @emph{not}
 ignored if a TTY output device is used; the given values are then
 rounded down to a multiple of@w{ }12 (@pxref{Implementation Differences}).
 
@@ -9232,7 +9259,7 @@ false
 @endExample
 
 @noindent
-The resulting motions, character sizes, and fonts have to
+The resulting motions, glyph sizes, and fonts have to
 match,@footnote{The created output nodes must be identical.
 @xref{Gtroff Internals}.} and not the individual motion, size, and
 font requests.  In the previous example, @samp{|} and @samp{\fR|\fP}
@@ -13508,8 +13535,8 @@ document.
 
 @item @acronym{AT&T} @code{troff} output
 Since a computer monitor has a very low resolution compared to modern
-printers the intermediate output for the X@w{ }devices can use the
-jump-and-write command with its 2-digit displacements.
+printers the intermediate output for the X@w{ }Window devices can use
+the jump-and-write command with its 2-digit displacements.
 
 @example
 @group
diff --git a/man/groff_tmac.man b/man/groff_tmac.man
index 1724c185..db2a0bb7 100644
--- a/man/groff_tmac.man
+++ b/man/groff_tmac.man
@@ -377,13 +377,13 @@ command line switch)
 .IP \(bu 4
 the home directory
 .IP \(bu 4
-a site-specific (platform-independent) directory, a platform-specific
+a platform-specific directory, a site-specific (platform-independent)
 directory, and the main tmac directory:
 .IP "" 6
-@LOCALMACRODIR@
-.br
 @SYSTEMMACRODIR@
 .br
+@LOCALMACRODIR@
+.br
 @MACRODIR@
 .\" --------------------------------------------------------------------
 .SH ENVIRONMENT
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index 98c37377..ac546de4 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -527,8 +527,8 @@ will scan directories given in the
 .B \-M
 option before these, and in standard directories (current directory if
 in unsafe mode, home directory,
-.BR @LOCALMACRODIR@ ,
 .BR @SYSTEMMACRODIR@ ,
+.BR @LOCALMACRODIR@ ,
 .BR @MACRODIR@ )
 after these.
 .
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 9a6d5c7a..12726638 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -58,6 +58,15 @@
 .  el   .nr cR 0
 .\}
 .
+.if !r LL \{\
+.  ie n .nr LL 78n
+.  el   .nr LL 6.5i
+.\}
+.if !r LT \{\
+.  ie n .nr LT 78n
+.  el   .nr LT 6.5i
+.\}
+.
 .nr an-html 0
 .if '\*[.T]'html' .nr an-html 1
 .if \n[an-html] .nr C 1
@@ -105,8 +114,6 @@
 .  nr PS-SH 10.95z
 .  nr VS    12p
 .
-.  nr LT    \n[.l]
-.
 .  \" use sizes similar to LaTeX
 .  if t \{\
 .    ie (\\n[S] == 11) \{\
@@ -127,6 +134,7 @@
 .
 .  ps \\n[PS]u
 .  vs \\n[VS]u
+.  ll \\n[LL]u
 .
 .  nr IN 7.2n
 .  PD
diff --git a/tmac/doc-ditroff b/tmac/doc-ditroff
index fd2707ba..8b8bd00a 100644
--- a/tmac/doc-ditroff
+++ b/tmac/doc-ditroff
@@ -149,8 +149,16 @@
 .  nr doc-header-space .5i
 .  nr doc-footer-space .5i
 .
-.  ll 6.5i
-.  lt 6.5i
+.  ie r LL \
+.    ll \n[LL]u
+.  el \
+.    ll 6.5i
+.
+.  ie r LT \
+.    lt \n[LT]u
+.  el \
+.    lt 6.5i
+.
 .  po 1i
 .
 .  nr doc-display-vertical .5v
diff --git a/tmac/doc-nroff b/tmac/doc-nroff
index 47260ddd..250163c1 100644
--- a/tmac/doc-nroff
+++ b/tmac/doc-nroff
@@ -128,8 +128,16 @@
 .    nr doc-header-space .5i
 .  nr doc-footer-space .5i
 .
-.  ll 78n
-.  lt 78n
+.  ie r LL \
+.    ll \n[LL]u
+.  el \
+.    ll 78n
+.
+.  ie r LT \
+.    lt \n[LT]u
+.  el \
+.    lt 78n
+.
 .  po 0i
 .
 .  nr doc-display-vertical 1v
diff --git a/tmac/groff_man.man b/tmac/groff_man.man
index 379f13b8..57e3f0f4 100644
--- a/tmac/groff_man.man
+++ b/tmac/groff_man.man
@@ -64,6 +64,16 @@ The
 macros understand the following command line options (which define various
 registers).
 .TP
+.BI \-rLL= line-length
+Set line length.
+If this option is not given, the line length defaults to 78n in nroff mode
+and 6.5i in troff mode.
+.TP
+.BI \-rLT= title-length
+Set title length.
+If this option is not given, the title length defaults to 78n in nroff mode
+and 6.5i in troff mode.
+.TP
 .B \-rcR=1
 This option (the default if in nroff mode) will create a single, very long
 page instead of multiple pages.
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index 7fab34fe..3ffe00d8 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -3935,6 +3935,17 @@ Register
 is ignored for
 .Tn TTY
 devices.
+.Pp
+The line and title length can be changed by setting the registers
+.Ql LL
+and
+.Ql LT ,
+respectively:
+.Pp
+.Dl groff -Tutf8 -rLL=100n -rLT=100n -mdoc foo.man | less
+.Pp
+If not set, both registers default to 78n for TTY devices and 6.5i
+otherwise.
 .
 .
 .Sh FILES