* tmac/groff_ms.man: Typographical improvements.

* doc/groff.texinfo: Updated version and copyright.
* src/devices/grops/grops.man: Updated.

* tmac/groff_tmac.man: Fix `ig' macro.

* tmac/an-old.tmac (ne): Redefine `ne' request to be a no-op in
nroff mode.
Use `.ne' unconditionally everywhere.
(TS): Only insert some vertical space.  Doing a page break is no
longer necessary due to the redefinition of the `ne' request.

* src/libs/libdriver/input.cc (parse_D_command): Don't emit a
warning for unknown subcommands but parse and pass them to the
device driver.

10 files changed, 177 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e2bd5d9..32ffda40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2002-01-25  Larry Kollar  <kollar@alltel.net>
+
+	* tmac/groff_ms.man: Typographical improvements.
+
+2002-01-25  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Updated version and copyright.
+	* src/devices/grops/grops.man: Updated.
+
+	* tmac/groff_tmac.man: Fix `ig' macro.
+
+	* tmac/an-old.tmac (ne): Redefine `ne' request to be a no-op in
+	nroff mode.
+	Use `.ne' unconditionally everywhere.
+	(TS): Only insert some vertical space.  Doing a page break is no
+	longer necessary due to the redefinition of the `ne' request.
+
+	* src/libs/libdriver/input.cc (parse_D_command): Don't emit a
+	warning for unknown subcommands but parse and pass them to the
+	device driver.
+
 2002-01-24  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/groff_www.man, NEWS: Fix typos.
@@ -21,7 +42,7 @@
 	Note that currently grohtml doesn't handle colors properly.  This
 	has to be fixed.
 
-	* src/libgroff/itoa.c (UINT_DIGITS): New macro.
+	* src/libs/libgroff/itoa.c (UINT_DIGITS): New macro.
 	(ui_to_a): New function.
 	* src/include/lib.h: Updated.
 
@@ -32,7 +53,7 @@
 	(color::operator==, color:operator!=): New.
 	(Red, Green, Blue, Cyan, Magenta, Yellow, Black, Gray): New macros
 	to make access to the `components' array more comprehensible.
-	* src/libgroff/color.cc: Implement new color support.
+	* src/libs/libgroff/color.cc: Implement new color support.
 	(atoh): Small fixes.
 	(color::read_encoding): Simplified for new troff intermediate color
 	output format.
@@ -534,7 +555,7 @@
 
 2001-11-29  Werner LEMBERG  <wl@gnu.org>
 
-	* src/lib/libbib/map.c, src/utils/pfbtops/pfbtops.c: Include
+	* src/libs/libbib/map.c, src/utils/pfbtops/pfbtops.c: Include
 	stdlib.h.
 
 	* src/roff/troff/input.cc (read_draw_node): Emit error message if
@@ -1773,8 +1794,8 @@ Version 1.17 released
 
 	* src/devices/grohtml-old/*: Removed.
 	* font/devhtml-old/*: Removed.
-	* src/libgroff/htmlindicate.cc (graphic_start, graphic_end): Remove
-	comments.
+	* src/libs/libgroff/htmlindicate.cc (graphic_start, graphic_end):
+	Remove comments.
 	* Makefile.in (CCPROGDIRS, DEVDIRS): Updated.
 	* test-groff (PATH): Updated.
 	* tmac/Makefile.sub (NORMALFILES): Updated.
@@ -1786,11 +1807,11 @@ Version 1.17 released
 	* tmac/www.tmac: Remove special code for html-old device.
 	Replace `html-or-html-old' register with `www-html'.
 
