Implement string-valued registers \n[.m] and \n[.M] to return the

name of the current drawing and background color, respectively.

* src/roff/troff/symbol.h: Moved to...
* src/include/symbol.h: Here.
Small fixes to make it work outside of the `troff' directory.
* src/roff/troff/symbol.cpp: Moved to...
* src/libs/libgroff/symbol.cpp: Here.
Small fixes to make it work outside of the `troff' directory.

* src/include/Makefile.sub (HDRS), src/libs/libgroff/Makefile.sub
(OBJS, CCSRCS), src/roff/troff/Makefile.sub (OBJS, CCSRCS, HDRS):
Updated.

* src/include/color.h: Include symbol.h.
(color): Add new field `nm'.
* src/libs/libgroff/color.cpp (color::color): Updated.

* src/roff/troff/dictionary.cpp, src/roff/troff/div.cpp,
src/roff/troff/node.cpp, src/roff/troff/number.cpp,
src/roff/troff/reg.cpp: Don't include symbol.h.

* src/roff/troff/env.cpp: Don't include symbol.h.
(environment::get_glyph_color_string,
environment_get_fill_color_string): New member functions.
(init_env_requests): Handle `.m' and `.M' registers.
* src/roff/troff/input.cpp: Don't include symbol.h.
(default_symbol): Moved to symbol.cpp/symbol.h.
(do_glyph_color, do_fill_color, define_color): Pass symbol name
to color constructor.
* src/roff/troff/env.h: Updated.

* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo:
Document new registers.

2 files changed, 24 insertions, 6 deletions

diff --git a/man/groff.man b/man/groff.man
index e9a63941..57adb3d6 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -2,11 +2,11 @@
 .ig
 groff.man
 
-Last update: 23 Jul 2003
+Last update: 07 Jan 2004
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -3164,6 +3164,12 @@ The title length (as set by the
 .request lt
 request).
 .
+.REG .m
+The current drawing color (string-valued).
+.
+.REG .M
+The current background color (string-valued).
+.
 .REG .n
 Length of text portion on previous output line.
 .
@@ -3451,7 +3457,7 @@ be reproduced, and say which version of groff you are using.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
diff --git a/man/groff_diff.man b/man/groff_diff.man
index bd19db80..a9a176a2 100644
--- a/man/groff_diff.man
+++ b/man/groff_diff.man
@@ -3,12 +3,12 @@
 .ig
 groff_diff.man
 
-Last update : 23 Jul 2003
+Last update : 07 Jan 2004
 
 This file is part of groff, the GNU roff type-setting system.
 It is the source of the man-page groff_diff(7).
 
-Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by James Clark
 
 modified by Werner Lemberg <wl@gnu.org>
@@ -2693,6 +2693,18 @@ The title length as set by the
 request.
 .
 .TP
+.B \[rs]n[.m]
+The name of the current drawing color.
+.
+This is a string-valued register.
+.
+.TP
+.B \[rs]n[.M]
+The name of the current background color.
+.
+This is a string-valued register.
+.
+.TP
 .B \[rs]n[.ne]
 The amount of space that was needed in the last
 .B ne
@@ -3680,7 +3692,7 @@ classical "device-independent" troff did.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free