diff options
author | wlemb <wlemb> | 2004-01-07 08:28:51 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2004-01-07 08:28:51 +0000 |
commit | 23a51193ba2a03d00a865cb53b8376fca05252e0 (patch) | |
tree | ac34a01b75ce33b1237a4ce1ec499bf0bde6e0c5 /src/include | |
parent | 1943ac7c60c141af6bdc1c5dbd18d8e42daeec37 (diff) | |
download | groff-23a51193ba2a03d00a865cb53b8376fca05252e0.tar.gz |
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.
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/Makefile.sub | 1 | ||||
-rw-r--r-- | src/include/color.h | 4 | ||||
-rw-r--r-- | src/include/symbol.h | 83 |
3 files changed, 87 insertions, 1 deletions
diff --git a/src/include/Makefile.sub b/src/include/Makefile.sub index ef9c4648..a0ab6e14 100644 --- a/src/include/Makefile.sub +++ b/src/include/Makefile.sub @@ -23,6 +23,7 @@ HDRS=\ search.h \ searchpath.h \ stringclass.h \ + symbol.h \ unicode.h GENHDRS=defs.h 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); diff --git a/src/include/symbol.h b/src/include/symbol.h new file mode 100644 index 00000000..af4a4c09 --- /dev/null +++ b/src/include/symbol.h @@ -0,0 +1,83 @@ +// -*- C++ -*- +/* Copyright (C) 1989, 1990, 1991, 1992, 2002, 2004 + Free Software Foundation, Inc. + Written by James Clark (jjc@jclark.com) + +This file is part of groff. + +groff is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +groff is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with groff; see the file COPYING. If not, write to the Free Software +Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#define DONT_STORE 1 +#define MUST_ALREADY_EXIST 2 + +class symbol { + static const char **table; + static int table_used; + static int table_size; + static char *block; + static int block_size; + const char *s; +public: + symbol(const char *p, int how = 0); + symbol(); + unsigned long hash() const; + int operator ==(symbol) const; + int operator !=(symbol) const; + const char *contents() const; + int is_null() const; + int is_empty() const; +}; + + +extern const symbol NULL_SYMBOL; +extern const symbol EMPTY_SYMBOL; + +inline symbol::symbol() : s(0) +{ +} + +inline int symbol::operator==(symbol p) const +{ + return s == p.s; +} + +inline int symbol::operator!=(symbol p) const +{ + return s != p.s; +} + +inline unsigned long symbol::hash() const +{ + return (unsigned long)s; +} + +inline const char *symbol::contents() const +{ + return s; +} + +inline int symbol::is_null() const +{ + return s == 0; +} + +inline int symbol::is_empty() const +{ + return s != 0 && *s == 0; +} + +symbol concat(symbol, symbol); + +extern symbol default_symbol; |