-	* src/libgroff/tmpfile.cc (remove_tmp_files),
-	src/libgroff/htmlindicate.cc (graphic_end), include/htmlindicate.h,
-	src/preproc/grn/*.cc, src/roff/groff/env.{cc,h}: Remove `void'
-	parameter if used as a single argument for consistency with rest of
-	source code.
+	* src/libs/libgroff/tmpfile.cc (remove_tmp_files),
+	src/libs/libgroff/htmlindicate.cc (graphic_end),
+	include/htmlindicate.h, src/preproc/grn/*.cc,
+	src/roff/groff/env.{cc,h}: Remove `void' parameter if used as a
+	single argument for consistency with rest of source code.
 
 	* aclocal.m4, tmac/an-old.tmac: Fix copyright.
 
@@ -2899,10 +2920,10 @@ Version 1.17 released
 	files.  Add home directory to unsafe path for consistency.  Don't
 	include the home directory in the font path.
 
-	* src/lib/libgroff/macropath.cc: Add `config_macro_path', change
+	* src/libs/libgroff/macropath.cc: Add `config_macro_path', change
 	`macro_path'.
 	* src/include/macropath.h: Add `config_macrp_path'.
-	* src/lib/libgroff/fontfile.cc: Fix font path.
+	* src/libs/libgroff/fontfile.cc: Fix font path.
 	* src/roff/troff/input.cc (process_startup_file): Use
 	`config_macro_path'.
 	(main): Select unsafe path if -U is given.
@@ -3058,8 +3079,8 @@ Version 1.17 released
 	* configure.in: Fix typo in comment.
 	* configure: Regenerated.
 
-	* src/libgroff/*, src/include/*, src/roff/troff/*: Fixing copyright
-	dates.
+	* src/libs/libgroff/*, src/include/*, src/roff/troff/*: Fixing
+	copyright dates.
 
 2000-11-08  Werner LEMBERG  <wl@gnu.org>
 
@@ -3631,7 +3652,7 @@ Version 1.16.1 released
 	(search_path::open_file): Use IS_ABSOLUTE, PATH_SEP and DIR_SEPS,
 	to support non-Posix systems.
 
-	* src/libc/libbib/search.cc: #include nonposix.h.
+	* src/libs/libbib/search.cc: #include nonposix.h.
 	(search_list::add_file): Open the file in binary mode.
 
 	* src/libs/libbib/linear.cc: #include nonposix.h.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 07f38aef..5283134a 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -226,13 +226,13 @@
 
 
 @ifinfo
-This Info file documents GNU troff version 1.17.
+This Info file documents GNU troff version 1.18.
 
 Published by the Free Software Foundation
 59 Temple Place, Suite 330
 Boston, MA  02111-1307  USA
 
-Copyright (C) 1994-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -273,8 +273,8 @@ instead of in the original English.
 @titlepage
 @title groff
 @subtitle The GNU implementation of @code{troff}
-@subtitle Edition 1.17
-@subtitle Spring 2001
+@subtitle Edition 1.18
+@subtitle Spring 2002
 @author by Trent A.@w{ }Fisher
 @author and Werner Lemberg
 
@@ -283,10 +283,11 @@ instead of in the original English.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright@w{ }1994-2000, 2001 Free Software Foundation,@w{ }Inc.
+Copyright @copyright@w{ }1994-2000, 2001, 2002 Free Software
+Foundation,@w{ }Inc.
 @sp 2
-Version 1.17 of @code{groff}, @*
-Spring 2001
+Version 1.18 of @code{groff}, @*
+Spring 2002
 @sp 2
 Published by the Free Software Foundation @*
 59 Temple Place, Suite 330 @*
@@ -319,7 +320,7 @@ Cover art by Etienne Suvasa.
 @node Top, Copying, (dir), (dir)
 
 @ifinfo
-This Info file documents groff version 1.17, the GNU implementation of
+This Info file documents groff version 1.18, the GNU implementation of
 the troff typesetting system.
 
 This is an in-progress document; contributions, comments, or
@@ -8696,7 +8697,7 @@ The @code{als} request can make a macro have more than one name.
 This would be called as
 
 @Example
-.vl $Id: groff.texinfo,v 1.91 2002/01/24 22:37:30 wlemb Exp $
+.vl $Id: groff.texinfo,v 1.92 2002/01/26 07:52:03 wlemb Exp $
 @endExample
 @endDefesc
 
diff --git a/src/devices/grops/grops.man b/src/devices/grops/grops.man
index e9c6be4f..b677482e 100644
--- a/src/devices/grops/grops.man
+++ b/src/devices/grops/grops.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -199,6 +199,7 @@ having members in each of these styles:
 .de FT
 .if '\\*(.T'ps' .ft \\$1
 ..
+.RS
 .TP
 .B AR
 .FT AR
@@ -359,13 +360,16 @@ Times-Bold
 .FT TBI
 Times-BoldItalic
 .FT
+.RE
 .LP
 There is also the following font which is not a member of a family:
+.RS
 .TP
 .B ZCMI
 .FT ZCMI
 ZapfChancery-MediumItalic
 .FT
+.RE
 .LP
 There are also some special fonts called
 .B SS
@@ -379,6 +383,17 @@ direction) is available as
 most characters in these fonts are unnamed and must be accessed using
 .BR \eN .
 .LP
+The default color for
+.B \em
+and
+.B \eM
+is black; for colors defined in the `rgb' color space,
+.B setrgbcolor
+is used, for `cmy' and `cmyk'
+.BR setcmykcolor ,
+and for `gray'
+.BR setgray .
+.LP
 .B grops
 understands various X commands produced using the
 .B \eX
diff --git a/src/libs/libdriver/input.cc b/src/libs/libdriver/input.cc
index 629453df..b0097964 100644
--- a/src/libs/libdriver/input.cc
+++ b/src/libs/libdriver/input.cc
@@ -347,7 +347,8 @@ ColorArg color_from_Df_command(IntArg);	// transform old color into new
 void fatal_command(char);	// abort for illegal command
 inline Char get_char(void);	// read next character from input stream
 ColorArg get_color_arg(void);	// read in argument for new color cmds
-IntArray *get_D_fixed_args(const int, const bool = false); // read in fixed no. of int args
+IntArray *get_D_fixed_args(const int, const bool = false);
+				// read in fixed no. of int args
 IntArray *get_D_variable_args(void); // variable, even no. of int args
 char *get_extended_arg(void);	// argument for `x X' (several lines)
 IntArg get_integer_arg(void);	// read in next integer argument
@@ -575,7 +576,8 @@ get_color_arg(void) {
 
    number: In-parameter, the number of args to be retrieved.
    ignore: In-parameter, ignore next argument -- GNU troff always emits
-           pairs of parameters for `D' extensions.  Default is `false'.
+           pairs of parameters for `D' extensions added by groff.
+           Default is `false'.
 
    Return: New IntArray containing the arguments.
 */
