diff options
| author | Soeren Sandmann <sandmann@redhat.com> | 2004-12-22 16:04:45 (GMT) |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-12-22 16:04:45 (GMT) |
| commit | 08d37ab642e8cb80774a87270fd6a3f9fab783fb (patch) | |
| tree | 1c05b53c93197c3ae3cf6350aea587f0b30a28b6 /dvi/painter.hh | |
| parent | 08dc4040951ec1e3945e07107d008a4ce7c928c9 (diff) | |
Auto*ify dvi and dvi/dvilib
Tue Dec 21 21:45:43 2004 Soeren Sandmann <sandmann@redhat.com>
* Makefile.am:
* dvi/dvilib/Makefile.am:
* dvi/Makefile.am:
* configure.ac: Auto*ify dvi and dvi/dvilib
* dvi/Makefile: Remove from CVS
* dvi/dvilib/dl-pkfont.cc (unpack_bitmap): Fix uchar/uint
confusion.
* dvi/dvilib/dl-fontdefinition.{cc,hh}: New DviFontMap class
* dvi/dvilib/dl-vffont.{cc,hh}: Many bugfixes to VF code.
Diffstat (limited to 'dvi/painter.hh')
| -rwxr-xr-x | dvi/painter.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dvi/painter.hh b/dvi/painter.hh index cbb968b..4d6fdda 100755 --- a/dvi/painter.hh +++ b/dvi/painter.hh @@ -23,9 +23,12 @@ public: class DviFrame : public DviLib::RefCounted { public: + DviLib::DviFontMap *fontmap; int h, v, w, x, y, z; // in dvi units DviFrame *next; DviFrame *copy (); + DviLib::AbstractFont *font; + ~DviFrame(); }; class DviPainter : public AbstractDviPainter @@ -49,7 +52,7 @@ public: virtual void y_rep (); // move down y virtual void z (int len); // move down len, set z = len virtual void z_rep (); // move down z - virtual void push_fontmap (std::map<int, DviLib::DviFontdefinition *> fontmap); + virtual void fontmap (DviLib::DviFontMap *fontmap); // set fontmap virtual void font_num (int font_num); // current_font = fd virtual void special (string spc); // do something special virtual void paint_bitmap (const unsigned char *data, @@ -65,7 +68,6 @@ private: AbstractFontFactory *font_factory; // runtime - DviLib::AbstractFont *current_font; DviFrame *current_frame; // stack of DVI frames double scale; // convert dvi units to pixels |