diff options
| author | wlemb <wlemb> | 2002-08-08 22:22:39 +0000 |
|---|---|---|
| committer | wlemb <wlemb> | 2002-08-08 22:22:39 +0000 |
| commit | d94c71b261cb701e85cfe48dd92cf1bf82d09d95 (patch) | |
| tree | 21cd6bb0d3c32cd40c87e737bf606dd9414d83a7 | |
| parent | ff9821742e6c599d6dc4e918ed160ca2bb0ad727 (diff) | |
| download | groff-d94c71b261cb701e85cfe48dd92cf1bf82d09d95.tar.gz | |
* src/roff/troff/input.cc (read_rgb, read_cmy, read_cmyk): Call
tok.next().
(read_gray): Ditto.
Don't push back a space but a newline onto the stack.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/roff/troff/input.cc | 6 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2002-08-08 Werner LEMBERG <wl@gnu.org> + + * src/roff/troff/input.cc (read_rgb, read_cmy, read_cmyk): Call + tok.next(). + (read_gray): Ditto. + Don't push back a space but a newline onto the stack. + 2002-08-07 Gaius Mulley <gaius@glam.ac.uk> Add fonts `CI', `CB', and `CBI' to grohtml which have been omitted diff --git a/src/roff/troff/input.cc b/src/roff/troff/input.cc index 35e1d077..534ef67f 100644 --- a/src/roff/troff/input.cc +++ b/src/roff/troff/input.cc @@ -1109,6 +1109,7 @@ static color *read_rgb() else { input_stack::push(make_temp_iterator(" ")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int r = get_color_element("rgb color", "red component"); unsigned int g = get_color_element("rgb color", "green component"); unsigned int b = get_color_element("rgb color", "blue component"); @@ -1136,6 +1137,7 @@ static color *read_cmy() else { input_stack::push(make_temp_iterator(" ")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int c = get_color_element("cmy color", "cyan component"); unsigned int m = get_color_element("cmy color", "magenta component"); unsigned int y = get_color_element("cmy color", "yellow component"); @@ -1163,6 +1165,7 @@ static color *read_cmyk() else { input_stack::push(make_temp_iterator(" ")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int c = get_color_element("cmyk color", "cyan component"); unsigned int m = get_color_element("cmyk color", "magenta component"); unsigned int y = get_color_element("cmyk color", "yellow component"); @@ -1189,8 +1192,9 @@ static color *read_gray() } } else { - input_stack::push(make_temp_iterator(" ")); + input_stack::push(make_temp_iterator("\n")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int g = get_color_element("gray", "gray value"); col->set_gray(g); } |