X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.h;h=66958da3c87d3a1d9a6453196e0a3b7a0b1d2b55;hp=539addde005515a205b3cd61a7e944b2f7b8ae6a;hb=62f28906ebae10fa325af43bf19315260c344303;hpb=5e85f2318e021b29590ae201311350842122d1e8

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 539addd..66958da 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -41,28 +41,54 @@
 #else
 #include "GHash.h"
 #endif
+#include "../gfxdevice.h"
+#include "../gfxtools.h"
+#include "../gfxfont.h"
+#include "../q.h"
+
+#define INTERNAL_FONT_SIZE 1024.0
+#define GLYPH_IS_SPACE(g) ((!(g)->line || ((g)->line->type==gfx_moveTo && !(g)->line->next)) && (g)->advance)
 
 struct GlyphInfo
 {
     SplashPath*path;
     int unicode;
     int glyphid;
+    double advance;
     double x1,y1,x2,y2;
+
+    double advance_max;
 };
 
-struct FontInfo
+class FontInfo
 {
-    FontInfo();
+    gfxfont_t*gfxfont;
+
+    char*id;
+public:
+    FontInfo(char*id);
     ~FontInfo();
+
+    gfxfont_t* getGfxFont();
+
+    double lastx,lasty;
+    int lastchar;
+    int lastadvance;
+
+    double ascender,descender;
+
     void grow(int size);
 
     GfxFont*font;
     double max_size;
     int num_glyphs;
     GlyphInfo**glyphs;
-    int*charid2glyph;
+    dict_t**kerning;
+
     SplashFont*splash_font;
     char seen;
+    int space_char;
+    float average_advance;
 };
 
 extern char*getFontID(GfxFont*font);
@@ -77,9 +103,13 @@ class InfoOutputDev: public OutputDev
     public:
     int x1,y1,x2,y2;
     int num_links;
-    int num_images;
+    int num_ppm_images;
+    int num_jpeg_images;
     int num_fonts;
     int num_polygons;
+    int num_textfields;
+
+    void dumpfonts(gfxdevice_t*dev);
 
     InfoOutputDev(XRef*xref);
     virtual ~InfoOutputDev(); 
@@ -123,6 +153,7 @@ class InfoOutputDev: public OutputDev
 				      Stream *maskStr,
 				      int maskWidth, int maskHeight,
 				      GfxImageColorMap *maskColorMap);
+
     virtual FontInfo* getFont(char*id);
 };