@@ -1114,6 +1116,7 @@ parse_D_command()
   switch((int) subcmd) {
   case '~':			// D~: draw B-spline
     // actually, this isn't available for some postprocessors
+  default:			// unknown options are passed to the device
     {
       IntArray *args = get_D_variable_args();
       send_draw(subcmd, args);
@@ -1197,11 +1200,6 @@ parse_D_command()
       delete args;
       break;
     }
-  default:			// ignore unknown D commands, but warn
-    warning("unknown command `D%1'", (char) subcmd);
-    skip_line();
-    // no positioning
-    break;
   } // end of D subcommands
 }
 
diff --git a/src/preproc/pic/lex.cc b/src/preproc/pic/lex.cc
index 39f60228..3aeb30c0 100644
--- a/src/preproc/pic/lex.cc
+++ b/src/preproc/pic/lex.cc
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2002
+     Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff --git a/src/preproc/pic/object.cc b/src/preproc/pic/object.cc
index 4eae9564..30d49067 100644
--- a/src/preproc/pic/object.cc
+++ b/src/preproc/pic/object.cc
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+     Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 0e064e9c..b9e3da83 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -63,6 +63,11 @@
 .if \n[an-html] .nr C 1
 .if r ps4html .nr C 1
 .
+.if n \{\
+.  de ne
+.  .
+.\}
+.
 .de set-an-margin
 .  nr an-margin \\n[IN]
 ..
@@ -256,7 +261,7 @@
 .  nr an-break-flag 1
 .  ps \\n[PS-SH]u
 .  ft B
-.  if !\\n[cR] .ne (2v + 1u)
+.  ne (2v + 1u)
 .  if \\n[.$] \&\\$*
 ..
 .
