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.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/include/color.h b/src/include/color.h
index 205f70ef..2a1c62f0 100644
--- a/src/include/color.h
+++ b/src/include/color.h
@@ -24,6 +24,7 @@ with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 #include <stddef.h>
+#include "symbol.h"
 
 enum color_scheme {DEFAULT, CMY, CMYK, RGB, GRAY};
 
@@ -38,8 +39,9 @@ private:
 		    const size_t);
 
 public:
+  symbol nm;
   enum {MAX_COLOR_VAL = 0xffff};
-  color() : scheme(DEFAULT){}
+  color(symbol s = default_symbol) : scheme(DEFAULT), nm(s) {}
   color(const color * const);
   ~color();
   void *operator new(size_t);