X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=dvi%2Fpainter.hh;h=4d6fdda11ba7627a94b9e2f9e2e6859649e34e46;hb=957099335895f67c4774e6e2a3108a2f46a525c3;hp=cbb968bf49d821ad046ee98ed1c04f61f3599e08;hpb=4296951e94a43c723e9522b588cab178eb66d144;p=evince.git

diff --git a/dvi/painter.hh b/dvi/painter.hh
index cbb968bf..4d6fdda1 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