@@ -273,7 +278,7 @@
 .  nr an-break-flag 1
 .  ps \\n[PS-SS]u
 .  ft B
-.  if !\\n[cR] .ne (2v + 1u)
+.  ne (2v + 1u)
 .  if \\n[.$] \&\\$*
 ..
 .
@@ -337,7 +342,7 @@
 .  di
 .  ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\
 .    in \\n[an-margin]u
-.    if !\\n[cR] .ne (2v + 1u)
+.    ne (2v + 1u)
 .    an-div
 .    br
 .    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
@@ -346,7 +351,7 @@
 .    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .    ti -\\n[an-prevailing-indent]u
 .    chop an-div
-.    if !\\n[cR] .ne (1v + 1u)
+.    ne (1v + 1u)
 \\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
 .  \}
 ..
@@ -370,7 +375,7 @@
 .    vs \\n[VS]u
 .    ft R
 .    sp \\n[PD]u
-.    if !\\n[cR] .ne (1v + 1u)
+.    ne (1v + 1u)
 .    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .  \}
 .  el \{\
@@ -385,7 +390,7 @@
 .  vs \\n[VS]u
 .  ft R
 .  sp \\n[PD]u
-.  if !\\n[cR] .ne (1v + 1u)
+.  ne (1v + 1u)
 .  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
 .  in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .  ti \\n[an-margin]u
@@ -494,12 +499,6 @@
 .
 .de1 TS
 .  sp \\n[PD]u
-.  if n \{\
-.    nr an-pl \\n[.p]
-.    pl \\n[nl]u
-.    bp
-.    pl \\n[an-pl]u
-.  \}
 ..
 .
 .de1 TE
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man
index eca546f6..cea0de74 100644
--- a/tmac/groff_ms.man
+++ b/tmac/groff_ms.man
@@ -120,50 +120,79 @@ or just after the
 .B RP
 macro.
 .LP
+.ne 9
 .B Margin settings
+.RS
+.na
 .TS
-center;
-cb cb cb cb
-afCW l l l .
+cb   s cb s s cb s cb s
+afCW s l  s s l  s l  s.
 Reg.	Definition	Effective	Default
 _
-PO	Page offset (left margin)	next page	1i
-LL	Line length	next para.	6i
-LT	Header/footer length	next para.	6i
-HM	Top (header) margin	next page	1i
-FM	Bottom (footer) margin	next page	1i
+PO	T{
+Page offset (left margin)
+T}	T{
+next page
+T}	1i
+LL	T{
+Line length
+T}	next para.	6i
+LT	T{
+Header/footer length
+T}	next para.	6i
+HM	T{
+Top (header) margin
+T}	next page	1i
+FM	T{
+Bottom (footer) margin
+T}	next page	1i
 _
 .TE
+.RE
 .LP
+.ne 7
 .B Text settings
+.RS
 .TS
-center;
-cb cb cb cb
-afCW l l l .
+cb   s cb s s cb s cb s
+afCW s l  s s l  s l  s.
 Reg.	Definition	Effective	Default
 _
-PS	Point size	next para.	10p
-VS	Line spacing (leading)	next para.	12p
+PS	T{
+Point size
+T}	next para.	10p
+VS	T{
+Line spacing (leading)
+T}	next para.	12p
 _
 .TE
+.RE
 .LP
-.if t .bp
+.ne 7
 .B Paragraph settings
+.RS
 .TS
-center;
-cb cb cb cb
-afCW l l l .
+cb cb s cb cb
+afCW l s l l .
 Reg.	Definition	Effective	Default
 _
-PI	Initial indent	next para.	5n
-PD	Space between paragraphs	next para.	0.3v
-QI	Quoted paragraph indent	next para.	5n
+PI	T{
+Initial indent
+T}	next para.	5n
+PD	T{
+Space between paragraphs
+T}	next para.	0.3v
+QI	T{
+Quoted paragraph indent
+T}	next para.	5n
 _
 .TE
+.RE
 .LP
+.ne 7
 .B Footnote settings
+.RS
 .TS
-center;
 cb cb cb cb
 afCW l l l .
 Reg.	Definition	Effective	Default
@@ -173,17 +202,23 @@ FI	Footnote indent	next footnote	2n
 FF	Footnote format	next footnote	0
 _
 .TE
+.RE
 .LP
+.ne 6
 .B Other settings
+.RS
 .TS
-center;
-cb cb cb cb
-afCW l l l .
+cb   s cb s s cb s cb s
+afCW s l  s s l  s l  s.
 Reg.	Definition	Effective	Default
 _
-MINGW	Minimum width between columns	next page	2n
+MINGW	T{
+Minimum width between columns
+T}	next page	2n
 _
 .TE
+.ad
+.RE
 .\" -----
 .SS "Cover page macros"
 Use the following macros to create a cover page for your document
@@ -432,11 +467,13 @@ Displays can be
 .I kept
 on a single page, or allowed to break across pages.
 The following table shows the display types available.
+.RS
+.ne 11
+.na
 .TS
-center;
-cb s | cb 
-cb cb | ^
-lfCW lfCW | lw(3i) .
+cb   s s    s cbt s s
+cb   s cb   s ^   s s
+lfCW s lfCW s l   s s.
 Display macro	Type of display
 With keep	No keep
 _
@@ -451,6 +488,8 @@ T}
 \&.DS R	\&.RD	Right-justified.
 _
 .TE
