diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/devices/grodvi/dvi.cpp | 5 | ||||
| -rw-r--r-- | src/devices/grohtml/post-html.cpp | 3 | ||||
| -rw-r--r-- | src/devices/grolbp/lbp.cpp | 5 | ||||
| -rw-r--r-- | src/devices/grolj4/lj4.cpp | 5 | ||||
| -rw-r--r-- | src/devices/grops/ps.cpp | 5 | ||||
| -rw-r--r-- | src/devices/grotty/tty.cpp | 5 | ||||
| -rw-r--r-- | src/include/printer.h | 1 |
8 files changed, 11 insertions, 27 deletions
@@ -1,3 +1,12 @@ +2004-10-30 Gaius Mulley <gaius@glam.ac.uk> + + * src/include/printer.h (printer): Remove virtual function + `round_width'. + Update all source files. + + * src/devices/grohtml/post-html.cpp (html_printer): New member + function `round_width'. + 2004-10-20 Tadziu Hoffmann <hoffmann@usm.uni-muenchen.de> * src/preproc/tbl/table.cpp (table::do_row): Fix handling of the `d' diff --git a/src/devices/grodvi/dvi.cpp b/src/devices/grodvi/dvi.cpp index fe2c4520..fb3636ec 100644 --- a/src/devices/grodvi/dvi.cpp +++ b/src/devices/grodvi/dvi.cpp @@ -112,11 +112,6 @@ struct output_font { output_font() : f(0) { } }; -int printer::round_width(int x) -{ - return x; -} - class dvi_printer : public printer { FILE *fp; int max_drift; diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp index ef7b6b1d..648dab33 100644 --- a/src/devices/grohtml/post-html.cpp +++ b/src/devices/grohtml/post-html.cpp @@ -2074,6 +2074,7 @@ class html_printer : public printer { void handle_assertion (int minv, int minh, int maxv, int maxh, const char *s); void handle_state_assertion (text_glob *g); void do_end_para (text_glob *g); + int round_width (int x); // ADD HERE public: @@ -4786,7 +4787,7 @@ void html_printer::special(char *s, const environment *env, char type) * taken from number.cpp in src/roff/troff, [hunits::hunits(units x)] */ -int printer::round_width(int x) +int html_printer::round_width(int x) { int r = font::hor; int n; diff --git a/src/devices/grolbp/lbp.cpp b/src/devices/grolbp/lbp.cpp index 6a196405..0f480843 100644 --- a/src/devices/grolbp/lbp.cpp +++ b/src/devices/grolbp/lbp.cpp @@ -59,11 +59,6 @@ private: lbp_font(const char *); }; -int printer::round_width(int x) -{ - return x; -} - class lbp_printer : public printer { public: lbp_printer(int, double, double); diff --git a/src/devices/grolj4/lj4.cpp b/src/devices/grolj4/lj4.cpp index f22c962d..a6287abd 100644 --- a/src/devices/grolj4/lj4.cpp +++ b/src/devices/grolj4/lj4.cpp @@ -159,11 +159,6 @@ void lj4_font::handle_unknown_font_command(const char *command, } } -int printer::round_width(int x) -{ - return x; -} - class lj4_printer : public printer { public: lj4_printer(int); diff --git a/src/devices/grops/ps.cpp b/src/devices/grops/ps.cpp index c98215f1..41aece50 100644 --- a/src/devices/grops/ps.cpp +++ b/src/devices/grops/ps.cpp @@ -1778,11 +1778,6 @@ void ps_printer::do_endinvis(char *, const environment *) --invis_count; } -int printer::round_width(int x) -{ - return x; -} - printer *make_printer() { return new ps_printer(user_paper_length); diff --git a/src/devices/grotty/tty.cpp b/src/devices/grotty/tty.cpp index 24ab96ba..bdaa1de3 100644 --- a/src/devices/grotty/tty.cpp +++ b/src/devices/grotty/tty.cpp @@ -192,11 +192,6 @@ void glyph::operator delete(void *p) } } -int printer::round_width(int x) -{ - return x; -} - class tty_printer : public printer { int is_utf8; glyph **lines; diff --git a/src/include/printer.h b/src/include/printer.h index bfba19d5..e182473d 100644 --- a/src/include/printer.h +++ b/src/include/printer.h @@ -83,7 +83,6 @@ public: virtual void end_of_line(); virtual void special(char *arg, const environment *env, char type = 'p'); - virtual int round_width(int); protected: font_pointer_list *font_list; |