+.RE
+.ad
 .LP
 Use the
 .B DE
@@ -593,6 +632,7 @@ prints footnote numbers by changing the value of the
 .B FF
 register as follows:
 .RS
+.ne 7
 .TP
 0
 Prints the footnote number as a superscript; indents the footnote (default).
@@ -666,19 +706,33 @@ appearing in the header or footer text.
 .SS Margins
 You control margins using a set of number registers.
 The following table lists the register names and defaults:
+.RS
+.ne 8
+.na
 .TS
-center;
-cb cb cb cb
-afCW l l a .
+cb   s cb s s cb s cb s
+afCW s l  s s l  s l  s.
 Reg.	Definition	Effective	Default
 _
-PO	Page offset (left margin)	next page	1i
-LL	Line length	next para.	6i
-LT	Header/footer length	next para.	6i
-HM	Top (header) margin	next page	1i
-FM	Bottom (footer) margin	next page	1i
+PO	T{
+Page offset (left margin)
+T}	next page	1i
+LL	T{
+Line length
+T}	next para.	6i
+LT	T{
+Header/footer length
+T}	next para.	6i
+HM	T{
+Top (header) margin
+T}	next page	1i
+FM	T{
+Bottom (footer) margin
+T}	next page	1i
 _
 .TE
+.RE
+.ad
 .PP
 Note that there is no right margin setting.
 The combination of page offset and line length
@@ -814,6 +868,7 @@ should use this number register.
 You can redefine the following strings to adapt the
 .I "groff ms"
 macros to languages other than English:
+.ne 18
 .TS
 center;
 cb cb
diff --git a/tmac/groff_tmac.man b/tmac/groff_tmac.man
index e8fe0ab4..b6654848 100755
--- a/tmac/groff_tmac.man
+++ b/tmac/groff_tmac.man
@@ -1,4 +1,4 @@
-.ig /
+.ig
 groff_tmac.5
 
 This file is part of groff, the GNU roff type-setting system.
@@ -14,7 +14,7 @@ Front-Cover Texts, and with no Back-Cover Texts.
 
 A copy of the Free Documentation License is included as a file called
 FDL in the main directory of the groff source package.
-./
+..
 .
 .\" --------------------------------------------------------------------
 .\" Setup
diff --git a/tmac/groff_www.man b/tmac/groff_www.man
index f531b981..a60bd558 100644
--- a/tmac/groff_www.man
+++ b/tmac/groff_www.man
@@ -1,5 +1,5 @@
 .TH GROFF_WWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.\" Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+.\" Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 .\"      Written by Gaius Mulley (gaius@glam.ac.uk)
 .\"
 .\" This file is part of groff.